Changeset 31495 in osm for applications/editors/josm/plugins/mapillary

Timestamp:

2015-08-13T00:07:14+02:00 (9 years ago)

Author:

nokutu

Message:

When zooming to show a set of images, the zoom level has a maximum value, so it can't too high.

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• MapillaryLayer.java (modified) (2 diffs)
• actions/MapillaryImportAction.java (modified) (1 diff)
• actions/MapillaryImportIntoSequenceAction.java (modified) (1 diff)
• gui/FinishedUploadDialog.java (modified) (1 diff)
• gui/MapillaryHistoryDialog.java (modified) (8 diffs)
• history/MapillaryRecord.java (modified) (1 diff)
• utils/MapillaryUtils.java (modified) (3 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java

@@ -190 +190 @@
   public void destroy() {
     setMode(null);
-
+    MapillaryRecord.getInstance().reset();
     AbstractMode.resetThread();
     MapillaryDownloader.stopAll();
@@ -211 +211 @@
   public static void clearInstance() {
     INSTANCE = null;
-  }
-
-  /**
-   * Zooms to fit all the {@link MapillaryAbstractImage} icons into the map
-   * view.
-   */
-  public void showAllPictures() {
-    double minLat = 90;
-    double minLon = 180;
-    double maxLat = -90;
-    double maxLon = -180;
-    for (MapillaryAbstractImage img : this.data.getImages()) {
-      if (img.getLatLon().lat() < minLat)
-        minLat = img.getLatLon().lat();
-      if (img.getLatLon().lon() < minLon)
-        minLon = img.getLatLon().lon();
-      if (img.getLatLon().lat() > maxLat)
-        maxLat = img.getLatLon().lat();
-      if (img.getLatLon().lon() > maxLon)
-        maxLon = img.getLatLon().lon();
-    }
-    Main.map.mapView.zoomTo(new Bounds(new LatLon(minLat, minLon), new LatLon(
-        maxLat, maxLon)));
   }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java

@@ -118 +118 @@
       }
       MapillaryRecord.getInstance().addCommand(new CommandImport(images));
-      MapillaryLayer.getInstance().showAllPictures();
+      MapillaryUtils.showAllPictures();
     }
   }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java

@@ -116 +116 @@
       MapillaryRecord.getInstance().addCommand(new CommandImport(this.images));
     }
-    MapillaryLayer.getInstance().showAllPictures();
+    MapillaryUtils.showAllPictures();
   }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/FinishedUploadDialog.java

@@ -36 +36 @@
     text.setAlignmentX(Component.CENTER_ALIGNMENT);
     this.add(text);
-    JButton web = new JButton("Approve upload in the website.");
+    JButton web = new JButton("Approve upload on the website.");
     web.addActionListener(new WebAction());
     web.setAlignmentX(Component.CENTER_ALIGNMENT);

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java

@@ -9 +9 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.swing.AbstractAction;
@@ -18 +21 @@
 import javax.swing.JTree;
 import javax.swing.SwingUtilities;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeSelectionModel;
 
 import org.openstreetmap.josm.gui.SideButton;
@@ -25 +31 @@
 import org.openstreetmap.josm.plugins.mapillary.history.MapillaryRecord;
 import org.openstreetmap.josm.plugins.mapillary.history.MapillaryRecordListener;
+import org.openstreetmap.josm.plugins.mapillary.history.commands.CommandDelete;
 import org.openstreetmap.josm.plugins.mapillary.history.commands.MapillaryCommand;
+import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -48 +56 @@
   private static MapillaryHistoryDialog INSTANCE;
 
+  private transient UndoRedoSelectionListener undoSelectionListener;
+  private transient UndoRedoSelectionListener redoSelectionListener;
+
   private final DefaultTreeModel undoTreeModel = new DefaultTreeModel(
       new DefaultMutableTreeNode());
@@ -61 +72 @@
   private SideButton redoButton;
 
