Changeset 71 in josm for src/org/openstreetmap/josm/io/RawGpsReader.java

Timestamp:

2006-03-25T16:21:09+01:00 (18 years ago)

Author:

imi

Message:

• refactored GpsPoint to be immutable and added LatLon and NorthEast
• refactored Bounding Box calculations
• various other renames

File:

• src/org/openstreetmap/josm/io/RawGpsReader.java (modified) (8 diffs)

src/org/openstreetmap/josm/io/RawGpsReader.java

@@ -11 +11 @@
 import org.jdom.Namespace;
 import org.jdom.input.SAXBuilder;
-import org.openstreetmap.josm.data.GeoPoint;
+import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
- * Read raw gps data from a gpx file. Only way points with their waies segments
+ * Read raw gps data from a gpx file. Only way points with their ways segments
  * and waypoints are imported.
  * @author imi
@@ -42 +42 @@
          * Parse and return the read data
          */
-        public Collection<Collection<GeoPoint>> parse() throws JDOMException, IOException {
+        public Collection<Collection<LatLon>> parse() throws JDOMException, IOException {
                 final SAXBuilder builder = new SAXBuilder();
                 builder.setValidation(false);
@@ -55 +55 @@
          */
         @SuppressWarnings("unchecked")
-        private Collection<Collection<GeoPoint>> parseData(Element root) throws JDOMException {
-                Collection<Collection<GeoPoint>> data = new LinkedList<Collection<GeoPoint>>();
+        private Collection<Collection<LatLon>> parseData(Element root) throws JDOMException {
+                Collection<Collection<LatLon>> data = new LinkedList<Collection<LatLon>>();
 
                 // workaround for bug where the server adds /gpx.asd to the namespace
@@ -62 +62 @@
                 
                 for (Object o : root.getChildren("wpt", GPX)) {
-                        Collection<GeoPoint> line = new LinkedList<GeoPoint>();
-                        line.add(new GeoPoint(parseDouble((Element)o, LatLon.lat), parseDouble((Element)o, LatLon.lon)));
+                        Collection<LatLon> line = new LinkedList<LatLon>();
+                        line.add(new LatLon(parseDouble((Element)o, LatLonAttr.lat), parseDouble((Element)o, LatLonAttr.lon)));
                         data.add(line);
                 }
                 for (Object o : root.getChildren("rte", GPX)) {
-                        Collection<GeoPoint> line = parseLine(((Element)o).getChildren("rtept", GPX));
+                        Collection<LatLon> line = parseLine(((Element)o).getChildren("rtept", GPX));
                         if (!line.isEmpty())
                                 data.add(line);
@@ -73 +73 @@
                 for (Object o : root.getChildren("trk", GPX)) {
                         for (Object seg : ((Element)o).getChildren("trkseg", GPX)) {
-                                Collection<GeoPoint> line = parseLine(((Element)seg).getChildren("trkpt", GPX));
+                                Collection<LatLon> line = parseLine(((Element)seg).getChildren("trkpt", GPX));
                                 if (!line.isEmpty())
                                         data.add(line);
@@ -81 +81 @@
         }
 
-        enum LatLon {lat, lon}
+        private enum LatLonAttr {lat, lon}
         /**
          * Return a parsed float value from the element behind the object o.
@@ -88 +88 @@
          * @throws JDOMException If the absolute of the value is out of bound.
          */
-        private double parseDouble(Element e, LatLon attr) throws JDOMException {
+        private double parseDouble(Element e, LatLonAttr attr) throws JDOMException {
                 double d = Double.parseDouble(e.getAttributeValue(attr.toString()));
-                if (Math.abs(d) > (attr == LatLon.lat ? 90 : 180))
+                if (Math.abs(d) > (attr == LatLonAttr.lat ? 90 : 180))
                         throw new JDOMException("Data error: "+attr+" value '"+d+"' is out of bound.");
                 return d;
@@ -99 +99 @@
          * points read.
          */
-        private Collection<GeoPoint> parseLine(List<Element> wpt) throws JDOMException {
-                Collection<GeoPoint> data = new LinkedList<GeoPoint>();
+        private Collection<LatLon> parseLine(List<Element> wpt) throws JDOMException {
+                Collection<LatLon> data = new LinkedList<LatLon>();
                 for (Element e : wpt)
-                        data.add(new GeoPoint(parseDouble(e, LatLon.lat), parseDouble(e, LatLon.lon)));
+                        data.add(new LatLon(parseDouble(e, LatLonAttr.lat), parseDouble(e, LatLonAttr.lon)));
                 return data;
         }