Changeset 31201 in osm for applications/editors

Timestamp:

2015-06-03T16:28:32+02:00 (10 years ago)

Author:

nokutu

Message:

Solve ticket #11521 and that sometimes not all sequences were downloaded because of shutting down the thread pool using shutdownNow()

Location:

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

Files:

• MapillaryImage.java (modified) (1 diff)
• downloads/MapillarySequenceDownloadThread.java (modified) (1 diff)
• downloads/MapillarySquareDownloadManagerThread.java (modified) (1 diff)

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

@@ -95 +95 @@
         }
 
-        public Boolean equals(MapillaryImage image) {
-                return this.key.equals(image.getKey());
+        @Override
+        public boolean equals(Object image) {
+                if (image instanceof MapillaryImage)
+                        return this.key.equals(((MapillaryImage) image).getKey());
+                return false;
         }
 

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

@@ -49 +49 @@
 
                         if (!jsonall.getBoolean("more") && !ex.isShutdown()) {
-                                ex.shutdownNow();
+                                ex.shutdown();
                         }
                         JsonArray jsonseq = jsonall.getJsonArray("ss");

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

@@ -36 +36 @@
 
         public void downloadSequences() {
-                ThreadPoolExecutor ex = new ThreadPoolExecutor(20, 35, 25,
+                ThreadPoolExecutor ex = new ThreadPoolExecutor(3, 5, 25,
                                 TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
                 int page = 0;