Skip to content

Commit fd1b864

Browse files
Rub21Rub21
committed
Fix discrepancies mviews adn tegola config
1 parent 39ccc1b commit fd1b864

File tree

7 files changed

+55
-230
lines changed

7 files changed

+55
-230
lines changed

‎images/tiler-server/config/providers/landuse_areas.toml‎

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ WHERE
4949
"""
5050

5151
[[providers.layers]]
52-
name = "landuse_areas_z10_11"
52+
name = "landuse_areas_z10_12"
5353
geometry_fieldname = "geometry"
5454
geometry_type = "multipolygon"
5555
id_fieldname = "osm_id"
@@ -68,13 +68,13 @@ SELECT
6868
end_decdate,
6969
{{LENGUAGES}}
7070
FROM
71-
mv_landuse_areas_z10_11
71+
mv_landuse_areas_z10_12
7272
WHERE
7373
geometry && !BBOX!
7474
"""
7575

7676
[[providers.layers]]
77-
name = "landuse_areas_z12_13"
77+
name = "landuse_areas_z13_15"
7878
geometry_fieldname = "geometry"
7979
geometry_type = "multipolygon"
8080
id_fieldname = "osm_id"
@@ -93,32 +93,7 @@ SELECT
9393
end_decdate,
9494
{{LENGUAGES}}
9595
FROM
96-
mv_landuse_areas_z12_13
97-
WHERE
98-
geometry && !BBOX!
99-
"""
100-
101-
[[providers.layers]]
102-
name = "landuse_areas_z14_15"
103-
geometry_fieldname = "geometry"
104-
geometry_type = "multipolygon"
105-
id_fieldname = "osm_id"
106-
sql = """
107-
SELECT
108-
ST_AsMVTGeom(geometry, !BBOX!) AS geometry,
109-
osm_id,
110-
name,
111-
class,
112-
type,
113-
area_m2,
114-
area,
115-
start_date,
116-
end_date,
117-
start_decdate,
118-
end_decdate,
119-
{{LENGUAGES}}
120-
FROM
121-
mv_landuse_areas_z14_15
96+
mv_landuse_areas_z13_15
12297
WHERE
12398
geometry && !BBOX!
12499
"""
@@ -165,20 +140,14 @@ max_zoom = 9
165140

166141
[[maps.layers]]
167142
name = "landuse_areas"
168-
provider_layer = "osm.landuse_areas_z10_11"
143+
provider_layer = "osm.landuse_areas_z10_12"
169144
min_zoom = 10
170-
max_zoom = 11
171-
172-
[[maps.layers]]
173-
name = "landuse_areas"
174-
provider_layer = "osm.landuse_areas_z12_13"
175-
min_zoom = 12
176-
max_zoom = 13
145+
max_zoom = 12
177146

178147
[[maps.layers]]
179148
name = "landuse_areas"
180-
provider_layer = "osm.landuse_areas_z14_15"
181-
min_zoom = 14
149+
provider_layer = "osm.landuse_areas_z13_15"
150+
min_zoom = 13
182151
max_zoom = 15
183152

184153
[[maps.layers]]

‎images/tiler-server/config/providers/landuse_points_centroids.toml‎

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ WHERE
4949

5050

5151
[[providers.layers]]
52-
name = "landuse_points_centroids_z10_11"
52+
name = "landuse_points_centroids_z10_12"
5353
geometry_fieldname = "geometry"
5454
geometry_type = "point"
5555
id_fieldname = "osm_id"
@@ -67,13 +67,13 @@ SELECT
6767
end_decdate,
6868
{{LENGUAGES}}
6969
FROM
70-
mv_landuse_points_centroids_z10_11
70+
mv_landuse_points_centroids_z10_12
7171
WHERE
7272
geometry && !BBOX!
7373
"""
7474

