Fix #23676: Mapillary still has some non-numeric ids in their tiles

Signed-off-by: Taylor Smock <[email protected]>
JOSM · Jun 17, 2024 · 7a3a633 · 7a3a633
1 parent 1044cea
commit 7a3a633
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryImageUtils.java b/src/main/java/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryImageUtils.java
@@ -255,12 +255,17 @@ public static long getKey(@Nullable IPrimitive image, boolean ignoreId) {
             }
             // This should always be a parseable integer according to API docs. By not checking that all characters are
             // digits, we save 55.6 MB of allocations in the test area during download.
-            if (image.hasKey(ImageProperties.ID.toString())) {
-                final var id = Long.parseLong(image.get(ImageProperties.ID.toString()));
-                if (id > 0) {
-                    image.setOsmId(id, 1);
+            try {
+                if (image.hasKey(ImageProperties.ID.toString())) {
+                    final var id = Long.parseLong(image.get(ImageProperties.ID.toString()));
+                    if (id > 0) {
+                        image.setOsmId(id, 1);
+                    }
+                    return id;
                 }
-                return id;
+            } catch (NumberFormatException numberFormatException) {
+                // This does actually happen; see #23734
+                Logging.error(numberFormatException);
             }
         }
         return 0;