aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--Makefile2
-rw-r--r--README.md4
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16cb3f4..dadb8e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -204,6 +204,7 @@ candidate:
- yarn install
- cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js
- make dist/candidate
+ - make dist/unitFromNumber.osc
when: manual
artifacts:
name: "candidate"
diff --git a/Makefile b/Makefile
index cf7409f..3d2cc2a 100644
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ dist/conflate:
./bin/conflate.js dist/vicmap-osm-uniq-flats-withinrange.geojson data/victoria-addr.osm.geojson dist/blocksByOSMAddr.geojson $@
dist/unitFromNumber.osc: dist/conflate/mr_explodeUnitFromNumber.geojson
- ./bin/mr2osc.mjs --dry-run $< $@
+ ./bin/mr2osc.mjs --dry-run --changeset-comment "Vicmap Import separate addr:unit and addr:housenumber where matched with Vicmap and previously were combined as unit/number" $< $@
convertConflationResultsToFGB:
ogr2ogr -f FlatGeobuf dist/conflate/withinExistingOSMAddressPoly.fgb dist/conflate/withinExistingOSMAddressPoly.geojson
diff --git a/README.md b/README.md
index 3d7eb2f..eff10a3 100644
--- a/README.md
+++ b/README.md
@@ -306,6 +306,10 @@ After conflation, import candidate .osm files are produced with
Split into the following candidate categories, then again split into suburb/locality (`admin_level=10`).
+Prepare unitFromNumber changeset to QA before uploading
+
+ make dist/unitFromNumber.osc
+
### Candidate Categories
1. `newAddressesWithoutConflicts` - new addresses from Vicmap where it's unlikely to conflict with existing OSM addresses, can be imported automatically.
2. `existingAddressesWithNewTagsOnly` - existing OSM addresses where we add new tags from Vicmap (no modifying or removing tags) and no geometry changes, can be imported automatically.