Changeset 34309 in osm for applications/editors/josm/plugins

Timestamp:

2018-06-17T17:51:18+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm16385 - handle multi values in repeat_on tag

Location:

applications/editors/josm/plugins/indoorhelper

Files:

• src/controller/IndoorHelperController.java (modified) (5 diffs)
• src/model/IndoorLevel.java (modified) (1 diff)
• test/unit/model (added)
• test/unit/model/IndoorLevelTest.java (added)
• test/unit/model/PresetCounterTest.java (moved) (moved from applications/editors/josm/plugins/indoorhelper/test/unit/PresetCounterTest.java ) (4 diffs)

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

@@ -57 +57 @@
 
 import model.IndoorHelperModel;
+import model.IndoorLevel;
 import model.TagCatalog.IndoorObject;
 import views.LevelSelectorView;
@@ -264 +265 @@
    static class ToolHelpButtonListener implements ActionListener {
 
-           @Override
-           public void actionPerformed(ActionEvent e) {
-                   String topic = "Plugin/IndoorHelper";
-                   //Open HelpBrowser for short description about the plugin
-                   HelpBrowser.setUrlForHelpTopic(Optional.ofNullable(topic).orElse("/"));
-           }
+       @Override
+       public void actionPerformed(ActionEvent e) {
+           String topic = "Plugin/IndoorHelper";
+           //Open HelpBrowser for short description about the plugin
+           HelpBrowser.setUrlForHelpTopic(Optional.ofNullable(topic).orElse("/"));
+       }
    }
 
@@ -565 +566 @@
     * specific tag (key). Just unsets the disabled state if object has a tag-value which is part of the
     * current working level.
-    * 
+    *
     * @author rebsc
     * @param key sepcific key to unset hidden objects which contains it
@@ -572 +573 @@
 
      Collection<OsmPrimitive> p = Main.main.getEditDataSet().allPrimitives();
-     Map<String, String> tags = new HashMap<>();
-     Integer level = Integer.parseInt(levelValue);
-     Integer firstVal, secVal;
+     int level = Integer.parseInt(levelValue);
 
      //Find all primitives with the specific tag and check if value is part of the current
@@ -580 +579 @@
      for (OsmPrimitive osm: p) {
          if ((osm.isDisabledAndHidden() || osm.isDisabled()) && osm.hasKey(key)) {
-
-             tags = osm.getInterestingTags();
-
-             for (Map.Entry<String, String> e: tags.entrySet()) {
+             for (Map.Entry<String, String> e: osm.getInterestingTags().entrySet()) {
                 if (e.getKey().equals(key)) {
-                    String val = e.getValue();
-
-                    //Extract values
-                    if (val.indexOf("-") == 0) {
-                        firstVal = (Integer.parseInt(val.split("-", 2)[1].split("-", 2)[0]))*-1;
-                        secVal = Integer.parseInt(val.split("-", 2)[1].split("-", 2)[1]);
-                    } else {
-                        firstVal = Integer.parseInt(val.split("-")[0]);
-                        secVal = Integer.parseInt(val.split("-")[1]);
-                    }
-
                     //Compare values to current working level
-                    if (level >= ((firstVal)-1) && level <= secVal) {
+                    if (IndoorLevel.isPartOfWorkingLevel(e.getValue(), level)) {
                         osm.unsetDisabledState();
                     } else {

applications/editors/josm/plugins/indoorhelper/src/model/IndoorLevel.java

@@ -115 +115 @@
         }
     }
+
+    public static boolean isPartOfWorkingLevel(String vals, int level) {
+        for (String val : vals.split(";")) {
+            int firstVal, secVal;
+
+            //Extract values
+            if (val.indexOf("-") == 0) {
+                firstVal = (Integer.parseInt(val.split("-", 2)[1].split("-", 2)[0]))*-1;
+                secVal = Integer.parseInt(val.split("-", 2)[1].split("-", 2)[1]);
+            } else if (val.contains("-")) {
+                firstVal = Integer.parseInt(val.split("-")[0]);
+                secVal = Integer.parseInt(val.split("-")[1]);
+            } else {
+                firstVal = Integer.parseInt(val);
+                secVal = firstVal;
+            }
+
+            // Compare values to current working level
+            if (level >= firstVal && level <= secVal) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

applications/editors/josm/plugins/indoorhelper/test/unit/model/PresetCounterTest.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
+package model;
+
 import static org.junit.Assert.assertEquals;
 
@@ -6 +9 @@
 import org.junit.Test;
 
-import model.PresetCounter;
 import model.TagCatalog.IndoorObject;
 
+/**
+ * Unit tests of {@link PresetCounter} class.
+ */
 public class PresetCounterTest {
 
@@ -36 +41 @@
         expectedList.add(IndoorObject.STEPS);
 
-
         //assertion
         assertEquals(expectedList.get(0), actualList.get(0));
@@ -42 +46 @@
         assertEquals(expectedList.get(2), actualList.get(2));
         assertEquals(expectedList.get(3), actualList.get(3));
-
-
     }
 }