Changeset 4416 in josm

Timestamp:

Sep 12, 2011 10:15:20 PM (21 months ago)

Author:

bastiK

Message:

applied #6825 - Display imagery providers bbox in a slippy map (patch by Don-vip)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java

@@ -18 +18 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import javax.swing.AbstractAction;
@@ -48 +50 @@
 import javax.swing.table.TableColumnModel;
 
+import org.openstreetmap.gui.jmapviewer.JMapViewer;
+import org.openstreetmap.gui.jmapviewer.MapRectangleImpl;
+import org.openstreetmap.gui.jmapviewer.interfaces.MapRectangle;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
@@ -364 +370 @@
         private JTable listActive;
         final JTable listdef;
+        final JMapViewer map;
         final PreferenceTabbedPane gui;
 
@@ -407 +414 @@
             add(scrolldef, GBC.std().insets(0, 5, 0, 0).fill(GridBagConstraints.BOTH).weight(1.0, 0.6).insets(5, 0, 0, 0));
 
+            // Add default item map
+            map = new JMapViewer();
+            map.setZoomContolsVisible(false);
+            map.setPreferredSize(new Dimension(200, 200));
+            add(map, GBC.std().insets(5, 5, 0, 0).fill(GridBagConstraints.BOTH).weight(0.333, 0.6).insets(5, 0, 0, 0));
+
+            listdef.getSelectionModel().addListSelectionListener(new DefListSelectionListener());
+
             JToolBar tb = new JToolBar(JToolBar.VERTICAL);
             tb.setFloatable(false);
@@ -429 +444 @@
             add(new JLabel(tr("Selected entries:")), GBC.eol().insets(5, 0, 0, 0));
             JScrollPane scroll = new JScrollPane(listActive);
-            add(scroll, GBC.std().fill(GridBagConstraints.BOTH).weight(1.0, 0.4).insets(5, 0, 0, 5));
+            add(scroll, GBC.std().fill(GridBagConstraints.BOTH).span(GridBagConstraints.RELATIVE).weight(1.0, 0.4).insets(5, 0, 0, 5));
             scroll.setPreferredSize(new Dimension(200, 200));
 
@@ -441 +456 @@
             add(sideButtonTB, GBC.eol().anchor(GBC.NORTH).insets(0, 0, 5, 5));
 
+        }
+
+        // Listener of default providers list selection
+        private final class DefListSelectionListener implements ListSelectionListener {
+            // The current drawn rectangles
+            private final Map<Integer, MapRectangle> mapRectangles;
+
+            private DefListSelectionListener() {
+                this.mapRectangles = new HashMap<Integer, MapRectangle>();
+            }
+
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                // First index is set to -1 when the list is refreshed, so discard all map rectangles
+                if (e.getFirstIndex() == -1) {
+                    map.removeAllMapRectangles();
+                    mapRectangles.clear();
+                    // Only process complete (final) selection events
+                } else if (!e.getValueIsAdjusting()) {
+                    for (int i = e.getFirstIndex(); i<=e.getLastIndex(); i++) {
+                        Bounds bounds = modeldef.getRow(i).getBounds();
+                        if (bounds != null) {
+                            if (listdef.getSelectionModel().isSelectedIndex(i)) {
+                                if (!mapRectangles.containsKey(i)) {
+                                    // Add new map rectangle
+                                    MapRectangle rectangle = new MapRectangleImpl(bounds);
+                                    mapRectangles.put(i, rectangle);
+                                    map.addMapRectangle(rectangle);
+                                }
+                            } else if (mapRectangles.containsKey(i)) {
+                                // Remove previousliy drawn map rectangle
+                                map.removeMapRectangle(mapRectangles.get(i));
+                                mapRectangles.remove(i);
+                            }
+                        }
+                    }
+                    // If needed, adjust map to show all map rectangles
+                    if (!mapRectangles.isEmpty()) {
+                        map.setDisplayToFitMapRectangle();
+                        map.zoomOut();
+                    }
+                }
+            }
         }