From e124e7e8b7ef52e8f04d55deaecd8e576b7ad637 Mon Sep 17 00:00:00 2001 From: Andrew Harvey Date: Wed, 9 Jun 2021 13:58:35 +1000 Subject: minor changes to compareSuburb --- .gitlab-ci.yml | 2 +- Makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d159d7f..f9bf3a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -239,7 +239,7 @@ build compareSuburb: - touch --no-create data/vicmap.geojson - time make dist/vicmap-osm-with-suburb.geojson - time make dist/vicmapSuburbDiffersWithOSM.geojson - - rm -f dist/vicmap-osm.geojson + - rm -f dist/vicmap-osm-with-suburb.geojson - make printDifferentSuburbs when: manual artifacts: diff --git a/Makefile b/Makefile index ebf4143..d85d1ff 100644 --- a/Makefile +++ b/Makefile @@ -200,9 +200,11 @@ data/victoria-admin-level10.osm.fgb: data/victoria-admin-level10.osm.geojson dist/vicmapSuburbDiffersWithOSM.geojson: dist/vicmap-osm-with-suburb.geojson data/victoria-admin-level10.osm.geojson ./bin/compareSuburb.js $^ $@ dist/suburbsWithPostcodeCounts.geojson + wc -l $@ printDifferentSuburbs: dist/vicmapSuburbDiffersWithOSM.geojson - ogr2ogr -f CSV -select '_osmSuburb,addr:suburb' /vsistdout/ $< | sort | uniq + echo "OSM Suburb,Vicmap Suburb" + ogr2ogr -f CSV -select '_osmSuburb,addr:suburb' /vsistdout/ $< | tail -n+1 | sort | uniq dist/candidates: data/victoria-admin-level10.osm.geojson dist/conflate mkdir -p $@ -- cgit v1.2.3