blob: 0a11a57e54e72756f74a0b478c8bfa6f66d4d8e8 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
|
image: "debian:buster-slim"
cache: &global_cache
key: global
paths:
- .yarn
- node_modules
stages:
- docker
- prepare
- build osm
- build vicmap
- conflate
- candidate
- upload
- pages
docker prepare:
image: docker:latest
services:
- docker:dind
stage: docker
before_script:
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE":prepare -f "docker/prepare.Dockerfile" .
- docker push "$CI_REGISTRY_IMAGE":prepare
after_script:
- docker logout $CI_REGISTRY
when: manual
cache: {}
docker build-vicmap:
image: docker:latest
services:
- docker:dind
stage: docker
before_script:
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE":build-vicmap -f "docker/build-vicmap.Dockerfile" .
- docker push "$CI_REGISTRY_IMAGE":build-vicmap
after_script:
- docker logout $CI_REGISTRY
when: manual
cache: {}
docker build-osm:
image: docker:latest
services:
- docker:dind
stage: docker
before_script:
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE":build-osm -f "docker/build-osm.Dockerfile" .
- docker push "$CI_REGISTRY_IMAGE":build-osm
after_script:
- docker logout $CI_REGISTRY
when: manual
cache: {}
docker conflate:
image: docker:latest
services:
- docker:dind
stage: docker
before_script:
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE":conflate -f "docker/conflate.Dockerfile" .
- docker push "$CI_REGISTRY_IMAGE":conflate
after_script:
- docker logout $CI_REGISTRY
when: manual
cache: {}
docker candidate:
image: docker:latest
services:
- docker:dind
stage: docker
before_script:
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE":candidate -f "docker/candidate.Dockerfile" .
- docker push "$CI_REGISTRY_IMAGE":candidate
after_script:
- docker logout $CI_REGISTRY
when: manual
cache: {}
prepare:
stage: prepare
image: "registry.gitlab.com/alantgeo/vicmap2osm:prepare"
before_script:
- b2 authorize-account $B2_KEYID $B2_APPKEY
- mkdir -p dist data
- b2 sync --allowEmptySource --noProgress --delete dist b2://vicmap2osm/dist
- b2 sync --allowEmptySource --noProgress --delete data b2://vicmap2osm/data
cache:
<<: *global_cache
policy: push
script:
- yarn install
- cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js
- mkdir -p dist
- make data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria/VICMAP_ADDRESS.gdb
- rm -rf data/vicmap.geojson data/VICMAP_ADDRESS.zip
- make data/vicmap.geojson
after_script:
- b2 upload-file --noProgress vicmap2osm data/vicmap.geojson data/vicmap.geojson
when: manual
build osm:
stage: build osm
image: "registry.gitlab.com/alantgeo/vicmap2osm:build-osm"
before_script:
- mkdir -p data dist
- ls data dist
- b2 authorize-account $B2_KEYID $B2_APPKEY
- b2 sync --allowEmptySource --noProgress b2://vicmap2osm/ .
cache:
<<: *global_cache
policy: pull-push
variables:
QT_QPA_PLATFORM: "offscreen"
script:
- yarn install
- cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js
- mkdir -p dist data
- make data/victoria-named-features.osm.geojson
- 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
needs: ['prepare']
dependencies:
- prepare
after_script:
- b2 sync --allowEmptySource --noProgress data b2://vicmap2osm/data
- b2 sync --allowEmptySource --noProgress dist b2://vicmap2osm/dist
build vicmap:
stage: build vicmap
image: "registry.gitlab.com/alantgeo/vicmap2osm:build-vicmap"
before_script:
- mkdir -p data dist
- ls data dist
- b2 authorize-account $B2_KEYID $B2_APPKEY
- b2 sync --allowEmptySource --noProgress b2://vicmap2osm/ .
cache:
<<: *global_cache
policy: pull-push
script:
- yarn install
- cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js
- yarn run test
- mkdir -p dist data
- mkdir -p data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria
- 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-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
needs: ['build osm']
dependencies:
- build osm
after_script:
- b2 sync --allowEmptySource --noProgress dist b2://vicmap2osm/dist
- b2 sync --allowEmptySource --noProgress debug b2://vicmap2osm/debug
conflate:
stage: conflate
image: "registry.gitlab.com/alantgeo/vicmap2osm:conflate"
before_script:
- mkdir -p data dist
- ls data dist
- b2 authorize-account $B2_KEYID $B2_APPKEY
- b2 sync --allowEmptySource --noProgress b2://vicmap2osm/ .
cache:
<<: *global_cache
policy: pull
script:
- yarn install
- cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js
- 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
needs: ['build vicmap', 'build osm']
dependencies:
- build vicmap
- build osm
after_script:
- b2 sync --allowEmptySource --noProgress data b2://vicmap2osm/data
- b2 sync --allowEmptySource --noProgress dist b2://vicmap2osm/dist
candidate:
stage: candidate
image: "registry.gitlab.com/alantgeo/vicmap2osm:candidate"
before_script:
- mkdir -p data dist
- ls data dist
- b2 authorize-account $B2_KEYID $B2_APPKEY
- b2 sync --allowEmptySource --noProgress b2://vicmap2osm/ .
cache:
<<: *global_cache
policy: pull
script:
- yarn install
- cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js
- make dist/unitFromNumber.osc
- make dist/candidates
needs: ['conflate']
dependencies:
- conflate
after_script:
- b2 sync --allowEmptySource --noProgress dist b2://vicmap2osm/dist
upload dev:
stage: upload
image: "registry.gitlab.com/alantgeo/vicmap2osm:candidate"
before_script:
- mkdir -p data dist
- ls data dist
cache:
<<: *global_cache
policy: pull
script:
- yarn install
- cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js
- ./bin/upload.sh
when: manual
needs: ['candidate']
dependencies:
- candidate
artifacts:
name: "upload"
paths:
- uploadLog
build compareSuburb:
stage: build vicmap
image: "registry.gitlab.com/alantgeo/vicmap2osm:build-osm"
before_script:
- mkdir -p data dist
- ls data dist
cache:
<<: *global_cache
policy: pull
script:
- yarn install
- cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js
- mkdir -p dist data
- mkdir -p data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria
- 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-with-suburb.geojson
- time make dist/vicmapSuburbDiffersWithOSM.geojson
- rm -f dist/vicmap-osm-with-suburb.geojson
- make printDifferentSuburbs
when: manual
needs: ['prepare']
dependencies:
- prepare
pages:
stage: pages
script:
- cp -r www public
- cp dist/conflate/*.changes.json public/data/
artifacts:
paths:
- public
needs: ['conflate']
dependencies:
- conflate
|
