Changeset 31416 in osm for applications

Timestamp:

2015-07-30T13:17:37+02:00 (9 years ago)

Author:

nokutu

Message:

Added the possibility to do a reverse walk.

Location:

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

Files:

• MapillaryLayer.java (modified) (1 diff)
• actions/MapillaryWalkAction.java (modified) (1 diff)
• actions/WalkThread.java (modified) (4 diffs)
• cache/MapillaryCache.java (modified) (1 diff)
• cache/Utils.java (modified) (4 diffs)
• gui/MapillaryWalkDialog.java (modified) (2 diffs)

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

@@ -445 +445 @@
    * Returns the 2 closest images belonging to a different sequence.
    *
-   * @return
+   * @return An array of length 2 containing the two closest images belonging
+   *         to different sequences.
    */
   private MapillaryImage[] getClosestImagesFromDifferentSequences() {

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

@@ -57 +57 @@
         && (int) pane.getValue() == JOptionPane.OK_OPTION) {
       thread = new WalkThread((int) dialog.spin.getValue(),
-          dialog.waitForPicture.isSelected(), dialog.followSelection.isSelected());
+          dialog.waitForPicture.isSelected(),
+          dialog.followSelection.isSelected(), dialog.goForward.isSelected());
       fireWalkStarted();
       thread.start();

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

@@ -28 +28 @@
   private final boolean waitForFullQuality;
   private final boolean followSelected;
+  private final boolean goForward;
   private BufferedImage lastImage;
   private volatile boolean paused = false;
@@ -37 +38 @@
    * @param waitForPicture
    * @param followSelected
+   * @param goForward
    */
-  public WalkThread(int interval, boolean waitForPicture, boolean followSelected) {
+  public WalkThread(int interval, boolean waitForPicture,
+      boolean followSelected, boolean goForward) {
     this.interval = interval;
     this.waitForFullQuality = waitForPicture;
     this.followSelected = followSelected;
+    this.goForward = goForward;
     data = MapillaryLayer.getInstance().getMapillaryData();
     data.addListener(this);
@@ -67 +71 @@
               break;
             image = image.next();
-            Utils.downloadPicture((MapillaryImage) image, Utils.PICTURE.FULL);
+            Utils.downloadPicture((MapillaryImage) image, Utils.PICTURE.FULL_IMAGE);
           }
         try {
@@ -98 +102 @@
               .getImage();
           lock.lock();
-          data.selectNext(followSelected);
+          if (goForward)
+            data.selectNext(followSelected);
+          else
+            data.selectPrevious(followSelected);
           lock.unlock();
         } catch (InterruptedException e) {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/cache/MapillaryCache.java

@@ -45 +45 @@
     this.key = key;
     try {
-      if (type == Type.FULL_IMAGE) {
-        url = new URL("https://d1cuyjsrcm0gby.cloudfront.net/" + key
-            + "/thumb-2048.jpg");
-        this.key += ".FULL_IMAGE";
-
-      } else if (type == Type.THUMBNAIL) {
-        url = new URL("https://d1cuyjsrcm0gby.cloudfront.net/" + key
-            + "/thumb-320.jpg");
-        this.key += ".THUMBNAIL";
+      switch (type) {
+        case FULL_IMAGE:
+          url = new URL("https://d1cuyjsrcm0gby.cloudfront.net/" + key
+              + "/thumb-2048.jpg");
+          this.key += ".FULL_IMAGE";
+          break;
+        case THUMBNAIL:
+          url = new URL("https://d1cuyjsrcm0gby.cloudfront.net/" + key
+              + "/thumb-320.jpg");
+          this.key += ".THUMBNAIL";
+          break;
       }
     } catch (MalformedURLException e) {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/cache/Utils.java

@@ -18 +18 @@
   /** Picture quality */
   public enum PICTURE {
-    /** Thumbnail quality picture () */
+    /** Thumbnail quality picture (320 p) */
     THUMBNAIL,
-    /** Full quality picture () */
-    FULL,
+    /** Full quality picture (2048 p) */
+    FULL_IMAGE,
     /** Both of them */
     BOTH;
@@ -27 +27 @@
 
   /**
-   * Downloads the picture of the given image and does nothing when it is
-   * downloaded.
+   * Downloads the the thumbnail and the full resolution picture of the given
+   * image. Does nothing if it is already in cache.
    *
    * @param img
+   *          The image whose picture is going to be downloaded.
    */
   public static void downloadPicture(MapillaryImage img) {
@@ -37 +38 @@
 
   /**
-   * Downloads the picture of the given image and does nothing when it is
-   * downloaded.
+   * Downloads the picture of the given image. Does nothing when it is already
+   * in cache.
    *
    * @param img
@@ -46 +47 @@
    */
   public static void downloadPicture(MapillaryImage img, PICTURE pic) {
-    if (pic == PICTURE.BOTH) {
-      if (new MapillaryCache(img.getKey(), MapillaryCache.Type.THUMBNAIL).get() == null)
+    switch (pic) {
+      case BOTH:
+        if (new MapillaryCache(img.getKey(), MapillaryCache.Type.THUMBNAIL)
+            .get() == null)
+          new MapillaryCache(img.getKey(), MapillaryCache.Type.THUMBNAIL)
+              .submit(IGNORE_DOWNLOAD, false);
+        if (new MapillaryCache(img.getKey(), MapillaryCache.Type.FULL_IMAGE)
+            .get() == null)
+          new MapillaryCache(img.getKey(), MapillaryCache.Type.FULL_IMAGE)
+              .submit(IGNORE_DOWNLOAD, false);
+        break;
+      case THUMBNAIL:
         new MapillaryCache(img.getKey(), MapillaryCache.Type.THUMBNAIL).submit(
             IGNORE_DOWNLOAD, false);
-      if (new MapillaryCache(img.getKey(), MapillaryCache.Type.FULL_IMAGE)
-          .get() == null)
+        break;
+      case FULL_IMAGE:
         new MapillaryCache(img.getKey(), MapillaryCache.Type.FULL_IMAGE)
             .submit(IGNORE_DOWNLOAD, false);
-    } else if (pic == PICTURE.THUMBNAIL
-        && new MapillaryCache(img.getKey(), MapillaryCache.Type.THUMBNAIL)
-            .get() == null) {
-      new MapillaryCache(img.getKey(), MapillaryCache.Type.THUMBNAIL).submit(
-          IGNORE_DOWNLOAD, false);
-    } else if (pic == PICTURE.FULL
-        && new MapillaryCache(img.getKey(), MapillaryCache.Type.FULL_IMAGE)
-            .get() == null) {
-      new MapillaryCache(img.getKey(), MapillaryCache.Type.FULL_IMAGE).submit(
-          IGNORE_DOWNLOAD, false);
+        break;
     }
   }

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

@@ -24 +24 @@
   /** Whether the view must follow the selected image. */
   public JCheckBox followSelection;
+  /** Go forward or backwards */
+  public JCheckBox goForward;
 
   /**
@@ -42 +44 @@
     followSelection.setSelected(true);
     add(followSelection);
+
+    goForward = new JCheckBox("Go forward");
+    goForward.setSelected(true);
+    add(goForward);
   }
 }