Changeset 24942 in osm

Timestamp:

2011-01-02T12:45:06+01:00 (14 years ago)

Author:

oliverw

Message:

Zoom to selected item in incomplete address list.

Location:

applications/editors/josm/plugins/FixAddresses

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fixAddresses/OsmUtils.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java (modified) (1 diff)

applications/editors/josm/plugins/FixAddresses/build.xml

@@ -90 +90 @@
                 <attribute name="Author" value="Oliver Wieland"/>
                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.fixAddresses.FixAddressesPlugin"/>
-                <attribute name="Plugin-Date" value="14.11.2010"/>
+                <attribute name="Plugin-Date" value="02.01.2011"/>
                 <attribute name="Plugin-Description" value="Finds and fixes invalid street addresses in a comfortable way."/>
                 <attribute name="de_Plugin-Description" value="Findet ungültige Addressen und bietet Unterstützung zur deren Korrektur."/>

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

@@ -17 +17 @@
 import java.util.Locale;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -23 +25 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Pair;
 
+// TODO: Auto-generated Javadoc
 /**
  * The Class OsmUtils provides some utilities not provided by the OSM data framework.
  */
 public class OsmUtils {
+        
+        /**
+         * Instantiates a new osm utils.
+         */
         private OsmUtils() {}
         
+        /** The cached locale. */
         private static String cachedLocale = null;
         
@@ -196 +205 @@
                 return cachedLocale;
         }
+        
+        /**
+         * Zooms to the given addresses.
+         *
+         * @param addressList the address list
+         */
+        public static void zoomAddresses(List<OSMAddress> addressList) {
+                CheckParameterUtil.ensureParameterNotNull(addressList, "addressList");
+                
+                if (Main.map == null && Main.map.mapView == null) return; // nothing to do
+                        
+                // compute bounding box
+                BoundingXYVisitor bbox = new BoundingXYVisitor();
+        for (OSMAddress source : addressList) {
+                OsmPrimitive osm = source.getOsmObject();
+                Bounds b = new Bounds(osm.getBBox().getTopLeft(), osm.getBBox().getBottomRight());
+            bbox.visit(b);
+        }
+        
+        // zoom to calculated bounding box        
+        Main.map.mapView.zoomTo(bbox.getBounds());
+        }
 
         /**
@@ -205 +236 @@
          */
         private static void applyDerivedValue(OSMAddress address, Way w, String tag) {
+                CheckParameterUtil.ensureParameterNotNull(address, "address");
+                CheckParameterUtil.ensureParameterNotNull(w, "way");
+                
                 if (!address.hasTag(tag) && TagUtils.hasTag(w, tag)) {                                          
                         address.setDerivedValue(tag, w.get(tag));

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

@@ -41 +41 @@
 import org.openstreetmap.josm.plugins.fixAddresses.IAddressEditContainerListener;
 import org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity;
+import org.openstreetmap.josm.plugins.fixAddresses.OsmUtils;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ApplyAllGuessesAction;
@@ -204 +205 @@
                 for (AbstractAddressEditAction action : actions) {
                         action.setEvent(event);
-                }               
+                }       
+                
+                OsmUtils.zoomAddresses(event.getSelectedIncompleteAddresses());
         }
 

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

@@ -142 +142 @@
         
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditTableModel#sortByColumn(int, boolean)
+         */
         @Override
         protected void sortByColumn(int column, boolean ascending) {