Changeset 5729 in josm for trunk/src/org

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (4 diffs)
• data/imagery/ImageryLayerInfo.java (modified) (4 diffs)
• gui/ImageryMenu.java (modified) (8 diffs)
• gui/io/RecentlyOpenedFilesMenu.java (modified) (1 diff)
• gui/preferences/imagery/ImageryPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -7 +7 @@
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
 import java.util.concurrent.Future;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.swing.JOptionPane;
+import org.xml.sax.SAXException;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 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.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -39 +30 @@
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.tools.Utils;
-import org.xml.sax.SAXException;
 
 /**
@@ -283 +272 @@
                 targetLayer.onPostDownloadFromServer();
             }
-
-            // Suggest potential imagery data, except if the data is downloaded after a "data update" command (see #8307)
-            if (!isUpdateData) {
-                suggestImageryLayers();
-            }
         }
         
@@ -304 +288 @@
             if (reader != null) {
                 reader.cancel();
-            }
-        }
-
-        protected void suggestImageryLayers() {
-            if (currentBounds != null) {
-                final LatLon center = currentBounds.getCenter();
-                final Set<ImageryInfo> layers = new HashSet<ImageryInfo>();
-    
-                for (ImageryInfo i : ImageryLayerInfo.instance.getDefaultLayers()) {
-                    if (i.getBounds() != null && i.getBounds().contains(center)) {
-                        layers.add(i);
-                    }
-                }
-                // Do not suggest layers already in use
-                layers.removeAll(ImageryLayerInfo.instance.getLayers());
-                // For layers containing complex shapes, check that center is in one of its shapes (fix #7910)
-                for (Iterator<ImageryInfo> iti = layers.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(center);
-                        }
-                        if (!found) {
-                            iti.remove();
-                        }
-                    }
-                }
-    
-                if (layers.isEmpty()) {
-                    return;
-                }
-    
-                final List<String> layerNames = new ArrayList<String>();
-                for (ImageryInfo i : layers) {
-                    layerNames.add(i.getName());
-                }
-    
-                if (!ConditionalOptionPaneUtil.showConfirmationDialog(
-                        "download.suggest-imagery-layer",
-                        Main.parent,
-                        tr("<html>For the downloaded area, the following additional imagery layers are available: {0}" +
-                                "Do you want to add those layers to the <em>Imagery</em> menu?" +
-                                "<br>(If needed, you can remove those entries in the <em>Preferences</em>.)",
-                                Utils.joinAsHtmlUnorderedList(layerNames)),
-                        tr("Add imagery layers?"),
-                        JOptionPane.YES_NO_OPTION,
-                        JOptionPane.QUESTION_MESSAGE,
-                        JOptionPane.YES_OPTION)) {
-                    return;
-                }
-    
-                ImageryLayerInfo.addLayers(layers);
             }
         }

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
+
+import org.xml.sax.SAXException;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
+import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.io.imagery.ImageryReader;
-import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.Utils;
-import org.xml.sax.SAXException;
 
 /**
@@ -60 +60 @@
     }
 
+    /**
+     * Loads the available imagery entries.
+     *
+     * The data is downloaded from the JOSM website (or loaded from cache).
+     * Entries marked as "default" are added to the user selection, if not
+     * already present.
+     *
+     * @param clearCache if true, clear the cache and start a fresh download.
+     */
     public void loadDefaults(boolean clearCache) {
         defaultLayers.clear();
@@ -148 +157 @@
         instance.add(info);
         instance.save();
-        Main.main.menu.imageryMenu.refreshImageryMenu();
     }
 
@@ -157 +165 @@
         instance.save();
         Collections.sort(instance.layers);
-        Main.main.menu.imageryMenu.refreshImageryMenu();
     }
 }

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();
     }
 

trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.Collections;
+
 import javax.swing.AbstractAction;
 import javax.swing.JMenu;

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

@@ -140 +140 @@
         ImageryLayerInfo.instance.clear();
         ImageryLayerInfo.instance.load();
-        Main.main.menu.imageryMenu.refreshImageryMenu();
         Main.main.menu.imageryMenu.refreshOffsetMenu();
         OffsetBookmark.saveBookmarks();
@@ -831 +830 @@
         ImageryLayerInfo.instance.load();
         OffsetBookmark.loadBookmarks();
-        Main.main.menu.imageryMenu.refreshImageryMenu();
         Main.main.menu.imageryMenu.refreshOffsetMenu();
     }