Changeset 31272 in osm for applications/editors/josm

Timestamp:

2015-06-17T00:17:40+02:00 (9 years ago)

Author:

nokutu

Message:

Fixed bug when downloading signals and some cache errors

Location:

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

Files:

• downloads/MapillarySignalDownloaderThread.java (modified) (1 diff)
• gui/MapillaryToggleDialog.java (modified) (1 diff)

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

@@ -41 +41 @@
                                 JsonArray rects = jsonarr.getJsonObject(i)
                                                 .getJsonArray("rects");
-                                if (rects == null)
-                                        return;
+                                JsonArray rectversions = jsonarr.getJsonObject(i).getJsonArray(
+                                                "rectversions");
                                 String key = jsonarr.getJsonObject(i).getString("key");
-                                for (int j = 0; j < rects.size(); j++) {
-                                        JsonObject data = rects.getJsonObject(j);
-                                        for (MapillaryAbstractImage image : MapillaryData
-                                                        .getInstance().getImages()) {
-                                                if (image instanceof MapillaryImage) {
-                                                        if (((MapillaryImage) image).getKey().equals(key)) {
-                                                                if (((MapillaryImage) image).getKey().equals(
-                                                                                key)) {
+                                if (rectversions != null) {
+                                        for (int j = 0; j < rectversions.size(); j++) {
+                                                rects = rectversions.getJsonObject(j).getJsonArray("rects");
+                                                for (int k = 0; k < rects.size(); k++) {
+                                                        JsonObject data = rects.getJsonObject(j);
+                                                        for (MapillaryAbstractImage image : MapillaryData
+                                                                        .getInstance().getImages())
+                                                                if (image instanceof MapillaryImage
+                                                                                && ((MapillaryImage) image).getKey()
+                                                                                                .equals(key))
                                                                         ((MapillaryImage) image).addSignal(data
                                                                                         .getString("type"));
-                                                                }
-                                                        }
                                                 }
+                                        }
+                                }
+
+                                // Just one signal on the picture
+                                else if (rects != null) {
+                                        for (int j = 0; j < rects.size(); j++) {
+                                                JsonObject data = rects.getJsonObject(j);
+                                                for (MapillaryAbstractImage image : MapillaryData
+                                                                .getInstance().getImages())
+                                                        if (image instanceof MapillaryImage
+                                                                        && ((MapillaryImage) image).getKey()
+                                                                                        .equals(key))
+                                                                ((MapillaryImage) image).addSignal(data
+                                                                                .getString("type"));
                                         }
                                 }

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

@@ -361 +361 @@
                                 }
                         });
-                } else if (data != null) {
+                } else if (data != null && result == LoadResult.SUCCESS) {
                         try {
                                 BufferedImage img = ImageIO.read(new ByteArrayInputStream(data