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

Timestamp:

2010-10-28T00:16:03+02:00 (14 years ago)

Author:

oliverw

Message:

Revised contents of unresolved addresses and changed some attribute defaults.

Location:

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit

Files:

• AddressEditContainer.java (modified) (1 diff)
• AddressNode.java (modified) (1 diff)
• NodeEntityBase.java (modified) (1 diff)
• gui/UnresolvedAddressesTableModel.java (modified) (2 diffs)

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java

@@ -282 +282 @@
         private boolean assignAddressToStreet(AddressNode aNode) {
                 String streetName = aNode.getStreet();
+                
                 if (streetName != null && streetDict.containsKey(streetName)) {
                         StreetNode sNode = streetDict.get(streetName);

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressNode.java

@@ -40 +40 @@
         public String getStreet() {
                 if (!TagUtils.hasAddrStreetTag(osmObject)) {
-                        return NodeEntityBase.ANONYMOUS;
+                        return MISSING_TAG;
                 }
                 return TagUtils.getAddrStreetValue(osmObject);
+        }
+        
+        public boolean hasStreetName() {
+                return TagUtils.hasAddrStreetTag(osmObject);
         }
         

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/NodeEntityBase.java

@@ -82 +82 @@
                         return  TagUtils.getNameValue(osmObject);
                 }
-                return ANONYMOUS;
+                return "";
         }
         

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/UnresolvedAddressesTableModel.java

@@ -42 +42 @@
 public class UnresolvedAddressesTableModel extends AddressEditTableModel {
 
-        private static final int NUMBER_OF_COLUMNS = 3;
-        private static final String[] COLUMN_NAMES = new String[]{tr("Street"), tr("City"), tr("Complete?")}; 
-        private static final Class<?>[] COLUMN_CLASSES = new Class<?>[]{String.class, String.class, Boolean.class};
+        private static final int NUMBER_OF_COLUMNS = 5;
+        private static final String[] COLUMN_NAMES = new String[]{
+                tr("Street"), tr("Housenumber"), tr("City"), tr("Postcode"), tr("Name")};
+        
+        private static final Class<?>[] COLUMN_CLASSES = new Class<?>[]{
+                String.class, String.class, String.class, String.class, String.class};
         
         /**
@@ -91 +94 @@
                         return aNode.getStreet();
                 case 1:
+                        return aNode.getHouseNumber();
+                case 2:
                         return aNode.getCity();
-                case 2:
-                        return aNode.isComplete();
+                case 3:
+                        return aNode.getPostCode();
+                case 4:
+                        return aNode.getName();
                 default:
                         throw new RuntimeException("Invalid column index: " + column);