From d4609528c385016f7247db7d486f6e9e51b5053e Mon Sep 17 00:00:00 2001
From: erik <erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Date: Tue, 1 Aug 2006 12:05:06 +0000
Subject: [PATCH]

---
 .../wamblee/{gpx => gps/coordinates}/CoordinateSystem.java  | 3 ++-
 .../org/wamblee/{gpx => gps/coordinates}/Coordinates.java   | 2 +-
 gps/src/org/wamblee/{gpx => gps/coordinates}/Point.java     | 3 ++-
 .../{gpx => gps/coordinates}/ReferenceCoordinateSystem.java | 3 ++-
 .../{gpx => gps/coordinates}/SphericalCoordinateSystem.java | 3 ++-
 .../{gpx => gps/coordinates}/Wgs84CoordinateSystem.java     | 3 ++-
 gps/src/org/wamblee/{gpx => gps/track}/Track.java           | 4 +++-
 gps/src/org/wamblee/{gpx => gps/track}/TrackPoint.java      | 6 +++++-
 gps/src/org/wamblee/gpx/GpxPlotter.java                     | 4 ++++
 9 files changed, 23 insertions(+), 8 deletions(-)
 rename gps/src/org/wamblee/{gpx => gps/coordinates}/CoordinateSystem.java (96%)
 rename gps/src/org/wamblee/{gpx => gps/coordinates}/Coordinates.java (97%)
 rename gps/src/org/wamblee/{gpx => gps/coordinates}/Point.java (97%)
 rename gps/src/org/wamblee/{gpx => gps/coordinates}/ReferenceCoordinateSystem.java (98%)
 rename gps/src/org/wamblee/{gpx => gps/coordinates}/SphericalCoordinateSystem.java (98%)
 rename gps/src/org/wamblee/{gpx => gps/coordinates}/Wgs84CoordinateSystem.java (98%)
 rename gps/src/org/wamblee/{gpx => gps/track}/Track.java (95%)
 rename gps/src/org/wamblee/{gpx => gps/track}/TrackPoint.java (86%)

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 c88b8069..e88d4833 100644
--- 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 cfca9dd5..b1fc9264 100644
--- 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 d04ec861..382bb5a5 100644
--- 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 7c4afb45..f3ed69cb 100644
--- 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 607c0a49..31232302 100644
--- 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 94f7ba7b..9ccabd87 100644
--- 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 5d253293..2b8d9c77 100644
--- 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 9be99bfc..08d18825 100644
--- 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 8cb03a19..19a145d1 100644
--- 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;
 
-- 
2.31.1