Changeset 6506 in josm for trunk/src

Timestamp:

2013-12-22T00:09:16+01:00 (10 years ago)

Author:

simon04

Message:

see #9414 - implement MapCSS-based tag checker/fixer

The file deprecated.mapcss contains all DeprecatedTags tests. The
latter is to be removed eventually.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Tag.java (modified) (2 diffs)
• data/validation/OsmValidator.java (modified) (3 diffs)
• data/validation/tests/MapCSSTagChecker.java (added)
• gui/mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)
• tools/CheckParameterUtil.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/Tag.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
+
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -97 +99 @@
     }
 
+    public static Tag ofString(String s) {
+        CheckParameterUtil.ensureParameterNotNull(s, "s");
+        final String[] x = s.split("=", 2);
+        if (x.length == 2) {
+            return new Tag(x[0], x[1]);
+        } else {
+            throw new IllegalArgumentException("String does not contain '='");
+        }
+    }
+
     @Override
     public String toString() {

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

@@ -35 +35 @@
 import org.openstreetmap.josm.data.validation.tests.DuplicatedWayNodes;
 import org.openstreetmap.josm.data.validation.tests.Highways;
+import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
 import org.openstreetmap.josm.data.validation.tests.MultipolygonTest;
 import org.openstreetmap.josm.data.validation.tests.NameMismatch;
@@ -106 +107 @@
         DuplicateRelation.class, // ID 1901 .. 1999
         BuildingInBuilding.class, // ID 2001 .. 2099
-        DeprecatedTags.class, // ID 2101 .. 2199
+        //DeprecatedTags.class, // ID 2101 .. 2199
         OverlappingAreas.class, // ID 2201 .. 2299
         WayConnectedToArea.class, // ID 2301 .. 2399
@@ -114 +115 @@
         Highways.class, // ID 2701 .. 2799
         BarriersEntrances.class, // ID 2801 .. 2899
-        OpeningHourTest.class // 2901 .. 2999
+        OpeningHourTest.class, // 2901 .. 2999
+        MapCSSTagChecker.class, // 3000 .. 3099
     };
     

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -359 +359 @@
             return env.osm.getUniqueId();
         }
+
+        public static String tr(String... args) {
+            final String text = args[0];
+            System.arraycopy(args, 1, args, 0, args.length - 1);
+            return org.openstreetmap.josm.tools.I18n.tr(text, args);
+        }
     }
 

trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java

@@ -92 +92 @@
 
     /**
+     * Ensures that the condition {@code condition} holds.
+     * @param condition The condition to check
+     * @throws IllegalArgumentException if the condition does not hold
+     */
+    public static void ensureThat(boolean condition, String message) throws IllegalArgumentException {
+        if (!condition)
+            throw new IllegalArgumentException(message);
+    }
+
+    /**
      * Ensures that <code>id</code> is non-null primitive id of type {@link OsmPrimitiveType#NODE}
      *