Changeset 15184 in josm for trunk

Timestamp:

2019-06-18T23:06:56+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17825 - support Geo URIs with WGS84 CRS and/or uncertainty

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/GeoUrlToBounds.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/GeoUrlToBoundsTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/GeoUrlToBounds.java

@@ -19 +19 @@
      * The pattern of a geo: url, having named match groups.
      */
-    public static final Pattern PATTERN = Pattern.compile("geo:(?<lat>[+-]?[0-9.]+),(?<lon>[+-]?[0-9.]+)(\\?z=(?<zoom>[0-9]+))?");
+    public static final Pattern PATTERN = Pattern.compile(
+            "geo:(?<lat>[+-]?[0-9.]+),(?<lon>[+-]?[0-9.]+)(?<crs>;crs=wgs84)?(?<uncertainty>;u=[0-9.]+)?(\\?z=(?<zoom>[0-9]+))?");
 
     private GeoUrlToBounds() {

trunk/test/unit/org/openstreetmap/josm/tools/GeoUrlToBoundsTest.java

@@ -40 +40 @@
 
     /**
+     * Tests parsing Geo URLs with a CRS and/or uncertainty.
+     */
+    @Test
+    public void testParseCrsUncertainty() {
+        assertThat(
+                GeoUrlToBounds.parse("geo:60.00000,17.000000;crs=wgs84"),
+                is(OsmUrlToBounds.positionToBounds(60.0, 17.0, 18))
+        );
+        assertThat(
+                GeoUrlToBounds.parse("geo:60.00000,17.000000;crs=wgs84;u=0"),
+                is(OsmUrlToBounds.positionToBounds(60.0, 17.0, 18))
+        );
+        assertThat(
+                GeoUrlToBounds.parse("geo:60.00000,17.000000;u=20"),
+                is(OsmUrlToBounds.positionToBounds(60.0, 17.0, 18))
+        );
+    }
+
+    /**
      * Tests parsing invalid Geo URL.
      */