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

Timestamp:

2008-12-19T14:43:36+01:00 (17 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/io

Files:

• OsmServerLocationReader.java (added)
• OsmServerObjectReader.java (modified) (2 diffs)
• OsmServerReader.java (modified) (5 diffs)

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;
+    
 }