Changeset 15584 in osm for applications/editors

Timestamp:

2009-06-04T01:11:51+02:00 (15 years ago)

Author:

rcernoch

Message:

CzechAddress: Now 0.2.0 is really almost ready

Location:

applications/editors/josm/plugins/czechaddress

Files:

• log2html.xsl (moved) (moved from applications/editors/josm/plugins/czechaddress/log.xsl )
• src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors (added)
• src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.form (added)
• src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java (added)
• src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java (modified) (1 diff)

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

@@ -1 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package org.openstreetmap.josm.plugins.czechaddress;
 
@@ -10 +5 @@
 
 /**
- *
+ * Utilities for handling {@link OsmPrimitive}s.
+ * 
  * @author Radomír Černoch, radomir.cernoch@gmail.com
  */
@@ -45 +41 @@
 
                 int val = o1.get(key).compareTo(o2.get(key));
-                if (val != 0) {
-                    return val;
-                }
+                if (val != 0) return val;
             }
 
-            return o1.toString().compareTo(o2.toString());
+            /*int val = o1.toString().compareTo(o2.toString());
+            if (val != 0) return val;*/
 
-            /*LatLon pos1 = null;
-            LatLon pos2 = null;
-            if (o1 instanceof Node) pos1 = ((Node) o1).coor;
-            if (o1 instanceof Way)  pos1 = ((Way)  o1).lastNode().coor;
-            if (o2 instanceof Node) pos1 = ((Node) o2).coor;
-            if (o2 instanceof Way)  pos1 = ((Way)  o2).lastNode().coor;
-
-            if (pos1 != null && pos2 != null) {
-            if (pos1.lat() < pos2.lat()) return -1;
-            if (pos1.lat() > pos2.lat()) return  1;
-            if (pos1.lon() < pos2.lon()) return -1;
-            if (pos1.lon() > pos2.lon()) return  1;
-            }*/
+            return o1.compareTo(o2);
         }
     };

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

@@ -5 +5 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.czechaddress.PrimUtils;
 import org.openstreetmap.josm.plugins.czechaddress.StringUtils;
 import org.openstreetmap.josm.plugins.czechaddress.intelligence.Reasoner;
@@ -61 +62 @@
 
     public static String getName(OsmPrimitive prim) {
-        String cp     = prim.get("addr:alternatenumber");
-        String co     = prim.get("addr:housenumber");
-        String street = prim.get("addr:street");
-        String city   = prim.get("addr:city");
-        String name   = prim.get("name");
+        String cp     = prim.get(PrimUtils.KEY_ADDR_CP);
+        String co     = prim.get(PrimUtils.KEY_ADDR_CO);
+        String street = prim.get(PrimUtils.KEY_ADDR_STREET);
+        String city   = prim.get(PrimUtils.KEY_ADDR_CITY);
+        String name   = prim.get(PrimUtils.KEY_NAME);
 
         String result = "";

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java

@@ -14 +14 @@
 import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin;
 import org.openstreetmap.josm.plugins.czechaddress.NotNullList;
+import org.openstreetmap.josm.plugins.czechaddress.PrimUtils;
 import org.openstreetmap.josm.plugins.czechaddress.StatusListener;
 import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement;
@@ -68 +69 @@
         matchesComboBox.setRenderer(new UniversalListRenderer());
 
-        if (primitive.get("addr:alternatenumber") != null) {
-            alternateNumberEdit.setText(primitive.get("addr:alternatenumber"));
+        if (primitive.get(PrimUtils.KEY_ADDR_CP) != null) {
+            alternateNumberEdit.setText(primitive.get(PrimUtils.KEY_ADDR_CP));
             updateMatches();
         }
@@ -133 +134 @@
             r.openTransaction();
             prim.keys = null;
-            prim.put("addr:alternatenumber", alternateNumberEdit.getText());
+            prim.put(PrimUtils.KEY_ADDR_CP, alternateNumberEdit.getText());
             r.update(prim);
             elems.addAll(r.getCandidates(prim));

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java

@@ -181 +181 @@
     @Override
     public String toString() {
-        /*if (target.keySet().contains("name"))
-            return target.get("name");
-
-        if (   target.keySet().contains("addr:alternatenumber")
-            || target.keySet().contains("addr:housenumber")) {
-
-            String cp = target.get("addr:alternatenumber");
-            String co = target.get("addr:housenumber");
-            String ul = target.get("addr:street");
-
-            if (cp == null) cp = "?";
-            if (co == null) co = "?";
-            if (ul == null) ul = "" ; else ul = " " + ul;
-
-            return "Dům " + String.valueOf(cp) + "/" + String.valueOf(co) + ul;
-        }*/
-
         return target.toString();
     }