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

Timestamp:

2007-10-07T13:20:27+02:00 (17 years ago)

Author:

gebner

Message:

Merge 0.5.

File:

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

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

@@ -17 +17 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
@@ -96 +96 @@
 
         /**
-         * Upload a segment (without the nodes).
-         */
-        public void visit(Segment ls) {
-                if (ls.id == 0 && !ls.deleted && ls.get("created_by") == null) {
-                        ls.put("created_by", "JOSM");
-                        sendRequest("PUT", "segment", ls, true);
-                } else if (ls.deleted) {
-                        sendRequest("DELETE", "segment", ls, false);
-                } else {
-                        sendRequest("PUT", "segment", ls, true);
-                }
-                processed.add(ls);
-        }
-
-        /**
-         * Upload a whole way with the complete segment id list.
+         * Upload a whole way with the complete node id list.
          */
         public void visit(Way w) {
@@ -125 +110 @@
         }
 
+        /**
+         * Upload an relation with all members.
+         */
+        public void visit(Relation e) {
+                if (e.id == 0 && !e.deleted && e.get("created_by") == null) {
+                        e.put("created_by", "JOSM");
+                        sendRequest("PUT", "relation", e, true);
+                } else if (e.deleted) {
+                        sendRequest("DELETE", "relation", e, false);
+                } else {
+                        sendRequest("PUT", "relation", e, true);
+                }
+                processed.add(e);
+        }
         /**
          * Read a long from the input stream and return it.
@@ -154 +153 @@
                         OsmPrimitive osm, boolean addBody) {
                 try {
-                        String version = Main.pref.get("osm-server.version", "0.4");
+                        String version = Main.pref.get("osm-server.version", "0.5");
                         URL url = new URL(
                                         Main.pref.get("osm-server.url") +
                                         "/" + version +
                                         "/" + urlSuffix + 
-                                        "/" + ((version.equals("0.4") && osm.id==0) ? "create":osm.id));
+                                        "/" + (osm.id==0 ? "create" : osm.id));
                         System.out.println("upload to: "+url);
                         activeConnection = (HttpURLConnection)url.openConnection();