Merge remote-tracking branch 'origin/master'

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<String, String>());

DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java

@@ -122,6 +122,7 @@ public class MapRenderingTypes {
 	}
 	
 	public boolean isRelationalTagValuePropogated(String tag, String val) {
+		Map<String, MapRulType> types = getEncodingRuleTypes();
 		MapRulType rType = types.get(constructRuleKey(tag, val));
 		if (rType == null) {
 			rType = types.get(constructRuleKey(tag, null));

DataExtractionOSM/src/net/osmand/osm/rendering_types.xml

@@ -700,4 +700,4 @@
 		<!-- Here user defined categories could be added -->
 		<!-- <type tag="user_defined" value="wsl" minzoom="10" /> -->
 	</category>
-</osmand_types>
+</osmand_types>