xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OSMUtils.isArea: reorder 'if' based on OSM stats (#799)

Browse Source
This commit is contained in:
Meibes
2020-12-23 18:53:20 +01:00
committed by Emux
parent 789c280fc2
commit 0eb4f3752f
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
vtm/src/org/oscim/tiling/source/mapfile/OSMUtils.java
View File

@@ -28,10 +28,10 @@ import java.util.Set;
public final class OSMUtils { public final class OSMUtils {
private static final Set<String> areaKeys = new HashSet<>(Arrays.asList( private static final Set<String> areaKeys = new HashSet<>(Arrays.asList(
"area", "building", "natural", "landuse", "amenity", "leisure", "aeroway",
"aeroway", "building", "landuse", "leisure", "natural", "amenity",
"highway", "barrier", "highway", "barrier",
"railway" "railway",
"area"
)); ));
/** /**
@@ -39,10 +39,12 @@ public final class OSMUtils {
* Precondition for this call is that the first and last node of a map element are the * Precondition for this call is that the first and last node of a map element are the
* same, so that this method should only return false if it is known that the * same, so that this method should only return false if it is known that the
* feature should not be an area even if the geometry is a polygon. * feature should not be an area even if the geometry is a polygon.
* <p/> * <p>
* Determining what is an area is neigh impossible in OSM, this method inspects tag elements * Determining what is an area is neigh impossible in OSM, this method inspects tag elements
* to give a likely answer. See http://wiki.openstreetmap.org/wiki/The_Future_of_Areas and * to give a likely answer. See http://wiki.openstreetmap.org/wiki/The_Future_of_Areas and
* http://wiki.openstreetmap.org/wiki/Way * http://wiki.openstreetmap.org/wiki/Way
* <p>
* The order in which the if-clauses are checked is determined with the help from https://taginfo.openstreetmap.org
* *
* @param mapElement the map element (which is assumed to be closed and have enough nodes to be an area) * @param mapElement the map element (which is assumed to be closed and have enough nodes to be an area)
* @return true if tags indicate this is an area, otherwise false. * @return true if tags indicate this is an area, otherwise false.
@@ -55,35 +57,32 @@ public final class OSMUtils {
if (!areaKeys.contains(key)) { if (!areaKeys.contains(key)) {
continue; continue;
} }
if ("area".equals(key)) { if ("building".equals(key) || "natural".equals(key) || "landuse".equals(key) || "amenity".equals(key) || "leisure".equals(key) || "aeroway".equals(key)) {
String value = tag.value.toLowerCase(Locale.ENGLISH); // as specified by http://wiki.openstreetmap.org/wiki/Key:area
// obvious result
if (("yes").equals(value) || ("y").equals(value) || ("true").equals(value)) {
return true;
}
if (("no").equals(value) || ("n").equals(value) || ("false").equals(value)) {
return false;
}
}
// as specified by http://wiki.openstreetmap.org/wiki/Key:area
if ("aeroway".equals(key) || "building".equals(key) || "landuse".equals(key) || "leisure".equals(key) || "natural".equals(key) || "amenity".equals(key)) {
return true; return true;
} } else if ("highway".equals(key) || "barrier".equals(key)) {
if ("highway".equals(key) || "barrier".equals(key)) {
// false unless something else overrides this. // false unless something else overrides this.
result = false; result = false;
} } else if ("railway".equals(key)) {
if ("railway".equals(key)) {
String value = tag.value.toLowerCase(Locale.ENGLISH); String value = tag.value.toLowerCase(Locale.ENGLISH);
// there is more to the railway tag then just rails, this excludes the // there is more to the railway tag then just rails, this excludes the
// most common railway lines from being detected as areas if they are closed. // most common railway lines from being detected as areas if they are closed.
// Since this method is only called if the first and last node are the same // Since this method is only called if the first and last node are the same
// this should be safe // this should be safe
if ("rail".equals(value) || "tram".equals(value) || "subway".equals(value) if ("rail".equals(value) || "tram".equals(value) || "subway".equals(value)
|| "monorail".equals(value) || "narrow_gauge".equals(value) || "preserved".equals(value) || "narrow_gauge".equals(value) || "light_rail".equals(value)
|| "light_rail".equals(value) || "construction".equals(value)) { || "construction".equals(value) || "preserved".equals(value)
|| "monorail".equals(value)) {
result = false; result = false;
} }
} else if ("area".equals(key)) {
String value = tag.value.toLowerCase(Locale.ENGLISH);
if (("yes").equals(value) || ("y").equals(value) || ("true").equals(value)) {
return true;
}
if (("no").equals(value) || ("n").equals(value) || ("false").equals(value)) {
return false;
}
} }
} }
return result; return result;