Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java

    r23887 r23894  
    282282        private boolean assignAddressToStreet(AddressNode aNode) {
    283283                String streetName = aNode.getStreet();
     284               
    284285                if (streetName != null && streetDict.containsKey(streetName)) {
    285286                        StreetNode sNode = streetDict.get(streetName);
  • applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressNode.java

    r23853 r23894  
    4040        public String getStreet() {
    4141                if (!TagUtils.hasAddrStreetTag(osmObject)) {
    42                         return NodeEntityBase.ANONYMOUS;
     42                        return MISSING_TAG;
    4343                }
    4444                return TagUtils.getAddrStreetValue(osmObject);
     45        }
     46       
     47        public boolean hasStreetName() {
     48                return TagUtils.hasAddrStreetTag(osmObject);
    4549        }
    4650       
  • applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/NodeEntityBase.java

    r23846 r23894  
    8282                        return  TagUtils.getNameValue(osmObject);
    8383                }
    84                 return ANONYMOUS;
     84                return "";
    8585        }
    8686       
  • applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/UnresolvedAddressesTableModel.java

    r23849 r23894  
    4242public class UnresolvedAddressesTableModel extends AddressEditTableModel {
    4343
    44         private static final int NUMBER_OF_COLUMNS = 3;
    45         private static final String[] COLUMN_NAMES = new String[]{tr("Street"), tr("City"), tr("Complete?")};
    46         private static final Class<?>[] COLUMN_CLASSES = new Class<?>[]{String.class, String.class, Boolean.class};
     44        private static final int NUMBER_OF_COLUMNS = 5;
     45        private static final String[] COLUMN_NAMES = new String[]{
     46                tr("Street"), tr("Housenumber"), tr("City"), tr("Postcode"), tr("Name")};
     47       
     48        private static final Class<?>[] COLUMN_CLASSES = new Class<?>[]{
     49                String.class, String.class, String.class, String.class, String.class};
    4750       
    4851        /**
     
    9194                        return aNode.getStreet();
    9295                case 1:
     96                        return aNode.getHouseNumber();
     97                case 2:
    9398                        return aNode.getCity();
    94                 case 2:
    95                         return aNode.isComplete();
     99                case 3:
     100                        return aNode.getPostCode();
     101                case 4:
     102                        return aNode.getName();
    96103                default:
    97104                        throw new RuntimeException("Invalid column index: " + column);
Note: See TracChangeset for help on using the changeset viewer.