Ticket #20933: 20933.patch

src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/Feature.java

@@ -5 +5 @@
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.openstreetmap.josm.data.osm.TagMap;
 import org.openstreetmap.josm.data.protobuf.ProtobufPacked;
@@ -110 +111 @@
             Object value = layer.getValue(number.intValue());
             if (value instanceof Double || value instanceof Float) {
                 // reset grouping if the instance is a singleton
-                final NumberFormat numberFormat = NumberFormat.getNumberInstance();
+                final NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.ROOT);
                 final boolean grouping = numberFormat.isGroupingUsed();
                 try {
                     numberFormat.setGroupingUsed(false);

test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/FeatureTest.java

@@ -12 +12 @@
 import static org.openstreetmap.josm.data.imagery.vectortile.mapbox.LayerTest.getLayer;
 
 import java.text.NumberFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
+import org.openstreetmap.josm.testutils.annotations.I18n;
 
 /**
  * Test class for {@link Feature}
@@ -50 +53 @@
         // This is the float we are adding
         // 49 74 24 00 == 1_000_000f
         // 3f 80 00 00 == 1f
-        byte[] newBytes = new byte[] {0x22, 0x09, 0x15, 0x00, 0x24, 0x74, 0x49};
+        byte[] newBytes = new byte[] {0x22, 0x05, 0x15, 0x00, 0x24, 0x74, 0x49};
         byte[] copyBytes = Arrays.copyOf(getSimpleFeatureLayerBytes(), getSimpleFeatureLayerBytes().length + newBytes.length - 4);
         // Change last few bytes
         System.arraycopy(newBytes, 0, copyBytes, 25, newBytes.length);
@@ -79 +82 @@
         assertEquals("1000000", feature.getTags().get("a"));
     }
 
+    /**
+     * Non-regression test for #20933 (Russian)
+     * @see #testNumberGroupingDecimalEn()
+     */
+    @I18n("ru")
+    @Test
+    void testNumberGroupingDecimalRu() {
+        testNumberGroupingDecimal();
+    }
+
+    /**
+     * Non-regression test for #20933 (English)
+     * @see #testNumberGroupingDecimalRu()
+     */
+    @I18n("en")
+    @Test
+    void testNumberGroupingDecimalEn() {
+        testNumberGroupingDecimal();
+    }
+
+    /**
+     * Common parts for non-regression tests for #20933
+     * @see #testNumberGroupingDecimalEn()
+     * @see #testNumberGroupingDecimalRu()
+     */
+    private void testNumberGroupingDecimal() {
+        byte[] newBytes = new byte[] {0x22, 0x09, 0x19, -45, 0x4D, 0x62, 0x10, 0x58, -71, 0x67, 0x40};
+        byte[] copyBytes = Arrays.copyOf(getSimpleFeatureLayerBytes(), getSimpleFeatureLayerBytes().length + newBytes.length - 4);
+        // Change last few bytes
+        System.arraycopy(newBytes, 0, copyBytes, 25, newBytes.length);
+        // Update the length of the record
+        copyBytes[1] = (byte) (copyBytes[1] + newBytes.length - 4);
+        Layer layer = assertDoesNotThrow(() -> getLayer(copyBytes));
+        layer.getKey(0);
+        List<Feature> features = new ArrayList<>(layer.getFeatures());
+        assertEquals(1, features.size());
+        assertEquals("189.792", features.get(0).getTags().get("a"));
+    }
+
     private void testCreation(byte[] bytes) {
         Layer layer = assertDoesNotThrow(() -> getLayer(bytes));
         // Sanity check the layer

new file test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.testutils.annotations;
+
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.support.AnnotationSupport;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Optional;
+
+import static java.util.Collections.emptyList;
+
+/**
+ * Enables the i18n module for this test.
+ * @author Taylor Smock
+ * @see JOSMTestRules#i18n(String)
+ *
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+@ExtendWith(I18n.I18nExtension.class)
+public @interface I18n {
+    /**
+     * Get the language to use for i18n
+     * @return The language (default "en").
+     */
+    String value() default "en";
+
+    /**
+     * Enables the i18n module for this test.
+     * @author Taylor Smock
+     * @see JOSMTestRules#i18n(String)
+     *
+     */
+    class I18nExtension implements AfterEachCallback, BeforeEachCallback {
+        @Override
+        public void afterEach(ExtensionContext context) throws Exception {
+            org.openstreetmap.josm.tools.I18n.set("en");
+            org.openstreetmap.josm.tools.I18n.set(org.openstreetmap.josm.tools.I18n.getOriginalLocale().getLanguage());
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) throws Exception {
+            Optional<I18n> annotation = AnnotationSupport.findAnnotation(context.getElement(), I18n.class);
+            String language = "en";
+            if (annotation.isPresent()) {
+                language = annotation.get().value();
+            }
+            org.openstreetmap.josm.tools.I18n.set(language);
+        }
+    }
+}