Changeset 210 in josm for src/org/openstreetmap

Timestamp:

2007-04-04T13:21:40+02:00 (17 years ago)

Author:

imi

Message:

• added the possibility for <wpt> tags in GPX files to construct markers from relative ​file:// urls
• fixed NPE when illegal characters in HTTP response from the server (fix for the fix)

Location:

src/org/openstreetmap/josm

Files:

• actions/OpenAction.java (modified) (1 diff)
• gui/layer/markerlayer/Marker.java (modified) (4 diffs)
• gui/layer/markerlayer/MarkerProducers.java (modified) (2 diffs)
• io/BoundingBoxDownloader.java (modified) (2 diffs)
• io/RawGpsReader.java (modified) (5 diffs)

src/org/openstreetmap/josm/actions/OpenAction.java

@@ -62 +62 @@
                                 Collection<Marker> markerData = null;
                                 if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) {
-                                        RawGpsReader r = new RawGpsReader(new FileInputStream(file));
+                                        RawGpsReader r = new RawGpsReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile());
                                         gpsData = r.trackData;
                                         markerData = r.markerData;

src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -5 +5 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.File;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -16 +17 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.ImageProvider;
+
+import com.sun.org.apache.xerces.internal.util.URI;
 
 /**
@@ -68 +71 @@
         static {
                 Marker.markerProducers.add(new MarkerProducers() {
-                        public Marker createMarker(LatLon ll, Map<String,String> data) {
+                        public Marker createMarker(LatLon ll, Map<String,String> data, File relativePath) {
                                 String link = data.get("link");
+
+                                // Try a relative file:// url, if the link is not in an URL-compatible form
+                                if (relativePath != null && !URI.isWellFormedAddress(link))
+                                        link = new File(relativePath, link).toURI().toString();
+
                                 if (link == null)
                                         return new Marker(ll, data.get("name"), data.get("symbol"));
@@ -138 +146 @@
          * @param ll lat/lon for marker
          * @param data hash containing keys and values from the GPX waypoint structure
+         * @param relativePath An path to use for constructing relative URLs or 
+         *        <code>null</code> for no relative URLs
          * @return a new Marker object
          */
-        public static Marker createMarker(LatLon ll, HashMap<String,String> data) {
+        public static Marker createMarker(LatLon ll, HashMap<String,String> data, File relativePath) {
                 for (MarkerProducers maker : Marker.markerProducers) {
-                        Marker marker = maker.createMarker(ll, data);
+                        Marker marker = maker.createMarker(ll, data, relativePath);
                         if (marker != null)
                                 return marker;

src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.layer.markerlayer;
 
+import java.io.File;
 import java.util.Map;
 
@@ -20 +21 @@
          * @param ll lat/lon for the marker position
          * @param data A map of all tags found in the <wpt> node of the gpx file. 
+         * @param relativePath An path to use for constructing relative URLs or 
+         *        <code>null</code> for no relative URLs
          * @return A Marker object, or <code>null</code>.
          */
-        public Marker createMarker(LatLon ll, Map<String,String> data);
+        public Marker createMarker(LatLon ll, Map<String,String> data, File relativePath);
 }

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

@@ -49 +49 @@
                                 break;
                         // Use only track points, since the server mix everything together 
-                        Collection<Collection<GpsPoint>> allWays = new RawGpsReader(in).trackData;
+                        Collection<Collection<GpsPoint>> allWays = new RawGpsReader(in, null).trackData;
 
                         boolean foundSomething = false;
@@ -70 +70 @@
                 if (cancel)
                         return null;
-                throw e;
+                throw new SAXException("Illegal characters within the HTTP-header response", e);
         } catch (IOException e) {
                 if (cancel)

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -15 +16 @@
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
 import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerProducers;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -26 +28 @@
  */
 public class RawGpsReader {
+
+        /**
+         * The relative path when constructing markers from wpt-tags. Passed to 
+         * {@link MarkerProducers#createMarker(LatLon, java.util.Map, String)}
+         */
+        private File relativeMarkerPath;
 
         /**
@@ -90 +98 @@
                                 currentTagValues.clear();
                         } else if (qName.equals("wpt")) {
-                                markerData.add(Marker.createMarker(currentLatLon, currentTagValues));
+                                markerData.add(Marker.createMarker(currentLatLon, currentTagValues, relativeMarkerPath));
                                 currentTagValues.clear();
                         } else if (qName.equals("trkseg") || qName.equals("trk") || qName.equals("gpx")) {
@@ -107 +115 @@
         }
 
-
         /**
-         * Parse the input stream and store the result in trackData and markerData 
+         * Parse the input stream and store the result in trackData and markerData
+         * 
+         * @param relativeMarkerPath The directory to use as relative path for all <wpt> 
+         *    marker tags. Maybe <code>null</code>, in which case no relative urls are constructed for the markers. 
          */
-        public RawGpsReader(InputStream source) throws SAXException, IOException {
+        public RawGpsReader(InputStream source, File relativeMarkerPath) throws SAXException, IOException {
+                this.relativeMarkerPath = relativeMarkerPath;
                 Parser parser = new Parser();
                 parser.parse(new InputStreamReader(source, "UTF-8"));