All values are stored as Positive West Seconds, but accessors - * are also provided for Positive East Degrees. - * - * @author Peter Yuill - * Modifified for JOSM : - * - add a constructor for JOSM LatLon (Pieren) - */ -public class NTV2GridShift implements Serializable { - - private static final double METRE_PER_SECOND = 2.0 * Math.PI * 6378137.0 / 3600.0 / 360.0; - private static final double RADIANS_PER_SECOND = 2.0 * Math.PI / 3600.0 / 360.0; - private double lon; - private double lat; - private double lonShift; - private double latShift; - private double lonAccuracy; - private double latAccuracy; - boolean latAccuracyAvailable; - boolean lonAccuracyAvailable; - private String subGridName; - - public NTV2GridShift() { - } - - public NTV2GridShift(LatLon p) { - setLatDegrees(p.lat()); - setLonPositiveEastDegrees(p.lon()); - } - - /** - * @return - */ - public double getLatSeconds() { - return lat; - } - - /** - * @return - */ - public double getLatDegrees() { - return lat / 3600.0; - } - - /** - * @return - */ - public double getLatShiftSeconds() { - return latShift; - } - - /** - * @return - */ - public double getLatShiftDegrees() { - return latShift / 3600.0; - } - - /** - * @return - */ - public double getShiftedLatSeconds() { - return lat + latShift; - } - - /** - * @return - */ - public double getShiftedLatDegrees() { - return (lat + latShift) / 3600.0; - } - - /** - * @return - */ - public boolean isLatAccuracyAvailable() { - return latAccuracyAvailable; - } - - /** - * @return - */ - public double getLatAccuracySeconds() { - if (!latAccuracyAvailable) - throw new IllegalStateException("Latitude Accuracy not available"); - return latAccuracy; - } - - /** - * @return - */ - public double getLatAccuracyDegrees() { - if (!latAccuracyAvailable) - throw new IllegalStateException("Latitude Accuracy not available"); - return latAccuracy / 3600.0; - } - - /** - * @return - */ - public double getLatAccuracyMetres() { - if (!latAccuracyAvailable) - throw new IllegalStateException("Latitude Accuracy not available"); - return latAccuracy * METRE_PER_SECOND; - } - - /** - * @return - */ - public double getLonPositiveWestSeconds() { - return lon; - } - - /** - * @return - */ - public double getLonPositiveEastDegrees() { - return lon / -3600.0; - } - - /** - * @return - */ - public double getLonShiftPositiveWestSeconds() { - return lonShift; - } - - /** - * @return - */ - public double getLonShiftPositiveEastDegrees() { - return lonShift / -3600.0; - } - - /** - * @return - */ - public double getShiftedLonPositiveWestSeconds() { - return lon + lonShift; - } - - /** - * @return - */ - public double getShiftedLonPositiveEastDegrees() { - return (lon + lonShift) / -3600.0; - } - - /** - * @return - */ - public boolean isLonAccuracyAvailable() { - return lonAccuracyAvailable; - } - - /** - * @return - */ - public double getLonAccuracySeconds() { - if (!lonAccuracyAvailable) - throw new IllegalStateException("Longitude Accuracy not available"); - return lonAccuracy; - } - - /** - * @return - */ - public double getLonAccuracyDegrees() { - if (!lonAccuracyAvailable) - throw new IllegalStateException("Longitude Accuracy not available"); - return lonAccuracy / 3600.0; - } - - /** - * @return - */ - public double getLonAccuracyMetres() { - if (!lonAccuracyAvailable) - throw new IllegalStateException("Longitude Accuracy not available"); - return lonAccuracy * METRE_PER_SECOND * Math.cos(RADIANS_PER_SECOND * lat); - } - - /** - * @param d - */ - public void setLatSeconds(double d) { - lat = d; - } - - /** - * @param d - */ - public void setLatDegrees(double d) { - lat = d * 3600.0; - } - - /** - * @param b - */ - public void setLatAccuracyAvailable(boolean b) { - latAccuracyAvailable = b; - } - - /** - * @param d - */ - public void setLatAccuracySeconds(double d) { - latAccuracy = d; - } - - /** - * @param d - */ - public void setLatShiftSeconds(double d) { - latShift = d; - } - - /** - * @param d - */ - public void setLonPositiveWestSeconds(double d) { - lon = d; - } - - /** - * @param d - */ - public void setLonPositiveEastDegrees(double d) { - lon = d * -3600.0; - } - - /** - * @param b - */ - public void setLonAccuracyAvailable(boolean b) { - lonAccuracyAvailable = b; - } - - /** - * @param d - */ - public void setLonAccuracySeconds(double d) { - lonAccuracy = d; - } - - /** - * @param d - */ - public void setLonShiftPositiveWestSeconds(double d) { - lonShift = d; - } - - /** - * @return - */ - public String getSubGridName() { - return subGridName; - } - - /** - * @param string - */ - public void setSubGridName(String string) { - subGridName = string; - } - - /** - * Make this object a copy of the supplied GridShift - * @param gs - */ - public void copy(NTV2GridShift gs) { - this.lon = gs.lon; - this.lat = gs.lat; - this.lonShift = gs.lonShift; - this.latShift = gs.latShift; - this.lonAccuracy = gs.lonAccuracy; - this.latAccuracy = gs.latAccuracy; - this.latAccuracyAvailable = gs.latAccuracyAvailable; - this.lonAccuracyAvailable = gs.lonAccuracyAvailable; - this.subGridName = gs.subGridName; - } - -} Index: trunk/src/org/openstreetmap/josm/data/projection/NTV2GridShiftFile.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/NTV2GridShiftFile.java (revision 5072) +++ (revision ) @@ -1,322 +1,0 @@ -/* - * Copyright (c) 2003 Objectix Pty Ltd All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL OBJECTIX PTY LTD BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.openstreetmap.josm.data.projection; - -import java.io.IOException; -import java.io.InputStream; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; - -/** - * Models the NTv2 format Grid Shift File and exposes methods to shift - * coordinate values using the Sub Grids contained in the file. - *
The principal reference for the alogrithms used is the - * 'GDAit Software Architecture Manual' produced by the Geomatics - * Department of the University of Melbourne - *
This library reads binary NTv2 Grid Shift files in Big Endian - * (Canadian standard) or Little Endian (Australian Standard) format. - * The older 'Australian' binary format is not supported, only the - * official Canadian format, which is now also used for the national - * Australian Grid. - *
Grid Shift files can be read as InputStreams or RandomAccessFiles. - * Loading an InputStream places all the required node information - * (accuracy data is optional) into heap based Java arrays. This is the - * highest perfomance option, and is useful for large volume transformations. - * Non-file data sources (eg using an SQL Blob) are also supported through - * InputStream. The RandonAccessFile option has a much smaller memory - * footprint as only the Sub Grid headers are stored in memory, but - * transformation is slower because the file must be read a number of - * times for each transformation. - *
Coordinates may be shifted Forward (ie from and to the Datums specified - * in the Grid Shift File header) or Reverse. The reverse transformation - * uses an iterative approach to approximate the Grid Shift, as the - * precise transformation is based on 'from' datum coordinates. - *
Coordinates may be specified - * either in Seconds using Positive West Longitude (the original NTv2 - * arrangement) or in decimal Degrees using Positive East Longitude. - * - * @author Peter Yuill - * Modifified for JOSM : - * - removed the RandomAccessFile mode (Pieren) - */ -public class NTV2GridShiftFile implements Serializable { - - private String overviewHeaderCountId; - private int overviewHeaderCount; - private int subGridHeaderCount; - private int subGridCount; - private String shiftType; - private String version; - private String fromEllipsoid = ""; - private String toEllipsoid = ""; - private double fromSemiMajorAxis; - private double fromSemiMinorAxis; - private double toSemiMajorAxis; - private double toSemiMinorAxis; - - private NTV2SubGrid[] topLevelSubGrid; - private NTV2SubGrid lastSubGrid; - - public NTV2GridShiftFile() { - } - - /** - * Load a Grid Shift File from an InputStream. The Grid Shift node - * data is stored in Java arrays, which will occupy about the same memory - * as the original file with accuracy data included, and about half that - * with accuracy data excluded. The size of the Australian national file - * is 4.5MB, and the Canadian national file is 13.5MB - *
The InputStream is closed by this method.
- *
- * @param in Grid Shift File InputStream
- * @param loadAccuracy is Accuracy data to be loaded as well as shift data?
- * @throws Exception
- */
- public void loadGridShiftFile(InputStream in, boolean loadAccuracy ) throws IOException {
- byte[] b8 = new byte[8];
- boolean bigEndian = true;
- fromEllipsoid = "";
- toEllipsoid = "";
- topLevelSubGrid = null;
- in.read(b8);
- overviewHeaderCountId = new String(b8);
- if (!"NUM_OREC".equals(overviewHeaderCountId))
- throw new IllegalArgumentException("Input file is not an NTv2 grid shift file");
- in.read(b8);
- overviewHeaderCount = NTV2Util.getIntBE(b8, 0);
- if (overviewHeaderCount == 11) {
- bigEndian = true;
- } else {
- overviewHeaderCount = NTV2Util.getIntLE(b8, 0);
- if (overviewHeaderCount == 11) {
- bigEndian = false;
- } else
- throw new IllegalArgumentException("Input file is not an NTv2 grid shift file");
- }
- in.read(b8);
- in.read(b8);
- subGridHeaderCount = NTV2Util.getInt(b8, bigEndian);
- in.read(b8);
- in.read(b8);
- subGridCount = NTV2Util.getInt(b8, bigEndian);
- NTV2SubGrid[] subGrid = new NTV2SubGrid[subGridCount];
- in.read(b8);
- in.read(b8);
- shiftType = new String(b8);
- in.read(b8);
- in.read(b8);
- version = new String(b8);
- in.read(b8);
- in.read(b8);
- fromEllipsoid = new String(b8);
- in.read(b8);
- in.read(b8);
- toEllipsoid = new String(b8);
- in.read(b8);
- in.read(b8);
- fromSemiMajorAxis = NTV2Util.getDouble(b8, bigEndian);
- in.read(b8);
- in.read(b8);
- fromSemiMinorAxis = NTV2Util.getDouble(b8, bigEndian);
- in.read(b8);
- in.read(b8);
- toSemiMajorAxis = NTV2Util.getDouble(b8, bigEndian);
- in.read(b8);
- in.read(b8);
- toSemiMinorAxis = NTV2Util.getDouble(b8, bigEndian);
-
- for (int i = 0; i < subGridCount; i++) {
- subGrid[i] = new NTV2SubGrid(in, bigEndian, loadAccuracy);
- }
- topLevelSubGrid = createSubGridTree(subGrid);
- lastSubGrid = topLevelSubGrid[0];
-
- in.close();
- }
-
- /**
- * Create a tree of Sub Grids by adding each Sub Grid to its parent (where
- * it has one), and returning an array of the top level Sub Grids
- * @param subGrid an array of all Sub Grids
- * @return an array of top level Sub Grids with lower level Sub Grids set.
- */
- private NTV2SubGrid[] createSubGridTree(NTV2SubGrid[] subGrid) {
- int topLevelCount = 0;
- HashMap This method is thread safe for both memory based and file based node data.
- * @param gs GridShift object containing the coordinate to shift and the shift values
- * @return the GridShift object supplied, with values updated.
- * @throws IOException
- */
- public NTV2GridShift interpolateGridShift(NTV2GridShift gs) {
- int lonIndex = (int)((gs.getLonPositiveWestSeconds() - minLon) / lonInterval);
- int latIndex = (int)((gs.getLatSeconds() - minLat) / latInterval);
-
- double X = (gs.getLonPositiveWestSeconds() - (minLon + (lonInterval * lonIndex))) / lonInterval;
- double Y = (gs.getLatSeconds() - (minLat + (latInterval * latIndex))) / latInterval;
-
- // Find the nodes at the four corners of the cell
-
- int indexA = lonIndex + (latIndex * lonColumnCount);
- int indexB = indexA + 1;
- int indexC = indexA + lonColumnCount;
- int indexD = indexC + 1;
-
- gs.setLonShiftPositiveWestSeconds(interpolate(
- lonShift[indexA], lonShift[indexB], lonShift[indexC], lonShift[indexD], X, Y));
-
- gs.setLatShiftSeconds(interpolate(
- latShift[indexA], latShift[indexB], latShift[indexC], latShift[indexD], X, Y));
-
- if (lonAccuracy == null) {
- gs.setLonAccuracyAvailable(false);
- } else {
- gs.setLonAccuracyAvailable(true);
- gs.setLonAccuracySeconds(interpolate(
- lonAccuracy[indexA], lonAccuracy[indexB], lonAccuracy[indexC], lonAccuracy[indexD], X, Y));
- }
-
- if (latAccuracy == null) {
- gs.setLatAccuracyAvailable(false);
- } else {
- gs.setLatAccuracyAvailable(true);
- gs.setLatAccuracySeconds(interpolate(
- latAccuracy[indexA], latAccuracy[indexB], latAccuracy[indexC], latAccuracy[indexD], X, Y));
- }
- return gs;
- }
-
- public String getParentSubGridName() {
- return parentSubGridName;
- }
-
- public String getSubGridName() {
- return subGridName;
- }
-
- public int getNodeCount() {
- return nodeCount;
- }
-
- public int getSubGridCount() {
- return (subGrid == null) ? 0 : subGrid.length;
- }
-
- public NTV2SubGrid getSubGrid(int index) {
- return (subGrid == null) ? null : subGrid[index];
- }
-
- /**
- * Set an array of Sub Grids of this sub grid
- * @param subGrid
- */
- public void setSubGridArray(NTV2SubGrid[] subGrid) {
- this.subGrid = subGrid;
- }
-
- @Override
- public String toString() {
- return subGridName;
- }
-
- public String getDetails() {
- StringBuffer buf = new StringBuffer("Sub Grid : ");
- buf.append(subGridName);
- buf.append("\nParent : ");
- buf.append(parentSubGridName);
- buf.append("\nCreated : ");
- buf.append(created);
- buf.append("\nUpdated : ");
- buf.append(updated);
- buf.append("\nMin Lat : ");
- buf.append(minLat);
- buf.append("\nMax Lat : ");
- buf.append(maxLat);
- buf.append("\nMin Lon : ");
- buf.append(minLon);
- buf.append("\nMax Lon : ");
- buf.append(maxLon);
- buf.append("\nLat Intvl: ");
- buf.append(latInterval);
- buf.append("\nLon Intvl: ");
- buf.append(lonInterval);
- buf.append("\nNode Cnt : ");
- buf.append(nodeCount);
- return buf.toString();
- }
-
- /**
- * Make a deep clone of this Sub Grid
- */
- @Override
- public Object clone() {
- NTV2SubGrid clone = null;
- try {
- clone = (NTV2SubGrid)super.clone();
- } catch (CloneNotSupportedException cnse) {
- }
- // Do a deep clone of the sub grids
- if (subGrid != null) {
- clone.subGrid = new NTV2SubGrid[subGrid.length];
- for (int i = 0; i < subGrid.length; i++) {
- clone.subGrid[i] = (NTV2SubGrid)subGrid[i].clone();
- }
- }
- return clone;
- }
- /**
- * @return
- */
- public double getMaxLat() {
- return maxLat;
- }
-
- /**
- * @return
- */
- public double getMaxLon() {
- return maxLon;
- }
-
- /**
- * @return
- */
- public double getMinLat() {
- return minLat;
- }
-
- /**
- * @return
- */
- public double getMinLon() {
- return minLon;
- }
-
-}
Index: trunk/src/org/openstreetmap/josm/data/projection/NTV2Util.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/NTV2Util.java (revision 5072)
+++ (revision )
@@ -1,117 +1,0 @@
-/*
- * Copyright (c) 2003 Objectix Pty Ltd All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL OBJECTIX PTY LTD BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.openstreetmap.josm.data.projection;
-
-/**
- * A set of static utility methods for reading the NTv2 file format
- *
- * @author Peter Yuill
- */
-public class NTV2Util {
-
- private NTV2Util() {
- }
-
- /**
- * Get a Little Endian int from four bytes of a byte array
- * @param b the byte array
- * @param i the index of the first data byte in the array
- * @return the int
- */
- public static final int getIntLE(byte[] b, int i) {
- return (b[i++] & 0x000000FF) | ((b[i++] << 8) & 0x0000FF00) | ((b[i++] << 16) & 0x00FF0000) | (b[i] << 24);
- }
-
- /**
- * Get a Big Endian int from four bytes of a byte array
- * @param b the byte array
- * @param i the index of the first data byte in the array
- * @return the int
- */
- public static final int getIntBE(byte[] b, int i) {
- return (b[i++] << 24) | ((b[i++] << 16) & 0x00FF0000) | ((b[i++] << 8) & 0x0000FF00) | (b[i] & 0x000000FF);
- }
-
- /**
- * Get an int from the first 4 bytes of a byte array,
- * in either Big Endian or Little Endian format.
- * @param b the byte array
- * @param bigEndian is the byte array Big Endian?
- * @return the int
- */
- public static final int getInt(byte[] b, boolean bigEndian) {
- if (bigEndian)
- return getIntBE(b, 0);
- else
- return getIntLE(b, 0);
- }
-
- /**
- * Get a float from the first 4 bytes of a byte array,
- * in either Big Endian or Little Endian format.
- * @param b the byte array
- * @param bigEndian is the byte array Big Endian?
- * @return the float
- */
- public static final float getFloat(byte[] b, boolean bigEndian) {
- int i = 0;
- if (bigEndian) {
- i = getIntBE(b, 0);
- } else {
- i = getIntLE(b, 0);
- }
- return Float.intBitsToFloat(i);
- }
-
- /**
- * Get a double from the first 8 bytes of a byte array,
- * in either Big Endian or Little Endian format.
- * @param b the byte array
- * @param bigEndian is the byte array Big Endian?
- * @return the double
- */
- public static final double getDouble(byte[] b, boolean bigEndian) {
- int i = 0;
- int j = 0;
- if (bigEndian) {
- i = getIntBE(b, 0);
- j = getIntBE(b, 4);
- } else {
- i = getIntLE(b, 4);
- j = getIntLE(b, 0);
- }
- long l = ((long)i << 32) |
- (j & 0x00000000FFFFFFFFL);
- return Double.longBitsToDouble(l);
- }
-
- /**
- * Does the current VM support the New IO api
- * @return true or false
- */
- public static boolean isNioAvailable() {
- boolean nioAvailable = false;
- try {
- Class.forName("java.nio.channels.FileChannel");
- nioAvailable = true;
- } catch (ClassNotFoundException cnfe) {}
- return nioAvailable;
- }
-}
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Datum.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Datum.java (revision 5073)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Datum.java (revision 5073)
@@ -0,0 +1,32 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.projection.datum;
+
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Ellipsoid;
+
+/**
+ * Datum based of NTV2 grid shift file.
+ */
+public class NTV2Datum extends AbstractDatum {
+
+ protected NTV2GridShiftFile nadgrids;
+
+ public NTV2Datum(String name, String proj4Id, Ellipsoid ellps, NTV2GridShiftFile nadgrids) {
+ super(name, proj4Id, ellps);
+ this.nadgrids = nadgrids;
+ }
+
+ @Override
+ public LatLon toWGS84(LatLon ll) {
+ NTV2GridShift gs = new NTV2GridShift(ll);
+ nadgrids.gridShiftForward(gs);
+ return new LatLon(ll.lat() + gs.getLatShiftDegrees(), ll.lon() + gs.getLonShiftPositiveEastDegrees());
+ }
+
+ @Override
+ public LatLon fromWGS84(LatLon ll) {
+ NTV2GridShift gs = new NTV2GridShift(ll);
+ nadgrids.gridShiftReverse(gs);
+ return new LatLon(ll.lat() + gs.getLatShiftDegrees(), ll.lon() + gs.getLonShiftPositiveEastDegrees());
+ }
+}
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java (revision 5073)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java (revision 5073)
@@ -0,0 +1,311 @@
+/*
+ * Copyright (c) 2003 Objectix Pty Ltd All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL OBJECTIX PTY LTD BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.openstreetmap.josm.data.projection.datum;
+
+import java.io.Serializable;
+
+import org.openstreetmap.josm.data.coor.LatLon;
+
+/**
+ * A value object for storing Longitude and Latitude of a point, the
+ * Lon and Lat shift values to get from one datum to another, and the
+ * Lon and Lat accuracy of the shift values.
+ * All values are stored as Positive West Seconds, but accessors
+ * are also provided for Positive East Degrees.
+ *
+ * @author Peter Yuill
+ * Modifified for JOSM :
+ * - add a constructor for JOSM LatLon (Pieren)
+ */
+public class NTV2GridShift implements Serializable {
+
+ private static final double METRE_PER_SECOND = 2.0 * Math.PI * 6378137.0 / 3600.0 / 360.0;
+ private static final double RADIANS_PER_SECOND = 2.0 * Math.PI / 3600.0 / 360.0;
+ private double lon;
+ private double lat;
+ private double lonShift;
+ private double latShift;
+ private double lonAccuracy;
+ private double latAccuracy;
+ boolean latAccuracyAvailable;
+ boolean lonAccuracyAvailable;
+ private String subGridName;
+
+ public NTV2GridShift() {
+ }
+
+ public NTV2GridShift(LatLon p) {
+ setLatDegrees(p.lat());
+ setLonPositiveEastDegrees(p.lon());
+ }
+
+ /**
+ * @return
+ */
+ public double getLatSeconds() {
+ return lat;
+ }
+
+ /**
+ * @return
+ */
+ public double getLatDegrees() {
+ return lat / 3600.0;
+ }
+
+ /**
+ * @return
+ */
+ public double getLatShiftSeconds() {
+ return latShift;
+ }
+
+ /**
+ * @return
+ */
+ public double getLatShiftDegrees() {
+ return latShift / 3600.0;
+ }
+
+ /**
+ * @return
+ */
+ public double getShiftedLatSeconds() {
+ return lat + latShift;
+ }
+
+ /**
+ * @return
+ */
+ public double getShiftedLatDegrees() {
+ return (lat + latShift) / 3600.0;
+ }
+
+ /**
+ * @return
+ */
+ public boolean isLatAccuracyAvailable() {
+ return latAccuracyAvailable;
+ }
+
+ /**
+ * @return
+ */
+ public double getLatAccuracySeconds() {
+ if (!latAccuracyAvailable)
+ throw new IllegalStateException("Latitude Accuracy not available");
+ return latAccuracy;
+ }
+
+ /**
+ * @return
+ */
+ public double getLatAccuracyDegrees() {
+ if (!latAccuracyAvailable)
+ throw new IllegalStateException("Latitude Accuracy not available");
+ return latAccuracy / 3600.0;
+ }
+
+ /**
+ * @return
+ */
+ public double getLatAccuracyMetres() {
+ if (!latAccuracyAvailable)
+ throw new IllegalStateException("Latitude Accuracy not available");
+ return latAccuracy * METRE_PER_SECOND;
+ }
+
+ /**
+ * @return
+ */
+ public double getLonPositiveWestSeconds() {
+ return lon;
+ }
+
+ /**
+ * @return
+ */
+ public double getLonPositiveEastDegrees() {
+ return lon / -3600.0;
+ }
+
+ /**
+ * @return
+ */
+ public double getLonShiftPositiveWestSeconds() {
+ return lonShift;
+ }
+
+ /**
+ * @return
+ */
+ public double getLonShiftPositiveEastDegrees() {
+ return lonShift / -3600.0;
+ }
+
+ /**
+ * @return
+ */
+ public double getShiftedLonPositiveWestSeconds() {
+ return lon + lonShift;
+ }
+
+ /**
+ * @return
+ */
+ public double getShiftedLonPositiveEastDegrees() {
+ return (lon + lonShift) / -3600.0;
+ }
+
+ /**
+ * @return
+ */
+ public boolean isLonAccuracyAvailable() {
+ return lonAccuracyAvailable;
+ }
+
+ /**
+ * @return
+ */
+ public double getLonAccuracySeconds() {
+ if (!lonAccuracyAvailable)
+ throw new IllegalStateException("Longitude Accuracy not available");
+ return lonAccuracy;
+ }
+
+ /**
+ * @return
+ */
+ public double getLonAccuracyDegrees() {
+ if (!lonAccuracyAvailable)
+ throw new IllegalStateException("Longitude Accuracy not available");
+ return lonAccuracy / 3600.0;
+ }
+
+ /**
+ * @return
+ */
+ public double getLonAccuracyMetres() {
+ if (!lonAccuracyAvailable)
+ throw new IllegalStateException("Longitude Accuracy not available");
+ return lonAccuracy * METRE_PER_SECOND * Math.cos(RADIANS_PER_SECOND * lat);
+ }
+
+ /**
+ * @param d
+ */
+ public void setLatSeconds(double d) {
+ lat = d;
+ }
+
+ /**
+ * @param d
+ */
+ public void setLatDegrees(double d) {
+ lat = d * 3600.0;
+ }
+
+ /**
+ * @param b
+ */
+ public void setLatAccuracyAvailable(boolean b) {
+ latAccuracyAvailable = b;
+ }
+
+ /**
+ * @param d
+ */
+ public void setLatAccuracySeconds(double d) {
+ latAccuracy = d;
+ }
+
+ /**
+ * @param d
+ */
+ public void setLatShiftSeconds(double d) {
+ latShift = d;
+ }
+
+ /**
+ * @param d
+ */
+ public void setLonPositiveWestSeconds(double d) {
+ lon = d;
+ }
+
+ /**
+ * @param d
+ */
+ public void setLonPositiveEastDegrees(double d) {
+ lon = d * -3600.0;
+ }
+
+ /**
+ * @param b
+ */
+ public void setLonAccuracyAvailable(boolean b) {
+ lonAccuracyAvailable = b;
+ }
+
+ /**
+ * @param d
+ */
+ public void setLonAccuracySeconds(double d) {
+ lonAccuracy = d;
+ }
+
+ /**
+ * @param d
+ */
+ public void setLonShiftPositiveWestSeconds(double d) {
+ lonShift = d;
+ }
+
+ /**
+ * @return
+ */
+ public String getSubGridName() {
+ return subGridName;
+ }
+
+ /**
+ * @param string
+ */
+ public void setSubGridName(String string) {
+ subGridName = string;
+ }
+
+ /**
+ * Make this object a copy of the supplied GridShift
+ * @param gs
+ */
+ public void copy(NTV2GridShift gs) {
+ this.lon = gs.lon;
+ this.lat = gs.lat;
+ this.lonShift = gs.lonShift;
+ this.latShift = gs.latShift;
+ this.lonAccuracy = gs.lonAccuracy;
+ this.latAccuracy = gs.latAccuracy;
+ this.latAccuracyAvailable = gs.latAccuracyAvailable;
+ this.lonAccuracyAvailable = gs.lonAccuracyAvailable;
+ this.subGridName = gs.subGridName;
+ }
+
+}
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 5073)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 5073)
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2003 Objectix Pty Ltd All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL OBJECTIX PTY LTD BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.openstreetmap.josm.data.projection.datum;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * Models the NTv2 format Grid Shift File and exposes methods to shift
+ * coordinate values using the Sub Grids contained in the file.
+ * The principal reference for the alogrithms used is the
+ * 'GDAit Software Architecture Manual' produced by the Geomatics
+ * Department of the University of Melbourne
+ * This library reads binary NTv2 Grid Shift files in Big Endian
+ * (Canadian standard) or Little Endian (Australian Standard) format.
+ * The older 'Australian' binary format is not supported, only the
+ * official Canadian format, which is now also used for the national
+ * Australian Grid.
+ * Grid Shift files can be read as InputStreams or RandomAccessFiles.
+ * Loading an InputStream places all the required node information
+ * (accuracy data is optional) into heap based Java arrays. This is the
+ * highest perfomance option, and is useful for large volume transformations.
+ * Non-file data sources (eg using an SQL Blob) are also supported through
+ * InputStream. The RandonAccessFile option has a much smaller memory
+ * footprint as only the Sub Grid headers are stored in memory, but
+ * transformation is slower because the file must be read a number of
+ * times for each transformation.
+ * Coordinates may be shifted Forward (ie from and to the Datums specified
+ * in the Grid Shift File header) or Reverse. The reverse transformation
+ * uses an iterative approach to approximate the Grid Shift, as the
+ * precise transformation is based on 'from' datum coordinates.
+ * Coordinates may be specified
+ * either in Seconds using Positive West Longitude (the original NTv2
+ * arrangement) or in decimal Degrees using Positive East Longitude.
+ *
+ * @author Peter Yuill
+ * Modifified for JOSM :
+ * - removed the RandomAccessFile mode (Pieren)
+ */
+public class NTV2GridShiftFile implements Serializable {
+
+ private String overviewHeaderCountId;
+ private int overviewHeaderCount;
+ private int subGridHeaderCount;
+ private int subGridCount;
+ private String shiftType;
+ private String version;
+ private String fromEllipsoid = "";
+ private String toEllipsoid = "";
+ private double fromSemiMajorAxis;
+ private double fromSemiMinorAxis;
+ private double toSemiMajorAxis;
+ private double toSemiMinorAxis;
+
+ private NTV2SubGrid[] topLevelSubGrid;
+ private NTV2SubGrid lastSubGrid;
+
+ public NTV2GridShiftFile() {
+ }
+
+ /**
+ * Load a Grid Shift File from an InputStream. The Grid Shift node
+ * data is stored in Java arrays, which will occupy about the same memory
+ * as the original file with accuracy data included, and about half that
+ * with accuracy data excluded. The size of the Australian national file
+ * is 4.5MB, and the Canadian national file is 13.5MB
+ * The InputStream is closed by this method.
+ *
+ * @param in Grid Shift File InputStream
+ * @param loadAccuracy is Accuracy data to be loaded as well as shift data?
+ * @throws Exception
+ */
+ public void loadGridShiftFile(InputStream in, boolean loadAccuracy ) throws IOException {
+ byte[] b8 = new byte[8];
+ boolean bigEndian = true;
+ fromEllipsoid = "";
+ toEllipsoid = "";
+ topLevelSubGrid = null;
+ in.read(b8);
+ overviewHeaderCountId = new String(b8);
+ if (!"NUM_OREC".equals(overviewHeaderCountId))
+ throw new IllegalArgumentException("Input file is not an NTv2 grid shift file");
+ in.read(b8);
+ overviewHeaderCount = NTV2Util.getIntBE(b8, 0);
+ if (overviewHeaderCount == 11) {
+ bigEndian = true;
+ } else {
+ overviewHeaderCount = NTV2Util.getIntLE(b8, 0);
+ if (overviewHeaderCount == 11) {
+ bigEndian = false;
+ } else
+ throw new IllegalArgumentException("Input file is not an NTv2 grid shift file");
+ }
+ in.read(b8);
+ in.read(b8);
+ subGridHeaderCount = NTV2Util.getInt(b8, bigEndian);
+ in.read(b8);
+ in.read(b8);
+ subGridCount = NTV2Util.getInt(b8, bigEndian);
+ NTV2SubGrid[] subGrid = new NTV2SubGrid[subGridCount];
+ in.read(b8);
+ in.read(b8);
+ shiftType = new String(b8);
+ in.read(b8);
+ in.read(b8);
+ version = new String(b8);
+ in.read(b8);
+ in.read(b8);
+ fromEllipsoid = new String(b8);
+ in.read(b8);
+ in.read(b8);
+ toEllipsoid = new String(b8);
+ in.read(b8);
+ in.read(b8);
+ fromSemiMajorAxis = NTV2Util.getDouble(b8, bigEndian);
+ in.read(b8);
+ in.read(b8);
+ fromSemiMinorAxis = NTV2Util.getDouble(b8, bigEndian);
+ in.read(b8);
+ in.read(b8);
+ toSemiMajorAxis = NTV2Util.getDouble(b8, bigEndian);
+ in.read(b8);
+ in.read(b8);
+ toSemiMinorAxis = NTV2Util.getDouble(b8, bigEndian);
+
+ for (int i = 0; i < subGridCount; i++) {
+ subGrid[i] = new NTV2SubGrid(in, bigEndian, loadAccuracy);
+ }
+ topLevelSubGrid = createSubGridTree(subGrid);
+ lastSubGrid = topLevelSubGrid[0];
+
+ in.close();
+ }
+
+ /**
+ * Create a tree of Sub Grids by adding each Sub Grid to its parent (where
+ * it has one), and returning an array of the top level Sub Grids
+ * @param subGrid an array of all Sub Grids
+ * @return an array of top level Sub Grids with lower level Sub Grids set.
+ */
+ private NTV2SubGrid[] createSubGridTree(NTV2SubGrid[] subGrid) {
+ int topLevelCount = 0;
+ HashMap This method is thread safe for both memory based and file based node data.
+ * @param gs GridShift object containing the coordinate to shift and the shift values
+ * @return the GridShift object supplied, with values updated.
+ * @throws IOException
+ */
+ public NTV2GridShift interpolateGridShift(NTV2GridShift gs) {
+ int lonIndex = (int)((gs.getLonPositiveWestSeconds() - minLon) / lonInterval);
+ int latIndex = (int)((gs.getLatSeconds() - minLat) / latInterval);
+
+ double X = (gs.getLonPositiveWestSeconds() - (minLon + (lonInterval * lonIndex))) / lonInterval;
+ double Y = (gs.getLatSeconds() - (minLat + (latInterval * latIndex))) / latInterval;
+
+ // Find the nodes at the four corners of the cell
+
+ int indexA = lonIndex + (latIndex * lonColumnCount);
+ int indexB = indexA + 1;
+ int indexC = indexA + lonColumnCount;
+ int indexD = indexC + 1;
+
+ gs.setLonShiftPositiveWestSeconds(interpolate(
+ lonShift[indexA], lonShift[indexB], lonShift[indexC], lonShift[indexD], X, Y));
+
+ gs.setLatShiftSeconds(interpolate(
+ latShift[indexA], latShift[indexB], latShift[indexC], latShift[indexD], X, Y));
+
+ if (lonAccuracy == null) {
+ gs.setLonAccuracyAvailable(false);
+ } else {
+ gs.setLonAccuracyAvailable(true);
+ gs.setLonAccuracySeconds(interpolate(
+ lonAccuracy[indexA], lonAccuracy[indexB], lonAccuracy[indexC], lonAccuracy[indexD], X, Y));
+ }
+
+ if (latAccuracy == null) {
+ gs.setLatAccuracyAvailable(false);
+ } else {
+ gs.setLatAccuracyAvailable(true);
+ gs.setLatAccuracySeconds(interpolate(
+ latAccuracy[indexA], latAccuracy[indexB], latAccuracy[indexC], latAccuracy[indexD], X, Y));
+ }
+ return gs;
+ }
+
+ public String getParentSubGridName() {
+ return parentSubGridName;
+ }
+
+ public String getSubGridName() {
+ return subGridName;
+ }
+
+ public int getNodeCount() {
+ return nodeCount;
+ }
+
+ public int getSubGridCount() {
+ return (subGrid == null) ? 0 : subGrid.length;
+ }
+
+ public NTV2SubGrid getSubGrid(int index) {
+ return (subGrid == null) ? null : subGrid[index];
+ }
+
+ /**
+ * Set an array of Sub Grids of this sub grid
+ * @param subGrid
+ */
+ public void setSubGridArray(NTV2SubGrid[] subGrid) {
+ this.subGrid = subGrid;
+ }
+
+ @Override
+ public String toString() {
+ return subGridName;
+ }
+
+ public String getDetails() {
+ StringBuffer buf = new StringBuffer("Sub Grid : ");
+ buf.append(subGridName);
+ buf.append("\nParent : ");
+ buf.append(parentSubGridName);
+ buf.append("\nCreated : ");
+ buf.append(created);
+ buf.append("\nUpdated : ");
+ buf.append(updated);
+ buf.append("\nMin Lat : ");
+ buf.append(minLat);
+ buf.append("\nMax Lat : ");
+ buf.append(maxLat);
+ buf.append("\nMin Lon : ");
+ buf.append(minLon);
+ buf.append("\nMax Lon : ");
+ buf.append(maxLon);
+ buf.append("\nLat Intvl: ");
+ buf.append(latInterval);
+ buf.append("\nLon Intvl: ");
+ buf.append(lonInterval);
+ buf.append("\nNode Cnt : ");
+ buf.append(nodeCount);
+ return buf.toString();
+ }
+
+ /**
+ * Make a deep clone of this Sub Grid
+ */
+ @Override
+ public Object clone() {
+ NTV2SubGrid clone = null;
+ try {
+ clone = (NTV2SubGrid)super.clone();
+ } catch (CloneNotSupportedException cnse) {
+ }
+ // Do a deep clone of the sub grids
+ if (subGrid != null) {
+ clone.subGrid = new NTV2SubGrid[subGrid.length];
+ for (int i = 0; i < subGrid.length; i++) {
+ clone.subGrid[i] = (NTV2SubGrid)subGrid[i].clone();
+ }
+ }
+ return clone;
+ }
+ /**
+ * @return
+ */
+ public double getMaxLat() {
+ return maxLat;
+ }
+
+ /**
+ * @return
+ */
+ public double getMaxLon() {
+ return maxLon;
+ }
+
+ /**
+ * @return
+ */
+ public double getMinLat() {
+ return minLat;
+ }
+
+ /**
+ * @return
+ */
+ public double getMinLon() {
+ return minLon;
+ }
+
+}
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java (revision 5073)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java (revision 5073)
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2003 Objectix Pty Ltd All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL OBJECTIX PTY LTD BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.openstreetmap.josm.data.projection.datum;
+
+/**
+ * A set of static utility methods for reading the NTv2 file format
+ *
+ * @author Peter Yuill
+ */
+public class NTV2Util {
+
+ private NTV2Util() {
+ }
+
+ /**
+ * Get a Little Endian int from four bytes of a byte array
+ * @param b the byte array
+ * @param i the index of the first data byte in the array
+ * @return the int
+ */
+ public static final int getIntLE(byte[] b, int i) {
+ return (b[i++] & 0x000000FF) | ((b[i++] << 8) & 0x0000FF00) | ((b[i++] << 16) & 0x00FF0000) | (b[i] << 24);
+ }
+
+ /**
+ * Get a Big Endian int from four bytes of a byte array
+ * @param b the byte array
+ * @param i the index of the first data byte in the array
+ * @return the int
+ */
+ public static final int getIntBE(byte[] b, int i) {
+ return (b[i++] << 24) | ((b[i++] << 16) & 0x00FF0000) | ((b[i++] << 8) & 0x0000FF00) | (b[i] & 0x000000FF);
+ }
+
+ /**
+ * Get an int from the first 4 bytes of a byte array,
+ * in either Big Endian or Little Endian format.
+ * @param b the byte array
+ * @param bigEndian is the byte array Big Endian?
+ * @return the int
+ */
+ public static final int getInt(byte[] b, boolean bigEndian) {
+ if (bigEndian)
+ return getIntBE(b, 0);
+ else
+ return getIntLE(b, 0);
+ }
+
+ /**
+ * Get a float from the first 4 bytes of a byte array,
+ * in either Big Endian or Little Endian format.
+ * @param b the byte array
+ * @param bigEndian is the byte array Big Endian?
+ * @return the float
+ */
+ public static final float getFloat(byte[] b, boolean bigEndian) {
+ int i = 0;
+ if (bigEndian) {
+ i = getIntBE(b, 0);
+ } else {
+ i = getIntLE(b, 0);
+ }
+ return Float.intBitsToFloat(i);
+ }
+
+ /**
+ * Get a double from the first 8 bytes of a byte array,
+ * in either Big Endian or Little Endian format.
+ * @param b the byte array
+ * @param bigEndian is the byte array Big Endian?
+ * @return the double
+ */
+ public static final double getDouble(byte[] b, boolean bigEndian) {
+ int i = 0;
+ int j = 0;
+ if (bigEndian) {
+ i = getIntBE(b, 0);
+ j = getIntBE(b, 4);
+ } else {
+ i = getIntLE(b, 4);
+ j = getIntLE(b, 0);
+ }
+ long l = ((long)i << 32) |
+ (j & 0x00000000FFFFFFFFL);
+ return Double.longBitsToDouble(l);
+ }
+
+ /**
+ * Does the current VM support the New IO api
+ * @return true or false
+ */
+ public static boolean isNioAvailable() {
+ boolean nioAvailable = false;
+ try {
+ Class.forName("java.nio.channels.FileChannel");
+ nioAvailable = true;
+ } catch (ClassNotFoundException cnfe) {}
+ return nioAvailable;
+ }
+}
Index: trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (revision 5072)
+++ trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (revision 5073)
@@ -24,6 +24,9 @@
import java.util.Set;
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
@@ -54,4 +57,5 @@
public static void main(String[] args) throws IOException, FileNotFoundException {
+ setUp();
Map