Changeset 6605 in josm for trunk

Timestamp:

2014-01-03T10:22:49+01:00 (11 years ago)

Author:

simon04

Message:

fix #9350 - Validator: test for the correct usage of :conditional tags, deprecate day|date|hour_on|off tags

This validates the correct syntax of :conditional keys and values (for the latter, only <restriction-value> @ <condition> and opening_hours are checked).

For more tests a preciser specification for allowed conditions is required (such as occupants>1).

Location:

trunk

Files:

• data/validator/deprecated.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java (added)
• src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/ConditionalKeysTest.groovy (added)

trunk/data/validator/deprecated.mapcss

@@ -177 +177 @@
   fixChangeKey: "monitoring:river_level => monitoring:water_level";
 }
+
+/* from http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Deprecated_tags */
+*[/(day|date|hour)_(on|off)/] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "*:conditional";
+  assertMatch: "node day_on=0-12";
+}

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

@@ -17 +17 @@
 import java.util.Map;
 import java.util.TreeSet;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.swing.JOptionPane;
@@ -28 +26 @@
 import org.openstreetmap.josm.data.validation.tests.BuildingInBuilding;
 import org.openstreetmap.josm.data.validation.tests.Coastlines;
+import org.openstreetmap.josm.data.validation.tests.ConditionalKeys;
 import org.openstreetmap.josm.data.validation.tests.CrossingWays;
 import org.openstreetmap.josm.data.validation.tests.DuplicateNode;
@@ -123 +122 @@
         MapCSSTagChecker.class, // 3000 .. 3099
         Lanes.class, // 3100 .. 3199
+        ConditionalKeys.class, // 3200 .. 3299
     };
     
@@ -133 +133 @@
             } catch (Exception e) {
                 Main.error(e);
-                continue;
             }
         }

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

@@ -177 +177 @@
      */
     public List<OpeningHoursTestError> checkOpeningHourSyntax(final String key, final String value, CheckMode mode) {
+        return checkOpeningHourSyntax(key, value, mode, false);
+    }
+
+    /**
+     * Checks for a correct usage of the opening hour syntax of the {@code value} given according to
+     * <a href="https://github.com/ypid/opening_hours.js">opening_hours.js</a> and returns a list containing
+     * validation errors or an empty list. Null values result in an empty list.
+     * @param key the OSM key (should be "opening_hours", "collection_times" or "service_times").
+     * @param value the opening hour value to be checked.
+     * @param mode whether to validate {@code value} as a time range, or points in time, or both.
+     * @param ignoreOtherSeverity whether to ignore errors with {@link Severity#OTHER}.
+     * @return a list of {@link TestError} or an empty list
+     */
+    public List<OpeningHoursTestError> checkOpeningHourSyntax(final String key, final String value, CheckMode mode, boolean ignoreOtherSeverity) {
         if (ENGINE == null || value == null || value.trim().isEmpty()) {
             return Collections.emptyList();
@@ -195 +209 @@
                 errors.add(new OpeningHoursTestError(i.toString().trim(), Severity.WARNING, prettifiedValue));
             }
-            if (errors.isEmpty() && prettifiedValue != null && !value.equals(prettifiedValue)) {
+            if (!ignoreOtherSeverity && errors.isEmpty() && prettifiedValue != null && !value.equals(prettifiedValue)) {
                 errors.add(new OpeningHoursTestError(tr("opening_hours value can be prettified"), Severity.OTHER, prettifiedValue));
             }

trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

@@ -274 +274 @@
     }
 
-    /**
-     * Initialize the tagging presets (load and may display error)
-     */
+    public static void readFromPreferences() {
+        taggingPresets = TaggingPresetReader.readFromPreferences(false);
+    }
+
+        /**
+         * Initialize the tagging presets (load and may display error)
+         */
     public static void initialize() {
-        taggingPresets = TaggingPresetReader.readFromPreferences(false);
+        readFromPreferences();
         for (TaggingPreset tp: taggingPresets) {
             if (!(tp instanceof TaggingPresetSeparator)) {