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

Timestamp:

2009-12-02T17:03:12+01:00 (15 years ago)

Author:

rcernoch

Message:

CzechAddress: Address database supports new format from MVCR

Location:

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress

Files:

• StringUtils.java (modified) (1 diff)
• parser/MvcrParser.java (modified) (7 diffs)

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java

@@ -111 +111 @@
     }
 
+    public static String tryTrim(String s) {
+        if (s == null) return null;
+        return s.trim();
+    }
+
     /**
      * Capitalizes the given string (first letter of every word upper-case,

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.plugins.czechaddress.StringUtils.capitalize;
+import static org.openstreetmap.josm.plugins.czechaddress.StringUtils.tryTrim;
 
 import java.io.FileInputStream;
@@ -43 +44 @@
         if (name.equals("a")) {
 
-            String cp = attributes.getValue("p");
-            String co = attributes.getValue("o");
+            String cp = tryTrim(attributes.getValue("p"));
+            String co = tryTrim(attributes.getValue("o"));
             if ((cp == null) && (co == null))
                 return;
@@ -59 +60 @@
         // ========== PARSING STREET ========== //
         if (name.equals("ulice")) {
-            String nazev = attributes.getValue("nazev");
+            String nazev = tryTrim(attributes.getValue("nazev"));
 
             // If the street filter is on, apply it!
@@ -85 +86 @@
                 return;
 
-            String nazev = attributes.getValue("nazev");
+            String nazev = tryTrim(attributes.getValue("nazev"));
 
             // If the suburb filter is on, apply it!
@@ -106 +107 @@
         if (name.equals("obec")) {
 
-            String nazev = attributes.getValue("nazev");
+            String nazev = tryTrim(attributes.getValue("nazev"));
 
             // If the viToCi filter is on, apply it!
@@ -129 +130 @@
 
             // If the region filter is on, apply it!
-            if (filRegion != null && !attributes.getValue("nazev").equals(filRegion)) {
+            if (filRegion != null &&
+                    !attributes.getValue("nazev").trim().equals(filRegion)) {
                 curRegion = null;
                 curViToCi = null;
@@ -144 +146 @@
             if (curRegion == null) {*/
                 curRegion = new Region(
-                    capitalize(attributes.getValue("nazev")),
-                    capitalize(attributes.getValue("kraj")),
-                    capitalize(attributes.getValue("okres")));
+                    capitalize(tryTrim(attributes.getValue("nazev"))),
+                    capitalize(tryTrim(attributes.getValue("kraj"))),
+                    capitalize(tryTrim(attributes.getValue("okres"))));
 
                 target.regions.add(curRegion);