Changeset 31934 in osm for applications/editors

Timestamp:

2016-01-04T15:02:38+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/DirectDownload: fix plugin - see #josm10049

Location:

applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload

Files:

• DirectDownload.java (modified) (3 diffs)
• DownloadDataGui.java (modified) (1 diff)
• GpxServerReader.java (added)
• UserTrackReader.java (added)

applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java

@@ -11 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -27 +28 @@
      * Will be invoked by JOSM to bootstrap the plugin
      *
-     * @param info  information about the plugin and its local installation    
+     * @param info  information about the plugin and its local installation
      */
     public DirectDownload(PluginInformation info) {
@@ -48 +49 @@
             UserTrack track = go.getSelectedUserTrack();
 
-            if ((go.getValue() == 1) && (track != null)) {
-                String urlString = OsmApi.getOsmApi().getBaseUrl() + "gpx/" + track.id + "/data";
+            if (!((go.getValue() == 1) && (track != null))) {
+                return;
+            }
 
-                try {
-                    URL trackDataUrl = new URL(urlString);
-                    InputStream is = Utils.openURLAndDecompress(trackDataUrl, true);
+            final GpxData data = new GpxServerReader().loadGpx(Long.parseLong(track.id));
+            if (data == null) {
+                return;
+            }
+            final GpxLayer gpxLayer = new GpxLayer(data);
 
-                    GpxReader r = new GpxReader(is);
-                    boolean parsedProperly = r.parse(true);
-                    GpxLayer gpxLayer = new GpxLayer(r.getGpxData(), track.filename, true);
+            if (data.hasRoutePoints() || data.hasTrackPoints()) {
+                Main.main.addLayer(gpxLayer);
+            }
 
-                    if (r.getGpxData().hasRoutePoints() || r.getGpxData().hasTrackPoints()) {
-                        Main.main.addLayer(gpxLayer);
-                    }
-
-                    if (Main.pref.getBoolean("marker.makeautomarkers", true) && !r.getGpxData().waypoints.isEmpty()) {
-                        MarkerLayer ml = new MarkerLayer(r.getGpxData(), tr("Markers from {0}", track.filename), null, gpxLayer);
-                        if (ml.data.size() > 0) {
-                            Main.main.addLayer(ml);
-                        }
-                    }
-                    if (!parsedProperly) {
-                        JOptionPane.showMessageDialog(Main.parent,
-                            tr("Error occurred while parsing gpx file {0}. Only a part of the file will be available.", urlString));
-                    }
-
-                } catch (java.net.MalformedURLException e) {
-                    JOptionPane.showMessageDialog(Main.parent,
-                            tr("Invalid URL {0}", urlString));
-                } catch (java.io.IOException e) {
-                    e.printStackTrace();
-                    JOptionPane.showMessageDialog(Main.parent,
-                            tr("Error fetching URL {0}", urlString));
-                } catch (SAXException e) {
-                    e.printStackTrace();
-                    JOptionPane.showMessageDialog(Main.parent,
-                            tr("Error parsing data from URL {0}", urlString));
+            if (Main.pref.getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {
+                MarkerLayer ml = new MarkerLayer(data, tr("Markers from {0}", track.filename), null, gpxLayer);
+                if (ml.data.size() > 0) {
+                    Main.main.addLayer(ml);
                 }
             }

applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java

@@ -64 +64 @@
         panel.add(scrollPane, BorderLayout.CENTER);
 
-    model.setData(getTrackList());
+    model.setData(new UserTrackReader().getTrackList());
 
     setContent(panel);
     setupDialog();
-    }
-
-    private static class TrackListHandler extends DefaultHandler {
-        private LinkedList<UserTrack> data = new LinkedList<>();
-
-        private String cdata = new String();
-
-        @Override
-        public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
-            if (qName.equals("gpx_file")) {
-            UserTrack track = new UserTrack();
-
-            track.id       = atts.getValue("id");
-            track.filename = atts.getValue("name");
-            track.datetime = atts.getValue("timestamp").replaceAll("[TZ]", " "); // TODO: do real parsing and time zone conversion
-
-            data.addFirst(track);
-            }
-            cdata = new String();
-        }
-
-        @Override
-                public void characters(char ch[], int start, int length)
-            throws SAXException {
-            cdata += new String(ch, start, length);
-        }
-
-        @Override
-                public void endElement(String uri, String localName, String qName) throws SAXException {
-            if (qName.equals("description")) {
-            data.getFirst().description = cdata;
-            }
-            /*
-            else if (qName.equals("tag")) {
-            data.getFirst().tags = cdata;
-            cdata = new String();
-            }
-            */
-        }
-
-        public List<UserTrack> getResult() {
-            return data;
-        }
-    }
-
-    private List<UserTrack> getTrackList() {
-        String urlString = OsmApi.getOsmApi().getBaseUrl() + "user/gpx_files";
-
-        try {
-            URL userTracksUrl = new URL(urlString);
-
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            TrackListHandler handler = new TrackListHandler();
-
-            //get a new instance of parser
-            SAXParser sp = spf.newSAXParser();
-
-            //parse the file and also register this class for call backs
-            sp.parse(userTracksUrl.openStream(), handler);
-
-            return handler.getResult();
-        } catch (java.net.MalformedURLException e) {
-            Main.error(e);
-            JOptionPane.showMessageDialog(null, tr("Invalid URL {0}", urlString));
-        } catch (java.io.IOException e) {
-            Main.error(e);
-            JOptionPane.showMessageDialog(null, tr("Error fetching URL {0}", urlString));
-        } catch (SAXException e) {
-            Main.error(e);
-            JOptionPane.showMessageDialog(null, tr("Error parsing data from URL {0}", urlString));
-        } catch (ParserConfigurationException e) {
-            Main.error(e);
-            JOptionPane.showMessageDialog(null, tr("Error parsing data from URL {0}", urlString));
-        }
-
-        return new LinkedList<>();
     }