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

Timestamp:

2015-07-09T11:57:53+02:00 (9 years ago)

Author:

nokutu

Message:

Finished join/unjoin mode. You can change the mode with a button in data menu.

Location:

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

Files:

• MapillaryData.java (modified) (6 diffs)
• MapillaryLayer.java (modified) (3 diffs)
• downloads/MapillarySquareDownloadManagerThread.java (modified) (5 diffs)
• gui/MapillaryMainDialog.java (modified) (2 diffs)
• mode/AbstractMode.java (modified) (2 diffs)
• mode/JoinMode.java (modified) (4 diffs)
• mode/SelectMode.java (modified) (1 diff)

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

@@ -163 +163 @@
    */
   public void selectNext() {
-    if (getSelectedImage() instanceof MapillaryImage) {
-      if (getSelectedImage() == null)
-        return;
-      if (((MapillaryImage) getSelectedImage()).getSequence() == null)
-        return;
-      if (selectedImage instanceof MapillaryImage
-          && ((MapillaryImage) selectedImage).getSequence() != null) {
-        MapillaryAbstractImage tempImage = selectedImage;
-        while (tempImage.next() != null) {
-          tempImage = tempImage.next();
-          if (tempImage.isVisible()) {
-            setSelectedImage(tempImage,
-                Main.pref.getBoolean("mapillary.move-to-picture", true));
-            break;
-          }
-        }
+    if (getSelectedImage() == null)
+      return;
+    if (getSelectedImage().getSequence() == null)
+      return;
+    MapillaryAbstractImage tempImage = selectedImage;
+    while (tempImage.next() != null) {
+      tempImage = tempImage.next();
+      if (tempImage.isVisible()) {
+        setSelectedImage(tempImage, Main.pref.getBoolean("mapillary.move-to-picture", true));
+        break;
       }
     }
@@ -189 +183 @@
    */
   public void selectPrevious() {
-    if (getSelectedImage() instanceof MapillaryImage) {
-      if (getSelectedImage() == null)
-        return;
-      if (((MapillaryImage) getSelectedImage()).getSequence() == null)
-        throw new IllegalStateException();
-      if (selectedImage instanceof MapillaryImage
-          && ((MapillaryImage) selectedImage).getSequence() != null) {
-        MapillaryAbstractImage tempImage = selectedImage;
-        while (tempImage.previous() != null) {
-          tempImage = tempImage.previous();
-          if (tempImage.isVisible()) {
-            setSelectedImage(tempImage,
-                Main.pref.getBoolean("mapillary.move-to-picture", true));
-            break;
-          }
-        }
+    if (getSelectedImage() == null)
+      return;
+    if (getSelectedImage().getSequence() == null)
+      throw new IllegalStateException();
+    MapillaryAbstractImage tempImage = selectedImage;
+    while (tempImage.previous() != null) {
+      tempImage = tempImage.previous();
+      if (tempImage.isVisible()) {
+        setSelectedImage(tempImage, Main.pref.getBoolean("mapillary.move-to-picture", true));
+        break;
       }
     }
@@ -242 +230 @@
         // Donwloadins thumbnails of surrounding pictures.
         if (mapillaryImage.next() != null) {
-          new MapillaryCache(((MapillaryImage) mapillaryImage.next()).getKey(),
-              MapillaryCache.Type.THUMBNAIL).submit(this, false);
+          new MapillaryCache(((MapillaryImage) mapillaryImage.next()).getKey(), MapillaryCache.Type.THUMBNAIL).submit(
+              this, false);
           if (mapillaryImage.next().next() != null)
-            new MapillaryCache(((MapillaryImage) mapillaryImage.next().next()).getKey(),
-                MapillaryCache.Type.THUMBNAIL).submit(this, false);
+            new MapillaryCache(((MapillaryImage) mapillaryImage.next().next()).getKey(), MapillaryCache.Type.THUMBNAIL)
+                .submit(this, false);
         }
         if (mapillaryImage.previous() != null) {
-          new MapillaryCache(((MapillaryImage) mapillaryImage.previous()).getKey(),
-              MapillaryCache.Type.THUMBNAIL).submit(this, false);
+          new MapillaryCache(((MapillaryImage) mapillaryImage.previous()).getKey(), MapillaryCache.Type.THUMBNAIL)
+              .submit(this, false);
           if (mapillaryImage.previous().previous() != null)
             new MapillaryCache(((MapillaryImage) mapillaryImage.previous().previous()).getKey(),
@@ -258 +246 @@
     }
     if (zoom)
-      Main.map.mapView.zoomTo(MapillaryData.getInstance().getSelectedImage()
-          .getLatLon());
+      Main.map.mapView.zoomTo(MapillaryData.getInstance().getSelectedImage().getLatLon());
     if (Main.map != null)
       Main.map.mapView.repaint();
@@ -265 +252 @@
   }
 
-  private void fireSelectedImageChanged(MapillaryAbstractImage oldImage,
-      MapillaryAbstractImage newImage) {
+  private void fireSelectedImageChanged(MapillaryAbstractImage oldImage, MapillaryAbstractImage newImage) {
     if (listeners.isEmpty())
       return;
@@ -323 +309 @@
    */
   @Override
-  public void loadingFinished(CacheEntry data, CacheEntryAttributes attributes,
-      LoadResult result) {
+  public void loadingFinished(CacheEntry data, CacheEntryAttributes attributes, LoadResult result) {
     // DO NOTHING
   }

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

@@ -124 +124 @@
     Main.map.mapView.removeMouseMotionListener(this.mode);
     this.mode = mode;
+    Main.map.mapView.setNewCursor(mode.cursor, this);
     Main.map.mapView.addMouseListener(mode);
     Main.map.mapView.addMouseMotionListener(mode);
+    updateHelpText();
   }
 
@@ -552 +554 @@
   public void activeLayerChange(Layer oldLayer, Layer newLayer) {
     if (newLayer == this) {
-      if (data.size() > 0)
-        Main.map.statusLine.setHelpText(tr("Total images: {0}", data.size()));
-      else
-        Main.map.statusLine.setHelpText(tr("No images found"));
+      updateHelpText();
       MapillaryPlugin.setMenuEnabled(MapillaryPlugin.JOIN_MENU, true);
     } else
@@ -568 +567 @@
   public void layerRemoved(Layer oldLayer) {
   }
+  
+  public void updateHelpText() {
+    String ret = "";
+    if (data.size() > 0)
+      ret += tr("Total images: {0}", data.size());
+    else
+      ret += tr("No images found");
+    ret += " -- " + tr(mode.toString());
+    
+     Main.map.statusLine.setHelpText(ret);
+  }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySquareDownloadManagerThread.java

@@ -39 +39 @@
   @Override
   public void run() {
-    Main.map.statusLine.setHelpText("Downloading images from Mapillary");
+    Main.map.statusLine.setHelpText(tr("Downloading images from Mapillary"));
     try {
       downloadSequences();
       if (imagesAdded) {
-        Main.map.statusLine.setHelpText("Downloading image's information");
+        Main.map.statusLine.setHelpText(tr("Downloading image's information"));
         completeImages();
         MapillaryMainDialog.getInstance().updateTitle();
-        Main.map.statusLine.setHelpText("Downloading signs");
+        Main.map.statusLine.setHelpText(tr("Downloading signs"));
         downloadSigns();
       }
@@ -52 +52 @@
       Main.error(e);
     }
-    if (layer.data.getImages().size() > 0)
-      Main.map.statusLine.setHelpText(tr("Total images: ") + layer.data.getImages().size());
-    else
-      Main.map.statusLine.setHelpText(tr("No images found"));
+    layer.updateHelpText();
     layer.data.dataUpdated();
     MapillaryFilterDialog.getInstance().refresh();
@@ -62 +59 @@
 
   private void downloadSequences() throws InterruptedException {
-    ThreadPoolExecutor ex = new ThreadPoolExecutor(3, 5, 25, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
+    ThreadPoolExecutor ex = new ThreadPoolExecutor(3, 5, 25, TimeUnit.SECONDS,
+        new ArrayBlockingQueue<Runnable>(5));
     int page = 0;
     while (!ex.isShutdown()) {
-      ex.execute(new MapillarySequenceDownloadThread(ex, urlSequences + "&page=" + page + "&limit=10", layer, this));
+      ex.execute(new MapillarySequenceDownloadThread(ex, urlSequences
+          + "&page=" + page + "&limit=10", layer, this));
       while (ex.getQueue().remainingCapacity() == 0)
         Thread.sleep(500);
@@ -75 +74 @@
 
   private void completeImages() throws InterruptedException {
-    ThreadPoolExecutor ex = new ThreadPoolExecutor(3, 5, 25, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
+    ThreadPoolExecutor ex = new ThreadPoolExecutor(3, 5, 25, TimeUnit.SECONDS,
+        new ArrayBlockingQueue<Runnable>(5));
     int page = 0;
     while (!ex.isShutdown()) {
-      ex.execute(new MapillaryImageInfoDownloaderThread(ex, urlImages + "&page=" + page + "&limit=20", layer));
+      ex.execute(new MapillaryImageInfoDownloaderThread(ex, urlImages
+          + "&page=" + page + "&limit=20", layer));
       while (ex.getQueue().remainingCapacity() == 0)
         Thread.sleep(100);
@@ -87 +88 @@
 
   private void downloadSigns() throws InterruptedException {
-    ThreadPoolExecutor ex = new ThreadPoolExecutor(3, 5, 25, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
+    ThreadPoolExecutor ex = new ThreadPoolExecutor(3, 5, 25, TimeUnit.SECONDS,
+        new ArrayBlockingQueue<Runnable>(5));
     int page = 0;
     while (!ex.isShutdown()) {
-      ex.execute(new MapillarySignDownloaderThread(ex, urlSigns + "&page=" + page + "&limit=20", layer));
+      ex.execute(new MapillarySignDownloaderThread(ex, urlSigns + "&page="
+          + page + "&limit=20", layer));
       while (ex.getQueue().remainingCapacity() == 0)
         Thread.sleep(100);

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

@@ -137 +137 @@
         return;
       }
+      // Enables/disables next/previous buttons
+      this.nextButton.setEnabled(false);
+      this.previousButton.setEnabled(false);
+      if (image.getSequence() != null) {
+        MapillaryAbstractImage tempImage = image;
+        while (tempImage.next() != null) {
+          tempImage = tempImage.next();
+          if (tempImage.isVisible()) {
+            this.nextButton.setEnabled(true);
+            break;
+          }
+        }
+      }
+      if (image.getSequence() != null) {
+        MapillaryAbstractImage tempImage = image;
+        while (tempImage.previous() != null) {
+          tempImage = tempImage.previous();
+          if (tempImage.isVisible()) {
+            this.previousButton.setEnabled(true);
+            break;
+          }
+        }
+      }
       if (image instanceof MapillaryImage) {
         mapillaryImageDisplay.hyperlink.setVisible(true);
         MapillaryImage mapillaryImage = (MapillaryImage) this.image;
         updateTitle();
-        // Enables/disables next/previous buttons
-        this.nextButton.setEnabled(false);
-        this.previousButton.setEnabled(false);
-        if (((MapillaryImage) image).getSequence() != null) {
-          MapillaryAbstractImage tempImage = image;
-          while (tempImage.next() != null) {
-            tempImage = tempImage.next();
-            if (tempImage.isVisible()) {
-              this.nextButton.setEnabled(true);
-              break;
-            }
-          }
-        }
-        if (((MapillaryImage) image).getSequence() != null) {
-          MapillaryAbstractImage tempImage = image;
-          while (tempImage.previous() != null) {
-            tempImage = tempImage.previous();
-            if (tempImage.isVisible()) {
-              this.previousButton.setEnabled(true);
-              break;
-            }
-          }
-        }
 
         mapillaryImageDisplay.hyperlink.setURL(mapillaryImage.getKey());
@@ -182 +182 @@
       } else if (image instanceof MapillaryImportedImage) {
         mapillaryImageDisplay.hyperlink.setVisible(false);
-        this.nextButton.setEnabled(false);
-        this.previousButton.setEnabled(false);
         MapillaryImportedImage mapillaryImage = (MapillaryImportedImage) this.image;
         try {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.mapillary.mode;
 
+import java.awt.Cursor;
 import java.awt.Graphics2D;
 import java.awt.Point;
@@ -14 +15 @@
 
   protected MapillaryData data = MapillaryData.getInstance();
+  
+  public int cursor = Cursor.DEFAULT_CURSOR;
 
   public AbstractMode() {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/JoinMode.java

@@ -2 +2 @@
 
 import java.awt.Color;
+import java.awt.Cursor;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 
 import org.openstreetmap.josm.Main;
@@ -18 +20 @@
   public MapillaryImportedImage lastClick;
   public MouseEvent lastPos;
+  
+  public JoinMode() {
+    cursor = Cursor.CROSSHAIR_CURSOR;
+  }
 
   @Override
@@ -24 +30 @@
       return;
     if (lastClick == null && data.getHighlighted() instanceof MapillaryImportedImage) {
-      if (data.getHighlighted().previous() == null || data.getHighlighted().next() == null)
-        lastClick = (MapillaryImportedImage) data.getHighlighted();
+      lastClick = (MapillaryImportedImage) data.getHighlighted();
     } else if (lastClick != null && data.getHighlighted() instanceof MapillaryImportedImage) {
-      if ((data.getHighlighted().previous() == null && lastClick.next() == null)
-          || (data.getHighlighted().next() == null && lastClick.previous() == null)) {
+      if (((data.getHighlighted().previous() == null && lastClick.next() == null) || (data.getHighlighted().next() == null && lastClick
+          .previous() == null))
+          && (data.getHighlighted().getSequence() != lastClick.getSequence() || lastClick.getSequence() == null)) {
         join(lastClick, (MapillaryImportedImage) data.getHighlighted());
       } else if (lastClick.next() == data.getHighlighted() || lastClick.previous() == data.getHighlighted())
@@ -81 +87 @@
 
   private void unjoin(MapillaryImportedImage img1, MapillaryImportedImage img2) {
-    // TODO
+    if (img1.next() != img2) {
+      MapillaryImportedImage temp = img1;
+      img1 = img2;
+      img2 = temp;
+    }
+
+    ArrayList<MapillaryAbstractImage> firstHalf = new ArrayList<>(img1.getSequence().getImages()
+        .subList(0, img1.getSequence().getImages().indexOf(img2)));
+    ArrayList<MapillaryAbstractImage> secondHalf = new ArrayList<>(img1.getSequence().getImages()
+        .subList(img1.getSequence().getImages().indexOf(img2), img1.getSequence().getImages().size()));
+
+    MapillarySequence seq1 = new MapillarySequence();
+    MapillarySequence seq2 = new MapillarySequence();
+
+    for (MapillaryAbstractImage img : firstHalf) {
+      img.setSequence(seq1);
+      seq1.add(img);
+    }
+    for (MapillaryAbstractImage img : secondHalf) {
+      img.setSequence(seq2);
+      seq2.add(img);
+    }
+  }
+  
+  @Override
+  public String toString() {
+    return "Join mode";
   }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java

@@ -196 +196 @@
   public void paint(Graphics2D g, MapView mv, Bounds box) {
   }
+  
+  @Override
+  public String toString() {
+    return "Select mode";
+  }
 }