Changeset 24889 in osm for applications/editors/josm/plugins/terracer/src

Timestamp:

2010-12-27T21:51:57+01:00 (14 years ago)

Author:

bastik

Message:

'applied #j5760 (patch by robome) - Order of housenumbers not correct'

File:

• applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java (modified) (2 diffs)

applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java

@@ -234 +234 @@
      */
     class HousenumberNodeComparator implements Comparator<Node> {
-        private final Pattern pat = Pattern.compile("^([0-9]+)");
+        private final Pattern pat = Pattern.compile("^(\\d+)\\s*(.*)");
 
         /*
@@ -252 +252 @@
             if (mat.find()) {
                 Integer node1Int = Integer.valueOf(mat.group(1));
+                String node1Rest = mat.group(2);
                 mat = pat.matcher(node2String);
                 if (mat.find()) {
                     Integer node2Int = Integer.valueOf(mat.group(1));
+                    // If the numbers are the same, the rest has to make the decision,
+                    // e.g. when comparing 23, 23a and 23b.
+                    if (node1Int.equals(node2Int))
+                    {
+                      String node2Rest = mat.group(2);
+                      return node1Rest.compareTo(node2Rest);
+                    }
 
                     return node1Int.compareTo(node2Int);