From 636f1bf7cb96e67c8533225e7a928a0e1bf34346 Mon Sep 17 00:00:00 2001 From: Andrew Harvey Date: Sat, 21 May 2022 17:03:47 +1000 Subject: update ci --- .gitlab-ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e6eed1..4795b75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,11 +129,12 @@ build vicmap: - touch data/VICMAP_ADDRESS.zip - touch data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria/VICMAP_ADDRESS.gdb - touch --no-create data/vicmap.geojson - - time make dist/vicmap-osm.geojson + - time make dist/vicmap-osm-with-suburb.geojson - time make dist/vicmap-osm-uniq.geojson - time make dist/vicmap-osm-uniq-flats.geojson - time make dist/vicmap-osm-uniq-flats-withinrange.geojson - time make dist/vicmap-osm-overlapping.geojson + - time make convertGeoJSONResultsToFGB - wc -l dist/*.geojson when: manual after_script: @@ -158,7 +159,9 @@ build osm: - cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js - mkdir -p dist data - make data/victoria-named-features.osm.geojson - - make dist/blocksByOSMAddr.fgb + - make data/victoria-addr.osm.fgb + - make data/victoria-addr.osm.centroids.fgb + - make data/blocks.fgb - make dist/blocksByOSMAddr.geojson - make data/victoria-admin-level9.osm.geojson - make summariseBlocksByOSMAddr @@ -183,6 +186,7 @@ conflate: - make dist/conflate - make dist/vicmap-complex-conflation - make dist/vicmap-building-conflation + - make convertConflationResultsToFGB - wc -l dist/conflate/*.geojson - wc -l dist/vicmap-*-conflation/*.geojson when: manual @@ -203,8 +207,8 @@ candidate: script: - yarn install - cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js - - make dist/candidate - make dist/unitFromNumber.osc + - make dist/candidates when: manual after_script: - b2 sync --allowEmptySource --noProgress dist b2://vicmap2osm/dist -- cgit v1.2.3