(no commit message)

diff --git a/gps/src/org/wamblee/gpx/CoordinateSystem.java b/gps/src/org/wamblee/gps/coordinates/CoordinateSystem.java
similarity index 96%
rename from gps/src/org/wamblee/gpx/CoordinateSystem.java
rename to gps/src/org/wamblee/gps/coordinates/CoordinateSystem.java
index c88b8069e77b97299ee850e1f1a2debb5a1f7b98..e88d4833af61de19a7aebde85bff4c68ba6787ef 100644 (file)
--- a/gps/src/org/wamblee/gpx/CoordinateSystem.java
+++ b/gps/src/org/wamblee/gps/coordinates/CoordinateSystem.java
@@ -14,7 +14,8 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.gpx;
+package org.wamblee.gps.coordinates;
+
 
 /**
  * Represents a coordinate system. 

diff --git a/gps/src/org/wamblee/gpx/Coordinates.java b/gps/src/org/wamblee/gps/coordinates/Coordinates.java
similarity index 97%
rename from gps/src/org/wamblee/gpx/Coordinates.java
rename to gps/src/org/wamblee/gps/coordinates/Coordinates.java
index cfca9dd5e450a563344095118e566e59ec50942f..b1fc92643ffc10b480bce77fb4ad2496fff74c28 100644 (file)
--- a/gps/src/org/wamblee/gpx/Coordinates.java
+++ b/gps/src/org/wamblee/gps/coordinates/Coordinates.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.gpx;
+package org.wamblee.gps.coordinates;
 
 /**
  * Coordinates in some 3-dimensional coordinate system.  

diff --git a/gps/src/org/wamblee/gpx/Point.java b/gps/src/org/wamblee/gps/coordinates/Point.java
similarity index 97%
rename from gps/src/org/wamblee/gpx/Point.java
rename to gps/src/org/wamblee/gps/coordinates/Point.java
index d04ec8618bba04914a2662df9fbdbb41958c1da2..382bb5a5e07fc92bd652c35bfd91f49b8559a3e6 100644 (file)
--- a/gps/src/org/wamblee/gpx/Point.java
+++ b/gps/src/org/wamblee/gps/coordinates/Point.java
@@ -14,7 +14,8 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.gpx;
+package org.wamblee.gps.coordinates;
+
 
 /**
  * Represents a point in some coordinate system. 

diff --git a/gps/src/org/wamblee/gpx/ReferenceCoordinateSystem.java b/gps/src/org/wamblee/gps/coordinates/ReferenceCoordinateSystem.java
similarity index 98%
rename from gps/src/org/wamblee/gpx/ReferenceCoordinateSystem.java
rename to gps/src/org/wamblee/gps/coordinates/ReferenceCoordinateSystem.java
index 7c4afb458c00d004376e67edb3265de0dd16dd17..f3ed69cb80aa6b7c382a5fb991945ec1f25adb73 100644 (file)
--- a/gps/src/org/wamblee/gpx/ReferenceCoordinateSystem.java
+++ b/gps/src/org/wamblee/gps/coordinates/ReferenceCoordinateSystem.java
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-package org.wamblee.gpx;
+package org.wamblee.gps.coordinates;
+
 
 /**
  * Reference coordinate system which is the basis for defining metrics.

diff --git a/gps/src/org/wamblee/gpx/SphericalCoordinateSystem.java b/gps/src/org/wamblee/gps/coordinates/SphericalCoordinateSystem.java
similarity index 98%
rename from gps/src/org/wamblee/gpx/SphericalCoordinateSystem.java
rename to gps/src/org/wamblee/gps/coordinates/SphericalCoordinateSystem.java
index 607c0a49a00bb23a636333582b1c93d04fa9ae60..31232302f70c1d36db8029dbf6ab324584db6c4c 100644 (file)
--- a/gps/src/org/wamblee/gpx/SphericalCoordinateSystem.java
+++ b/gps/src/org/wamblee/gps/coordinates/SphericalCoordinateSystem.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.gpx;
+package org.wamblee.gps.coordinates;
 
 import static java.lang.Math.PI;
 import static java.lang.Math.cos;
 import static java.lang.Math.sin;
 
+
 /**
  * Represents the coordinate system for a GPS measurement identified by
  * <ul>

diff --git a/gps/src/org/wamblee/gpx/Wgs84CoordinateSystem.java b/gps/src/org/wamblee/gps/coordinates/Wgs84CoordinateSystem.java
similarity index 98%
rename from gps/src/org/wamblee/gpx/Wgs84CoordinateSystem.java
rename to gps/src/org/wamblee/gps/coordinates/Wgs84CoordinateSystem.java
index 94f7ba7b3e5140f30c794b18a3b9375e19b11413..9ccabd876d8605e82f1702357451e6d2ac005bd0 100644 (file)
--- a/gps/src/org/wamblee/gpx/Wgs84CoordinateSystem.java
+++ b/gps/src/org/wamblee/gps/coordinates/Wgs84CoordinateSystem.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.gpx;
+package org.wamblee.gps.coordinates;
 
 import static java.lang.Math.PI;
 import static java.lang.Math.cos;
 import static java.lang.Math.sin;
 
+
 /**
  * Represents the WGS 84 coordinate system for a GPS measurement identified by
  * <ul>

diff --git a/gps/src/org/wamblee/gpx/Track.java b/gps/src/org/wamblee/gps/track/Track.java
similarity index 95%
rename from gps/src/org/wamblee/gpx/Track.java
rename to gps/src/org/wamblee/gps/track/Track.java
index 5d2532938aa19ca892cd65c91a3ad140337f18ee..2b8d9c778b9828d5eb107c63d8f970f81e6fd1ae 100644 (file)
--- a/gps/src/org/wamblee/gpx/Track.java
+++ b/gps/src/org/wamblee/gps/track/Track.java
@@ -14,11 +14,13 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.gpx;
+package org.wamblee.gps.track;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.wamblee.gps.coordinates.Point;
+
 /**
  * Represents a GPS track. 
  */

