docs: remove redundant info about odk_merge

hotosm · Jul 11, 2024 · aea31fe · aea31fe
1 parent 0da3897
commit aea31fe
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 136 deletions.
diff --git a/Makefile b/Makefile
@@ -31,7 +31,6 @@ MDS := \
 	docs/about/externaldata.md \
 	docs/about/make_data_extract.md \
 	docs/about/xlsforms.md \
-	docs/about/odk_merge.md \
 	docs/about/convert.md \
 	docs/about/odk_client.md \
 	docs/about/osmfile.md

diff --git a/README.md b/README.md
@@ -227,12 +227,6 @@ format used for submissions downloaded from [ODK
 Central](https://docs.getodk.org/central-intro/), or the JSON format
 also from Central.
 
-### odk_merge.py
-
-This program conflates the data collected by ODK Collect with the
-existing OSM data. The output of this file can be loaded into JOSM
-for validation and uploading to OpenStreetMap.
-
 ### odk_client.py
 
 This program is a simple command line client to an ODK Central

diff --git a/docs/about/conflation.md b/docs/about/conflation.md
@@ -47,9 +47,10 @@ schema is much more compact, as everything is in a single column.
 
 ## Using Postgres
 
-If you use the [odk_merge](https://hotosm.github.io/osm-fieldwork/about/odk_merge/)
-program, you don't have to deal
-with accessing the database directly, but here's how if you want to.
+If you use the
+[OdkParsers](https://hotosm.github.io/osm-fieldwork/api/parsers/)
+program, you don't have to deal with accessing the database directly,
+but here's how if you want to.
 
 This would find all of the tags for a hotel:
 

diff --git a/docs/about/programs.md b/docs/about/programs.md
@@ -27,11 +27,11 @@ for users who want to work with OpenStreetMap data and want to convert
 ODK Central data into a compatible format. There is more detailed information on
 the program for converting ODK to OSM [here](CSVDump.md)
 
-## odk_merge.py
+## parsers.py
 
-odk_merge.py is a program for conflating the OSM XML file produced
+parsers.py is a program for conflating the OSM XML file produced
 from CSVDump.py into with the data extract. This merges tags that have
-been added or change by ODK Collect with exiting OSM data, The result
+been added or changed by ODK Collect with exiting OSM data, The result
 can be loaded into JOSM and after validation, uploaded to OSM.
 
 # OSM Fieldwork Modules

diff --git a/docs/about/user-manual.md b/docs/about/user-manual.md
@@ -74,7 +74,7 @@ website frontend is the actual GUI.
   - Convert the ODK Instance to CSV
 - odk2geojson
   - Convert the ODK Instance to GeoJson
-- odk_merge
+- parsers
   - Conflate POIs from Collect with existing OSM data
 - odk_client
   - Remotely control an ODK Central server

diff --git a/docs/api/parsers.md b/docs/api/parsers.md
@@ -0,0 +1,6 @@
+# OdkParsers
+
+::: osm_fieldwork.parsers.ODKParsers
+options:
+show_source: false
+heading_level: 3
diff --git a/osm_fieldwork/odk2geojson.py b/osm_fieldwork/odk2geojson.py