diff options
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | README.md | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a761c1..d868db7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,7 +104,8 @@ build osm: script: - yarn install - mkdir -p dist data - - make dist/addressesPerBlock.fgb + - make dist/blocksByOSMAddr.fgb + - make summariseBlocksByOSMAddr when: manual artifacts: name: "build osm" @@ -118,8 +118,8 @@ data/blocks.fgb: data/victoria-roads.fgb qgis_process run native:polygonize -- INPUT=$< KEEP_FIELDS=FALSE OUTPUT=$@ # count OSM addresses by block, those with no OSM addresses we can import all the candidate addresses without conflation issues -dist/addressesPerBlock.fgb: data/victoria-addr.osm.centroids.fgb data/blocks.fgb +dist/blocksByOSMAddr.fgb: data/victoria-addr.osm.centroids.fgb data/blocks.fgb qgis_process run native:countpointsinpolygon -- POINTS=$< POLYGONS='data/blocks.fgb|layername=blocks' FIELD=NUMPOINTS OUTPUT=$@ -summariseAddressesPerBlock: - ogrinfo -dialect sqlite -sql 'select count(*), NUMPOINTS = 0 from addressesPerBlock group by (NUMPOINTS = 0)' data/addressesPerBlock.fgb +summariseBlocksByOSMAddr: + ogrinfo -dialect sqlite -sql 'select count(*), NUMPOINTS = 0 from blocksByOSMAddr group by (NUMPOINTS = 0)' data/blocksByOSMAddr.fgb @@ -152,4 +152,4 @@ Generate city blocks: Sort blocks into containing some OSM addresses or containing no OSM addresses: - make data/addressPerBlock.fgb + make data/blocksByOSMAddr.fgb |