Changeset 225 in josm

Timestamp:

2007-05-05T23:44:30+02:00 (18 years ago)

Author:

framm

Message:

bumped default for API version to 0.4. old 0.3 can still be set using osm-server.version preference.

Files:

• src/org/openstreetmap/josm/io/OsmReader.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmServerReader.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmWriter.java (modified) (1 diff)
• test/org/openstreetmap/josm/io/IncompleteDownloaderTest.java (modified) (1 diff)

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

@@ -101 +101 @@
                                         if (atts == null)
                                                 throw new SAXException(tr("Unknown version"));
-                                        if (!Main.pref.get("osm-server.version", "0.3").equals(atts.getValue("version")))
+                                        if (!Main.pref.get("osm-server.version", "0.4").equals(atts.getValue("version")))
                                                 throw new SAXException(tr("Unknown version")+": "+atts.getValue("version"));
                                 } else if (qName.equals("node")) {

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

@@ -22 +22 @@
          */
         protected InputStream getInputStream(String urlStr, PleaseWaitDialog pleaseWaitDlg) throws IOException {
-                String version = Main.pref.get("osm-server.version", "0.3");
+                String version = Main.pref.get("osm-server.version", "0.4");
                 urlStr = Main.pref.get("osm-server.url")+"/"+version+"/" + urlStr;
                 System.out.println("download: "+urlStr);

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

@@ -153 +153 @@
                         OsmPrimitive osm, boolean addBody) {
                 try {
-                        String version = Main.pref.get("osm-server.version", "0.3");
+                        String version = Main.pref.get("osm-server.version", "0.4");
                         URL url = new URL(
                                         Main.pref.get("osm-server.url") +

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

@@ -35 +35 @@
                 public void header(PrintWriter out) {
                         out.print("<osm version='");
-                        out.print(Main.pref.get("osm-server.version", "0.3"));
+                        out.print(Main.pref.get("osm-server.version", "0.4"));
                         out.println("' generator='JOSM'>");
                 }

test/org/openstreetmap/josm/io/IncompleteDownloaderTest.java

@@ -25 +25 @@
                 IncompleteDownloader downloader = new IncompleteDownloader(l) {
                         @Override protected InputStream getInputStream(String urlStr, PleaseWaitDialog pleaseWaitDlg) {
-                                String xml = "<osm version='0.3'><segment id='23' from='1' to='2'/></osm>";
+                                String xml = "<osm version='0.4'><segment id='23' from='1' to='2'/></osm>";
                     return new ByteArrayInputStream(xml.getBytes());
             }