Changeset 23921 in osm

Timestamp:

2010-10-30T17:53:36+02:00 (14 years ago)

Author:

oliverw

Message:

Added ApplyAllGuessesAction including some convenience methods in AddressNode/AddressEditContainer.

Location:

applications/editors/josm/plugins/AddressEdit

Files:

• images/dialogs/applyguesses_24.png (added)
• src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/addressEdit/AddressNode.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/ApplyAllGuessesAction.java (added)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/AssignAddressToStreetAction.java (modified) (1 diff)

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

@@ -285 +285 @@
                 return unresolvedAddresses != null ? unresolvedAddresses.size() : 0;
         }
+        
+        /**
+         * Gets the number of guessed tags.
+         * @return
+         */
+        public int getNumberOfGuesses() {
+                int sum = 0;
+                                
+                for (AddressNode aNode : getAllAddressesToFix()) {
+                        if (aNode.hasGuesses()) {
+                                sum++;
+                        }
+                }
+                return sum;
+        }
+        
+        /**
+         * Gets all (incomplete and/or unresolved) address nodes to fix.
+         * @return
+         */
+        public List<AddressNode> getAllAddressesToFix() {
+                List<AddressNode> all = new ArrayList<AddressNode>(incompleteAddresses);
+
+                for (AddressNode aNode : unresolvedAddresses) {
+                        if (!all.contains(aNode)) {
+                                all.add(aNode);
+                        }
+                }
+                
+                return all; 
+        }
 
         /**

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

@@ -81 +81 @@
                 return !StringUtils.isNullOrEmpty(guessedStreetName);
         }
+        
+        /**
+         * Returns true, if this instance has guesses regarding address tags.
+         * @return
+         */
+        public boolean hasGuesses() {
+                return hasGuessedStreetName(); // to be extended later
+        }
+        
+        /**
+         * Applies all guessed tags for this node.
+         */
+        public void applyAllGuesses() {
+                if (hasGuessedStreetName()) applyGuessedStreet();
+        }
 
         /**

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

@@ -71 +71 @@
         /* Actions */
         private AssignAddressToStreetAction resolveAction = new AssignAddressToStreetAction();
+        private ApplyAllGuessesAction applyAllGuessesAction = new ApplyAllGuessesAction();
         private GuessAddressDataAction guessAddressAction = new GuessAddressDataAction();
         
         private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[] {
                 resolveAction,
-                guessAddressAction
+                guessAddressAction,
+                applyAllGuessesAction
         };
         private JLabel streetLabel;
@@ -125 +127 @@
                         
                         JPanel unresolvedButtons = new JPanel(new FlowLayout());
-                        SideButton assign = new SideButton(resolveAction, "assignstreet_24");                                                                                                                      
+                        SideButton assign = new SideButton(resolveAction);                                                                                                                         
                         unresolvedButtons.add(assign);
-                        SideButton guess = new SideButton(guessAddressAction, "guessstreets_24");                                                                                                                          
+                        SideButton guess = new SideButton(guessAddressAction);                                                                                                                     
                         unresolvedButtons.add(guess);
+                        SideButton applyAllGuesses = new SideButton(applyAllGuessesAction);                                                                                                                        
+                        unresolvedButtons.add(applyAllGuesses);
                         unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH);
                         

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

@@ -23 +23 @@
 
         public AssignAddressToStreetAction() {
-                super(tr("Assign address to street"));
+                super(tr("Assign address to street"), "assignstreet_24", "Assign the selected address(es) to the selected street.");
         }