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

Timestamp:

2010-10-24T18:03:48+02:00 (14 years ago)

Author:

oliverw

Message:

First version of address edit dialog.

Location:

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

Files:

• AddressEditAction.java (modified) (5 diffs)
• AddressVisitor.java (modified) (2 diffs)
• StreetNode.java (modified) (1 diff)
• gui/AddressEditDialog.java (added)
• gui/AddressEditModel.java (added)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.addressEdit;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -6 +8 @@
 import java.util.Collection;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;
+import org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditDialog;
+import org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditModel;
 import org.openstreetmap.josm.tools.Shortcut;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 public class AddressEditAction extends JosmAction implements
-                SelectionChangedListener {
+SelectionChangedListener, CancelListener {
 
         /**
@@ -20 +26 @@
          */
         private static final long serialVersionUID = 1L;
+        private AddressEditModel addressModel;
+        private boolean isCanceled = false;
 
         public AddressEditAction() {
-                super(tr("Address Editor"), "addressedit_24", tr("Handy Address Editing Functions"),
-                Shortcut.registerShortcut("tools:AddressEdit", tr("Tool: {0}", tr("Address Edit")),
-                        KeyEvent.VK_A, Shortcut.GROUP_MENU,
-                        InputEvent.ALT_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK), false);
-        setEnabled(false);
-        DataSet.addSelectionListener(this);
+                super(tr("Address Editor"), "addressedit_24",
+                                tr("Handy Address Editing Functions"), Shortcut
+                                .registerShortcut("tools:AddressEdit", tr("Tool: {0}",
+                                                tr("Address Edit")), KeyEvent.VK_A,
+                                                Shortcut.GROUP_MENU, InputEvent.ALT_DOWN_MASK
+                                                | InputEvent.SHIFT_DOWN_MASK), false);
+                setEnabled(false);
+                DataSet.addSelectionListener(this);
         }
 
@@ -33 +43 @@
         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
                 synchronized (this) {
-                        AddressVisitor addrVisitor = new AddressVisitor();
-                        
-                        for (OsmPrimitive osm : newSelection) {
-                    osm.visit(addrVisitor);
-                }
-                        //generateTagCode(addrVisitor);
-                        
-                        addrVisitor.resolveAddresses();
+                        collectAddressesAndStreets(newSelection);
                 }
         }
+
+        @Override
+        public void actionPerformed(ActionEvent arg0) {
+                collectAddressesAndStreets(Main.main.getCurrentDataSet()
+                                .allPrimitives());
+
+                if (addressModel != null) {
+                        AddressEditDialog dlg = new AddressEditDialog(addressModel);
+                        dlg.setVisible(true);
+                }
+        }
+
+        private void collectAddressesAndStreets(
+                        final Collection<? extends OsmPrimitive> osmData) {
+                if (osmData == null || osmData.isEmpty())
+                        return;
+
+                final AddressVisitor addrVisitor = new AddressVisitor();
+
+                //final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Prepare OSM data..."));
+                // int ticks = osmData.size();
+
+
+
+                try {
+                        for (OsmPrimitive osm : osmData) {
+                                osm.visit(addrVisitor);
+
+                                if (isCanceled) {
+                                        addrVisitor.clearData(); // free visitor data
+                                        return;
+                                }
+                        }
+                        //monitor.worked(1);
+
+                        // generateTagCode(addrVisitor);
+                        //monitor.setCustomText(tr("Resolving addresses..."));
+                        addrVisitor.resolveAddresses();
+                        //monitor.worked(1);
+
+
+                } finally {
+                        //monitor.close();
+                }
+
+                addressModel = new AddressEditModel(
+                                addrVisitor.getStreetList(), 
+                                addrVisitor.getUnresolvedItems());
+        }
+
+        @Override
+        protected void updateEnabledState() {
+                setEnabled(getCurrentDataSet() != null);
+        }
+
+        @Override
+        protected void updateEnabledState(
+                        Collection<? extends OsmPrimitive> selection) {
+                setEnabled(selection != null && !selection.isEmpty());
+        }
+
+        /* ----------------------------------------- */
 
         private void generateTagCode(AddressVisitor addrVisitor) {
                 /* This code is abused to generate tag utility code */
                 for (String tag : addrVisitor.getTags()) {
-                        String methodName = createMethodName(tag);                      
-                        System.out.println(String.format("/** Check if OSM primitive has a tag '%s'.\n * @param osmPrimitive The OSM entity to check.*/\npublic static boolean has%sTag(OsmPrimitive osmPrimitive) {\n return osmPrimitive != null ? osmPrimitive.hasKey(%s_TAG) : false;\n}\n",
-                                        tag,
-                                        methodName, 
-                                        tag.toUpperCase().replaceAll(":", "_")));
-                        System.out.println(String.format("/** Gets the value of tag '%s'.\n * @param osmPrimitive The OSM entity to check.*/\npublic static String get%sValue(OsmPrimitive osmPrimitive) {\n return osmPrimitive != null ? osmPrimitive.get(%s_TAG) : null;\n}\n",
-                                        tag,
-                                        methodName, 
-                                        tag.toUpperCase().replaceAll(":", "_")));
+                        String methodName = createMethodName(tag);
+                        System.out
+                        .println(String
+                                        .format(
+                                                        "/** Check if OSM primitive has a tag '%s'.\n * @param osmPrimitive The OSM entity to check.*/\npublic static boolean has%sTag(OsmPrimitive osmPrimitive) {\n return osmPrimitive != null ? osmPrimitive.hasKey(%s_TAG) : false;\n}\n",
+                                                        tag, methodName, tag.toUpperCase()
+                                                        .replaceAll(":", "_")));
+                        System.out
+                        .println(String
+                                        .format(
+                                                        "/** Gets the value of tag '%s'.\n * @param osmPrimitive The OSM entity to check.*/\npublic static String get%sValue(OsmPrimitive osmPrimitive) {\n return osmPrimitive != null ? osmPrimitive.get(%s_TAG) : null;\n}\n",
+                                                        tag, methodName, tag.toUpperCase()
+                                                        .replaceAll(":", "_")));
                 }
-                
+
                 for (String tag : addrVisitor.getTags()) {
-                        System.out.println(String.format("public static final String %s_TAG = \"%s\";", tag.toUpperCase().replaceAll(":", "_"), tag));
+                        System.out.println(String.format(
+                                        "public static final String %s_TAG = \"%s\";", tag
+                                        .toUpperCase().replaceAll(":", "_"), tag));
                 }
         }
-        
+
         private String createMethodName(String osmName) {
                 StringBuffer result = new StringBuffer(osmName.length());
@@ -79 +150 @@
                                         nextUp = false;
                                 } else {
-                                        result.append(c);               
+                                        result.append(c);
                                 }
                         }
                 }
-                
+
                 return result.toString();
         }
 
         @Override
-        public void actionPerformed(ActionEvent arg0) {
-
+        public void operationCanceled() {
+                isCanceled = true;
         }
-
 }

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

@@ -129 +129 @@
                 return streetDict;
         }
+        
+        public List<StreetNode> getStreetList() {
+                return new ArrayList<StreetNode>(streetDict.values());
+        }
 
         public List<AddressNode> getUnresolvedItems() {
@@ -174 +178 @@
                 System.out.println("Still unresolved: " + unresolvedAddresses.size() + " addresses");
         }
+        
+        public void clearData() {
+                streetDict.clear();
+                unresolvedAddresses.clear();
+        }
 }

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

@@ -67 +67 @@
         }
         
+        public boolean hasAddresses() {
+                return addresses != null && addresses.size() > 0;
+        }
+        
         public List<AddressNode> getAddresses() {
                 return addresses;