Changeset 624 in josm for trunk/src/org/openstreetmap/josm/io/OsmWriter.java

Timestamp:

2008-05-10T21:35:30+02:00 (16 years ago)

Author:

framm

Message:

• preliminary support for API 0.6, patches by Martijn van Oosterhout <kleptog@…>. Should not have an effect on 0.5 operations

File:

• trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) (5 diffs)

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

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
@@ -34 +35 @@
 
         private final boolean osmConform;
+        private final Changeset changeset;
 
         public abstract static class Osm implements OsmWriterInterface {
@@ -73 +75 @@
 
                 public void write(PrintWriter out) {
-                        Visitor writer = new OsmWriter(out, osmConform);
+                        Visitor writer = new OsmWriter(out, osmConform, null);
                         for (Node n : ds.nodes)
                                 if (shouldWrite(n))
@@ -109 +111 @@
                 private final OsmPrimitive osm;
                 private final boolean osmConform;
-
-                public Single(OsmPrimitive osm, boolean osmConform) {
+                private final Changeset changeset;
+
+                public Single(OsmPrimitive osm, boolean osmConform, Changeset changeset) {
                         this.osm = osm;
                         this.osmConform = osmConform;
+                        this.changeset = changeset;
                 }
 
                 public void write(PrintWriter out) {
-                        osm.visit(new OsmWriter(out, osmConform));
-        }
-        }
-
-        private OsmWriter(PrintWriter out, boolean osmConform) {
+                        osm.visit(new OsmWriter(out, osmConform, changeset));
+        }
+        }
+
+        private OsmWriter(PrintWriter out, boolean osmConform, Changeset changeset) {
                 super(out);
                 this.osmConform = osmConform;
+                this.changeset = changeset;
         }
 
@@ -205 +210 @@
                 }
                 out.print(" visible='"+osm.visible+"'");
-                
+                if( osm.version != -1 )
+                        out.print( " old_version='"+osm.version+"'");
+                if( this.changeset != null && this.changeset.id != 0)
+                        out.print( " changeset='"+this.changeset.id+"'" );
         }
 }