Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-10-05 15:29:09 +02:00
commit d73412f2d9

View file

@ -382,7 +382,7 @@ public class MapPoiTypes {
lastTypePoiAdditionalsCategories.addAll(lastCategoryPoiAdditionalsCategories);
lastTypePoiAdditionalsCategories.addAll(lastFilterPoiAdditionalsCategories);
if(!Algorithms.isEmpty(parser.getAttributeValue("", "poi_additional_category"))) {
Collections.addAll(lastFilterPoiAdditionalsCategories, parser.getAttributeValue("", "poi_additional_category").split(","));
Collections.addAll(lastTypePoiAdditionalsCategories, parser.getAttributeValue("", "poi_additional_category").split(","));
}
if(!Algorithms.isEmpty(parser.getAttributeValue("", "excluded_poi_additional_category"))) {
lastType.addExcludedPoiAdditionalCategories(parser.getAttributeValue("", "excluded_poi_additional_category").split(","));