Changeset 1146 in josm for trunk/src/org/openstreetmap

Timestamp:

2008-12-19T14:43:36+01:00 (16 years ago)

Author:

framm

Message:

• Added new "open location" option in the file menu which can be used to download OSM data from a given URL. Experimental feature, use with care.

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/OpenAction.java (deleted)
• actions/OpenFileAction.java (added)
• actions/OpenLocationAction.java (added)
• actions/downloadtasks/DownloadOsmTask.java (modified) (3 diffs)
• gui/MainApplet.java (modified) (1 diff)
• gui/MainMenu.java (modified) (4 diffs)
• gui/dialogs/RelationEditor.java (modified) (1 diff)
• io/OsmServerLocationReader.java (added)
• io/OsmServerObjectReader.java (modified) (2 diffs)
• io/OsmServerReader.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -484 +484 @@
         if (s.startsWith("file:")) {
             try {
-                main.menu.open.openFile(new File(new URI(s)));
+                main.menu.openFile.openFile(new File(new URI(s)));
             } catch (URISyntaxException e) {
                 JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed file url: \"{0}\"", s));
@@ -501 +501 @@
         }
 
-        main.menu.open.openFile(new File(s));
+        main.menu.openFile.openFile(new File(s));
     }
 

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.BoundingBoxDownloader;
+import org.openstreetmap.josm.io.OsmServerLocationReader;
+import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -30 +32 @@
 
         private static class Task extends PleaseWaitRunnable {
-                private BoundingBoxDownloader reader;
+                private OsmServerReader reader;
                 private DataSet dataSet;
                 private boolean newLayer;
 
-                public Task(boolean newLayer, BoundingBoxDownloader reader) {
+                public Task(boolean newLayer, OsmServerReader reader) {
                         super(tr("Downloading data"));
                         this.reader = reader;
@@ -83 +85 @@
                 Main.worker.execute(task);
     }
+    
+    public void loadUrl(boolean new_layer, String url) {
+        Task task = new Task(new_layer, new OsmServerLocationReader(url));
+        Main.worker.execute(task);
+    }
+    
+    
+    
 
         public JCheckBox getCheckBox() {

trunk/src/org/openstreetmap/josm/gui/MainApplet.java

@@ -108 +108 @@
                 m.remove(m.fileMenu);
                 m.editMenu.add(new UploadPreferencesAction());
-                m.open.setEnabled(false);
+                m.openFile.setEnabled(false);
                 m.exit.setEnabled(false);
                 m.save.setEnabled(false);

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -20 +20 @@
 import org.openstreetmap.josm.actions.AlignInCircleAction;
 import org.openstreetmap.josm.actions.AlignInLineAction;
+import org.openstreetmap.josm.actions.OpenLocationAction;
 import org.openstreetmap.josm.actions.OrthogonalizeAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
@@ -36 +37 @@
 import org.openstreetmap.josm.actions.MergeNodesAction;
 import org.openstreetmap.josm.actions.NewAction;
-import org.openstreetmap.josm.actions.OpenAction;
+import org.openstreetmap.josm.actions.OpenFileAction;
 import org.openstreetmap.josm.actions.PasteAction;
 import org.openstreetmap.josm.actions.PasteTagsAction;
@@ -76 +77 @@
     /* File menu */
     public final NewAction newAction = new NewAction();
-    public final OpenAction open = new OpenAction();
+    public final OpenFileAction openFile = new OpenFileAction();
+    public final OpenLocationAction openLocation = new OpenLocationAction();
     public final JosmAction save = new SaveAction(null);
     public final JosmAction saveAs = new SaveAsAction(null);
@@ -167 +169 @@
 
         add(fileMenu, newAction);
-        add(fileMenu, open);
+        add(fileMenu, openFile);
+        add(fileMenu, openLocation);
         fileMenu.addSeparator();
         add(fileMenu, save);

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java

@@ -539 +539 @@
                 }
                 if (download) {
-                        OsmServerObjectReader reader = new OsmServerObjectReader();
+                        OsmServerObjectReader reader = new OsmServerObjectReader(clone.id, OsmServerObjectReader.TYPE_REL, true);
                         try {
-                                DataSet dataSet = reader.parseOsm(clone.id,
-                                                OsmServerObjectReader.TYPE_REL, true);
+                                DataSet dataSet = reader.parseOsm();
                                 if (dataSet != null) {
                                         final MergeVisitor visitor = new MergeVisitor(Main.main

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

@@ -17 +17 @@
     public final static  String TYPE_NODE = "node";
 
+    long id;
+    String type;
+    boolean full;
+    
+    public OsmServerObjectReader(long id, String type, boolean full) {
+        this.id = id;
+        this.type = type;
+        this.full = full;
+    }
     /**
      * Method to download single objects from OSM server. ways, relations, nodes
@@ -26 +35 @@
      * @throws IOException
      */
-    public DataSet parseOsm(long id, String type, boolean full) throws SAXException, IOException {
+    public DataSet parseOsm() throws SAXException, IOException {
         try {
-
             Main.pleaseWaitDlg.progress.setValue(0);
             Main.pleaseWaitDlg.currentAction.setText(tr("Contacting OSM Server..."));

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

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
+import org.xml.sax.SAXException;
 
 /**
@@ -24 +26 @@
  * @author imi
  */
-abstract class OsmServerReader extends OsmConnection {
+public abstract class OsmServerReader extends OsmConnection {
         /**
          * Open a connection to the given url and return a reader on the input stream
@@ -35 +37 @@
                 String version = Main.pref.get("osm-server.version", "0.5");
                 urlStr = Main.pref.get("osm-server.url")+"/"+version+"/" + urlStr;
+        return getInputStreamRaw(urlStr, pleaseWaitDlg);
+    }
+    
+    protected InputStream getInputStreamRaw(String urlStr, PleaseWaitDialog pleaseWaitDlg) throws IOException {
+        
                 System.out.println("download: "+urlStr);
                 initAuthentication();
@@ -50 +57 @@
                 if (isAuthCancelled() && activeConnection.getResponseCode() == 401)
                         return null;
-                if( activeConnection.getResponseCode() == 500 )
+                if (activeConnection.getResponseCode() == 500)
                 {
                         throw new IOException(tr("Server returned internal error. Try a reduced area or retry after waiting some time."));
@@ -66 +73 @@
                 return inputStream;
         }
+    
+    public abstract DataSet parseOsm() throws SAXException, IOException;
+    
 }