+  private ConcurrentHashMap<Object, MapillaryCommand> map;
+
   private MapillaryHistoryDialog() {
     super(tr("Mapillary history"), "mapillaryhistory.png",
@@ -69 +82 @@
     MapillaryRecord.getInstance().addListener(this);
 
+    this.map = new ConcurrentHashMap<>();
+
     this.undoTree.expandRow(0);
     this.undoTree.setShowsRootHandles(true);
     this.undoTree.setRootVisible(false);
     this.undoTree.setCellRenderer(new MapillaryCellRenderer());
+    this.undoTree.getSelectionModel().setSelectionMode(
+        TreeSelectionModel.SINGLE_TREE_SELECTION);
+    this.undoTree.addMouseListener(new MouseEventHandler());
+    this.undoSelectionListener = new UndoRedoSelectionListener(this.undoTree);
+    this.undoTree.getSelectionModel().addTreeSelectionListener(
+        this.undoSelectionListener);
+
     this.redoTree.expandRow(0);
     this.redoTree.setCellRenderer(new MapillaryCellRenderer());
     this.redoTree.setShowsRootHandles(true);
     this.redoTree.setRootVisible(false);
+    this.redoTree.getSelectionModel().setSelectionMode(
+        TreeSelectionModel.SINGLE_TREE_SELECTION);
+    this.redoTree.addMouseListener(new MouseEventHandler());
+    this.redoSelectionListener = new UndoRedoSelectionListener(this.redoTree);
+    this.redoTree.getSelectionModel().addTreeSelectionListener(
+        this.redoSelectionListener);
 
     JPanel treesPanel = new JPanel(new GridBagLayout());
@@ -130 +158 @@
     DefaultMutableTreeNode undoRoot = new DefaultMutableTreeNode();
 
+    this.map.clear();
     for (MapillaryCommand command : undoCommands) {
-      if (command != null)
-        undoRoot.add(new DefaultMutableTreeNode(command.toString()));
+      if (command != null) {
+        DefaultMutableTreeNode node = new DefaultMutableTreeNode(
+            command.toString());
+        this.map.put(node, command);
+        undoRoot.add(node);
+      }
     }
     for (MapillaryCommand command : redoCommands) {
-      if (command != null)
-        redoRoot.add(new DefaultMutableTreeNode(command.toString()));
+      if (command != null) {
+        DefaultMutableTreeNode node = new DefaultMutableTreeNode(
+            command.toString());
+        this.map.put(node, command);
+        redoRoot.add(node);
+      }
     }
 
@@ -213 +250 @@
     MapillaryHistoryDialog.INSTANCE = null;
   }
+
+  private class MouseEventHandler implements MouseListener {
+
+    @Override
+    public void mouseClicked(MouseEvent e) {
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent e) {
+    }
+
+    @Override
+    public void mouseExited(MouseEvent e) {
+    }
+
+    @Override
+    public void mousePressed(MouseEvent e) {
+      if (e.getClickCount() == 2) {
+        if (MapillaryHistoryDialog.this.undoTree.getSelectionPath() != null) {
+          MapillaryCommand cmd = MapillaryHistoryDialog.this.map
+              .get(MapillaryHistoryDialog.this.undoTree.getSelectionPath()
+                  .getLastPathComponent());
+          if (!(cmd instanceof CommandDelete))
+            MapillaryUtils.showPictures(cmd.images, true);
+        } else
+          MapillaryUtils.showPictures(MapillaryHistoryDialog.this.map
+              .get(MapillaryHistoryDialog.this.redoTree.getSelectionPath()
+                  .getLastPathComponent()).images, true);
+      }
+    }
+
+    @Override
+    public void mouseReleased(MouseEvent e) {
+    }
+  }
+
+  private class UndoRedoSelectionListener implements TreeSelectionListener {
+
+    private JTree source;
+
+    private UndoRedoSelectionListener(JTree source) {
+      this.source = source;
+    }
+
+    @Override
+    public void valueChanged(TreeSelectionEvent e) {
+      if (this.source == MapillaryHistoryDialog.this.undoTree) {
+        MapillaryHistoryDialog.this.redoTree.getSelectionModel()
+            .removeTreeSelectionListener(
+                MapillaryHistoryDialog.this.redoSelectionListener);
+        MapillaryHistoryDialog.this.redoTree.clearSelection();
+        MapillaryHistoryDialog.this.redoTree.getSelectionModel()
+            .addTreeSelectionListener(
+                MapillaryHistoryDialog.this.redoSelectionListener);
+      }
+      if (this.source == MapillaryHistoryDialog.this.redoTree) {
+        MapillaryHistoryDialog.this.undoTree.getSelectionModel()
+            .removeTreeSelectionListener(
+                MapillaryHistoryDialog.this.undoSelectionListener);
+        MapillaryHistoryDialog.this.undoTree.clearSelection();
+        MapillaryHistoryDialog.this.undoTree.getSelectionModel()
+            .addTreeSelectionListener(
+                MapillaryHistoryDialog.this.undoSelectionListener);
+      }
+    }
+  }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecord.java

@@ -127 +127 @@
         lis.recordChanged();
   }
