Changeset 200 in josm

Timestamp:

2007-02-14T16:21:14+01:00 (18 years ago)

Author:

imi

Message:

• new MarkerLayer code from Frederik. Supports Audio, Image and WebMarker (links)

Files:

• images/markers (added)
• images/markers/photo.png (added)
• images/markers/speech.png (added)
• images/markers/web.png (added)
• src/org/openstreetmap/josm/actions/OpenAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/MarkerLayer.java (deleted)
• src/org/openstreetmap/josm/gui/layer/markerlayer (added)
• src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (added)
• src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (added)
• src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (added)
• src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (added)
• src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (added)
• src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java (added)
• src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java (added)
• src/org/openstreetmap/josm/io/RawGpsReader.java (modified) (6 diffs)
• src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/OpenBrowser.java (modified) (3 diffs)

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

@@ -18 +18 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.gui.layer.MarkerLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer;
-import org.openstreetmap.josm.gui.layer.MarkerLayer.Marker;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
+import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.io.RawCsvReader;

src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -53 +53 @@
         static JList instance;
         private JScrollPane listScrollPane;
-        
+
         public final static class DeleteLayerAction extends AbstractAction {
 
@@ -91 +91 @@
                         Layer l = layer == null ? (Layer)instance.getSelectedValue() : layer;
                         l.visible = !l.visible;
+                        Main.map.mapView.repaint();
+                        instance.repaint();
+                }
+        }
+
+        public final static class ShowHideMarkerText extends AbstractAction {
+                private final Layer layer;
+
+                public ShowHideMarkerText(Layer layer) {
+                        super(tr("Show/Hide Text"), ImageProvider.get("dialogs", "showhide"));
+                        putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the marker text."));
+                        putValue("help", "Dialog/LayerList/ShowHideText");
+                        this.layer = layer;
+                }
+
+                public void actionPerformed(ActionEvent e) {
+                        Layer l = layer == null ? (Layer)instance.getSelectedValue() : layer;
+                        String current = Main.pref.get("marker.show "+l.name,"show");
+                        Main.pref.put("marker.show "+l.name, current.equalsIgnoreCase("show") ? "hide" : "show");
                         Main.map.mapView.repaint();
                         instance.repaint();

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

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Stack;
 
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.layer.MarkerLayer.Marker;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
+import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -43 +44 @@
                 private Collection<GpsPoint> current = new LinkedList<GpsPoint>();
                 private LatLon currentLatLon;
-                private String currentTime = "";
-                private String currentName = "";
+                private HashMap<String, String> currentTagValues = new HashMap<String, String>();
                 private Stack<String> tags = new Stack<String>();
 
@@ -50 +50 @@
                         if (qName.equals("wpt") || qName.equals("trkpt")) {
                                 try {
-                        double lat = Double.parseDouble(atts.getValue("lat"));
-                        double lon = Double.parseDouble(atts.getValue("lon"));
-                                if (Math.abs(lat) > 90)
-                                        throw new SAXException(tr("Data error: lat value \"{0}\" is out of bound.", lat));
-                                if (Math.abs(lon) > 180)
-                                        throw new SAXException(tr("Data error: lon value \"{0}\" is out of bound.", lon));
-                        currentLatLon = new LatLon(lat, lon);
-                } catch (NumberFormatException e) {
-                        e.printStackTrace();
-                        throw new SAXException(e);
-                }
-                currentTime = "";
-                currentName = "";
+                                        double lat = Double.parseDouble(atts.getValue("lat"));
+                                        double lon = Double.parseDouble(atts.getValue("lon"));
+                                        if (Math.abs(lat) > 90)
+                                                throw new SAXException(tr("Data error: lat value \"{0}\" is out of bound.", lat));
+                                        if (Math.abs(lon) > 180)
+                                                throw new SAXException(tr("Data error: lon value \"{0}\" is out of bound.", lon));
+                                        currentLatLon = new LatLon(lat, lon);
+                                } catch (NumberFormatException e) {
+                                        e.printStackTrace();
+                                        throw new SAXException(e);
+                                }
+                                currentTagValues.clear();
                         }
                         tags.push(qName);
@@ -69 +68 @@
                 @Override public void characters(char[] ch, int start, int length) {
                         String peek = tags.peek();
-                        if (peek.equals("time") || peek.equals("name")) {
+                        if (peek.equals("time") || peek.equals("name") || peek.equals("link") || peek.equals("symbol")) {
                                 String tag = tags.pop();
                                 if (tags.empty() || (!tags.peek().equals("wpt") && !tags.peek().equals("trkpt"))) {
@@ -76 +75 @@
                                 }
                                 String contents = new String(ch, start, length);
-                                if (peek.equals("time")) currentTime += contents; else currentName += contents;
+                                String oldContents = currentTagValues.get(peek);
+                                if (oldContents == null) {
+                                        currentTagValues.put(peek, contents);
+                                } else {
+                                        currentTagValues.put(peek, oldContents + contents);     
+                                }
                                 tags.push(tag);
                         }
@@ -83 +87 @@
                 @Override public void endElement(String namespaceURI, String localName, String qName) {
                         if (qName.equals("trkpt")) {
-                                current.add(new GpsPoint(currentLatLon, currentTime));
-                                currentTime = "";
-                                currentName = "";
+                                current.add(new GpsPoint(currentLatLon, currentTagValues.get("time")));
+                                currentTagValues.clear();
                         } else if (qName.equals("wpt")) {
-                                markerData.add(new Marker(currentLatLon, currentName, null));
-                                currentTime = "";
-                                currentName = "";
+                                markerData.add(Marker.createMarker(currentLatLon, currentTagValues));
+                                currentTagValues.clear();
                         } else if (qName.equals("trkseg") || qName.equals("trk") || qName.equals("gpx")) {
                                 newTrack();
-                                currentTime = "";
-                                currentName = "";
+                                currentTagValues.clear();
                         }
                         tags.pop();
-        }
+                }
 
                 private void newTrack() {

src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -52 +52 @@
          */
         public static ImageIcon get(String subdir, String name) {
-                if (subdir != "")
+                ImageIcon icon = getIfAvailable(subdir, name);
+                if (icon == null) {
+                        String ext = name.indexOf('.') != -1 ? "" : ".png";
+                        throw new NullPointerException("/images/"+subdir+name+ext+" not found");
+                }
+                return icon;
+        }
+
+        /**
+         * Like {@link #get(String)}, but does not throw and return <code>null</code>
+         * in case of nothing is found. Use this, if the image to retrieve is optional.
+         */
+        public static ImageIcon getIfAvailable(String subdir, String name) {
+                if (name == null)
+                        return null;
+                if (subdir == null || subdir != "")
                         subdir += "/";
                 String ext = name.indexOf('.') != -1 ? "" : ".png";

src/org/openstreetmap/josm/tools/OpenBrowser.java

@@ -2 +2 @@
 
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.swing.JApplet;
+
+import org.openstreetmap.josm.Main;
 
 /**
@@ -13 +19 @@
          */
         public static String displayUrl(String url) {
+                if (Main.applet) {
+                        try {
+                                JApplet applet = (JApplet) Main.parent;
+                                applet.getAppletContext().showDocument(new URL(url));
+                                return null;
+                        } catch (MalformedURLException mue) {
+                                return mue.getMessage();
+                        }
+                }
+
                 String os = System.getProperty("os.name");
                 if (os == null)
@@ -37 +53 @@
         private static void linux(String url) throws IOException {
                 try {
-                Runtime.getRuntime().exec("gnome-open " + url);
-        } catch (IOException e) {
-                Runtime.getRuntime().exec("kfmclient openURL " + url);
-        }
+                        Runtime.getRuntime().exec("gnome-open " + url);
+                } catch (IOException e) {
+                        Runtime.getRuntime().exec("kfmclient openURL " + url);
+                }
         }