Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-02-19 17:57:09 +01:00
commit b92a1dfb45

View file

@ -264,6 +264,7 @@ public abstract class MapRenderingTypes {
rtype.category = parentCategory == null ? null : parentCategory.category; rtype.category = parentCategory == null ? null : parentCategory.category;
rtype.onlyPoint = Boolean.parseBoolean(parser.getAttributeValue("", "point")); //$NON-NLS-1$ rtype.onlyPoint = Boolean.parseBoolean(parser.getAttributeValue("", "point")); //$NON-NLS-1$
rtype.relation = Boolean.parseBoolean(parser.getAttributeValue("", "relation")); //$NON-NLS-1$ rtype.relation = Boolean.parseBoolean(parser.getAttributeValue("", "relation")); //$NON-NLS-1$
rtype.relationGroup = Boolean.parseBoolean(parser.getAttributeValue("", "relationGroup")); //$NON-NLS-1$
if (rtype.isMain()) { if (rtype.isMain()) {
rtype.namePrefix = parser.getAttributeValue("", "namePrefix"); //$NON-NLS-1$ rtype.namePrefix = parser.getAttributeValue("", "namePrefix"); //$NON-NLS-1$
if (rtype.namePrefix == null) { if (rtype.namePrefix == null) {
@ -420,6 +421,7 @@ public abstract class MapRenderingTypes {
protected String category = null; protected String category = null;
protected boolean relation; protected boolean relation;
protected boolean relationGroup;
// creation of only section // creation of only section
protected boolean map = true; protected boolean map = true;
protected boolean poi = true; protected boolean poi = true;
@ -444,7 +446,6 @@ public abstract class MapRenderingTypes {
return poi; return poi;
} }
public boolean isMap(){ public boolean isMap(){
return map; return map;
} }
@ -542,6 +543,11 @@ public abstract class MapRenderingTypes {
return relation; return relation;
} }
public boolean isRelationGroup() {
return relationGroup;
}
public int getFreq() { public int getFreq() {
return freq; return freq;
} }