Skip to content

Commit 629391c

Browse files
henrythaslerhenrythasler
committed
remove IDs; trim geometries in manual queries
1 parent 8538627 commit 629391c

File tree

2 files changed

+21
-53
lines changed

2 files changed

+21
-53
lines changed

‎src/sources.json

+3-28
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
"minzoom": 10,
9494
"table": "import.landuse_gen10",
9595
"keys": [
96-
"osm_id as id",
9796
"subclass",
9897
"area",
9998
"name"
@@ -126,7 +125,6 @@
126125
"minzoom": 8,
127126
"table": "import.landcover_gen8",
128127
"keys": [
129-
"osm_id as id",
130128
"class",
131129
"subclass",
132130
"area",
@@ -169,7 +167,6 @@
169167
"minzoom": 8,
170168
"table": "import.waterway_gen8",
171169
"keys": [
172-
"osm_id as id",
173170
"subclass",
174171
"tunnel",
175172
"layer",
@@ -194,7 +191,6 @@
194191
"minzoom": 14,
195192
"table": "import.waterway",
196193
"keys": [
197-
"osm_id as id",
198194
"subclass",
199195
"tunnel",
200196
"layer",
@@ -208,9 +204,6 @@
208204
"name": "waterarea",
209205
"minzoom": 8,
210206
"table": "import.waterarea_gen8",
211-
"keys": [
212-
"osm_id as id"
213-
],
214207
"variants": [
215208
{
216209
"minzoom": 9,
@@ -247,7 +240,6 @@
247240
"minzoom": 8,
248241
"table": "import.roads_gen8",
249242
"keys": [
250-
"osm_id as id",
251243
"class",
252244
"subclass",
253245
"oneway",
@@ -293,7 +285,6 @@
293285
"buffer": 256,
294286
"table": "import.roads",
295287
"keys": [
296-
"osm_id as id",
297288
"class",
298289
"subclass",
299290
"oneway",
@@ -316,14 +307,13 @@
316307
{
317308
"minzoom": 11,
318309
"name": "cycleroute",
319-
"sql": "SELECT row_number() over () as gid, ref, name, ST_AsMvtGeom(ST_LineMerge(ST_Collect(geometry)), !BBOX!) AS geom from import.cycleroute where (geometry && !BBOX!) AND ST_GeometryType(geometry)='ST_LineString' group by ref, name order by ref desc NULLS last, name desc NULLS last"
310+
"sql": "SELECT ref, name, ST_AsMvtGeom(ST_LineMerge(ST_Collect(geometry)), !BBOX!, 4096, 64) AS geom from import.cycleroute where (geometry && !BBOX!) AND ST_GeometryType(geometry)='ST_LineString' group by ref, name order by ref desc NULLS last, name desc NULLS last"
320311
},
321312
{
322313
"minzoom": 9,
323314
"name": "railway",
324315
"table": "import.railway",
325316
"keys": [
326-
"id",
327317
"class",
328318
"subclass",
329319
"zorder",
@@ -350,7 +340,6 @@
350340
"name": "transportation",
351341
"table": "import.transportation",
352342
"keys": [
353-
"id",
354343
"class",
355344
"subclass",
356345
"CASE WHEN (name_de <> '') IS NOT FALSE THEN name_de WHEN (name_en <> '') IS NOT FALSE THEN name_en ELSE name END as name"
@@ -362,12 +351,11 @@
362351
{
363352
"minzoom": 10,
364353
"name": "manmade",
365-
"sql": "select osm_id as id, ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, ST_Length(geometry)::integer as length, ST_IsClosed(geometry) as polygon from import.manmade_lines_gen13 WHERE (geometry && !BBOX!)",
354+
"sql": "select ST_AsMvtGeom(geometry, !BBOX!, 4096, 64) as geom, class, subclass, ST_Length(geometry)::integer as length, ST_IsClosed(geometry) as polygon from import.manmade_lines_gen13 WHERE (geometry && !BBOX!)",
366355
"variants": [
367356
{
368357
"minzoom": 14,
369-
"buffer": 256,
370-
"sql": "select osm_id as id, ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, ST_Length(geometry)::integer as length, ST_IsClosed(geometry) as polygon from import.manmade_lines WHERE (geometry && !BBOX!) \n UNION ALL\n select osm_id as id, ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, ST_Perimeter(geometry)::integer as length, TRUE as polygon from import.manmade_polygons WHERE (geometry && !BBOX!) \n UNION ALL\n select osm_id as id, ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, 0 as length, FALSE as polygon from import.manmade_points WHERE (geometry && !BBOX!)\n "
358+
"sql": "select ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, ST_Length(geometry)::integer as length, ST_IsClosed(geometry) as polygon from import.manmade_lines WHERE (geometry && !BBOX!) \n UNION ALL\n select ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, ST_Perimeter(geometry)::integer as length, TRUE as polygon from import.manmade_polygons WHERE (geometry && !BBOX!) \n UNION ALL\n select ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, 0 as length, FALSE as polygon from import.manmade_points WHERE (geometry && !BBOX!)\n "
371359
}
372360
]
373361
},
@@ -376,7 +364,6 @@
376364
"name": "piste",
377365
"table": "import.piste",
378366
"keys": [
379-
"id",
380367
"difficulty"
381368
],
382369
"where": [
@@ -388,7 +375,6 @@
388375
"name": "admin",
389376
"table": "import.admin",
390377
"keys": [
391-
"id",
392378
"ref",
393379
"level"
394380
]
@@ -398,9 +384,6 @@
398384
"maxzoom": 15,
399385
"name": "buildings-large",
400386
"table": "import.buildings_gen14",
401-
"keys": [
402-
"osm_id as id"
403-
],
404387
"where": [
405388
"ST_Area(geometry)>10000"
406389
]
@@ -409,9 +392,6 @@
409392
"minzoom": 14,
410393
"name": "buildings",
411394
"table": "import.buildings_gen14",
412-
"keys": [
413-
"osm_id as id"
414-
],
415395
"variants": [
416396
{
417397
"minzoom": 15,
@@ -424,7 +404,6 @@
424404
"name": "housenumbers",
425405
"table": "import.housenumbers",
426406
"keys": [
427-
"osm_id as id",
428407
"number",
429408
"name"
430409
]
@@ -434,7 +413,6 @@
434413
"minzoom": 8,
435414
"table": "import.label_waterarea_gen8",
436415
"keys": [
437-
"osm_id as id",
438416
"subclass",
439417
"area",
440418
"ele",
@@ -465,7 +443,6 @@
465443
"table": "import.label",
466444
"prefix": "DISTINCT ON(pop, name)",
467445
"keys": [
468-
"row_number() over (ORDER by pop desc NULLS LAST) as id",
469446
"class",
470447
"subclass",
471448
"name",
@@ -479,7 +456,6 @@
479456
"name": "poi",
480457
"table": "import.poi_cluster_gen11",
481458
"keys": [
482-
"id",
483459
"count",
484460
"class",
485461
"subclass",
@@ -519,7 +495,6 @@
519495
"minzoom": 18,
520496
"table": "import.poi",
521497
"keys": [
522-
"osm_id as id",
523498
"1 as count",
524499
"class",
525500
"subclass",

‎src/sources.toml

+18-25
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
name = "landuse"
6565
minzoom = 10
6666
table = "import.landuse_gen10"
67-
keys = ["osm_id as id", "subclass", "area", "name"]
67+
keys = ["subclass", "area", "name"]
6868
[[sources.layers.variants]]
6969
minzoom = 11
7070
table = "import.landuse_gen11"
@@ -85,7 +85,7 @@
8585
name = "landcover"
8686
minzoom = 8
8787
table = "import.landcover_gen8"
88-
keys = ["osm_id as id", "class", "subclass", "area", "surface", "name"]
88+
keys = ["class", "subclass", "area", "surface", "name"]
8989
[[sources.layers.variants]]
9090
minzoom = 9
9191
table = "import.landcover_gen9"
@@ -112,7 +112,7 @@
112112
name = "waterway"
113113
minzoom = 8
114114
table = "import.waterway_gen8"
115-
keys = ["osm_id as id", "subclass", "tunnel", "layer", "name"]
115+
keys = ["subclass", "tunnel", "layer", "name"]
116116
where = ["subclass IN('river', 'canal')"]
117117
[[sources.layers.variants]]
118118
minzoom = 10
@@ -124,14 +124,13 @@
124124
[[sources.layers.variants]]
125125
minzoom = 14
126126
table = "import.waterway"
127-
keys = ["osm_id as id", "subclass", "tunnel", "layer", "CASE WHEN (name_de <> '') IS NOT FALSE THEN name_de WHEN (name_en <> '') IS NOT FALSE THEN name_en ELSE name END as name"]
127+
keys = ["subclass", "tunnel", "layer", "CASE WHEN (name_de <> '') IS NOT FALSE THEN name_de WHEN (name_en <> '') IS NOT FALSE THEN name_en ELSE name END as name"]
128128
where = []
129129

130130
[[sources.layers]]
131131
name = "waterarea"
132132
minzoom = 8
133133
table = "import.waterarea_gen8"
134-
keys = ["osm_id as id"]
135134
[[sources.layers.variants]]
136135
minzoom = 9
137136
table = "import.waterarea_gen9"
@@ -159,7 +158,6 @@
159158
minzoom = 8
160159
table = "import.roads_gen8"
161160
keys = [
162-
"osm_id as id",
163161
"class",
164162
"subclass",
165163
"oneway",
@@ -200,7 +198,6 @@
200198
buffer = 256
201199
table = "import.roads"
202200
keys = [
203-
"osm_id as id",
204201
"class",
205202
"subclass",
206203
"oneway",
@@ -221,13 +218,13 @@
221218
[[sources.layers]]
222219
minzoom = 11
223220
name = "cycleroute"
224-
sql = "SELECT row_number() over () as gid, ref, name, ST_AsMvtGeom(ST_LineMerge(ST_Collect(geometry)), !BBOX!) AS geom from import.cycleroute where (geometry && !BBOX!) AND ST_GeometryType(geometry)='ST_LineString' group by ref, name order by ref desc NULLS last, name desc NULLS last"
221+
sql = "SELECT ref, name, ST_AsMvtGeom(ST_LineMerge(ST_Collect(geometry)), !BBOX!, 4096, 64) AS geom from import.cycleroute where (geometry && !BBOX!) AND ST_GeometryType(geometry)='ST_LineString' group by ref, name order by ref desc NULLS last, name desc NULLS last"
225222

226223
[[sources.layers]]
227224
minzoom = 9
228225
name = "railway"
229226
table = "import.railway"
230-
keys = ["id", "class", "subclass", "zorder", "bridge", "tunnel", "service"]
227+
keys = ["class", "subclass", "zorder", "bridge", "tunnel", "service"]
231228
where = ["subclass NOT IN('subway', 'tram')", "(attraction <> '') IS NOT TRUE", "(service <> '') IS NOT TRUE"]
232229
[[sources.layers.variants]]
233230
minzoom = 15
@@ -237,50 +234,46 @@
237234
minzoom = 10
238235
name = "transportation"
239236
table = "import.transportation"
240-
keys = ["id", "class", "subclass", "CASE WHEN (name_de <> '') IS NOT FALSE THEN name_de WHEN (name_en <> '') IS NOT FALSE THEN name_en ELSE name END as name"]
237+
keys = ["class", "subclass", "CASE WHEN (name_de <> '') IS NOT FALSE THEN name_de WHEN (name_en <> '') IS NOT FALSE THEN name_en ELSE name END as name"]
241238
where = ["NOT ST_IsClosed(geometry)"]
242239

243-
244240
[[sources.layers]]
245241
minzoom = 10
246242
name = "manmade"
247-
sql = "select osm_id as id, ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, ST_Length(geometry)::integer as length, ST_IsClosed(geometry) as polygon from import.manmade_lines_gen13 WHERE (geometry && !BBOX!)"
243+
sql = "select ST_AsMvtGeom(geometry, !BBOX!, 4096, 64) as geom, class, subclass, ST_Length(geometry)::integer as length, ST_IsClosed(geometry) as polygon from import.manmade_lines_gen13 WHERE (geometry && !BBOX!)"
248244
[[sources.layers.variants]]
249245
minzoom = 14
250-
buffer = 256
251-
sql = """select osm_id as id, ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, ST_Length(geometry)::integer as length, ST_IsClosed(geometry) as polygon from import.manmade_lines WHERE (geometry && !BBOX!)
246+
sql = """select ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, ST_Length(geometry)::integer as length, ST_IsClosed(geometry) as polygon from import.manmade_lines WHERE (geometry && !BBOX!)
252247
UNION ALL
253-
select osm_id as id, ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, ST_Perimeter(geometry)::integer as length, TRUE as polygon from import.manmade_polygons WHERE (geometry && !BBOX!)
248+
select ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, ST_Perimeter(geometry)::integer as length, TRUE as polygon from import.manmade_polygons WHERE (geometry && !BBOX!)
254249
UNION ALL
255-
select osm_id as id, ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, 0 as length, FALSE as polygon from import.manmade_points WHERE (geometry && !BBOX!)
250+
select ST_AsMvtGeom(geometry, !BBOX!) as geom, class, subclass, 0 as length, FALSE as polygon from import.manmade_points WHERE (geometry && !BBOX!)
256251
"""
257252

258253
[[sources.layers]]
259254
minzoom = 14
260255
name = "piste"
261256
table = "import.piste"
262-
keys = ["id", "difficulty"]
257+
keys = ["difficulty"]
263258
where = ["NOT ST_IsClosed(geometry)"]
264259

265260
[[sources.layers]]
266261
minzoom = 14
267262
name = "admin"
268263
table = "import.admin"
269-
keys = ["id", "ref", "level"]
264+
keys = ["ref", "level"]
270265

271266
[[sources.layers]]
272267
minzoom = 13
273268
maxzoom = 15
274269
name = "buildings-large"
275270
table = "import.buildings_gen14"
276-
keys = ["osm_id as id"]
277271
where = ["ST_Area(geometry)>10000"]
278272

279273
[[sources.layers]]
280274
minzoom = 14
281275
name = "buildings"
282276
table = "import.buildings_gen14"
283-
keys = ["osm_id as id"]
284277
[[sources.layers.variants]]
285278
minzoom = 15
286279
table = "import.buildings"
@@ -289,13 +282,13 @@
289282
minzoom = 18
290283
name = "housenumbers"
291284
table = "import.housenumbers"
292-
keys = ["osm_id as id", "number", "name"]
285+
keys = ["number", "name"]
293286

294287
[[sources.layers]]
295288
name = "waterlabels"
296289
minzoom = 8
297290
table = "import.label_waterarea_gen8"
298-
keys = ["osm_id as id", "subclass", "area", "ele", "name"]
291+
keys = ["subclass", "area", "ele", "name"]
299292
[[sources.layers.variants]]
300293
minzoom = 10
301294
table = "import.label_waterarea_gen10"
@@ -314,14 +307,14 @@
314307
name = "label"
315308
table = "import.label"
316309
prefix = "DISTINCT ON(pop, name)"
317-
keys = ["row_number() over (ORDER by pop desc NULLS LAST) as id", "class", "subclass", "name", "ele", "pop"]
310+
keys = ["class", "subclass", "name", "ele", "pop"]
318311
postfix = "ORDER BY pop DESC NULLS LAST, name"
319312

320313
[[sources.layers]]
321314
minzoom = 11
322315
name = "poi"
323316
table = "import.poi_cluster_gen11"
324-
keys = ["id", "count", "class", "subclass", "name", "ele", "access", "subway", "religion", "parking"]
317+
keys = ["count", "class", "subclass", "name", "ele", "access", "subway", "religion", "parking"]
325318
[[sources.layers.variants]]
326319
minzoom = 12
327320
table = "import.poi_cluster_gen12"
@@ -343,5 +336,5 @@
343336
[[sources.layers.variants]]
344337
minzoom = 18
345338
table = "import.poi"
346-
keys = ["osm_id as id", "1 as count", "class", "subclass", "name", "ele", "access", "subway", "religion", "parking"]
339+
keys = ["1 as count", "class", "subclass", "name", "ele", "access", "subway", "religion", "parking"]
347340

0 commit comments

Comments
 (0)