Changeset 36263 in osm for applications/editors/josm/plugins

Timestamp:

2024-05-06T21:11:29+02:00 (9 months ago)

Author:

taylor.smock

Message:

Fix #23658: Streetside fails to parse dates when using some locales

Location:

applications/editors/josm/plugins/MicrosoftStreetside

Files:

• src/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnable.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/plugins/streetside/gui/StreetsidePreferenceSettingTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnableTest.java (modified) (2 diffs)

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnable.java

@@ -13 +13 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.Callable;
@@ -149 +150 @@
                 final var vintageStart = LocalDate
                         .parse(node.getString("vintageStart").replace("GMT", "UTC"),
-                                DateTimeFormatter.ofPattern("dd LLL yyyy zzz"))
+                                DateTimeFormatter.ofPattern("dd LLL yyyy zzz", Locale.ROOT))
                         .atStartOfDay().toInstant(ZoneOffset.UTC);
                 final var vintageEnd = LocalDate
                         .parse(node.getString("vintageStart").replace("GMT", "UTC"),
-                                DateTimeFormatter.ofPattern("dd LLL yyyy zzz"))
+                                DateTimeFormatter.ofPattern("dd LLL yyyy zzz", Locale.ROOT))
                         .atTime(LocalTime.MAX).toInstant(ZoneOffset.UTC);
                 final List<String> imageUrlSubdomains = node.getJsonArray("imageUrlSubdomains")

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/gui/StreetsidePreferenceSettingTest.java

@@ -100 +100 @@
             settings.ok();
             assertEquals(new StringProperty("streetside.download-mode", "default").get(),
-                    DOWNLOAD_MODE.fromLabel(Objects.requireNonNull(((JComboBox<String>) getPrivateFieldValue(settings, "downloadModeComboBox"))
-                            .getSelectedItem()).toString()).getPrefId());
+                    DOWNLOAD_MODE.fromLabel(Objects
+                            .requireNonNull(((JComboBox<String>) getPrivateFieldValue(settings, "downloadModeComboBox"))
+                                    .getSelectedItem())
+                            .toString()).getPrefId());
         }
     }

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnableTest.java

@@ -7 +7 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.plugins.streetside.StreetsideLayer;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 import org.openstreetmap.josm.testutils.annotations.LayerManager;
@@ -42 +41 @@
     }
 
-    private void testNumberOfDecodedImages(int expectedNumImgs, Bounds bounds)
-            throws IllegalArgumentException {
-        SequenceDownloadRunnable r = new SequenceDownloadRunnable(StreetsideLayer.getInstance().getData(), bounds);
-        r.run();
-        assertEquals(expectedNumImgs, StreetsideLayer.getInstance().getData().getImages().size());
+    private void testNumberOfDecodedImages(int expectedNumImgs, Bounds bounds) throws IllegalArgumentException {
+        SequenceDownloadRunnable r = new SequenceDownloadRunnable(bounds);
+        final var images = r.call();
+        assertEquals(expectedNumImgs, images.size());
     }
 }