Changeset 18344 in osm for applications/editors/josm/plugins/validator/src

Timestamp:

2009-10-28T21:16:49+01:00 (15 years ago)

Author:

skela

Message:

JOSM validator: Ignore railway=tram when checking crossing ways.
Tram lines often cross each other without a junction.
Furthermore, Helsinki is mapped so that tram lines may cross highways
without a junction node. (There are junction nodes only for footways
and cycleways.) This modification will silence bogus warnings.

File:

• applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java (modified) (2 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java

@@ -74 +74 @@
 
         String coastline1 = w.get("natural");
-        boolean isCoastline1 = coastline1 != null && (coastline1.equals("water") || coastline1.equals("coastline"));
+        boolean isCoastline1 = "water".equals(coastline1) || "coastline".equals(coastline1);
         String railway1 = w.get("railway");
-        boolean isSubway1 = railway1 != null && railway1.equals("subway");
-        boolean isBuilding = false;
-        if(w.get("building") != null)
-            isBuilding = true;
-        
-        if( w.get("highway") == null && w.get("waterway") == null && (railway1 == null || isSubway1)  && !isCoastline1 && !isBuilding)
+        boolean isSubway1 = "subway".equals(railway1);
+        boolean isTram1 = "tram".equals(railway1);
+        boolean isBuilding = (w.get("building") != null);
+
+        if( w.get("highway") == null && w.get("waterway") == null && (railway1 == null || isSubway1 || isTram1)  && !isCoastline1 && !isBuilding)
             return;
 
@@ -109 +108 @@
                     if( !es1.intersects(es2) ) continue;
                     if( isSubway1 && "subway".equals(railway2)) continue;
+                    if( isTram1 && "tram".equals(railway2)) continue;
 
                     boolean isCoastline2 = coastline2 != null && (coastline2.equals("water") || coastline2.equals("coastline"));