Changeset 16743 in osm for applications

Timestamp:

2009-07-31T12:16:51+02:00 (15 years ago)

Author:

rcernoch

Message:

Patch applied

Location:

applications/editors/josm/plugins/czechaddress

Files:

• . (modified) (1 prop)
• conscriptionnumber.patch (deleted)
• src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java (modified) (3 diffs)

applications/editors/josm/plugins/czechaddress

@@ -1 +1 @@
 build
 .log.xsl.swp
+.git

@@ -1 +1 @@
 build
 .log.xsl.swp
+.git

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

@@ -14 +14 @@
     public static final String KEY_PLACE        = "place";
 
-    public static final String KEY_ADDR_CP      = "addr:alternatenumber";
-    public static final String KEY_ADDR_CO      = "addr:housenumber";
+    public static final String KEY_ADDR_CP      = "addr:conscriptionnumber";
+    public static final String KEY_ADDR_CO      = "addr:streetnumber";
+    public static final String KEY_ADDR_HOUSE_N = "addr:housenumber";
     public static final String KEY_ADDR_STREET  = "addr:street";
     public static final String KEY_ADDR_CITY    = "addr:city";

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java

@@ -93 +93 @@
     public static String generateName(String cp, String co) {
 
-        if ((cp != null) && (co != null))
-            return cp + "/" + co;
-
-        if (co != null) return co;
-        if (cp != null) return cp;
-
-        assert false;
-        return ""; // <-- just to make compiler happy.
+        if (co == null)
+            return cp;
+        else {
+            if (cp == null)
+                return "?/"+co;
+            else
+                return cp+"/"+co;
+        }
     }
 
@@ -153 +153 @@
     @Override
     protected int[] getFieldMatchList(OsmPrimitive prim) {
-        int[] result = {0, 0};
+        int[] result = {0, 0, 0};
         if (!isMatchable(prim)) return result;
 
         // First field is the AlternateNubmer
         result[0] = matchField(this.cp, prim.get(PrimUtils.KEY_ADDR_CP));
+        result[2] = matchField(name,    prim.get(PrimUtils.KEY_ADDR_HOUSE_N));
         
         // Second field is the Housenumber
@@ -191 +192 @@
         ParentResolver resolver = new ParentResolver(this);
 
+        props.add(getStringFieldDiff(PrimUtils.KEY_ADDR_HOUSE_N, prim.get(PrimUtils.KEY_ADDR_HOUSE_N), name));
+
         props.add(getStringFieldDiff(PrimUtils.KEY_ADDR_CP, prim.get(PrimUtils.KEY_ADDR_CP), getCP()));
         props.add(getStringFieldDiff(PrimUtils.KEY_ADDR_CO, prim.get(PrimUtils.KEY_ADDR_CO), getCO()));

@@ -1 +1 @@
 build
 .log.xsl.swp
+.git