Changeset 5066 in josm for trunk/src/org/openstreetmap/josm/data/projection/BelgianLambert1972.java

Timestamp:

2012-03-10T16:18:23+01:00 (12 years ago)

Author:

bastiK

Message:

Proj parameter refactoring (see #7495)

File:

• trunk/src/org/openstreetmap/josm/data/projection/BelgianLambert1972.java (modified) (3 diffs)

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

@@ -7 +7 @@
 import org.openstreetmap.josm.data.projection.datum.SevenParameterDatum;
 import org.openstreetmap.josm.data.projection.proj.LambertConformalConic;
+import org.openstreetmap.josm.data.projection.proj.ProjParameters;
 
 /**
  * Belgian Lambert 72 projection as specified by the Belgian IGN
  * in this document: http://www.ngi.be/Common/Lambert2008/Transformation_Geographic_Lambert_FR.pdf
- * @author Don-vip 
+ * @author Don-vip
  *
  */
@@ -19 +20 @@
         ellps = Ellipsoid.hayford;
         // 7 parameters transformation: http://www.eye4software.com/resources/datum/4313/
-        datum = new SevenParameterDatum("Belgium Datum 72", null, Ellipsoid.hayford, -99.06, 53.32, -112.49, 0.419, -0.830, 1.885, -1);
+        datum = new SevenParameterDatum("Belgium Datum 72", null, ellps, -99.06, 53.32, -112.49, 0.419, -0.830, 1.885, -1);
         x_0 =  150000.013;
         y_0 = 5400088.438;
         lon_0 = convertDegreeMinuteSecond(4, 22, 2.952);
-        double lat_0 = 90.0;
-        double lat_1 = 49 + convertMinuteSecond(50, 0.00204);
-        double lat_2 = 51 + convertMinuteSecond(10, 0.00204);
         proj = new LambertConformalConic();
-        ((LambertConformalConic)proj).updateParameters2SP(ellps, lat_0, lat_1, lat_2);
+        try {
+            proj.initialize(new ProjParameters() {{
+                ellps = BelgianLambert1972.this.ellps;
+                lat_0 = 90.0;
+                lat_1 = 49 + convertMinuteSecond(50, 0.00204);
+                lat_2 = 51 + convertMinuteSecond(10, 0.00204);
+            }});
+        } catch (ProjectionConfigurationException e) {
+            throw new RuntimeException(e);
+        }
     }
-    
+
     @Override
     public String getCacheDirectoryName() {
@@ -46 +53 @@
         return 31370;
     }
-    
+
     @Override
     public String toString() {