Changeset 9628 in josm

Timestamp:

2016-01-25T12:36:19+01:00 (8 years ago)

Author:

bastiK

Message:

fix WMTS with EPSG:4326 broken in [9608] (see #12186)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/projection/CustomProjection.java (modified) (5 diffs)
• src/org/openstreetmap/josm/data/projection/Projection.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/projection/proj/LonLat.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/projection/proj/Proj.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -55 +55 @@
     protected String cacheDir;
     protected Bounds bounds;
-    private double metersPerUnit = 1;
+    private double metersPerUnit;
+    private double metersPerUnitNoDegrees;
     private String axis = "enu"; // default axis orientation is East, North, Up
 
@@ -286 +287 @@
                 this.code = s;
             }
+            boolean defaultUnits = true;
             s = parameters.get(Param.units.key);
             if (s != null) {
@@ -291 +293 @@
                 if (UNITS_TO_METERS.containsKey(s)) {
                     this.metersPerUnit = UNITS_TO_METERS.get(s);
+                    this.metersPerUnitNoDegrees = this.metersPerUnit;
+                    defaultUnits = false;
                 } else {
                     Main.warn("No metersPerUnit found for: " + s);
@@ -298 +302 @@
             if (s != null) {
                 this.metersPerUnit = parseDouble(s, Param.to_meter.key);
+                this.metersPerUnitNoDegrees = this.metersPerUnit;
+                defaultUnits = false;
+            }
+            if (defaultUnits) {
+                this.metersPerUnit = proj.isGeographic() ? METER_PER_UNIT_DEGREE : 1;
+                this.metersPerUnitNoDegrees = 1;
             }
             s = parameters.get(Param.axis.key);
@@ -700 +710 @@
         return metersPerUnit;
     }
+    
+    /**
+     * Like {@link #getMetersPerUnit()}, but has default value 1 for a
+     * geographic CRS. I.e. by default, degrees are not converted to meters,
+     * but left alone (similar to proj.4 behavior).
+     * @return 
+     */
+    public double getMetersPerUnitProj() {
+        return metersPerUnitNoDegrees;
+    }
 
     @Override

trunk/src/org/openstreetmap/josm/data/projection/Projection.java

@@ -96 +96 @@
      * Get the number of meters per unit of this projection. This more
      * defines the scale of the map, than real conversion of unit to meters
-     * as this value is more less correct only along great circles.
+     * as this value is more less correct only along certain lines of true scale.
      *
      * Used by WMTS to properly scale tiles
      * @return meters per unit of projection
-     *
      */
     double getMetersPerUnit();

trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java

@@ -99 +99 @@
     }
 
+    @Override
+    public boolean isGeographic() {
+        return false;
+    }
+
     /**
      * Calculates the meridian distance. This is the distance along the central

trunk/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java

@@ -29 +29 @@
  * Sec. 1.3.7.1 Oblique and Equatorial Stereographic, http://www.epsg.org/GuidanceNotes
  */
-public class DoubleStereographic implements Proj {
+public class DoubleStereographic extends AbstractProj {
 
     private Ellipsoid ellps;
-    private double e;
     private double n;
     private double c;
@@ -52 +51 @@
     @Override
     public void initialize(ProjParameters params) throws ProjectionConfigurationException {
+        super.initialize(params);
         if (params.lat0 == null)
             throw new ProjectionConfigurationException(tr("Parameter ''{0}'' required.", "lat_0"));
         ellps = params.ellps;
-        e = ellps.e;
         initialize(params.lat0);
     }

trunk/src/org/openstreetmap/josm/data/projection/proj/LonLat.java

@@ -43 +43 @@
         return new Bounds(-90, -180, 90, 180, false);
     }
+
+    @Override
+    public boolean isGeographic() {
+        return true;
+    }
 }

trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java

@@ -82 +82 @@
      */
     Bounds getAlgorithmBounds();
+
+    /**
+     * Return true, if a geographic coordinate reference system is represented.
+     *
+     * I.e. if it returns latitude/longitude values rather than Cartesian
+     * east/north coordinates on a flat surface.
+     * @return true, if it is geographic
+     */
+    boolean isGeographic();
 }

trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java

@@ -34 +34 @@
  * this formula (rigorous formulas)</a>.
  */
-public class SwissObliqueMercator implements Proj {
+public class SwissObliqueMercator extends AbstractProj {
 
     // CHECKSTYLE.ON: LineLength
@@ -49 +49 @@
     @Override
     public void initialize(ProjParameters params) throws ProjectionConfigurationException {
+        super.initialize(params);
         if (params.lat0 == null)
             throw new ProjectionConfigurationException(tr("Parameter ''{0}'' required.", "lat_0"));

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

@@ -293 +293 @@
             }
             Projection proj = Projections.getProjectionByCode(ref.code);
-            double scale = proj.getMetersPerUnit();
+            double scale = ((CustomProjection) proj).getMetersPerUnitProj();
             for (Pair<LatLon, EastNorth> p : ref.data) {
                 LatLon ll = p.a;