Permalink
Browse files

S3DB (#1025)

- map-writer: reference all part elements
- tag-mapping: enable roof directions
  • Loading branch information...
Gustl22 authored and devemux86 committed Dec 28, 2017
1 parent 8ab84c3 commit 5e3194f814fea1e9072637687981f7f81ca73a25
@@ -421,15 +421,15 @@
<osm-tag key="roof:angle" renderable="false" value="%f" />
<osm-tag key="roof:levels" renderable="false" value="%f" />
<osm-tag key="roof:direction" renderable="false" value="%f" />
<!--<osm-tag equivalent-values="N,n,north" key="roof:direction" renderable="false" value="0" />-->
<!--<osm-tag equivalent-values="NE,ne" key="roof:direction" renderable="false" value="45" />-->
<!--<osm-tag equivalent-values="NW,nw" key="roof:direction" renderable="false" value="315" />-->
<!--<osm-tag equivalent-values="S,s,south" key="roof:direction" renderable="false" value="180" />-->
<!--<osm-tag equivalent-values="SE,se" key="roof:direction" renderable="false" value="135" />-->
<!--<osm-tag equivalent-values="SW,sw" key="roof:direction" renderable="false" value="225" />-->
<!--<osm-tag equivalent-values="E,e,east" key="roof:direction" renderable="false" value="90" />-->
<!--<osm-tag equivalent-values="W,w,west" key="roof:direction" renderable="false" value="270" />-->
<osm-tag equivalent-values="N,n,north" key="roof:direction" renderable="false" value="0" />
<osm-tag equivalent-values="NE,ne" key="roof:direction" renderable="false" value="45" />
<osm-tag equivalent-values="E,e,east" key="roof:direction" renderable="false" value="90" />
<osm-tag equivalent-values="SE,se" key="roof:direction" renderable="false" value="135" />
<osm-tag equivalent-values="S,s,south" key="roof:direction" renderable="false"
value="180" />
<osm-tag equivalent-values="SW,sw" key="roof:direction" renderable="false" value="225" />
<osm-tag equivalent-values="W,w,west" key="roof:direction" renderable="false" value="270" />
<osm-tag equivalent-values="NW,nw" key="roof:direction" renderable="false" value="315" />
<osm-tag key="building:colour" renderable="false" value="%f" />
<!-- Detect unmatched tags -->
@@ -513,8 +513,8 @@ protected void handleImplicitWayRelations() {
return;
}
int progressImplicitRelations = 0;
float limitImplicitRelations = this.tilesToPartElements.entrySet().size();
/*int progressImplicitRelations = 0;
float limitImplicitRelations = this.tilesToPartElements.entrySet().size();*/
// Iterate through tiles which contain parts
for (Map.Entry<TileCoordinate, TLongHashSet> tilePartElementEntry : this.tilesToPartElements.entrySet()) {
@@ -527,12 +527,12 @@ protected void handleImplicitWayRelations() {
}
// Log
String wayRelLog = "Progress: Implicit relations "
/*String wayRelLog = "Progress: Implicit relations "
+ ((int) ((progressImplicitRelations / limitImplicitRelations) * 100))
+ "%% - Tile (" + tilePartElementEntry.getKey().getX()
+ ", " + tilePartElementEntry.getKey().getY() + ")";
progressImplicitRelations++;
int nRootElements = 0;
int nRootElements = 0;*/
// Load parts only once in cache
List<TDWay> pElems = new ArrayList<>();
@@ -593,7 +593,6 @@ protected void handleImplicitWayRelations() {
// Remove part which is already referenced
pElems.remove(pElem);
tilePartElementEntry.getValue().remove(pElem.getId());
break;
}
}
}

0 comments on commit 5e3194f

Please sign in to comment.