Changeset 8941 in josm

Timestamp:

2015-10-24T21:32:35+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #12004 - suggest to replace source:maxspeed=UK:* by source:maxspeed=GB:* as per ISO 3166-2

Location:

trunk

Files:

• src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/validation/tests/Highways.java (modified) (6 diffs)
• test/config/unit-josm.home (modified) (1 prop)
• test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.groovy (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -17 +17 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -106 +106 @@
     }
 
-    @Override public boolean executeCommand() {
-        Main.main.getCurrentDataSet().beginUpdate();
+    @Override
+    public boolean executeCommand() {
+        final DataSet dataSet = objects.get(0).getDataSet();
+        dataSet.beginUpdate();
         try {
             super.executeCommand(); // save old
@@ -129 +131 @@
             return true;
         } finally {
-            Main.main.getCurrentDataSet().endUpdate();
-        }
-    }
-
-    @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+            dataSet.endUpdate();
+        }
+    }
+
+    @Override
+    public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
         modified.addAll(objects);
     }

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

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.validation.FixableTestError;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
@@ -39 +40 @@
     protected static final int SOURCE_MAXSPEED_CONTEXT_MISMATCH_VS_HIGHWAY = 2706;
     protected static final int SOURCE_WRONG_LINK = 2707;
+
+    protected static final String SOURCE_MAXSPEED = "source:maxspeed";
 
     /**
@@ -92 +95 @@
                 testMissingPedestrianCrossing(n);
             }
-            if (n.hasKey("source:maxspeed")) {
+            if (n.hasKey(SOURCE_MAXSPEED)) {
                 // Check maxspeed but not context against highway for nodes
                 // as maxspeed is not set on highways here but on signs, speed cameras, etc.
@@ -107 +110 @@
                 testWrongRoundabout(w);
             }
-            if (w.hasKey("source:maxspeed")) {
+            if (w.hasKey(SOURCE_MAXSPEED)) {
                 // Check maxspeed, including context against highway
                 testSourceMaxspeed(w, true);
@@ -240 +243 @@
 
     private void testSourceMaxspeed(OsmPrimitive p, boolean testContextHighway) {
-        String value = p.get("source:maxspeed");
+        String value = p.get(SOURCE_MAXSPEED);
         if (value.matches("[A-Z]{2}:.+")) {
             int index = value.indexOf(':');
@@ -246 +249 @@
             String country = value.substring(0, index);
             if (!ISO_COUNTRIES.contains(country)) {
-                errors.add(new TestError(this, Severity.WARNING,
-                        tr("Unknown country code: {0}", country), SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE, p));
+                if ("UK".equals(country)) {
+                    errors.add(new FixableTestError(this, Severity.WARNING,
+                            tr("Unknown country code: {0}", country), SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE, p,
+                            new ChangePropertyCommand(p, SOURCE_MAXSPEED, value.replace("UK:", "GB:"))));
+                } else {
+                    errors.add(new TestError(this, Severity.WARNING,
+                            tr("Unknown country code: {0}", country), SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE, p));
+                }
             }
             // Check context

trunk/test/config/unit-josm.home

@@ -7 +7 @@
 elevation
 preferences.xml.bak
+plugins
+ebdirigo

@@ -7 +7 @@
 elevation
 preferences.xml.bak
+plugins
+ebdirigo

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.groovy

@@ -5 +5 @@
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
+import org.openstreetmap.josm.data.osm.Node
 import org.openstreetmap.josm.data.osm.Way
 
@@ -17 +18 @@
         def ds = new DataSet()
 
-        def n00 = new org.openstreetmap.josm.data.osm.Node(new LatLon(0, 0))
-        def n10 = new org.openstreetmap.josm.data.osm.Node(new LatLon(1, 0))
-        def n20 = new org.openstreetmap.josm.data.osm.Node(new LatLon(2, 0))
-        def n01 = new org.openstreetmap.josm.data.osm.Node(new LatLon(0, 1))
-        def n11 = new org.openstreetmap.josm.data.osm.Node(new LatLon(1, 1))
-        def n21 = new org.openstreetmap.josm.data.osm.Node(new LatLon(2, 1))
+        def n00 = new Node(new LatLon(0, 0))
+        def n10 = new Node(new LatLon(1, 0))
+        def n20 = new Node(new LatLon(2, 0))
+        def n01 = new Node(new LatLon(0, 1))
+        def n11 = new Node(new LatLon(1, 1))
+        def n21 = new Node(new LatLon(2, 1))
 
         ds.addPrimitive(n00)
@@ -61 +62 @@
         assert Highways.isHighwayLinkOkay(createTestSetting("residential", "residential"))
     }
+
+    void testSourceMaxSpeedUnitedKingdom() {
+        def link = createTestSetting("primary", "primary")
+        link.put("maxspeed", "60 mph")
+        link.put("source:maxspeed", "UK:nsl_single")
+        def test = new Highways()
+        test.visit(link)
+        assert test.errors.size() == 1
+        def error = test.errors.get(0)
+        assert error.isFixable()
+        assert error.getFix().executeCommand()
+        assert "GB:nsl_single".equals(link.get("source:maxspeed"))
+    }
 }

@@ -7 +7 @@
 elevation
 preferences.xml.bak
+plugins
+ebdirigo