Changeset 5729 in josm for trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java

Timestamp:

2013-02-19T10:04:40+01:00 (11 years ago)

Author:

bastiK

Message:

applied #8441 - show local imagery sources in menu instead of popup

File:

• trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java

@@ -8 +8 @@
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.Action;
@@ -16 +19 @@
 import javax.swing.JPopupMenu;
 import javax.swing.MenuElement;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
 
 import org.openstreetmap.josm.Main;
@@ -21 +26 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.Map_Rectifier_WMSmenuAction;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
+import org.openstreetmap.josm.data.imagery.Shape;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -28 +35 @@
 
 public class ImageryMenu extends JMenu implements MapView.LayerChangeListener {
+
     private Action offsetAction = new JosmAction(
             tr("Imagery offset"), "mapmode/adjustimg", tr("Adjust imagery offset"), null, false, false) {
@@ -66 +74 @@
         }
     };
+
     private JMenuItem singleOffset = new JMenuItem(offsetAction);
     private JMenuItem offsetMenuItem = singleOffset;
     private Map_Rectifier_WMSmenuAction rectaction = new Map_Rectifier_WMSmenuAction();
-    private int offsPos;
-    private MenuScroller menuScroller;
 
     public ImageryMenu() {
@@ -76 +83 @@
         setupMenuScroller();
         MapView.addLayerChangeListener(this);
+        // build dynamically
+        addMenuListener(new MenuListener() {
+            @Override
+            public void menuSelected(MenuEvent e) {
+                refreshImageryMenu();
+            }
+
+            @Override
+            public void menuDeselected(MenuEvent e) {
+            }
+
+            @Override
+            public void menuCanceled(MenuEvent e) {
+            }
+        });
     }
     
-    private final void setupMenuScroller() {
+    private void setupMenuScroller() {
         int screenHeight = Toolkit.getDefaultToolkit().getScreenSize().height;
         int menuItemHeight = singleOffset.getPreferredSize().height;
-        menuScroller = MenuScroller.setScrollerFor(this, (screenHeight / menuItemHeight)-1);
-    }
-
-    public void refreshImageryMenu() {
-        if (menuScroller != null) {
-            menuScroller.dispose();
-            menuScroller = null;
-        }
-        setupMenuScroller();
+        MenuScroller.setScrollerFor(this, (screenHeight / menuItemHeight)-1);
+    }
+
+    protected void refreshImageryMenu() {
         removeAll();
 
@@ -96 +113 @@
             add(new AddImageryLayerAction(u));
         }
+
+        // list all imagery entries where the current map location
+        // is within the imagery bounds
+        if (Main.isDisplayingMapView()) {
+            MapView mv = Main.map.mapView;
+            LatLon pos = mv.getProjection().eastNorth2latlon(mv.getCenter());
+            final Set<ImageryInfo> inViewLayers = new HashSet<ImageryInfo>();
+
+            for (ImageryInfo i : ImageryLayerInfo.instance.getDefaultLayers()) {
+                if (i.getBounds() != null && i.getBounds().contains(pos)) {
+                    inViewLayers.add(i);
+                }
+            }
+            // Do not suggest layers already in use
+            inViewLayers.removeAll(ImageryLayerInfo.instance.getLayers());
+            // For layers containing complex shapes, check that center is in one
+            // of its shapes (fix #7910)
+            for (Iterator<ImageryInfo> iti = inViewLayers.iterator(); iti.hasNext(); ) {
+                List<Shape> shapes = iti.next().getBounds().getShapes();
+                if (shapes != null && !shapes.isEmpty()) {
+                    boolean found = false;
+                    for (Iterator<Shape> its = shapes.iterator(); its.hasNext() && !found; ) {
+                        found = its.next().contains(pos);
+                    }
+                    if (!found) {
+                        iti.remove();
+                    }
+                }
+            }
+            if (!inViewLayers.isEmpty()) {
+                addSeparator();
+                for (ImageryInfo i : inViewLayers) {
+                    add(new AddImageryLayerAction(i));
+                }
+            }
+        }
+
         addSeparator();
         add(new JMenuItem(rectaction));
 
         addSeparator();
-        offsPos = getMenuComponentCount();
         add(offsetMenuItem);
     }
@@ -137 +190 @@
 
     public void refreshOffsetMenu() {
-        JMenuItem newItem = getNewOffsetMenu();
-        remove(offsetMenuItem);
-        add(newItem, offsPos);
-        offsetMenuItem = newItem;
+        offsetMenuItem = getNewOffsetMenu();
     }