diff --git a/gps/src/org/wamblee/gpx/TrackPoint.java b/gps/src/org/wamblee/gps/track/TrackPoint.java
similarity index 86%
rename from gps/src/org/wamblee/gpx/TrackPoint.java
rename to gps/src/org/wamblee/gps/track/TrackPoint.java
index 9be99bfc99ea77607191531e5473008371b4b46a..08d188250b9f367b23f01398a3838154f86ed844 100644 (file)
--- a/gps/src/org/wamblee/gpx/TrackPoint.java
+++ b/gps/src/org/wamblee/gps/track/TrackPoint.java
@@ -14,7 +14,11 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.gpx;
+package org.wamblee.gps.track;
+
+import org.wamblee.gps.coordinates.Coordinates;
+import org.wamblee.gps.coordinates.Point;
+import org.wamblee.gps.coordinates.Wgs84CoordinateSystem;
 
 
 /**

diff --git a/gps/src/org/wamblee/gpx/GpxPlotter.java b/gps/src/org/wamblee/gpx/GpxPlotter.java
index 8cb03a191d24f8a8e545cbcb36d7fbfdc9949e25..19a145d1679dfb69244f9f88a60a3daaebd94966 100644 (file)
--- a/gps/src/org/wamblee/gpx/GpxPlotter.java
+++ b/gps/src/org/wamblee/gpx/GpxPlotter.java
@@ -37,6 +37,10 @@ import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.wamblee.general.Pair;
+import org.wamblee.gps.coordinates.Point;
+import org.wamblee.gps.coordinates.ReferenceCoordinateSystem;
+import org.wamblee.gps.track.Track;
+import org.wamblee.gps.track.TrackPoint;
 import org.wamblee.xml.DomUtils;
 import org.xml.sax.SAXException;