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

Timestamp:

2010-11-07T13:44:50+01:00 (14 years ago)

Author:

oliverw

Message:

Added action to convert all streets of the data layer into a relation. However, it is deactivated due to some open questions.

Location:

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses

Files:

• OSMStreet.java (modified) (6 diffs)
• gui/AddressEditDialog.java (modified) (4 diffs)
• gui/actions/ConvertAllToRelationAction.java (added)
• gui/actions/ConvertToRelationAction.java (modified) (5 diffs)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMStreet.java

@@ -19 +19 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 
 /**
@@ -52 +53 @@
         }
         
+        /**
+         * Lazy creation of children list.
+         */
         private void lazyCreateChildren() {
                 if (children == null) {
@@ -58 +62 @@
         }
         
+        /**
+         * Adds an associated address to the street.
+         *
+         * @param aNode the address node to add
+         */
         public void addAddress(OSMAddress aNode) {
                 lazyCreateAddresses();
@@ -63 +72 @@
         }
 
+        /**
+         * Lazy creation of address list.
+         */
         private void lazyCreateAddresses() {
                 if (addresses == null) {
@@ -69 +81 @@
         }
         
+        /**
+         * Checks for addresses.
+         *
+         * @return true, if street has one or more associated addresses.
+         */
         public boolean hasAddresses() {
                 return addresses != null && addresses.size() > 0;
@@ -136 +153 @@
         }
         
+        /**
+         * Checks if the attached way has an associated street relation.
+         *
+         * @return true, if this street has an "associatedStreet" relation.
+         */
+        public boolean hasAssociatedStreetRelation() {
+                OsmPrimitive osm = getOsmObject();
+                for (OsmPrimitive refs : osm.getReferrers()) {
+                        if (refs instanceof Relation) {
+                                Relation rel = (Relation) refs;
+                                if (TagUtils.isAssociatedStreetRelation(rel)) {
+                                        return true;
+                                }
+                        }
+                }
+                return false;
+        }
+        
         /* (non-Javadoc)
          * @see org.openstreetmap.josm.plugins.addressEdit.NodeEntityBase#toString()

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java

@@ -58 +58 @@
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ApplyAllGuessesAction;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AssignAddressToStreetAction;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ConvertAllToRelationAction;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ConvertToRelationAction;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.GuessAddressDataAction;
@@ -84 +85 @@
         private RemoveAddressTagsAction removeAddressTagsAction = new RemoveAddressTagsAction();
         private ConvertToRelationAction convertToRelationAction = new ConvertToRelationAction();
+        private ConvertAllToRelationAction convertAllToRelationAction = new ConvertAllToRelationAction();
         
         private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[] {
@@ -91 +93 @@
                 selectAddressesInMapAction,
                 removeAddressTagsAction,
-                convertToRelationAction
+                convertToRelationAction,
+                convertAllToRelationAction
         };
         private JLabel streetLabel;
@@ -130 +133 @@
                         headerPanel.add(streetLabel);
                         
-                        JPanel streetButtonPanel = new JPanel(new GridLayout(1, 4));
+                        JPanel streetButtonPanel = new JPanel(new GridLayout(1, 3));
                         SideButton convertToRel = new SideButton(convertToRelationAction);                                                                                                                         
                         streetButtonPanel.add(convertToRel);
+                        // SideButton convertAllToRel = new SideButton(convertAllToRelationAction);                                                                                                                        
+                        // streetButtonPanel.add(convertAllToRel);
+                        // add filler
+                        streetButtonPanel.add(new JPanel());
+                        streetButtonPanel.add(new JPanel());
                         
                         streetPanel.add(streetButtonPanel, BorderLayout.SOUTH);

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java

@@ -32 +32 @@
                 super(tr("Convert to relation."), "convert2rel_24", "Create relation between street and related addresses.");
         }
+        
+        /**
+         * Instantiates a new convert to relation action.
+         *
+         * @param name the name of the action
+         * @param iconName the icon name
+         * @param tooltip the tool tip to show on hover
+         */
+        public ConvertToRelationAction(String name, String iconName, String tooltip) {
+                super(name, iconName, tooltip);         
+        }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction#addressEditActionPerformed(org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditSelectionEvent)
+         */
         @Override
         public void addressEditActionPerformed(AddressEditSelectionEvent ev) {
@@ -38 +52 @@
                 
                 if (streetNode != null) {
-                        beginTransaction(tr("Create address relation for ") + " '" + streetNode.getName() + "'");
-                        
-                        Relation r = new Relation();
-                        commands.add(new AddCommand(r));
-                        commands.add(new ChangePropertyCommand(r, TagUtils.NAME_TAG, streetNode.getName()));
-                        commands.add(new ChangePropertyCommand(r, TagUtils.RELATION_TYPE, TagUtils.ASSOCIATEDSTREET_RELATION_TYPE));
-                                                
-                        r.addMember(new RelationMember(TagUtils.STREET_RELATION_ROLE, streetNode.getOsmObject()));
-                        for (OSMAddress addrNode : streetNode.getAddresses()) {
-                                beginObjectTransaction(addrNode);                               
-                                r.addMember(new RelationMember(TagUtils.HOUSE_RELATION_ROLE, addrNode.getOsmObject()));
-                                addrNode.setStreetName(null);
-                                finishObjectTransaction(addrNode);
-                        }
-                        finishTransaction();
+                        createRelationForStreet(streetNode);
                 }
         }
 
+        /**
+         * Creates the 'associatedStreet' relation for a given street by adding all addresses which
+         * matches the name of the street.
+         *
+         * @param streetNode the street node
+         */
+        protected void createRelationForStreet(OSMStreet streetNode) {
+                if (streetNode == null || !streetNode.hasAddresses()) return;
+                
+                beginTransaction(tr("Create address relation for ") + " '" + streetNode.getName() + "'");
+                // Create the relation
+                Relation r = new Relation();
+                commands.add(new AddCommand(r));
+                commands.add(new ChangePropertyCommand(r, TagUtils.NAME_TAG, streetNode.getName()));
+                commands.add(new ChangePropertyCommand(r, TagUtils.RELATION_TYPE, TagUtils.ASSOCIATEDSTREET_RELATION_TYPE));
+                // add street with role 'street'
+                r.addMember(new RelationMember(TagUtils.STREET_RELATION_ROLE, streetNode.getOsmObject()));
+                
+                // add address members
+                for (OSMAddress addrNode : streetNode.getAddresses()) {
+                        beginObjectTransaction(addrNode);                               
+                        r.addMember(new RelationMember(TagUtils.HOUSE_RELATION_ROLE, addrNode.getOsmObject()));
+                        addrNode.setStreetName(null); // remove street name
+                        finishObjectTransaction(addrNode);
+                }
+                finishTransaction();
+        }
+
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction#addressEditActionPerformed(org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer)
+         */
         @Override
         public void addressEditActionPerformed(AddressEditContainer container) {
@@ -61 +92 @@
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer)
+         */
         @Override
         protected void updateEnabledState(AddressEditContainer container) {
@@ -66 +100 @@
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditSelectionEvent)
+         */
         @Override
         protected void updateEnabledState(AddressEditSelectionEvent event) {
@@ -71 +108 @@
                 
                 OSMStreet street = event.getSelectedStreet();
-                setEnabled(street != null && street.hasAddresses());
+                setEnabled(street != null && street.hasAddresses() && !street.hasAssociatedStreetRelation());
         }