Changeset 58 in josm for src/org/openstreetmap/josm/actions/UploadAction.java

Timestamp:

2006-03-14T01:47:55+01:00 (18 years ago)

Author:

imi

Message:

• implemented 0.3 API
• enabled upload of ways
• switched to MinML (GPX still uses JDOM)
• changed assumed server precision to 10^{-12 (was 10}-13)

File:

• src/org/openstreetmap/josm/actions/UploadAction.java (modified) (4 diffs)

src/org/openstreetmap/josm/actions/UploadAction.java

@@ -17 +17 @@
 import org.jdom.JDOMException;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences.PreferencesException;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Track;
 import org.openstreetmap.josm.gui.GBC;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
@@ -39 +39 @@
 
         public void actionPerformed(ActionEvent e) {
+                
+                //TODO: Remove this in later versions (temporary only)
+                if (Main.pref.osmDataServer.endsWith("/0.2") || Main.pref.osmDataServer.endsWith("/0.2/")) {
+                        int answer = JOptionPane.showConfirmDialog(Main.main, 
+                                        "You seem to have an outdated server entry in your preferences.\n" +
+                                        "\n" +
+                                        "As of JOSM Release 1.2, you must no longer specify the API version in\n" +
+                                        "the osm url. For the OSM standard server, use http://www.openstreetmap.org/api" +
+                                        "\n" +
+                                        "Fix settings and continue?", "Outdated server url detected.", JOptionPane.YES_NO_OPTION);
+                        if (answer != JOptionPane.YES_OPTION)
+                                return;
+                        int cutPos = Main.pref.osmDataServer.endsWith("/0.2") ? 4 : 5;
+                        Main.pref.osmDataServer = Main.pref.osmDataServer.substring(0, Main.pref.osmDataServer.length()-cutPos);
+                        try {
+                                Main.pref.save();
+                        } catch (PreferencesException x) {
+                                x.printStackTrace();
+                                JOptionPane.showMessageDialog(Main.main, "Could not save the preferences chane:\n" +
+                                                x.getMessage());
+                        }
+                }
+
                 final Collection<OsmPrimitive> add = new LinkedList<OsmPrimitive>();
                 final Collection<OsmPrimitive> update = new LinkedList<OsmPrimitive>();
                 final Collection<OsmPrimitive> delete = new LinkedList<OsmPrimitive>();
-                boolean acceptedTracks = false;
                 for (OsmPrimitive osm : Main.main.ds.allPrimitives()) {
-                        boolean doSomething = true;
                         if (osm.id == 0 && !osm.isDeleted())
                                 add.add(osm);
@@ -51 +72 @@
                         else if (osm.isDeleted() && osm.id != 0)
                                 delete.add(osm);
-                        else
-                                doSomething = false;
-
-                        if (osm instanceof Track && doSomething && !acceptedTracks) {
-                                int answer = JOptionPane.showConfirmDialog(Main.main, 
-                                                "The server currently does not understand the concept of Tracks.\n" +
-                                                "All tracks will be ignored on upload. Continue anyway?",
-                                                "No Track support", JOptionPane.YES_NO_OPTION);
-                                if (answer != JOptionPane.YES_OPTION)
-                                        return;
-                                acceptedTracks = true;
-                        }
                 }
 
@@ -88 +97 @@
                 }).start();
         }
-        
+
         /**
          * Displays a screen where the actions that would be taken are displayed and