Changeset 9628 in josm for trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

Timestamp:

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

Author:

bastiK

Message:

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

File:

• trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (modified) (5 diffs)

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