Skip to content

Commit 1e3c2fc

Browse files
vknoppkewetzelvknoppkewetzel
committed
update order
1 parent 81465aa commit 1e3c2fc

File tree

2 files changed

+76
-78
lines changed

2 files changed

+76
-78
lines changed

‎main/main-draft.json

+25-27
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"sources": {
66
"osm": {
77
"type": "vector",
8-
"tiles": [
9-
"https://vtiles.openhistoricalmap.org/maps/osm/{z}/{x}/{y}.pbf"
10-
]
8+
"tiles": ["https://vtiles.openhistoricalmap.org/maps/osm/{z}/{x}/{y}.pbf"]
119
},
1210
"ohm_landcover_hillshade": {
1311
"type": "raster",
@@ -145,6 +143,30 @@
145143
"layout": {"visibility": "visible"},
146144
"paint": {"fill-color": "rgba(221, 221, 221, 1)"}
147145
},
146+
{
147+
"id": "landuse_areas_allz",
148+
"type": "fill",
149+
"source": "osm",
150+
"source-layer": "landuse_areas",
151+
"minzoom": 0,
152+
"maxzoom": 24,
153+
"filter": [
154+
"all",
155+
["in", "type", "forest", "wood", "nature_reserve", "park"]
156+
],
157+
"layout": {"visibility": "visible"},
158+
"paint": {
159+
"fill-color": {
160+
"stops": [
161+
[0, "rgba(192, 201, 173, 1)"],
162+
[4, "rgba(188, 193, 179, 1)"],
163+
[5, "rgba(203, 214, 183, 1)"],
164+
[7, "rgba(220, 232, 194, 1)"]
165+
]
166+
},
167+
"fill-opacity": 1
168+
}
169+
},
148170
{
149171
"id": "landuse_areas_z12_generalized_land_use",
150172
"type": "fill",
@@ -466,30 +488,6 @@
466488
]
467489
}
468490
},
469-
{
470-
"id": "landuse_areas_allz",
471-
"type": "fill",
472-
"source": "osm",
473-
"source-layer": "landuse_areas",
474-
"minzoom": 0,
475-
"maxzoom": 24,
476-
"filter": [
477-
"all",
478-
["in", "type", "forest", "wood", "nature_reserve", "park"]
479-
],
480-
"layout": {"visibility": "visible"},
481-
"paint": {
482-
"fill-color": {
483-
"stops": [
484-
[0, "rgba(192, 201, 173, 1)"],
485-
[4, "rgba(188, 193, 179, 1)"],
486-
[5, "rgba(203, 214, 183, 1)"],
487-
[7, "rgba(220, 232, 194, 1)"]
488-
]
489-
},
490-
"fill-opacity": 1
491-
}
492-
},
493491
{
494492
"id": "parking_lots",
495493
"type": "fill",

‎main/main.json

+51-51
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sources": {
66
"osm": {
77
"type": "vector",
8-
"tiles": ["https://vtiles.staging.openhistoricalmap.org/maps/osm/{z}/{x}/{y}.pbf"]
8+
"tiles": ["https://vtiles.openhistoricalmap.org/maps/osm/{z}/{x}/{y}.pbf"]
99
},
1010
"ohm_landcover_hillshade": {
1111
"type": "raster",
@@ -86,6 +86,21 @@
8686
]
8787
}
8888
},
89+
{
90+
"id": "landuse_areas_military_overlay",
91+
"type": "fill",
92+
"source": "osm",
93+
"source-layer": "landuse_areas",
94+
"minzoom": 10,
95+
"maxzoom": 24,
96+
"filter": ["all", ["==", "type", "military"]],
97+
"layout": {"visibility": "visible"},
98+
"paint": {
99+
"fill-color": "rgba(178, 194, 157, 1)",
100+
"fill-antialias": false,
101+
"fill-pattern": "military-fill"
102+
}
103+
},
89104
{
90105
"id": "military_landuselow",
91106
"type": "fill",
@@ -118,30 +133,39 @@
118133
"paint": {"fill-color": "rgba(244, 244, 235, 1)"}
119134
},
120135
{
121-
"id": "landuse_areas_military_overlay",
136+
"id": "airports",
122137
"type": "fill",
123138
"source": "osm",
124-
"source-layer": "landuse_areas",
125-
"minzoom": 10,
139+
"source-layer": "transport_areas",
140+
"minzoom": 12,
126141
"maxzoom": 24,
127-
"filter": ["all", ["==", "type", "military"]],
142+
"filter": ["all", ["==", "type", "apron"]],
128143
"layout": {"visibility": "visible"},
129-
"paint": {
130-
"fill-color": "rgba(178, 194, 157, 1)",
131-
"fill-antialias": false,
132-
"fill-pattern": "military-fill"
133-
}
144+
"paint": {"fill-color": "rgba(221, 221, 221, 1)"}
134145
},
135146
{
136-
"id": "airports",
147+
"id": "landuse_areas_allz",
137148
"type": "fill",
138149
"source": "osm",
139-
"source-layer": "transport_areas",
140-
"minzoom": 12,
150+
"source-layer": "landuse_areas",
151+
"minzoom": 0,
141152
"maxzoom": 24,
142-
"filter": ["all", ["==", "type", "apron"]],
153+
"filter": [
154+
"all",
155+
["in", "type", "forest", "wood", "nature_reserve", "park"]
156+
],
143157
"layout": {"visibility": "visible"},
144-
"paint": {"fill-color": "rgba(221, 221, 221, 1)"}
158+
"paint": {
159+
"fill-color": {
160+
"stops": [
161+
[0, "rgba(192, 201, 173, 1)"],
162+
[4, "rgba(188, 193, 179, 1)"],
163+
[5, "rgba(203, 214, 183, 1)"],
164+
[7, "rgba(220, 232, 194, 1)"]
165+
]
166+
},
167+
"fill-opacity": 1
168+
}
145169
},
146170
{
147171
"id": "landuse_areas_z12_generalized_land_use",
@@ -464,30 +488,6 @@
464488
]
465489
}
466490
},
467-
{
468-
"id": "landuse_areas_allz",
469-
"type": "fill",
470-
"source": "osm",
471-
"source-layer": "landuse_areas",
472-
"minzoom": 0,
473-
"maxzoom": 24,
474-
"filter": [
475-
"all",
476-
["in", "type", "forest", "wood", "nature_reserve", "park"]
477-
],
478-
"layout": {"visibility": "visible"},
479-
"paint": {
480-
"fill-color": {
481-
"stops": [
482-
[0, "rgba(192, 201, 173, 1)"],
483-
[4, "rgba(188, 193, 179, 1)"],
484-
[5, "rgba(203, 214, 183, 1)"],
485-
[7, "rgba(220, 232, 194, 1)"]
486-
]
487-
},
488-
"fill-opacity": 1
489-
}
490-
},
491491
{
492492
"id": "parking_lots",
493493
"type": "fill",
@@ -4947,7 +4947,7 @@
49474947
"id": "water_areaslabels_z15",
49484948
"type": "symbol",
49494949
"source": "osm",
4950-
"source-layer": "water_areas",
4950+
"source-layer": "water_areas_centroids",
49514951
"minzoom": 15,
49524952
"maxzoom": 24,
49534953
"filter": ["all", [">", "area", 100000]],
@@ -4968,7 +4968,7 @@
49684968
"id": "water_areaslabels_z12",
49694969
"type": "symbol",
49704970
"source": "osm",
4971-
"source-layer": "water_areas",
4971+
"source-layer": "water_areas_centroids",
49724972
"minzoom": 12,
49734973
"maxzoom": 15,
49744974
"filter": ["all", [">", "area", 1000000]],
@@ -5022,7 +5022,7 @@
50225022
"id": "water_areaslabels_z8",
50235023
"type": "symbol",
50245024
"source": "osm",
5025-
"source-layer": "water_areas",
5025+
"source-layer": "water_areas_centroids",
50265026
"minzoom": 8,
50275027
"maxzoom": 12,
50285028
"filter": ["all", [">", "area", 10000000]],
@@ -5125,7 +5125,7 @@
51255125
"id": "landuse_areaslabels_park",
51265126
"type": "symbol",
51275127
"source": "osm",
5128-
"source-layer": "landuse_areas",
5128+
"source-layer": "landuse_areas_centroids",
51295129
"minzoom": 14,
51305130
"maxzoom": 24,
51315131
"filter": [
@@ -5167,7 +5167,7 @@
51675167
"id": "landuse_areaslabels_farming",
51685168
"type": "symbol",
51695169
"source": "osm",
5170-
"source-layer": "landuse_areas",
5170+
"source-layer": "landuse_areas_centroids",
51715171
"minzoom": 14,
51725172
"maxzoom": 24,
51735173
"filter": [
@@ -5199,7 +5199,7 @@
51995199
"id": "landuse_areaslabels_forest",
52005200
"type": "symbol",
52015201
"source": "osm",
5202-
"source-layer": "landuse_areas",
5202+
"source-layer": "landuse_areas_centroids",
52035203
"minzoom": 14,
52045204
"maxzoom": 24,
52055205
"filter": ["all", ["in", "type", "forest", "wood", "nature_reserve"]],
@@ -5218,7 +5218,7 @@
52185218
"id": "landuse_areaslabels_school",
52195219
"type": "symbol",
52205220
"source": "osm",
5221-
"source-layer": "landuse_areas",
5221+
"source-layer": "landuse_areas_centroids",
52225222
"minzoom": 14,
52235223
"maxzoom": 24,
52245224
"filter": [
@@ -5240,7 +5240,7 @@
52405240
"id": "points_of_interest_frombuildings",
52415241
"type": "symbol",
52425242
"source": "osm",
5243-
"source-layer": "buildings",
5243+
"source-layer": "buildings_centroids",
52445244
"minzoom": 16,
52455245
"filter": ["all"],
52465246
"layout": {
@@ -5265,7 +5265,7 @@
52655265
"id": "points_of_interest_fromareasz14",
52665266
"type": "symbol",
52675267
"source": "osm",
5268-
"source-layer": "amenity_areas",
5268+
"source-layer": "amenity_areas_centroids",
52695269
"minzoom": 14,
52705270
"maxzoom": 16,
52715271
"filter": [
@@ -5307,7 +5307,7 @@
53075307
"id": "points_of_interest_fromareas",
53085308
"type": "symbol",
53095309
"source": "osm",
5310-
"source-layer": "amenity_areas",
5310+
"source-layer": "amenity_areas_centroids",
53115311
"minzoom": 16,
53125312
"maxzoom": 24,
53135313
"filter": ["all"],
@@ -5343,7 +5343,7 @@
53435343
"id": "points_of_interest_amenity_14",
53445344
"type": "symbol",
53455345
"source": "osm",
5346-
"source-layer": "amenity_points",
5346+
"source-layer": "amenity_points_centroids",
53475347
"minzoom": 14,
53485348
"maxzoom": 16,
53495349
"filter": ["all"],
@@ -5367,7 +5367,7 @@
53675367
"id": "points_of_interest_amenity",
53685368
"type": "symbol",
53695369
"source": "osm",
5370-
"source-layer": "amenity_points",
5370+
"source-layer": "amenity_points_centroids",
53715371
"minzoom": 15,
53725372
"maxzoom": 24,
53735373
"filter": ["all"],

0 commit comments

Comments
 (0)