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

Timestamp:

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

Author:

Don-vip

Message:

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

File:

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

trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.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.tools.I18n.tr;
 
@@ -77 +78 @@
         if (n.isUsable()) {
             if (!n.hasTag("crossing", "no")
-             && !(n.hasKey("crossing") && (n.hasTag("highway", "crossing") || n.hasTag("highway", "traffic_signals")))
+             && !(n.hasKey("crossing") && (n.hasTag(HIGHWAY, "crossing")
+                                        || n.hasTag(HIGHWAY, "traffic_signals")))
              && n.isReferredByWays(2)) {
                 testMissingPedestrianCrossing(n);
@@ -92 +94 @@
     public void visit(Way w) {
         if (w.isUsable()) {
-            if (w.isClosed() && w.hasTag("highway", CLASSIFIED_HIGHWAYS) && w.hasTag("junction", "roundabout")) {
+            if (w.isClosed() && w.hasTag(HIGHWAY, CLASSIFIED_HIGHWAYS) && w.hasTag("junction", "roundabout")) {
                 // TODO: find out how to handle splitted roundabouts (see #12841)
                 testWrongRoundabout(w);
@@ -110 +112 @@
         for (Node n : new HashSet<>(w.getNodes())) {
             for (Way h : Utils.filteredCollection(n.getReferrers(), Way.class)) {
-                String value = h.get("highway");
+                String value = h.get(HIGHWAY);
                 if (h != w && value != null && !value.endsWith("_link")) {
                     List<Way> list = map.get(value);
@@ -130 +132 @@
                 if (list.size() > 2 || oneway1 == null || oneway2 == null || !oneway1 || !oneway2) {
                     // Error when the highway tags do not match
-                    String value = w.get("highway");
+                    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})", value, s))
                                 .primitives(w)
-                                .fix(() -> new ChangePropertyCommand(w, "highway", s))
+                                .fix(() -> new ChangePropertyCommand(w, HIGHWAY, s))
                                 .build());
                     }
@@ -145 +147 @@
 
     public static boolean isHighwayLinkOkay(final Way way) {
-        final String highway = way.get("highway");
+        final String highway = way.get(HIGHWAY);
         if (highway == null || !highway.endsWith("_link")
                 || !IN_DOWNLOADED_AREA.test(way.getNode(0)) || !IN_DOWNLOADED_AREA.test(way.getNode(way.getNodesCount()-1))) {
@@ -164 +166 @@
 
         return Utils.filteredCollection(referrers, Way.class).stream().anyMatch(
-                otherWay -> !way.equals(otherWay) && otherWay.hasTag("highway", highway, highway.replaceAll("_link$", "")));
+                otherWay -> !way.equals(otherWay) && otherWay.hasTag(HIGHWAY, highway, highway.replaceAll("_link$", "")));
     }
 
@@ -185 +187 @@
 
         for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
-            String highway = w.get("highway");
+            String highway = w.get(HIGHWAY);
             if (highway != null) {
                 if ("footway".equals(highway) || "path".equals(highway)) {