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

Timestamp:

2019-11-30T18:25:05+01:00 (5 years ago)

Author:

donvip

Message:

fix #josm18370 - AIOOBE at IndoorLevel.isPartOfWorkingLevel

File:

• applications/editors/josm/plugins/indoorhelper/src/model/IndoorLevel.java (modified) (3 diffs)

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

@@ -19 +19 @@
 package model;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.openstreetmap.josm.data.osm.Tag;
 
@@ -30 +33 @@
 
 public class IndoorLevel {
+
+    private static final Pattern RANGE = Pattern.compile("(-?[0-9]+)-(-?[0-9]+)");
 
     private Tag levelNumberTag;
@@ -119 +124 @@
         for (String val : vals.split(";")) {
             int firstVal, secVal;
+            Matcher m = RANGE.matcher(val);
 
             //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]);
+            if (m.matches()) {
+                firstVal = Integer.parseInt(m.group(1));
+                secVal = Integer.parseInt(m.group(2));
             } else {
                 firstVal = Integer.parseInt(val);