Changeset 11913 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

Timestamp:

2017-04-15T01:38:46+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1192 - String literals should not be duplicated

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.HIGHWAY;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.RAILWAY;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -57 +59 @@
         @Override
         public boolean isPrimitiveUsable(OsmPrimitive p) {
-            return super.isPrimitiveUsable(p) && p.hasKey("highway");
+            return super.isPrimitiveUsable(p) && p.hasKey(HIGHWAY);
         }
     }
@@ -181 +183 @@
                         continue;
                     }
-                    if (en.hasTag("highway", "turning_circle", "bus_stop")
+                    if (en.hasTag(HIGHWAY, "turning_circle", "bus_stop")
                             || en.hasTag("amenity", "parking_entrance")
-                            || en.hasTag("railway", "buffer_stop")
+                            || en.hasTag(RAILWAY, "buffer_stop")
                             || en.isKeyTrue("noexit")
                             || en.hasKey("entrance", "barrier")) {
@@ -302 +304 @@
         MyWaySegment(Way w, Node n1, Node n2) {
             this.w = w;
-            String railway = w.get("railway");
-            String highway = w.get("highway");
+            String railway = w.get(RAILWAY);
+            String highway = w.get(HIGHWAY);
             this.isAbandoned = "abandoned".equals(railway) || w.isKeyTrue("disused");
             this.highway = (highway != null || railway != null) && !isAbandoned;
@@ -449 +451 @@
                 && !w.hasKey("addr:interpolation")
                 // similarly for public transport platforms
-                && !w.hasTag("highway", "platform") && !w.hasTag("railway", "platform")
+                && !w.hasTag(HIGHWAY, "platform") && !w.hasTag(RAILWAY, "platform")
                 ) {
             ways.addAll(getWaySegments(w));
             QuadBuckets<Node> set = endnodes;
-            if (w.hasKey("highway", "railway")) {
+            if (w.hasKey(HIGHWAY, RAILWAY)) {
                 set = endnodesHighway;
             }