Changeset 35 in josm for src/org/openstreetmap/josm/io/OsmServerWriter.java

Timestamp:

2005-12-28T01:29:01+01:00 (18 years ago)

Author:

imi

Message:

• fixed bug in UTM
• upload of nodes and segments
• fixed bugs in display the selection

File:

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

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

@@ -27 +27 @@
  * Class that uploades all changes to the osm server.
  * 
- * This is done like this:
- * - All objects with id = 0 are uploaded as new, except those in deleted, 
- *   which are ignored
- * - All objects in deleted list are deleted.
- * - All remaining objects with modified flag set are updated.
+ * This is done like this: - All objects with id = 0 are uploaded as new, except
+ * those in deleted, which are ignored - All objects in deleted list are
+ * deleted. - All remaining objects with modified flag set are updated.
  * 
- * This class implements visitor and will perform the correct upload action
- * on the visited element. 
+ * This class implements visitor and will perform the correct upload action on
+ * the visited element.
  * 
  * @author imi
@@ -41 +39 @@
 
         /**
-         * Send the dataset to the server. Ask the user first and does nothing if
-         * he does not want to send the data.
+         * Send the dataset to the server. Ask the user first and does nothing if he
+         * does not want to send the data.
          */
         public void uploadOsm(Collection<OsmPrimitive> list) throws JDOMException {
@@ -48 +46 @@
 
                 try {
-//                      for (OsmPrimitive osm : list)
-//                              osm.visit(this);
+                        for (OsmPrimitive osm : list)
+                                osm.visit(this);
                 } catch (RuntimeException e) {
                         throw new JDOMException("An error occoured: ", e);
@@ -60 +58 @@
         @SuppressWarnings("unchecked")
         public void visit(Node n) {
-                if (n.id == 0) {
-                        sendRequest("PUT", "newnode", n);
-                } else if (Main.main.ds.deleted.contains(n)) {
-                        sendRequest("DELETE", "node/"+n.id, n);
+                if (n.id == 0 && !n.isDeleted()) {
+                        sendRequest("PUT", "newnode", n, true);
+                } else if (n.isDeleted()) {
+                        sendRequest("DELETE", "node/" + n.id, n, false);
                 } else {
-                        sendRequest("PUT", "node/"+n.id, n);
+                        sendRequest("PUT", "node/" + n.id, n, true);
                 }
         }
 
         public void visit(LineSegment ls) {
+                if (ls.id == 0 && !ls.isDeleted()) {
+                        sendRequest("PUT", "newsegment", ls, true);
+                } else if (ls.isDeleted()) {
+                        sendRequest("DELETE", "segment/" + ls.id, ls, false);
+                } else {
+                        sendRequest("PUT", "segment/" + ls.id, ls, true);
+                }
         }
 
         public void visit(Track t) {
+                // not implemented in server
         }
 
         public void visit(Key k) {
+                // not implemented in server
         }
 
@@ -82 +89 @@
          */
         private long readId(InputStream inputStream) throws IOException {
-                BufferedReader in = new BufferedReader(new InputStreamReader(inputStream));
+                BufferedReader in = new BufferedReader(new InputStreamReader(
+                                inputStream));
                 String s = in.readLine();
                 if (s == null)
@@ -92 +100 @@
                 }
         }
-        
+
         @SuppressWarnings("unchecked")
-        private void sendRequest(String requestMethod, String urlSuffix, OsmPrimitive osm) {
+        private void sendRequest(String requestMethod, String urlSuffix,
+                        OsmPrimitive osm, boolean addBody) {
                 try {
                         URL url = new URL(Main.pref.osmDataServer + "/" + urlSuffix);
-                        HttpURLConnection con = (HttpURLConnection)url.openConnection();
+                        HttpURLConnection con = (HttpURLConnection) url.openConnection();
                         con.setConnectTimeout(20000);
                         con.setRequestMethod(requestMethod);
-                        con.setDoOutput(true);
+                        if (addBody)
+                                con.setDoOutput(true);
                         con.connect();
 
-                        OsmXmlVisitor visitor = new OsmXmlVisitor(false);
-                        osm.visit(visitor);
-                        Element root = new Element("osm");
-                        root.setAttribute("version", "0.2");
-                        root.getChildren().add(visitor.element);
-                        XMLOutputter xmlOut = new XMLOutputter(Format.getPrettyFormat());
-                        OutputStream out = con.getOutputStream();
-                        Document doc = new Document(root);
-                        xmlOut.output(doc, out);
-                        xmlOut.output(doc, System.out);
-                        out.close();
-                        
+                        if (addBody) {
+                                OsmXmlVisitor visitor = new OsmXmlVisitor(false);
+                                osm.visit(visitor);
+                                Element root = new Element("osm");
+                                root.setAttribute("version", "0.2");
+                                root.getChildren().add(visitor.element);
+                                XMLOutputter xmlOut = new XMLOutputter(Format.getPrettyFormat());
+                                OutputStream out = con.getOutputStream();
+                                Document doc = new Document(root);
+                                xmlOut.output(doc, out);
+                                xmlOut.output(doc, System.out);
+                                out.close();
+                        }
+
                         int retCode = con.getResponseCode();
-                        System.out.println(retCode+" "+con.getResponseMessage());
                         if (retCode == 200 && osm.id == 0)
                                 osm.id = readId(con.getInputStream());