Changeset 5073 in josm for trunk/src

Timestamp:

2012-03-11T21:19:59+01:00 (13 years ago)

Author:

bastiK

Message:

move ntv2 to datum (see #7494)

Location:

trunk/src/org/openstreetmap/josm/data/projection

Files:

• AbstractProjection.java (modified) (6 diffs)
• GaussKrueger.java (modified) (2 diffs)
• Lambert.java (modified) (2 diffs)
• datum/NTV2Datum.java (added)
• datum/NTV2GridShift.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/projection/NTV2GridShift.java ) (1 diff)
• datum/NTV2GridShiftFile.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/projection/NTV2GridShiftFile.java ) (1 diff)
• datum/NTV2SubGrid.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/projection/NTV2SubGrid.java ) (1 diff)
• datum/NTV2Util.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/projection/NTV2Util.java ) (1 diff)

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

@@ -20 +20 @@
  * Subclasses of AbstractProjection must set ellps and proj to a non-null value.
  * In addition, either datum or nadgrid has to be initialized to some value.
- *
- * FIXME: nadgrids should probably be implemented as a Datum
  */
 abstract public class AbstractProjection implements Projection {
@@ -32 +30 @@
     protected double lon_0 = 0.0;   /* central meridian */
     protected double k_0 = 1.0;     /* general scale factor */
-    protected NTV2GridShiftFile nadgrids = null;
-    
+
     public final Ellipsoid getEllipsoid() {
         return ellps;
@@ -64 +61 @@
     @Override
     public EastNorth latlon2eastNorth(LatLon ll) {
-        if (nadgrids != null) {
-            NTV2GridShift gs = new NTV2GridShift(ll);
-            nadgrids.gridShiftReverse(gs);
-            ll = new LatLon(ll.lat()+gs.getLatShiftDegrees(), ll.lon()+gs.getLonShiftPositiveEastDegrees());
-        } else {
-            ll = datum.fromWGS84(ll);
-        }
+        ll = datum.fromWGS84(ll);
         double[] en = proj.project(Math.toRadians(ll.lat()), Math.toRadians(ll.lon() - lon_0));
         return new EastNorth(ellps.a * k_0 * en[0] + x_0, ellps.a * k_0 * en[1] + y_0);
@@ -79 +70 @@
         double[] latlon_rad = proj.invproject((en.east() - x_0) / ellps.a / k_0, (en.north() - y_0) / ellps.a / k_0);
         LatLon ll = new LatLon(Math.toDegrees(latlon_rad[0]), Math.toDegrees(latlon_rad[1]) + lon_0);
-        if (nadgrids != null) {
-            NTV2GridShift gs = new NTV2GridShift(ll);
-            nadgrids.gridShiftForward(gs);
-            ll = new LatLon(ll.lat()+gs.getLatShiftDegrees(), ll.lon()+gs.getLonShiftPositiveEastDegrees());
-        } else {
-            ll = datum.toWGS84(ll);
-        }
-        return ll;
+        return datum.toWGS84(ll);
     }
 
@@ -94 +78 @@
         return 10;
     }
-    
+
     /**
      * @return The EPSG Code of this CRS, null if it doesn't have one.
@@ -108 +92 @@
         return "EPSG:" + getEpsgCode();
     }
-    
+
     protected static final double convertMinuteSecond(double minute, double second) {
         return (minute/60.0) + (second/3600.0);
     }
-    
+
     protected static final double convertDegreeMinuteSecond(double degree, double minute, double second) {
         return degree + convertMinuteSecond(minute, second);

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.datum.NTV2Datum;
+import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFile;
 import org.openstreetmap.josm.data.projection.proj.ProjParameters;
 import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
@@ -60 +62 @@
         this.zone = zone;
         ellps = Ellipsoid.Bessel1841;
-        nadgrids = BETA2007;
+        datum = new NTV2Datum("BETA2007", null, ellps, BETA2007);
         ////less acurrate datum (errors up to 3m):
         //datum = new SevenParameterDatum(

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.datum.NTV2Datum;
+import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFile;
 import org.openstreetmap.josm.data.projection.proj.LambertConformalConic;
 import org.openstreetmap.josm.data.projection.proj.ProjParameters;
@@ -101 +103 @@
         this.layoutZone = layoutZone;
         ellps = Ellipsoid.clarkeIGN;
-        datum = null; // no datum needed, we have a shift file
-        nadgrids = ntf_rgf93Grid;
+        datum = new NTV2Datum("ntf_rgf93Grid", null, ellps, ntf_rgf93Grid);
         x_0 = x_0s[layoutZone];
         lon_0 = 2.0 + 20.0 / 60 + 14.025 / 3600; // 0 grade Paris

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java

@@ -18 +18 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.openstreetmap.josm.data.projection;
+package org.openstreetmap.josm.data.projection.datum;
 
 import java.io.Serializable;

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -18 +18 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.openstreetmap.josm.data.projection;
+package org.openstreetmap.josm.data.projection.datum;
 
 import java.io.IOException;

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java

@@ -18 +18 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.openstreetmap.josm.data.projection;
+package org.openstreetmap.josm.data.projection.datum;
 
 import java.io.IOException;

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java

@@ -18 +18 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.openstreetmap.josm.data.projection;
+package org.openstreetmap.josm.data.projection.datum;
 
 /**