Changeset 1169 in josm for trunk/src/org/openstreetmap/josm/data/gpx

Timestamp:

2008-12-23T15:07:05+01:00 (17 years ago)

Author:

stoecker

Message:

removed usage of tab stops

Location:

trunk/src/org/openstreetmap/josm/data/gpx

Files:

• GpxData.java (modified) (3 diffs)
• GpxLink.java (modified) (1 diff)
• GpxRoute.java (modified) (1 diff)
• GpxTrack.java (modified) (1 diff)
• WayPoint.java (modified) (1 diff)
• WithAttributes.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -15 +15 @@
  * It uses GPX v1.1, see {@link <a href="http://www.topografix.com/GPX/1/1/">the spec</a>}
  * for details.
- * 
+ *
  * @author Raphael Mack <ramack@raphael-mack.de>
  */
 public class GpxData extends WithAttributes {
-        public File storageFile;
-        public boolean fromServer;
+    public File storageFile;
+    public boolean fromServer;
 
-        public Collection<GpxTrack> tracks = new LinkedList<GpxTrack>();
-        public Collection<GpxRoute> routes = new LinkedList<GpxRoute>();
-        public Collection<WayPoint> waypoints = new LinkedList<WayPoint>();
+    public Collection<GpxTrack> tracks = new LinkedList<GpxTrack>();
+    public Collection<GpxRoute> routes = new LinkedList<GpxRoute>();
+    public Collection<WayPoint> waypoints = new LinkedList<WayPoint>();
 
-        public Bounds bounds;
+    public Bounds bounds;
 
-        public void mergeFrom(GpxData other) {
-                if (storageFile == null && other.storageFile != null) {
-                        storageFile = other.storageFile;
-                }
-                fromServer = fromServer && other.fromServer;
+    public void mergeFrom(GpxData other) {
+        if (storageFile == null && other.storageFile != null) {
+            storageFile = other.storageFile;
+        }
+        fromServer = fromServer && other.fromServer;
 
-                for (Map.Entry<String, Object> ent : other.attr.entrySet()) {
-                        // TODO: Detect conflicts.
-                        String k = ent.getKey();
-                        if (k.equals("link") && attr.containsKey("link")) {
-                                ((Collection<GpxLink>) attr.get("link")).addAll(
-                                        (Collection<GpxLink>) ent.getValue());
-                        } else {
-                                attr.put(k, ent.getValue());
-                        }
-                }
-                tracks.addAll(other.tracks);
-                routes.addAll(other.routes);
-                waypoints.addAll(other.waypoints);
-        }
+        for (Map.Entry<String, Object> ent : other.attr.entrySet()) {
+            // TODO: Detect conflicts.
+            String k = ent.getKey();
+            if (k.equals("link") && attr.containsKey("link")) {
+                ((Collection<GpxLink>) attr.get("link")).addAll(
+                    (Collection<GpxLink>) ent.getValue());
+            } else {
+                attr.put(k, ent.getValue());
+            }
+        }
+        tracks.addAll(other.tracks);
+        routes.addAll(other.routes);
+        waypoints.addAll(other.waypoints);
+    }
 
-        public boolean hasTrackPoints() {
-                for (GpxTrack trk : tracks) {
-                        for (Collection<WayPoint> trkseg : trk.trackSegs) {
-                                if (!trkseg.isEmpty())
-                                        return true;
-                        }
-                }
-                return false;
-        }
+    public boolean hasTrackPoints() {
+        for (GpxTrack trk : tracks) {
+            for (Collection<WayPoint> trkseg : trk.trackSegs) {
+                if (!trkseg.isEmpty())
+                    return true;
+            }
+        }
+        return false;
+    }
 
-        public boolean hasRoutePoints() {
-                for (GpxRoute rte : routes) {
-                        if (!rte.routePoints.isEmpty())
-                                return true;
-                }
-                return false;
-        }
+    public boolean hasRoutePoints() {
+        for (GpxRoute rte : routes) {
+            if (!rte.routePoints.isEmpty())
+                return true;
+        }
+        return false;
+    }
 
-        // FIXME might perhaps use visitor pattern?
-        public void recalculateBounds() {
-                bounds = null;
-                for (WayPoint wpt : waypoints) {
-                        if (bounds == null) {
-                                bounds = new Bounds(wpt.latlon, wpt.latlon);
-                        } else {
-                                bounds.extend(wpt.latlon);
-                        }
-                }
-                for (GpxRoute rte : routes) {
-                        for (WayPoint wpt : rte.routePoints) {
-                                if (bounds == null) {
-                                        bounds = new Bounds(wpt.latlon, wpt.latlon);
-                                } else {
-                                        bounds.extend(wpt.latlon);
-                                }
-                        }
-                }
-                for (GpxTrack trk : tracks) {
-                        for (Collection<WayPoint> trkseg : trk.trackSegs) {
-                                for (WayPoint wpt : trkseg) {
-                                        if (bounds == null) {
-                                                bounds = new Bounds(wpt.latlon, wpt.latlon);
-                                        } else {
-                                                bounds.extend(wpt.latlon);
-                                        }
-                                }
-                        }
-                }
-                if (bounds == null) {
-                        bounds = new Bounds();
-                }
-        }
-    
+    // FIXME might perhaps use visitor pattern?
+    public void recalculateBounds() {
+        bounds = null;
+        for (WayPoint wpt : waypoints) {
+            if (bounds == null) {
+                bounds = new Bounds(wpt.latlon, wpt.latlon);
+            } else {
+                bounds.extend(wpt.latlon);
+            }
+        }
+        for (GpxRoute rte : routes) {
+            for (WayPoint wpt : rte.routePoints) {
+                if (bounds == null) {
+                    bounds = new Bounds(wpt.latlon, wpt.latlon);
+                } else {
+                    bounds.extend(wpt.latlon);
+                }
+            }
+        }
+        for (GpxTrack trk : tracks) {
+            for (Collection<WayPoint> trkseg : trk.trackSegs) {
+                for (WayPoint wpt : trkseg) {
+                    if (bounds == null) {
+                        bounds = new Bounds(wpt.latlon, wpt.latlon);
+                    } else {
+                        bounds.extend(wpt.latlon);
+                    }
+                }
+            }
+        }
+        if (bounds == null) {
+            bounds = new Bounds();
+        }
+    }
+
     /**
      * calculates the sum of the lengths of all track segments
@@ -108 +108 @@
         double result = 0.0; // in meters
         WayPoint last = null;
-                
+
         for (GpxTrack trk : tracks) {
             for (Collection<WayPoint> trkseg : trk.trackSegs) {
@@ -129 +129 @@
         double lat1, lon1, lat2, lon2;
         double dlon, dlat;
-            
+
         lat1 = p1.lat() * Math.PI / 180.0;
         lon1 = p1.lon() * Math.PI / 180.0;

trunk/src/org/openstreetmap/josm/data/gpx/GpxLink.java

@@ -5 +5 @@
 
 public class GpxLink {
-        public String uri;
-        public String text;
-        public String type;
+    public String uri;
+    public String text;
+    public String type;
 
-        public GpxLink(String uri) {
-                this.uri = uri;
-        }
+    public GpxLink(String uri) {
+        this.uri = uri;
+    }
 }

trunk/src/org/openstreetmap/josm/data/gpx/GpxRoute.java

@@ -8 +8 @@
 
 public class GpxRoute extends WithAttributes {
-        public Collection<WayPoint> routePoints = new LinkedList<WayPoint>();
+    public Collection<WayPoint> routePoints = new LinkedList<WayPoint>();
 }

trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java

@@ -8 +8 @@
 
 public class GpxTrack extends WithAttributes {
-        public Collection<Collection<WayPoint>> trackSegs
-                = new LinkedList<Collection<WayPoint>>();
+    public Collection<Collection<WayPoint>> trackSegs
+        = new LinkedList<Collection<WayPoint>>();
 }

trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -15 +15 @@
 public class WayPoint extends WithAttributes implements Comparable<WayPoint>
 {
-        public final LatLon latlon;
-        public final EastNorth eastNorth;
-        public double time;
-        public Color speedLineColor;
-        public boolean drawLine;
-        public int dir;
+    public final LatLon latlon;
+    public final EastNorth eastNorth;
+    public double time;
+    public Color speedLineColor;
+    public boolean drawLine;
+    public int dir;
 
-        public WayPoint(LatLon ll) {
-                latlon = ll;
-                eastNorth = Main.proj.latlon2eastNorth(ll);
-        }
+    public WayPoint(LatLon ll) {
+        latlon = ll;
+        eastNorth = Main.proj.latlon2eastNorth(ll);
+    }
 
-        @Override
-        public String toString() {
-                return "WayPoint (" + (attr.containsKey("name") ? attr.get("name") + ", " :"") + latlon.toString() + ", " + attr + ")";
-        }
-        
-        /**
-         * Convert the time stamp of the waypoint into seconds from the epoch
-         */
-        public final static SimpleDateFormat GPXTIMEFMT = 
-                new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); // ignore timezone
-        
-        public void setTime() {
-                if (! attr.containsKey("time")) {
-                        return;
-                }
-                Date d = GPXTIMEFMT.parse(attr.get("time").toString(), new ParsePosition(0));
-                if (d != null /* parsing ok */) {
-                        time = d.getTime() / 1000.0; /* ms => seconds */
-                }
-        }
+    @Override
+    public String toString() {
+        return "WayPoint (" + (attr.containsKey("name") ? attr.get("name") + ", " :"") + latlon.toString() + ", " + attr + ")";
+    }
 
