Changeset 512 in josm for trunk/src/org

Timestamp:

2008-01-04T01:25:43+01:00 (17 years ago)

Author:

gebner

Message:

Add support for two non-standard GPX variants:

• <link>URL</link> (gets silently translated to <link href="URL"/>)
• <... lat="nan" lon="nan"> (we parse "nan" as Double.NaN and skip these points when rendering)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/GpxLayer.java (modified) (1 diff)
• io/GpxReader.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -254 +254 @@
                         for (Collection<WayPoint> segment : trk.trackSegs) {
                                 for (WayPoint trkPnt : segment) {
+                                        if (Double.isNaN(trkPnt.latlon.lat()) || Double.isNaN(trkPnt.latlon.lon()))
+                                                continue;
                                         Point screen = mv.getPoint(trkPnt.eastNorth);
                                         if (lines && old != null) {

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -66 +66 @@
                 }               
 
+                private double parseCoord(String s) {
+                        try {
+                                return Double.parseDouble(s);
+                        } catch (NumberFormatException ex) {
+                                return Double.NaN;
+                        }
+                }
+
+                private LatLon parseLatLon(Attributes atts) {
+                        return new LatLon(
+                                parseCoord(atts.getValue("lat")),
+                                parseCoord(atts.getValue("lon")));
+                }
+
                 @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
                         switch(currentState) {
@@ -73 +87 @@
                                         currentState = state.metadata;
                                 } else if (qName.equals("wpt")) {
-                                        LatLon ll = new LatLon(Double.parseDouble(atts.getValue("lat")), Double.parseDouble(atts.getValue("lon")));
                                         states.push(currentState);
                                         currentState = state.wpt;
-                                        currentWayPoint = new WayPoint(ll);
+                                        currentWayPoint = new WayPoint(parseLatLon(atts));
                                 } else if (qName.equals("rte")) {
                                         states.push(currentState);
@@ -122 +135 @@
                         case trkseg:
                                 if (qName.equals("trkpt")) {
-                                        LatLon ll = new LatLon(Double.parseDouble(atts.getValue("lat")), Double.parseDouble(atts.getValue("lon")));
                                         states.push(currentState);
                                         currentState = state.wpt;
-                                        currentWayPoint = new WayPoint(ll);
+                                        currentWayPoint = new WayPoint(parseLatLon(atts));
                                 }
                                 break;
@@ -144 +156 @@
                                         currentLink = new GpxLink(atts.getValue("href"));
                                 } else if (qName.equals("rtept")) {
-                                        LatLon ll = new LatLon(Double.parseDouble(atts.getValue("lat")), Double.parseDouble(atts.getValue("lon")));
                                         states.push(currentState);
                                         currentState = state.wpt;
-                                        currentWayPoint = new WayPoint(ll);
+                                        currentWayPoint = new WayPoint(parseLatLon(atts));
                                 } else if (qName.equals("extensions")) {
                                         states.push(currentState);
@@ -198 +209 @@
                                         currentLink.type = accumulator.toString();
                                 } else if (qName.equals("link")) {
+                                        // <link>URL</link>
+                                        if (currentLink.uri == null)
+                                                currentLink.uri = accumulator.toString();
+
                                         currentState = states.pop();
                                 }