Changeset 5737 in josm for trunk/src/org

Timestamp:

2013-02-21T02:30:26+01:00 (12 years ago)

Author:

Don-vip

Message:

see #8442 - Add write methods to OsmWriter to not rely only on DataSet

File:

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

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

@@ -91 +91 @@
     };
 
-    protected Collection<OsmPrimitive> sortById(Collection<? extends OsmPrimitive> primitives) {
-        List<OsmPrimitive> result = new ArrayList<OsmPrimitive>(primitives.size());
+    protected <T extends OsmPrimitive> Collection<T> sortById(Collection<T> primitives) {
+        List<T> result = new ArrayList<T>(primitives.size());
         result.addAll(primitives);
         Collections.sort(result, byIdComparator);
@@ -105 +105 @@
     }
 
+    /**
+     * Writes the contents of the given dataset (nodes, then ways, then relations)
+     * @param ds The dataset to write
+     */
     public void writeContent(DataSet ds) {
-        for (OsmPrimitive n : sortById(ds.getNodes())) {
+        writeNodes(ds.getNodes());
+        writeWays(ds.getWays());
+        writeRelations(ds.getRelations());
+    }
+    
+    /**
+     * Writes the given nodes sorted by id
+     * @param nodes The nodes to write
+     * @since 5737
+     */
+    public void writeNodes(Collection<Node> nodes) {
+        for (Node n : sortById(nodes)) {
             if (shouldWrite(n)) {
-                visit((Node)n);
-            }
-        }
-        for (OsmPrimitive w : sortById(ds.getWays())) {
+                visit(n);
+            }
+        }
+    }
+    
+    /**
+     * Writes the given ways sorted by id
+     * @param ways The ways to write
+     * @since 5737
+     */
+    public void writeWays(Collection<Way> ways) {
+        for (Way w : sortById(ways)) {
             if (shouldWrite(w)) {
-                visit((Way)w);
-            }
-        }
-        for (OsmPrimitive e: sortById(ds.getRelations())) {
-            if (shouldWrite(e)) {
-                visit((Relation)e);
+                visit(w);
+            }
+        }
+    }
+    
+    /**
+     * Writes the given relations sorted by id
+     * @param relations The relations to write
+     * @since 5737
+     */
+    public void writeRelations(Collection<Relation> relations) {
+        for (Relation r : sortById(relations)) {
+            if (shouldWrite(r)) {
+                visit(r);
             }
         }