Changeset 813 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2008-08-21T00:34:53+02:00 (16 years ago)

Author:

stoecker

Message:

support of Garmin time stamps in GPX import. patch by Roland Ramthun

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• gpx/WayPoint.java (modified) (1 diff)
• osm/visitor/SimplePaintVisitor.java (modified) (1 diff)

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

@@ -35 +35 @@
          * Convert the time stamp of the waypoint into seconds from the epoch
          */
-        public void setTime () {
+        public void setTime() {
                 if (! attr.containsKey("time")) {
-                        time = 0.0;
                         return;
                 }
                 SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); // ignore timezone
                 Date d = f.parse(attr.get("time").toString(), new ParsePosition(0));
-                if (d == null /* failed to parse */) {
-                        time = 0.0;
-                } else {
+                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 */
                 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -108 +108 @@
                 fillUnselectedNode = Main.pref.getBoolean("mappaint.node.fill-unselected", false);
                 virtualNodeSize = virtual ? Main.pref.getInteger("mappaint.node.virtual-size", 4) / 2 : 0;
-                virtualNodeSpace = Main.pref.getInteger("mappaint.node.virtual-space", 50);
+                virtualNodeSpace = Main.pref.getInteger("mappaint.node.virtual-space", 70);
 
                 ((Graphics2D)g)