Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix sorting for tags

Browse source
This commit is contained in:
Victor Shcherb 2020-07-29 14:36:24 +02:00
parent 174a940d59
commit ea08f604b6
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
OsmAnd-java/src/main/java/net/osmand/osm/MapRenderingTypes.java
View file

@ -14,7 +14,6 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.osm.MapRenderingTypes.MapRulType;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -163,6 +162,16 @@ public abstract class MapRenderingTypes {
return mt; return mt;
} }
protected MapRulType checkOrMainRule(String tag, String value, int minzoom) {
MapRulType mt = types.get(constructRuleKey(tag, value));
if (mt == null) {
mt = registerRuleType(MapRulType.createMainEntity(tag, value));
mt.minzoom = minzoom;
mt.maxzoom = 21;
}
return mt;
}
protected MapRulType checkOrCreateAdditional(String tag, String value) { protected MapRulType checkOrCreateAdditional(String tag, String value) {
MapRulType mt = types.get(constructRuleKey(tag, value)); MapRulType mt = types.get(constructRuleKey(tag, value));
if (mt == null) { if (mt == null) {
@ -319,16 +328,12 @@ public abstract class MapRenderingTypes {
rtype.additionalTags.put(tg, targetTag); rtype.additionalTags.put(tg, targetTag);
} }
} }
rtype.relationGroupPrefix = parser.getAttributeValue("", "relationGroupPrefix"); //$NON-NLS-1$
String relationGroupAdditionalTags = parser.getAttributeValue("", "relationGroupAdditionalTags"); String relationGroupAdditionalTags = parser.getAttributeValue("", "relationGroupAdditionalTags");
String relationAdditionalPrefix = parser.getAttributeValue("", "relationGroupAdditionalPrefix");
if (relationGroupAdditionalTags != null) { if (relationGroupAdditionalTags != null) {
rtype.relationGroupAdditionalTags = new LinkedHashMap<String, String>(); rtype.relationGroupAdditionalTags = new LinkedHashMap<String, String>();
for(String tg : relationGroupAdditionalTags.split(",")) { for(String tg : relationGroupAdditionalTags.split(",")) {
String targetTag = tg; rtype.relationGroupAdditionalTags.put(tg, tg);
if(!Algorithms.isEmpty(relationAdditionalPrefix)) {
targetTag = relationAdditionalPrefix + tg;
}
rtype.relationGroupAdditionalTags.put(tg, targetTag);
} }
} }
@ -343,12 +348,8 @@ public abstract class MapRenderingTypes {
} }
String rnmts = parser.getAttributeValue("", "relationGroupNameTags"); String rnmts = parser.getAttributeValue("", "relationGroupNameTags");
if (rnmts != null) { if (rnmts != null) {
String relationGroupNamePrefix = parser.getAttributeValue("", "relationGroupNamePrefix"); //$NON-NLS-1$
if (relationGroupNamePrefix == null) {
relationGroupNamePrefix = "";
}
rtype.relationGroupNameTags = new LinkedHashMap<String, String>(); rtype.relationGroupNameTags = new LinkedHashMap<String, String>();
putNameTags(rnmts, rtype.relationGroupNameTags, relationGroupNamePrefix); putNameTags(rnmts, rtype.relationGroupNameTags, "");
} }
} }
return rtype; return rtype;
@ -517,9 +518,10 @@ public abstract class MapRenderingTypes {
// relation part // relation part
protected Map<String, String> relationNames; protected Map<String, String> relationNames;
protected Map<String, String> additionalTags; protected Map<String, String> additionalTags;
protected Map<String, List<String>> relationSortTags;
protected String relationGroupPrefix;
protected Map<String, String> relationGroupNameTags; protected Map<String, String> relationGroupNameTags;
protected Map<String, String> relationGroupAdditionalTags; protected Map<String, String> relationGroupAdditionalTags;
protected Map<String, List<String>> relationSortTags;
protected TagValuePattern tagValuePattern; protected TagValuePattern tagValuePattern;
protected boolean additional; protected boolean additional;