Changeset 31194 in osm for applications/editors

Timestamp:

2015-06-03T11:38:58+02:00 (10 years ago)

Author:

nokutu

Message:

Fixed bug which would duplicate some images and now the Mapillary layer is set as active when being created

Location:

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

Files:

• MapillaryLayer.java (modified) (1 diff)
• MapillaryPlugin.java (modified) (3 diffs)
• MapillarySequence.java (modified) (3 diffs)
• MapillaryToggleDialog.java (modified) (1 diff)
• downloads/MapillarySequenceDownloadThread.java (modified) (1 diff)

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

@@ -94 +94 @@
                 MapillaryPlugin.setMenuEnabled(MapillaryPlugin.EXPORT_MENU, true);
                 download();
+                Main.map.mapView.setActiveLayer(this);
         }
 

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

@@ -33 +33 @@
                         "mapiconselected.png").get();
         public static final int ICON_SIZE = 24;
-        
+
         public static CacheAccess<String, BufferedImageCacheEntry> CACHE;
 
@@ -56 +56 @@
                 EXPORT_MENU.setEnabled(false);
                 try {
-                        CACHE = JCSCacheManager.getCache("mapillary", 10, 10000, this.getPluginDir() + "/cache/");
+                        CACHE = JCSCacheManager.getCache("mapillary", 10, 10000,
+                                        this.getPluginDir() + "/cache/");
                 } catch (IOException e) {
                         Main.error(e);
@@ -70 +71 @@
                 }
                 if (oldFrame != null && newFrame == null) { // map frame destroyed
-                        MapillaryToggleDialog.deleteInstance();
+                        MapillaryToggleDialog.destroyInstance();
                 }
         }

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

@@ -14 +14 @@
         private final List<MapillaryImage> images;
         private String timestamp;
+        private final String key;
 
-        public MapillarySequence() {
+        public MapillarySequence(String key) {
                 this.images = new ArrayList<>();
+                this.key = key;
         }
 
-        public MapillarySequence(List<MapillaryImage> images) {
-                this.images = images;
-        }
 
         /**
@@ -47 +46 @@
         public synchronized void add(MapillaryImage image) {
                 this.images.add(image);
+        }
+        
+        public String getKey() {
+                return this.key;
         }
 
@@ -115 +118 @@
                                 - this.images.indexOf(image2));
         }
+        
+        public boolean equals(MapillarySequence sequence) {
+                return this.getKey() == sequence.getKey();
+        }
 }

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

@@ -82 +82 @@
         }
 
-        public static void deleteInstance() {
+        public static void destroyInstance() {
                 INSTANCE = null;
         }

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

@@ -77 +77 @@
                                 if (isSequenceWrong)
                                         break;
-                                MapillarySequence sequence = new MapillarySequence();
+                                MapillarySequence sequence = new MapillarySequence(jsonobj.getString("key"));
+                                for (MapillaryImage mimage : MapillaryData.getInstance().getImages())
+                                        if (mimage.getSequence().getKey() == sequence.getKey())
+                                                break;
                                 int first = -1;
                                 int last = -1;