Changeset 15558 in osm for applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase

Timestamp:

2009-06-03T01:31:58+02:00 (16 years ago)

Author:

rcernoch

Message:

Reasoner and Conflict resolver now work. The current version is still unstable, but already usable.

Location:

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

Files:

• AddressElement.java (modified) (4 diffs)
• Database.java (modified) (1 diff)
• House.java (modified) (5 diffs)
• ParentResolver.java (modified) (2 diffs)

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

@@ -16 +16 @@
  * @author Radomír Černoch radomir.cernoch@gmail.com
  */
-public abstract class AddressElement {
+public abstract class AddressElement implements Comparable<AddressElement> {
 
     protected String name;
     protected AddressElement parent = null;
-
-    protected static final String KEY_ADDR_CP      = "addr:alternatenumber";
-    protected static final String KEY_ADDR_CO      = "addr:housenumber";
-    protected static final String KEY_ADDR_STREET  = "addr:street";
-    protected static final String KEY_ADDR_CITY    = "addr:city";
-    protected static final String KEY_ADDR_COUNTRY = "addr:country";
-    protected static final String KEY_IS_IN        = "is_in";
-    protected static final String KEY_NAME         = "name";
 
     /**
@@ -199 +191 @@
                 elemValue.trim().toUpperCase())) ? 1 : -1;
     }
-    
+
+    public static int matchFieldAbbrev(String elemValue, String primValue) {
+
+        if (elemValue == null) return  0;
+        if (primValue == null) return -1;
+
+        return StringUtils.matchAbbrev(primValue, elemValue) ? 1 : -1;
+    }
+
     
     protected int[] getFieldMatchList(OsmPrimitive primitive) {
@@ -211 +211 @@
     }
 
-    public boolean isMatchable(OsmPrimitive prim) {
-        return false;
-    }
-
-    
     public int getMatchQuality(OsmPrimitive primitive) {
         
@@ -278 +273 @@
         return result;
     }
+
+    public int compareTo(AddressElement elem) {
+
+        ParentResolver r1 = new ParentResolver(this);
+        ParentResolver r2 = new ParentResolver(elem);
+
+        int retVal = r1.compareTo(r2);
+        if (retVal != 0) return retVal;
+
+        return getName().compareTo(((AddressElement) elem).getName());
+    }
 }

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

@@ -14 +14 @@
  */
 public class Database {
+
+    private Database() {}
+    private static Database singleton = null;
+    public  static Database getInstance() {
+        if (singleton == null)
+            singleton = new Database();
+
+        return singleton;
+    }
 
     /**

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

@@ -4 +4 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.czechaddress.NotNullList;
+import org.openstreetmap.josm.plugins.czechaddress.PrimUtils;
+import org.openstreetmap.josm.plugins.czechaddress.StringUtils;
 import org.openstreetmap.josm.plugins.czechaddress.proposal.Proposal;
 
@@ -139 +141 @@
                 
         // First field is the AlternateNubmer
-        result[0] = matchField(this.cp, prim.get(KEY_ADDR_CP));
+        result[0] = matchField(this.cp, prim.get(PrimUtils.KEY_ADDR_CP));
         
         // Second field is the Housenumber
         if (parent instanceof Street)
-            result[1] = Math.min( matchField(parent.getName(), prim.get(KEY_ADDR_STREET)),
-                                  matchField(this.co,          prim.get(KEY_ADDR_CO)) );
+            result[1] = Math.min(
+                matchFieldAbbrev(parent.getName(), prim.get(PrimUtils.KEY_ADDR_STREET)),
+                matchField(      this.co,          prim.get(PrimUtils.KEY_ADDR_CO)) );
         return result;
     }
@@ -160 +163 @@
         ParentResolver pr = new ParentResolver(this);
 
-        props.add(getStringFieldDiff(KEY_ADDR_CP, prim.get(KEY_ADDR_CP), getCP()));
-        props.add(getStringFieldDiff(KEY_ADDR_CO, prim.get(KEY_ADDR_CO), getCO()));
-
-        props.add(getStringFieldDiff(KEY_ADDR_COUNTRY,
-                            prim.get(KEY_ADDR_COUNTRY), "CZ"));
+        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()));
+
+        props.add(getStringFieldDiff(PrimUtils.KEY_ADDR_COUNTRY,
+                            prim.get(PrimUtils.KEY_ADDR_COUNTRY), "CZ"));
 
         if (pr.parentStreet != null)
-            props.add(getStringFieldDiff(KEY_ADDR_STREET,
-                                prim.get(KEY_ADDR_STREET),
+            props.add(getStringFieldDiff(PrimUtils.KEY_ADDR_STREET,
+                                prim.get(PrimUtils.KEY_ADDR_STREET),
                                 pr.parentStreet.getName()));
-        
-/*        if (pr.parentViToCi != null) {
-            String targetIsIn = "";
-
-            if ((pr.parentSuburb != null) &&
-                !(pr.parentViToCi.getName().equals(pr.parentSuburb.getName())))
-                targetIsIn += pr.parentSuburb.getName() + ", ";
-
-            targetIsIn += pr.parentViToCi.getName() + ", ";
-
-            if (pr.parentRegion != null)
-                targetIsIn += pr.parentRegion.getNuts3Name() + " kraj, ";
-
-            targetIsIn += "CZ";
-
-            props.add(getStringFieldDiff(KEY_ADDR_CITY,
-                                prim.get(KEY_ADDR_CITY),
-                                pr.parentViToCi.getName()));
-*/
-        
-        
+
         if (parent.parent != null) // For sure our parent is a ElemWithStreets
-            props.add(getStringFieldDiff(KEY_IS_IN,
-                                prim.get(KEY_IS_IN),
+            props.add(getStringFieldDiff(PrimUtils.KEY_IS_IN,
+                                prim.get(PrimUtils.KEY_IS_IN),
                                 parent.parent.getIsIn()));
-/*        }*/
 
         // If we have added any proposal so far, add the source info as well.
@@ -204 +186 @@
     }
 
-    public boolean isMatchable(OsmPrimitive prim) {
+    public static boolean isMatchable(OsmPrimitive prim) {
         
         for (String key : prim.keySet()) {
@@ -211 +193 @@
                 return true;
         }
-
         return false;
     }
+
+    @Override
+    public int compareTo(AddressElement o) {
+        // Most important criterion is the street
+        int val = super.compareTo(o);
+        if (val != 0) return val;
+        if (!(o instanceof House)) return val;
+
+        House house = (House) o;
+
+        // Second most important is the "CO"
+        if (co != null && house.co != null)
+            val = co.compareTo(house.co);
+        if (val != 0) return val;
+
+        // Third most important is the "CP"
+        if (cp != null && house.cp != null)
+            val = cp.compareTo(house.cp);
+        return val;
+    }
 }

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

@@ -10 +10 @@
  * @author Radomír Černoch, radomir.cernoch@gmail.com
  */
-public class ParentResolver {
+public class ParentResolver implements Comparable<ParentResolver> {
 
     public Street parentStreet = null;
@@ -39 +39 @@
         }
     }
+
+    public int compareTo(ParentResolver o) {
+        int val = 0;
+
+        if (parentRegion != null && o.parentRegion != null)
+            val = parentRegion.compareTo(o.parentRegion);
+        if (val != 0)
+            return val;
+
+        if (parentViToCi != null && o.parentViToCi != null)
+            val = parentViToCi.compareTo(o.parentViToCi);
+        if (val != 0)
+            return val;
+
+        if (parentSuburb != null && o.parentSuburb != null)
+            val = parentSuburb.compareTo(o.parentSuburb);
+        if (val != 0)
+            return val;
+
+        if (parentStreet != null && o.parentStreet != null)
+            val = parentStreet.compareTo(o.parentStreet);
+        return val;
+    }
 }