Changeset 34 in josm for src/org/openstreetmap/josm/io/OsmServerReader.java

Timestamp:

2005-12-22T23:54:50+01:00 (20 years ago)

Author:

imi

Message:

• fixed bug in movement that lat/lon was not updated
• upload of nodes (disabled since untested)

File:

• src/org/openstreetmap/josm/io/OsmServerReader.java (modified) (6 diffs)

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

@@ -10 +10 @@
 
 import org.jdom.JDOMException;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.GeoPoint;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -21 +22 @@
 
         /**
-         * The url string of the desired map data.
+         * The boundings of the desired map data.
          */
-        private String urlStr;
         private final double lat1;
         private final double lon1;
@@ -32 +32 @@
          * Construct the reader and store the information for attaching
          */
-        public OsmServerReader(String server, 
-                        double lat1, double lon1, double lat2, double lon2) {
+        public OsmServerReader(double lat1, double lon1, double lat2, double lon2) {
                 this.lon2 = lon2;
                 this.lat2 = lat2;
                 this.lon1 = lon1;
                 this.lat1 = lat1;
-                urlStr = server.endsWith("/") ? server : server+"/";
         }
 
@@ -49 +47 @@
          */
         public Collection<Collection<GeoPoint>> parseRawGps() throws IOException, JDOMException {
-                String url = urlStr+"trackpoints?bbox="+lon1+","+lat1+","+lon2+","+lat2+"&page=";
+                String url = Main.pref.osmDataServer+"/trackpoints?bbox="+lon1+","+lat1+","+lon2+","+lat2+"&page=";
                 Collection<Collection<GeoPoint>> data = new LinkedList<Collection<GeoPoint>>();
                 Collection<GeoPoint> list = new LinkedList<GeoPoint>();
@@ -80 +78 @@
          */
         public DataSet parseOsm() throws JDOMException, IOException {
-                Reader r = getReader(urlStr+"map?bbox="+lon1+","+lat1+","+lon2+","+lat2);
+                Reader r = getReader(Main.pref.osmDataServer+"/map?bbox="+lon1+","+lat1+","+lon2+","+lat2);
                 if (r == null)
                         return null;
@@ -95 +93 @@
         private Reader getReader(String urlStr) throws IOException {
                 initAuthentication();
+                System.out.println(urlStr);
                 URL url = new URL(urlStr);
                 HttpURLConnection con = (HttpURLConnection)url.openConnection();