Changeset 31179 in osm for applications/editors/josm

Timestamp:

2015-06-02T13:27:08+02:00 (10 years ago)

Author:

nokutu

Message:

Solved bugs with end of sequence pictures and implemented a mechanism to protect against bad sequences comming from Mapillary API

Location:

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

Files:

• MapillaryToggleDialog.java (modified) (3 diffs)
• downloads/MapillarySequenceDownloadThread.java (modified) (3 diffs)

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

@@ -106 +106 @@
                         }
                         if (this.image != null) {
+                                this.nextButton.setEnabled(true);
+                                this.previousButton.setEnabled(true);
+                                if (this.image.next() == null)
+                                        this.nextButton.setEnabled(false);
+                                if (this.image.previous() == null)
+                                        this.previousButton.setEnabled(false);
+                                        
                                 CacheAccess<String, BufferedImageCacheEntry> prev;
                                 try {
@@ -166 +173 @@
                         if (MapillaryToggleDialog.getInstance().getImage() != null) {
                                 MapillaryData.getInstance().selectNext();
-                                Main.map.mapView.zoomTo(MapillaryData.getInstance()
-                                                .getSelectedImage().getLatLon());
+                                if (MapillaryData.getInstance()
+                                                .getSelectedImage() != null)
+                                        Main.map.mapView.zoomTo(MapillaryData.getInstance()
+                                                        .getSelectedImage().getLatLon());
                         }
                 }
@@ -189 +198 @@
                         if (MapillaryToggleDialog.getInstance().getImage() != null) {
                                 MapillaryData.getInstance().selectPrevious();
-                                Main.map.mapView.zoomTo(MapillaryData.getInstance()
-                                                .getSelectedImage().getLatLon());
+                                if (MapillaryData.getInstance()
+                                                .getSelectedImage() != null)
+                                        Main.map.mapView.zoomTo(MapillaryData.getInstance()
+                                                        .getSelectedImage().getLatLon());
                         }
                 }

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

@@ -34 +34 @@
         private Bounds bounds;
 
-        public MapillarySequenceDownloadThread(ExecutorService ex, String url, Bounds bounds) {
+        public MapillarySequenceDownloadThread(ExecutorService ex, String url,
+                        Bounds bounds) {
                 this.url = url;
                 this.ex = ex;
@@ -51 +52 @@
                         }
                         JsonArray jsonseq = jsonall.getJsonArray("ss");
+                        // At the moment there is a bug with some sequences at Mapillay API,
+                        // so if they are worng he use this variable to skip them.
+                        boolean isSequenceWrong = false;
                         for (int i = 0; i < jsonseq.size(); i++) {
                                 JsonObject jsonobj = jsonseq.getJsonObject(i);
@@ -64 +68 @@
                                                                                 .getJsonNumber(0).doubleValue(), cas
                                                                                 .getJsonNumber(j).doubleValue()));
+                                        } catch (IndexOutOfBoundsException e) {
+                                                Main.error(e);
+                                                isSequenceWrong = true;
                                         } catch (Exception e) {
                                                 Main.error(e);
                                         }
                                 }
+                                if (isSequenceWrong)
+                                        break;
                                 MapillarySequence sequence = new MapillarySequence();
                                 int first = -1;