Changeset 34069 in osm

Timestamp:

2018-02-18T15:26:07+01:00 (6 years ago)

Author:

donvip

Message:

fix #josm15961 - support letter-prefixed numbers

Location:

applications/editors/josm/plugins/HouseNumberTaggingTool

Files:

• .classpath (modified) (1 diff)
• .settings/org.eclipse.core.resources.prefs (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/housenumbertool/Dto.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java (modified) (4 diffs)
• test (added)
• test/unit (added)
• test/unit/org (added)
• test/unit/org/openstreetmap (added)
• test/unit/org/openstreetmap/josm (added)
• test/unit/org/openstreetmap/josm/plugins (added)
• test/unit/org/openstreetmap/josm/plugins/housenumbertool (added)
• test/unit/org/openstreetmap/josm/plugins/housenumbertool/TagDialogTest.java (added)

applications/editors/josm/plugins/HouseNumberTaggingTool/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="test/unit"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
         <classpathentry kind="output" path="bin"/>

applications/editors/josm/plugins/HouseNumberTaggingTool/.settings/org.eclipse.core.resources.prefs

@@ -1 +1 @@
 eclipse.preferences.version=1
+encoding/test=UTF-8
 encoding/src=UTF-8

applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/Dto.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.housenumbertool;
 

applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.housenumbertool;
 
@@ -10 +11 @@
  */
 public class HouseNumberTaggingToolPlugin extends Plugin {
-    private final LaunchAction action;
 
     /**
@@ -18 +18 @@
     public HouseNumberTaggingToolPlugin(PluginInformation info) {
         super(info);
-        action = new LaunchAction(getPluginDirs().getUserDataDirectory(false));
-        MainMenu.add(MainApplication.getMenu().dataMenu, action, false,0);
+        LaunchAction action = new LaunchAction(getPluginDirs().getUserDataDirectory(false));
+        MainMenu.add(MainApplication.getMenu().dataMenu, action, false, 0);
     }
 }

applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.housenumbertool;
 

applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.housenumbertool;
 
@@ -23 +24 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.swing.ButtonGroup;
@@ -320 +323 @@
         housnumber.setPreferredSize(new Dimension(200, 24));
 
-        int number = 0;
-        try {
-            number = Integer.valueOf(dto.getHousenumber()) + dto.getHousenumberChangeValue();
-        } catch (NumberFormatException e)  {
-            // Do nothing
-        }
-        if (number > 0) {
-            housnumber.setText(String.valueOf(number));
+        String number = incrementHouseNumber(dto.getHousenumber(), dto.getHousenumberChangeValue());
+        if (number != null) {
+            housnumber.setText(number);
         }
 
@@ -358 +356 @@
 
         return editPanel;
+    }
+
+    static String incrementHouseNumber(String number, int increment) {
+        try {
+            Matcher m = Pattern.compile("([^\\pN]+)?(\\pN+)([^\\pN]+)?").matcher(number);
+            if (m.matches()) {
+                String prefix = m.group(1) != null ? m.group(1) : "";
+                int n = Integer.valueOf(m.group(2)) + increment;
+                String suffix = m.group(3) != null ? m.group(3) : "";
+                return prefix + n + suffix;
+            }
+        } catch (NumberFormatException e)  {
+            // Do nothing
+        }
+        return null;
     }