+
+  /**
+   * Resets the object to its start state.
+   */
+  public void reset() {
+    this.commandList.clear();
+    this.position = -1;
+  }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java

@@ -8 +8 @@
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.SwingUtilities;
 
 import org.apache.commons.imaging.common.RationalNumber;
 import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryAbstractImage;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryData;
@@ -25 +30 @@
  */
 public class MapillaryUtils {
+
+  private static double MIN_ZOOM_SQUARE_SIDE = 0.002;
+
   /**
    * Updates the help text at the bottom of the window.
@@ -199 +207 @@
       MapillaryData.dataUpdated();
   }
+
+  /**
+   * Zooms to fit all the given {@link MapillaryAbstractImage} objects.
+   *
+   * @param images
+   *          The images your are zooming to.
+   * @param select
+   *          Whether the added images must be selected or not.
+   */
+  public static void showPictures(final List<MapillaryAbstractImage> images,
+      final boolean select) {
+    if (!SwingUtilities.isEventDispatchThread()) {
+      SwingUtilities.invokeLater(new Runnable() {
+        @Override
+        public void run() {
+          showPictures(images, select);
+        }
+      });
+    } else {
+      double minLat = 90;
+      double minLon = 180;
+      double maxLat = -90;
+      double maxLon = -180;
+      for (MapillaryAbstractImage img : images) {
+        if (img.getLatLon().lat() < minLat)
+          minLat = img.getLatLon().lat();
+        if (img.getLatLon().lon() < minLon)
+          minLon = img.getLatLon().lon();
+        if (img.getLatLon().lat() > maxLat)
+          maxLat = img.getLatLon().lat();
+        if (img.getLatLon().lon() > maxLon)
+          maxLon = img.getLatLon().lon();
+      }
+      Bounds zoomBounds = new Bounds(new LatLon(minLat, minLon), new LatLon(
+          maxLat, maxLon));
+      // The zoom rectangle must have a minimum size.
+      double latExtent = zoomBounds.getMaxLat() - zoomBounds.getMinLat() >= MIN_ZOOM_SQUARE_SIDE ? zoomBounds
+          .getMaxLat() - zoomBounds.getMinLat()
+          : MIN_ZOOM_SQUARE_SIDE;
+      double lonExtent = zoomBounds.getMaxLon() - zoomBounds.getMinLon() >= MIN_ZOOM_SQUARE_SIDE ? zoomBounds
+          .getMaxLon() - zoomBounds.getMinLon()
+          : MIN_ZOOM_SQUARE_SIDE;
+      zoomBounds = new Bounds(zoomBounds.getCenter(), latExtent, lonExtent);
+
+      Main.map.mapView.zoomTo(zoomBounds);
+      MapillaryLayer.getInstance().getData().setSelectedImage(null);
+      if (select)
+        MapillaryLayer.getInstance().getData().addMultiSelectedImage(images);
+      if (Main.main != null)
+        MapillaryData.dataUpdated();
+    }
+  }
+
+  /**
+   * Zooms to fit all the {@link MapillaryAbstractImage} objects stored in the
+   * database.
+   */
+  public static void showAllPictures() {
+    showPictures(MapillaryLayer.getInstance().getData().getImages(), false);
+  }
 }