Changeset 31400 in osm for applications

Timestamp:

2015-07-24T12:53:18+02:00 (10 years ago)

Author:

nokutu

Message:

Fixed bug when downloading multiple times, several instances of the same image object would be created.

Location:

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

Files:

• MapillaryData.java (modified) (1 diff)
• MapillaryLayer.java (modified) (2 diffs)
• cache/Utils.java (modified) (2 diffs)
• downloads/MapillarySequenceDownloadThread.java (modified) (1 diff)

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

@@ -237 +237 @@
    */
   public void setSelectedImage(MapillaryAbstractImage image, boolean zoom) {
+    if (image != null) {
+      System.out.println("----------------------------");
+      for (MapillaryAbstractImage img : getImages())
+        System.out.println(img.getSequence());
+    }
     MapillaryAbstractImage oldImage = selectedImage;
     selectedImage = image;

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

@@ -251 +251 @@
   }
 
-  /**
-   * Returns true any of the images from the database has been modified.
-   */
   @Override
   public boolean isModified() {
@@ -304 +301 @@
   }
 
-  /**
-   * Paints the database in the map.
-   */
   @Override
   public synchronized void paint(Graphics2D g, MapView mv, Bounds box) {

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

@@ -8 +8 @@
 
 /**
- * Downloads and stores pictures in cache.
+ * Utility methods for working with cache.
  *
  * @author nokutu
  *
  */
-public class Utils implements ICachedLoaderListener {
+public class Utils {
 
-  static Utils INSTANCE = new Utils();
-
+  private static IgnoreDownload IGNORE_DOWNLOAD = new IgnoreDownload();
 
   /**
-   * Downloads the picture of the given image.
+   * Downloads the picture of the given image and does nothing when it is downloaded.
    *
    * @param img
@@ -27 +26 @@
       throw new IllegalArgumentException();
     new MapillaryCache(((MapillaryImage) img).getKey(), MapillaryCache.Type.THUMBNAIL).submit(
-        INSTANCE, false);
+        IGNORE_DOWNLOAD, false);
     new MapillaryCache(((MapillaryImage) img).getKey(), MapillaryCache.Type.FULL_IMAGE).submit(
-        INSTANCE, false);
+        IGNORE_DOWNLOAD, false);
   }
 
-  @Override
-  public void loadingFinished(CacheEntry arg0, CacheEntryAttributes arg1,
-      LoadResult arg2) {
-    // Nothing
+  private static class IgnoreDownload implements ICachedLoaderListener {
+
+    @Override
+    public void loadingFinished(CacheEntry arg0, CacheEntryAttributes arg1,
+        LoadResult arg2) {
+      // Nothing
+    }
   }
-
 }

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

@@ -102 +102 @@
         for (MapillaryImage img : finalImages) {
           if (layer.getMapillaryData().getImages().contains(img)) {
+            // The image in finalImages is substituted by the one in the
+            // database, as they are equal.
+            img = (MapillaryImage) layer.getMapillaryData().getImages()
+                .get(layer.getMapillaryData().getImages().indexOf(img));
             sequence.add(img);
             ((MapillaryImage) layer.getMapillaryData().getImages()
                 .get(layer.getMapillaryData().getImages().indexOf(img)))
                 .setSequence(sequence);
-            finalImages.set(
-                finalImages.indexOf(img),
-                (MapillaryImage) layer.getMapillaryData().getImages()
-                    .get(layer.getMapillaryData().getImages().indexOf(img)));
+            finalImages.set(finalImages.indexOf(img), img);
           } else {
             img.setSequence(sequence);