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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-01-08 18:36:47 +01:00
commit 6b406b7eed
1 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -423,21 +423,14 @@ public class MapRenderingTypes {
XmlPullParser parser = PlatformUtil.newXMLPullParser(); XmlPullParser parser = PlatformUtil.newXMLPullParser();
int tok; int tok;
parser.setInput(is, "UTF-8"); parser.setInput(is, "UTF-8");
String parentCategory = null; MapRulType parentCategory = null;
String poiParentCategory = null;
String poiParentPrefix = null;
String order = null;
while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) { while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
if (tok == XmlPullParser.START_TAG) { if (tok == XmlPullParser.START_TAG) {
String name = parser.getName(); String name = parser.getName();
if (name.equals("category")) { //$NON-NLS-1$ if (name.equals("category")) { //$NON-NLS-1$
parentCategory = parser.getAttributeValue("","name"); parentCategory = parseCategoryFromXml(parser);
poiParentCategory = parser.getAttributeValue("","poi_category");
poiParentPrefix = parser.getAttributeValue("","poi_prefix");
order = parser.getAttributeValue("","order");
parseCategoryFromXml(parser, poiParentCategory, poiParentPrefix);
} else if (name.equals("type")) { } else if (name.equals("type")) {
parseTypeFromXML(parser, parentCategory, poiParentCategory, poiParentPrefix, order); parseTypeFromXML(parser, parentCategory);
} else if (name.equals("routing_type")) { } else if (name.equals("routing_type")) {
parseRouteTagFromXML(parser); parseRouteTagFromXML(parser);
} }
@ -463,11 +456,11 @@ public class MapRenderingTypes {
protected void parseRouteTagFromXML(XmlPullParser parser) { protected void parseRouteTagFromXML(XmlPullParser parser) {
} }
protected MapRulType parseTypeFromXML(XmlPullParser parser, String parentCategory, String poiParentCategory, String poiParentPrefix, String parentOrder) { protected MapRulType parseTypeFromXML(XmlPullParser parser, MapRulType parentCategory) {
return parseBaseRuleType(parser, parentCategory, poiParentCategory, poiParentPrefix, parentOrder, true); return parseBaseRuleType(parser, parentCategory, true);
} }
protected MapRulType parseBaseRuleType(XmlPullParser parser, String parentCategory, String poiParentCategory, String poiParentPrefix, String parentOrder, boolean filterOnlyMap) { protected MapRulType parseBaseRuleType(XmlPullParser parser, MapRulType parentCategory, boolean filterOnlyMap) {
String tag = lc(parser.getAttributeValue("", "tag")); String tag = lc(parser.getAttributeValue("", "tag"));
String value = lc(parser.getAttributeValue("", "value")); String value = lc(parser.getAttributeValue("", "value"));
String additional = parser.getAttributeValue("", "additional"); String additional = parser.getAttributeValue("", "additional");
@ -501,8 +494,8 @@ public class MapRenderingTypes {
String order = parser.getAttributeValue("", "order"); String order = parser.getAttributeValue("", "order");
if(!Algorithms.isEmpty(order)) { if(!Algorithms.isEmpty(order)) {
rtype.order = Integer.parseInt(order); rtype.order = Integer.parseInt(order);
} else if(!Algorithms.isEmpty(parentOrder)) { } else if (parentCategory != null) {
rtype.order = Integer.parseInt(parentOrder); rtype.order = parentCategory.order;
} }
String applyTo = parser.getAttributeValue("", "apply_to"); String applyTo = parser.getAttributeValue("", "apply_to");
String applyValue = parser.getAttributeValue("", "apply_value"); String applyValue = parser.getAttributeValue("", "apply_value");
@ -514,14 +507,14 @@ public class MapRenderingTypes {
rtype = registerRuleType(rtype); rtype = registerRuleType(rtype);
} }
rtype.category = parentCategory == null ? null : parentCategory.category;
rtype.category = parentCategory; if (parentCategory != null) {
if (poiParentCategory != null && poiParentCategory.length() > 0) { if (parentCategory.poiCategory != null) {
rtype.poiCategory = AmenityType.getAndRegisterType(poiParentCategory); rtype.poiCategory = parentCategory.poiCategory;
rtype.poiSpecified = true; rtype.poiSpecified = true;
} }
if (poiParentPrefix != null) { rtype.poiPrefix = parentCategory.poiPrefix;
rtype.poiPrefix = poiParentPrefix; rtype.poiWithNameOnly = parentCategory.poiWithNameOnly;
} }
String poiCategory = parser.getAttributeValue("", "poi_category"); String poiCategory = parser.getAttributeValue("", "poi_category");
@ -533,7 +526,10 @@ public class MapRenderingTypes {
rtype.poiCategory = AmenityType.getAndRegisterType(poiCategory); rtype.poiCategory = AmenityType.getAndRegisterType(poiCategory);
} }
} }
rtype.poiWithNameOnly = Boolean.parseBoolean(parser.getAttributeValue("", "poi_with_name")); String poiWithName = parser.getAttributeValue("", "poi_with_name");
if (poiWithName != null) {
rtype.poiWithNameOnly = Boolean.parseBoolean(poiWithName);
}
String poiPrefix = parser.getAttributeValue("", "poi_prefix"); String poiPrefix = parser.getAttributeValue("", "poi_prefix");
if (poiPrefix != null) { if (poiPrefix != null) {
rtype.poiPrefix = poiPrefix; rtype.poiPrefix = poiPrefix;
@ -610,19 +606,26 @@ public class MapRenderingTypes {
} }
} }
protected void parseCategoryFromXml(XmlPullParser parser, String poiParentCategory, String poiParentPrefix) { protected MapRulType parseCategoryFromXml(XmlPullParser parser) {
String poi_tag = parser.getAttributeValue("","poi_tag"); String poiTag = parser.getAttributeValue("", "poi_tag");
if (poi_tag != null && poiParentCategory.length() > 0) { String poiCategory = parser.getAttributeValue("", "poi_category");
MapRulType rtype = new MapRulType(); MapRulType rtype = new MapRulType();
rtype.poiCategory = AmenityType.getAndRegisterType(poiParentCategory); rtype.category = parser.getAttributeValue("", "name");
if (!Algorithms.isEmpty(parser.getAttributeValue("", "order"))) {
rtype.order = Integer.parseInt(parser.getAttributeValue("", "order"));
}
if (poiTag != null && poiCategory != null && poiCategory.length() > 0) {
rtype.poiCategory = AmenityType.getAndRegisterType(parser.getAttributeValue("", "poi_category"));
rtype.poiSpecified = true; rtype.poiSpecified = true;
rtype.relation = Boolean.parseBoolean(parser.getAttributeValue("", "relation")); rtype.relation = Boolean.parseBoolean(parser.getAttributeValue("", "relation"));
rtype.poiWithNameOnly = Boolean.parseBoolean(parser.getAttributeValue("", "poi_with_name")); rtype.poiWithNameOnly = Boolean.parseBoolean(parser.getAttributeValue("", "poi_with_name"));
rtype.poiPrefix = poiParentPrefix; rtype.poiPrefix = parser.getAttributeValue("", "poi_prefix");
rtype.onlyPoi = true; rtype.onlyPoi = true;
rtype.tagValuePattern = new TagValuePattern(poi_tag, null);
registerRuleType(rtype); rtype.tagValuePattern = new TagValuePattern(poiTag, null);
return registerRuleType(rtype);
} }
return rtype;
} }
protected static String constructRuleKey(String tag, String val) { protected static String constructRuleKey(String tag, String val) {