Changeset 34741 in osm

Timestamp:

2018-11-25T22:05:36+01:00 (6 years ago)

Author:

donvip

Message:

fix #17030 - remove indoorhelper validator file

Location:

applications/editors/josm/plugins/indoorhelper

Files:

• data/indoorhelper.validator.mapcss (deleted)
• src/controller/IndoorHelperController.java (modified) (7 diffs)

applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java

@@ -31 +31 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -47 +46 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.data.validation.OsmValidator;
-import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -172 +169 @@
     * The listener which provides the handling of the applyButton.
     * Gets the texts which were written by the user and writes them to the OSM-data.
-    * After that it checks the tagged data  with the built-in validator file.
+    * After that it checks the tagged data.
     *
     * @author egru
@@ -622 +619 @@
 
     /**
-     * Forces JOSM to load the validator and mappaint settings.
+     * Forces JOSM to load the mappaint settings.
      */
     private void updateSettings() {
         Preferences.main().init(false);
-        MapCSSTagChecker tagChecker = OsmValidator.getTest(MapCSSTagChecker.class);
-            if (tagChecker != null) {
-                OsmValidator.initializeTests(Collections.singleton(tagChecker));
-            }
-
-            MapPaintStyles.readFromPreferences();
+        MapPaintStyles.readFromPreferences();
     }
 
     /**
-     * Enables or disables the preferences for the mapcss-style and the validator.
+     * Enables or disables the preferences for the mapcss-style.
      *
      * @param enabled Activates or disables the settings.
@@ -642 +634 @@
        Map<String, Setting<?>> settings = Preferences.main().getAllSettings();
 
-       MapListSetting validatorMapListSetting = (MapListSetting) settings.
-               get("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries");
-       List<Map<String, String>> validatorMaps = new ArrayList<>();
-       if (validatorMapListSetting != null) {
-           validatorMaps = validatorMapListSetting.getValue();
-       }
-
        MapListSetting styleMapListSetting = (MapListSetting) settings.
                get("mappaint.style.entries");
@@ -657 +642 @@
 
        if (enabled) {
-           //set the validator active
-
-           List<Map<String, String>> validatorMapsNew = new ArrayList<>();
-           if (!validatorMaps.isEmpty()) {
-               validatorMapsNew.addAll(validatorMaps);
-           }
-
-           for (Map<String, String> map : validatorMapsNew) {
-               if (map.containsValue(tr("Indoor"))) {
-                   validatorMapsNew.remove(map);
-                   break;
-               }
-           }
-
-           Map<String, String> indoorValidator = new HashMap<>();
-           indoorValidator.put("title", "Indoor");
-           indoorValidator.put("active", "true");
-           indoorValidator.put("url", Config.getDirs().getUserDataDirectory(true)+ sep +"validator" +
-                   sep + "indoorhelper.validator.mapcss");
-
-           validatorMapsNew.add(indoorValidator);
-           Config.getPref().putListOfMaps("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
-                   validatorMapsNew);
-
            //set mappaint active
 
@@ -704 +665 @@
            updateSettings();
        } else {
-           //set the validator inactive
-
-
-           List<Map<String, String>> validatorMapsNew = new ArrayList<>();
-           if (!validatorMaps.isEmpty()) {
-               validatorMapsNew.addAll(validatorMaps);
-           }
-
-           for (Map<String, String> map : validatorMapsNew) {
-               if (map.containsValue(tr("Indoor"))) {
-                   validatorMapsNew.remove(map);
-                   break;
-               }
-           }
-           Map<String, String> indoorValidator = new HashMap<>();
-           indoorValidator.put("title", tr("Indoor"));
-           indoorValidator.put("active", "false");
-           indoorValidator.put("url", Config.getDirs().getUserDataDirectory(true)+ sep +"validator" +
-                   sep + "indoorhelper.validator.mapcss");
-
-           validatorMapsNew.add(indoorValidator);
-           Config.getPref().putListOfMaps("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
-                   validatorMapsNew);
-
-
            //set mappaint inactive
-
 
            List<Map<String, String>> styleMapsNew = new ArrayList<>();