7575
[[providers.layers]]
76-
name = "landuse_points_centroids_z12_13"
76+
name = "landuse_points_centroids_z13_15"
7777
geometry_fieldname = "geometry"
7878
geometry_type = "point"
7979
id_fieldname = "osm_id"
@@ -91,31 +91,7 @@ SELECT
9191
end_decdate,
9292
{{LENGUAGES}}
9393
FROM
94-
mv_landuse_points_centroids_z12_13
95-
WHERE
96-
geometry && !BBOX!
97-
"""
98-
99-
[[providers.layers]]
100-
name = "landuse_points_centroids_z14_15"
101-
geometry_fieldname = "geometry"
102-
geometry_type = "point"
103-
id_fieldname = "osm_id"
104-
sql = """
105-
SELECT
106-
ST_AsMVTGeom(geometry, !BBOX!) AS geometry,
107-
osm_id,
108-
name,
109-
class,
110-
type,
111-
area_m2,
112-
start_date,
113-
end_date,
114-
start_decdate,
115-
end_decdate,
116-
{{LENGUAGES}}
117-
FROM
118-
mv_landuse_points_centroids_z14_15
94+
mv_landuse_points_centroids_z13_15
11995
WHERE
12096
geometry && !BBOX!
12197
"""
@@ -160,20 +136,14 @@ max_zoom = 9
160136

161137
[[maps.layers]]
162138
name = "landuse_points_centroids"
163-
provider_layer = "osm.landuse_points_centroids_z10_11"
139+
provider_layer = "osm.landuse_points_centroids_z10_12"
164140
min_zoom = 10
165-
max_zoom = 11
166-
167-
[[maps.layers]]
168-
name = "landuse_points_centroids"
169-
provider_layer = "osm.landuse_points_centroids_z12_13"
170-
min_zoom = 12
171-
max_zoom = 13
141+
max_zoom = 12
172142

173143
[[maps.layers]]
174144
name = "landuse_points_centroids"
175-
provider_layer = "osm.landuse_points_centroids_z14_15"
176-
min_zoom = 14
145+
provider_layer = "osm.landuse_points_centroids_z13_15"
146+
min_zoom = 13
177147
max_zoom = 15
178148

179149
[[maps.layers]]

‎images/tiler-server/config/providers/other_areas.toml‎

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ WHERE
2626
geometry_fieldname = "geometry"
2727
geometry_type = "multipolygon"
2828
id_fieldname = "osm_id"
29-
name = "other_areas_z10_11"
29+
name = "other_areas_z10_12"
3030
sql = """
3131
SELECT
3232
ST_AsMVTGeom(geometry, !BBOX!) AS geometry,
@@ -41,7 +41,7 @@ SELECT
4141
end_decdate,
4242
{{LENGUAGES}}
4343
FROM
44-
mv_other_areas_z10_11
44+
mv_other_areas_z10_12
4545
WHERE
4646
geometry && !BBOX!
4747
"""
@@ -50,7 +50,7 @@ WHERE
5050
geometry_fieldname = "geometry"
5151
geometry_type = "multipolygon"
5252
id_fieldname = "osm_id"
53-
name = "other_areas_z12_13"
53+
name = "other_areas_z13_15"
5454
sql = """
5555
SELECT
5656
ST_AsMVTGeom(geometry, !BBOX!) AS geometry,
@@ -65,31 +65,7 @@ SELECT
6565
end_decdate,
6666
{{LENGUAGES}}
6767
FROM
68-
mv_other_areas_z12_13
69-
WHERE
70-
geometry && !BBOX!
71-
"""
72-
73-
[[providers.layers]]
74-
geometry_fieldname = "geometry"
75-
geometry_type = "multipolygon"
76-
id_fieldname = "osm_id"
77-
name = "other_areas_z14_15"
78-
sql = """
79-
SELECT
80-
ST_AsMVTGeom(geometry, !BBOX!) AS geometry,
81-
osm_id,
82-
name,
83-
class,
84-
type,
85-
area_m2,
86-
start_date,
87-
end_date,
88-
start_decdate,
89-
end_decdate,
90-
{{LENGUAGES}}
91-
FROM
92-
mv_other_areas_z14_15
68+
mv_other_areas_z13_15
9369
WHERE
9470
geometry && !BBOX!
9571
"""
@@ -127,20 +103,14 @@ max_zoom = 9
127103

128104
[[maps.layers]]
129105
name = "other_areas"
130-
provider_layer = "osm.other_areas_z10_11"
106+
provider_layer = "osm.other_areas_z10_12"
131107
min_zoom = 10
132-
max_zoom = 11
133-
134-
[[maps.layers]]
135-
name = "other_areas"
136-
provider_layer = "osm.other_areas_z12_13"
137-
min_zoom = 12
138-
max_zoom = 13
108+
max_zoom = 12
139109

140110
[[maps.layers]]
141111
name = "other_areas"
142-
provider_layer = "osm.other_areas_z14_15"
143-
min_zoom = 14
112+
provider_layer = "osm.other_areas_z13_15"
113+
min_zoom = 13
144114
max_zoom = 15
145115

146116
[[maps.layers]]

‎images/tiler-server/config/providers/other_points_centroids.toml‎

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ WHERE
2626
geometry_fieldname = "geometry"
2727
geometry_type = "point"
2828
id_fieldname = "osm_id"
29-
name = "other_points_centroids_z10_11"
29+
name = "other_points_centroids_z10_12"
3030
sql = """
3131
SELECT
3232
ST_AsMVTGeom(geometry, !BBOX!) AS geometry,
@@ -41,7 +41,7 @@ SELECT
4141
end_decdate,
4242
{{LENGUAGES}}
4343
FROM
44-
mv_other_points_centroids_z10_11
44+
mv_other_points_centroids_z10_12
4545
WHERE
4646
geometry && !BBOX!
4747
"""
@@ -50,7 +50,7 @@ WHERE
5050
geometry_fieldname = "geometry"
5151
geometry_type = "point"
5252
id_fieldname = "osm_id"
53-
name = "other_points_centroids_z12_13"
53+
name = "other_points_centroids_z13_15"
5454
sql = """
5555
SELECT
5656
ST_AsMVTGeom(geometry, !BBOX!) AS geometry,
@@ -65,31 +65,7 @@ SELECT
6565
end_decdate,
6666
{{LENGUAGES}}
6767
FROM
68-
mv_other_points_centroids_z12_13
69-
WHERE
70-
geometry && !BBOX!
71-
"""
72-
73-
[[providers.layers]]
74-
geometry_fieldname = "geometry"
75-
geometry_type = "point"
76-
id_fieldname = "osm_id"
77-
name = "other_points_centroids_z14_15"
78-
sql = """
79-
SELECT
80-
ST_AsMVTGeom(geometry, !BBOX!) AS geometry,
81-
osm_id,
82-
name,
83-
class,
84-
type,
85-
area_m2,
86-
start_date,
87-
end_date,
88-
start_decdate,
89-
end_decdate,
90-
{{LENGUAGES}}
91-
FROM
92-
mv_other_points_centroids_z14_15
68+
mv_other_points_centroids_z13_15
9369
WHERE
9470
geometry && !BBOX!
9571
"""
@@ -128,20 +104,14 @@ max_zoom = 9
128104

129105
[[maps.layers]]
130106
name = "other_points_centroids"
131-
provider_layer = "osm.other_points_centroids_z10_11"
107+
provider_layer = "osm.other_points_centroids_z10_12"
132108
min_zoom = 10
133-
max_zoom = 11
134-
135-
[[maps.layers]]
136-
name = "other_points_centroids"
137-
provider_layer = "osm.other_points_centroids_z12_13"
138-
min_zoom = 12
139-
max_zoom = 13
109+
max_zoom = 12
140110

141111
[[maps.layers]]
142112
name = "other_points_centroids"
143-
provider_layer = "osm.other_points_centroids_z14_15"
144-
min_zoom = 14
113+
provider_layer = "osm.other_points_centroids_z13_15"
114+
min_zoom = 13
145115
max_zoom = 15
146116

147117
[[maps.layers]]

0 commit comments

Comments
 (0)