Skip to content

v0.2.48..v0.2.49 changeset conflate.asciidoc

Garret Voltz edited this page Oct 2, 2019 · 1 revision
diff --git a/docs/commands/conflate.asciidoc b/docs/commands/conflate.asciidoc
index 153216c..70ce919 100644
--- a/docs/commands/conflate.asciidoc
+++ b/docs/commands/conflate.asciidoc
@@ -6,15 +6,15 @@
 The +conflate+ command conflates two maps into a single map.  If the specified output file name ends with the extension .osc, an OSM
 changeset will be written, instead of an OSM map.
 
-* +input1+         - First input (e.g. OSM file).
-* +input2+         - Second input (e.g. OSM file, XML changeset file (.osc)).
-* +output+         - The output path.
+* +input1+         - First input; may be any supported input format (e.g. OSM file).
+* +input2+         - Second input; may be any supported input format (e.g. OSM file, XML changeset file (.osc)).
+* +output+         - The output path; may be any supported output format
 * +--differential+ - Calculates the the differential between two conflation inputs.  The output will be all elements in input2 that do
                      not conflict with any elements in input1.
 * +--include-tags+ - Include a check for modified tags when doing differential conflation.  The output will include unmodified geometries
                      from Input1, with new/updated tags from Input2 applied, using an overwrite-merge.
 * +--stats+        - Hootenanny map statistics such as node and way count; must be the last option entered and may be optionally followed
-                     by an output file name
+                     by an output JSON file name
 
 === Feature Filtering
 
@@ -25,7 +25,7 @@ section of the Hootenanny User Guide.
 === Usage
 
 --------------------------------------
-conflate (input1) (input2) (output) [--differential] [--stats filename]
+conflate (input1) (input2) (output) [--differential] [--include-tags] [--stats filename]
 --------------------------------------
 
 ==== Examples
@@ -76,10 +76,11 @@ hoot conflate -D unify.pre.ops=hoot::CookieCutterOp -D cookie.cutter.alpha=2500
   input1.osm input2.osm output.osm
 --------------------------------------
 
-==== See Also
+=== See Also
 
 * _Unifying Conflation_, <<hootalgo,Hootenanny - Algorithms>>
 * _Differential Conflation_, <<hootalgo,Hootenanny - Algorithms>>
 * _Attribute Conflation_, <<hootalgo,Hootenanny - Algorithms>>
 * _Horizontal Conflation_, <<hootalgo,Hootenanny - Algorithms>>
+* https://github.com/ngageoint/hootenanny/blob/master/docs/user/SupportedDataFormats.asciidoc#applying-changes-1[Supported Input Formats]
 
Clone this wiki locally