-        /**
-         * Convert a time stamp of the waypoint from the <cmt> or <desc> field 
-         * into seconds from the epoch. Handles the date format as it is used by 
-         * Garmin handhelds. Does not overwrite an existing timestamp (!= 0.0).
-         * A value of <time> fields overwrites values set with by method.
-         * Does nothing if specified key does not exist or text cannot be parsed.
-         * 
-         * @param key The key that contains the text to convert.
-         */
-        public void setGarminCommentTime(String key) {
-                // do not overwrite time if already set
-                if (time != 0.0) {
-                        return;
-                }
-                if (! attr.containsKey(key)) {
-                        return;
-                }
-                // example date format "18-AUG-08 13:33:03"
-                SimpleDateFormat f = new SimpleDateFormat("dd-MMM-yy HH:mm:ss"); // Garmin wpts have no timezone
-                Date d = f.parse(attr.get(key).toString(), new ParsePosition(0));
-                if (d != null /* parsing OK */) {
-                        time = d.getTime() / 1000.0; /* ms => seconds */
-                }
-        }
+    /**
+     * Convert the time stamp of the waypoint into seconds from the epoch
+     */
+    public final static SimpleDateFormat GPXTIMEFMT =
+        new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); // ignore timezone
 
-        public int compareTo(WayPoint w)
-        {
-                return Double.compare(time, w.time);
-        }
+    public void setTime() {
+        if (! attr.containsKey("time")) {
+            return;
+        }
+        Date d = GPXTIMEFMT.parse(attr.get("time").toString(), new ParsePosition(0));
+        if (d != null /* parsing ok */) {
+            time = d.getTime() / 1000.0; /* ms => seconds */
+        }
+    }
+
+    /**
+     * Convert a time stamp of the waypoint from the <cmt> or <desc> field
+     * into seconds from the epoch. Handles the date format as it is used by
+     * Garmin handhelds. Does not overwrite an existing timestamp (!= 0.0).
+     * A value of <time> fields overwrites values set with by method.
+     * Does nothing if specified key does not exist or text cannot be parsed.
+     *
+     * @param key The key that contains the text to convert.
+     */
+    public void setGarminCommentTime(String key) {
+        // do not overwrite time if already set
+        if (time != 0.0) {
+            return;
+        }
+        if (! attr.containsKey(key)) {
+            return;
+        }
+        // example date format "18-AUG-08 13:33:03"
+        SimpleDateFormat f = new SimpleDateFormat("dd-MMM-yy HH:mm:ss"); // Garmin wpts have no timezone
+        Date d = f.parse(attr.get(key).toString(), new ParsePosition(0));
+        if (d != null /* parsing OK */) {
+            time = d.getTime() / 1000.0; /* ms => seconds */
+        }
+    }
+
+    public int compareTo(WayPoint w)
+    {
+        return Double.compare(time, w.time);
+    }
 }

trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java

@@ -1 @@
-// License: GPL. 
+// License: GPL.
 package org.openstreetmap.josm.data.gpx;
 
@@ -9 +9 @@
  * The "attr" hash is used to store the XML payload
  * (not only XML attributes!)
- * 
+ *
  * @author Frederik Ramm <frederik@remote.org>
  *
  */
 public class WithAttributes {
-        
-        public Map<String, Object> attr = new HashMap<String, Object>(0);
-        
-        public String getString(String key) {
-                Object value = attr.get(key);
-                return (value instanceof String) ? (String)value : null;
-        }
+
+    public Map<String, Object> attr = new HashMap<String, Object>(0);
+
+    public String getString(String key) {
+        Object value = attr.get(key);
+        return (value instanceof String) ? (String)value : null;
+    }
 }