Changeset 34 in josm for src/org/openstreetmap/josm/actions

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)

Location:

src/org/openstreetmap/josm/actions

Files:

• DownloadAction.java (modified) (2 diffs)
• UploadAction.java (modified) (2 diffs)

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

@@ -61 +61 @@
                 dlg.add(new JLabel("Bounding box"), GBC.eol());
 
+                dlg.add(new JLabel("min lon"), GBC.std().insets(10,0,5,0));
+                dlg.add(latlon[0], GBC.std());
                 dlg.add(new JLabel("min lat"), GBC.std().insets(10,0,5,0));
-                dlg.add(latlon[0], GBC.std());
+                dlg.add(latlon[1], GBC.eol());
+                dlg.add(new JLabel("max lon"), GBC.std().insets(10,0,5,0));
+                dlg.add(latlon[2], GBC.std());
                 dlg.add(new JLabel("max lat"), GBC.std().insets(10,0,5,0));
-                dlg.add(latlon[1], GBC.eol());
-                dlg.add(new JLabel("min lon"), GBC.std().insets(10,0,5,0));
-                dlg.add(latlon[2], GBC.std());
-                dlg.add(new JLabel("max lon"), GBC.std().insets(10,0,5,0));
                 dlg.add(latlon[3], GBC.eop());
 
@@ -144 +144 @@
                         return;
                 }
-                OsmServerReader osmReader = new OsmServerReader(Main.pref.osmDataServer,
-                                b.latlon[0], b.latlon[1], b.latlon[2], b.latlon[3]);
+                OsmServerReader osmReader = new OsmServerReader(b.latlon[0], b.latlon[1], b.latlon[2], b.latlon[3]);
                 try {
                         String name = latlon[0].getText()+" "+latlon[1].getText()+" x "+

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

@@ -15 +15 @@
 import javax.swing.KeyStroke;
 
+import org.jdom.JDOMException;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.GBC;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.io.OsmServerWriter;
 
 /**
@@ -61 +63 @@
                         return;
                 
-                JOptionPane.showMessageDialog(Main.main, "not implemented yet.");
+                OsmServerWriter server = new OsmServerWriter();
+                try {
+                        Collection<OsmPrimitive> all = new LinkedList<OsmPrimitive>();
+                        all.addAll(add);
+                        all.addAll(update);
+                        all.addAll(delete);
+                        server.uploadOsm(all);
+                } catch (JDOMException x) {
+                        x.printStackTrace();
+                        JOptionPane.showMessageDialog(Main.main, x.getMessage());
+                }
         }