Changeset 34309 in osm for applications/editors/josm/plugins/indoorhelper/src/model

Timestamp:

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

Author:

donvip

Message:

fix #josm16385 - handle multi values in repeat_on tag

File:

• applications/editors/josm/plugins/indoorhelper/src/model/IndoorLevel.java (modified) (1 diff)

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;
+    }
 }