Changeset 9790 in josm for trunk/test/unit/org

Timestamp:

2016-02-12T14:31:47+01:00 (8 years ago)

Author:

bastiK

Message:

use intended units for east/north coordinates (see #12186)

When east/north coordinates are not in meter, but
feet, ... convert them to correct units.
Currently they are always stored in meters or degrees.
This makes no difference to JOSM internally, but affects
services like WMS/WMTS.
Only relevant for projections with +units=... or +to_meter=...
parameter set to non-default value.

File:

• trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java

@@ -293 +293 @@
             }
             Projection proj = Projections.getProjectionByCode(ref.code);
-            double scale = ((CustomProjection) proj).getMetersPerUnitProj();
+            double scale = ((CustomProjection) proj).getToMeter();
             for (Pair<LatLon, EastNorth> p : ref.data) {
                 LatLon ll = p.a;
@@ -303 +303 @@
                     en = new EastNorth(en.north(), en.east());
                 }
+                en = new EastNorth(en.east() * scale, en.north() * scale); // convert to meter
                 final double EPSILON_EN = 1e-2; // 1cm
                 if (!isEqual(enRef, en, EPSILON_EN, true)) {