From 0132035122ff9959511456684c6f798397f06cde Mon Sep 17 00:00:00 2001 From: prqek Date: Thu, 30 Aug 2012 15:11:41 +0200 Subject: [PATCH] Fixed some errors in "Implement way propogation" --- .../src/net/osmand/data/preparation/IndexVectorMapCreator.java | 1 + DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java | 1 + DataExtractionOSM/src/net/osmand/osm/rendering_types.xml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DataExtractionOSM/src/net/osmand/data/preparation/IndexVectorMapCreator.java b/DataExtractionOSM/src/net/osmand/data/preparation/IndexVectorMapCreator.java index 259a435321..7949a5755f 100644 --- a/DataExtractionOSM/src/net/osmand/data/preparation/IndexVectorMapCreator.java +++ b/DataExtractionOSM/src/net/osmand/data/preparation/IndexVectorMapCreator.java @@ -102,6 +102,7 @@ public class IndexVectorMapCreator extends AbstractIndexPartCreator { } } if(propogated != null) { + ctx.loadEntityRelation((Relation) e); for(EntityId id : ((Relation) e).getMembersMap().keySet()) { if(!propogatedTags.containsKey(id)) { propogatedTags.put(id, new LinkedHashMap()); diff --git a/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java b/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java index 27ec5efb87..c97dd162d6 100644 --- a/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java +++ b/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java @@ -122,6 +122,7 @@ public class MapRenderingTypes { } public boolean isRelationalTagValuePropogated(String tag, String val) { + Map types = getEncodingRuleTypes(); MapRulType rType = types.get(constructRuleKey(tag, val)); if (rType == null) { rType = types.get(constructRuleKey(tag, null)); diff --git a/DataExtractionOSM/src/net/osmand/osm/rendering_types.xml b/DataExtractionOSM/src/net/osmand/osm/rendering_types.xml index d1793e5485..ebc918dd4a 100644 --- a/DataExtractionOSM/src/net/osmand/osm/rendering_types.xml +++ b/DataExtractionOSM/src/net/osmand/osm/rendering_types.xml @@ -700,4 +700,4 @@ - \ No newline at end of file +