Changeset 11608 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2017-02-25T03:14:20+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14402 - add blacklist for leisure area values to avoid false positives - improve globally the detection of keys/tags

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• Test.java (modified) (2 diffs)
• tests/Addresses.java (modified) (2 diffs)
• tests/Coastlines.java (modified) (1 diff)
• tests/CrossingWays.java (modified) (1 diff)
• tests/Highways.java (modified) (2 diffs)
• tests/LongSegment.java (modified) (1 diff)
• tests/MultipolygonTest.java (modified) (1 diff)
• tests/OverlappingWays.java (modified) (2 diffs)
• tests/PowerLines.java (modified) (2 diffs)
• tests/TurnrestrictionTest.java (modified) (2 diffs)
• tests/UnconnectedWays.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -342 +342 @@
      */
     protected static final boolean isBuilding(OsmPrimitive p) {
-        String v = p.get("building");
-        return v != null && !"no".equals(v) && !"entrance".equals(v);
+        return p.hasTagDifferent("building", "no", "entrance");
     }
 
@@ -357 +356 @@
         Test test = (Test) obj;
         return Objects.equals(name, test.name) &&
-                Objects.equals(description, test.description);
+               Objects.equals(description, test.description);
     }
 }

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

@@ -63 +63 @@
             // warning level only if several relations have different names, see #10945
             final String name = list.get(0).get("name");
-            if (name == null || SubclassFilteredCollection.filter(list, r -> name.equals(r.get("name"))).size() < list.size()) {
+            if (name == null || SubclassFilteredCollection.filter(list, r -> r.hasTag("name", name)).size() < list.size()) {
                 level = Severity.WARNING;
             } else {
@@ -147 +147 @@
                         street.add((Way) p);
                     }
-                    if (relationName != null && p.hasKey("name") && !relationName.equals(p.get("name"))) {
+                    if (relationName != null && p.hasTagDifferent("name", relationName)) {
                         if (wrongStreetNames.isEmpty()) {
                             wrongStreetNames.add(r);

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

@@ -251 +251 @@
 
     private static boolean isCoastline(OsmPrimitive osm) {
-        return osm instanceof Way && "coastline".equals(osm.get("natural"));
+        return osm instanceof Way && osm.hasTag("natural", "coastline");
     }
 

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

@@ -241 +241 @@
 
     static boolean isHighway(OsmPrimitive w) {
-        return w.hasKey(HIGHWAY) && !w.hasTag(HIGHWAY, "rest_area", "services");
+        return w.hasTagDifferent(HIGHWAY, "rest_area", "services");
     }
 

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

@@ -92 +92 @@
     public void visit(Way w) {
         if (w.isUsable()) {
-            if (w.isClosed() && w.hasKey("highway") && CLASSIFIED_HIGHWAYS.contains(w.get("highway"))
-                    && w.hasKey("junction") && "roundabout".equals(w.get("junction"))) {
+            if (w.isClosed() && w.hasTag("highway", CLASSIFIED_HIGHWAYS) && w.hasTag("junction", "roundabout")) {
                 // TODO: find out how to handle splitted roundabouts (see #12841)
                 testWrongRoundabout(w);
@@ -131 +130 @@
                 if (list.size() > 2 || oneway1 == null || oneway2 == null || !oneway1 || !oneway2) {
                     // Error when the highway tags do not match
-                    if (!w.get("highway").equals(s)) {
+                    String value = w.get("highway");
+                    if (!value.equals(s)) {
                         errors.add(TestError.builder(this, Severity.WARNING, WRONG_ROUNDABOUT_HIGHWAY)
-                                .message(tr("Incorrect roundabout (highway: {0} instead of {1})", w.get("highway"), s))
+                                .message(tr("Incorrect roundabout (highway: {0} instead of {1})", value, s))
                                 .primitives(w)
                                 .fix(() -> new ChangePropertyCommand(w, "highway", s))

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

@@ -35 +35 @@
     @Override
     public void visit(Way w) {
-        if ("ferry".equals(w.get("route"))) {
+        if (w.hasTag("route", "ferry")) {
             return;
         }

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

@@ -175 +175 @@
     private void checkStyleConsistency(Relation r, Multipolygon polygon) {
         ElemStyles styles = MapPaintStyles.getStyles();
-        if (styles != null && !"boundary".equals(r.get("type"))) {
+        if (styles != null && !r.hasTag("type", "boundary")) {
             AreaElement area = ElemStyles.getAreaElemStyle(r, false);
             boolean areaStyle = area != null;

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

@@ -90 +90 @@
 
                 for (WaySegment ws : duplicated) {
-                    if (ws.way.get("highway") != null) {
+                    if (ws.way.hasKey("highway")) {
                         highway++;
-                    } else if (ws.way.get("railway") != null) {
+                    } else if (ws.way.hasKey("railway")) {
                         railway++;
                     }
@@ -107 +107 @@
                     currentWays.add(ws.way);
                 }
-                /* These ways not seen before
-                 * If two or more of the overlapping ways are
-                 * highways or railways mark a separate error
-                 */
+                // These ways not seen before
+                // If two or more of the overlapping ways are highways or railways mark a separate error
                 if ((highlight = seenWays.get(currentWays)) == null) {
                     String errortype;

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

@@ -165 +165 @@
      */
     private static boolean isPowerIn(OsmPrimitive p, Collection<String> values) {
-        String v = p.get("power");
-        return v != null && values != null && values.contains(v);
+        return p.hasTag("power", values);
     }
 
@@ -176 +175 @@
      */
     private static boolean isBuildingIn(OsmPrimitive p, Collection<String> values) {
-        String v = p.get("building");
-        return v != null && values != null && values.contains(v);
+        return p.hasTag("building", values);
     }
 }

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

@@ -48 +48 @@
     @Override
     public void visit(Relation r) {
-        if (!"restriction".equals(r.get("type")))
+        if (!r.hasTag("type", "restriction"))
             return;
 
@@ -224 +224 @@
 
     private static boolean isFullOneway(Way w) {
-        return w.isOneway() != 0 && !"no".equals(w.get("oneway:bicycle"));
+        return w.isOneway() != 0 && !w.hasTag("oneway:bicycle", "no");
     }
 

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

@@ -306 +306 @@
             this.isAbandoned = "abandoned".equals(railway) || w.isKeyTrue("disused");
             this.highway = (highway != null || railway != null) && !isAbandoned;
-            this.isBoundary = !this.highway && "administrative".equals(w.get("boundary"));
+            this.isBoundary = !this.highway && w.hasTag("boundary", "administrative");
             line = new Line2D.Double(n1.getEastNorth().east(), n1.getEastNorth().north(),
                     n2.getEastNorth().east(), n2.getEastNorth().north());