Changeset 17549 in josm for trunk

Timestamp:

2021-03-01T10:48:58+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20346 - fix definition of EPSG:3346 for Lithuania (patch by nagisa)

Location:

trunk

Files:

• nodist/data/projection/josm-epsg (modified) (1 diff)
• test/data/wmts/WMTSCapabilities-Lithuania.xml (added)
• test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (modified) (2 diffs)

trunk/nodist/data/projection/josm-epsg

@@ -75 +75 @@
 # Lambert Zone (Estonia)
 <3301> +proj=lcc +lat_0=57.51755393055556 +lat_1=59.333333333333336 +lat_2=58 +lon_0=24 +x_0=500000 +y_0=6375000 +ellps=GRS80 +nadgrids=null +units=m +axis=neu +bounds=21.64,56.05,28.58,61.13  <>
+# LKS94 / Lithuania TM
+<3346> +proj=tmerc +lat_0=0 +lon_0=24 +k=0.9998 +x_0=500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +axis=neu +bounds=19.03,53.89,26.84,56.46 +no_defs <>
 # Belgian Lambert 2008
 <3812> +proj=lcc +lat_0=50d47'52.134" +lat_1=49d50'0" +lat_2=51d10'0" +lon_0=4d21'33.177" +x_0=649328 +y_0=665262 +ellps=GRS80 +nadgrids=null +units=m +bounds=2.54,49.51,6.4,51.5  <>

trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

@@ -62 +62 @@
     private final ImageryInfo testImageryGeoAdminCh = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-GeoAdminCh.xml");
     private final ImageryInfo testImagery12168 = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12168-WMTSCapabilities.xml");
+    private final ImageryInfo testImageryORT2LT = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Lithuania.xml");
     private final ImageryInfo testLotsOfLayers = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-lots-of-layers.xml");
     private final ImageryInfo testDuplicateTags = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-identifier.xml");
@@ -249 +250 @@
                 "http://www.ngi.be/cartoweb/1.0.0/topo/default/3857/7/1/1.png",
                 testSource.getTileUrl(0, 1, 1));
+    }
+
+    @Test
+    public void testProjectionWithENUAxis() throws IOException, WMTSGetCapabilitiesException {
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3346"));
+        WMTSTileSource testSource = new WMTSTileSource(testImageryORT2LT);
+        testSource.initProjection(ProjectionRegistry.getProjection());
+        TileXY tileXY0 = testSource.latLonToTileXY(55.31083718860799, 22.172052608196587, 0);
+        double delta = 1e-10;
+        assertEquals(27.09619727782481, tileXY0.getX(), delta);
+        assertEquals(19.03524443532604, tileXY0.getY(), delta);
+        TileXY tileXY2 = testSource.latLonToTileXY(55.31083718860799, 22.172052608196587, 2);
+        assertEquals(81.28859183347444, tileXY2.getX(), delta);
+        assertEquals(57.10573330597811, tileXY2.getY(), delta);
     }