Changeset 10363 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java

Timestamp:

2016-06-12T20:40:45+02:00 (8 years ago)

Author:

stoecker

Message:

gsoc-core - patch by Michael Zangl - fix #12955 - remove deprecation usage

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java

@@ -42 +42 @@
     /** Values for {@code power} key interpreted as power stations */
     protected static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "substation", "plant", "generator");
+    /** Values for {@code building} key interpreted as power stations */
+    protected static final Collection<String> BUILDING_STATION_TAGS = Arrays.asList("transformer_tower");
     /** Values for {@code power} key interpreted as allowed power items */
     protected static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear",
@@ -174 +176 @@
      */
     protected static final boolean isPowerStation(OsmPrimitive p) {
-        return isPowerIn(p, POWER_STATION_TAGS);
+        return isPowerIn(p, POWER_STATION_TAGS) || isBuildingIn(p, BUILDING_STATION_TAGS);
     }
 
@@ -196 +198 @@
 
     /**
-     * Helper function to check if power tags is a certain value.
+     * Helper function to check if power tag is a certain value.
      * @param p The primitive to be tested
      * @param values List of possible values
@@ -203 +205 @@
     private static boolean isPowerIn(OsmPrimitive p, Collection<String> values) {
         String v = p.get("power");
+        return v != null && values != null && values.contains(v);
+    }
+
+    /**
+     * Helper function to check if building tag is a certain value.
+     * @param p The primitive to be tested
+     * @param values List of possible values
+     * @return {@code true} if power key is set and equal to possible values
+     */
+    private static boolean isBuildingIn(OsmPrimitive p, Collection<String> values) {
+        String v = p.get("building");
         return v != null && values != null && values.contains(v);
     }