@openhistoricalmap/map-styles 0.9.2 → 0.9.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -23,10 +23,19 @@
23
23
  "tiles": [
24
24
  "https://vtiles.staging.openhistoricalmap.org/maps/ne/{z}/{x}/{y}.pbf"
25
25
  ]
26
+ },
27
+ "osm_land": {
28
+ "type": "vector",
29
+ "tiles": [
30
+ "https://vtiles.staging.openhistoricalmap.org/maps/osm/{z}/{x}/{y}.pbf"
31
+ ],
32
+ "minzoom": 0,
33
+ "maxzoom": 22,
34
+ "scheme": "xyz"
26
35
  }
27
36
  },
28
- "sprite": "https://www.openhistoricalmap.org/map-styles/rail/rail_spritesheet",
29
- "glyphs": "https://www.openhistoricalmap.org/map-styles/fonts/{fontstack}/{range}.pbf",
37
+ "sprite": "https://openhistoricalmap.github.io/map-styles/railway/railway_spritesheet",
38
+ "glyphs": "https://openhistoricalmap.github.io/map-styles/fonts/{fontstack}/{range}.pbf",
30
39
  "layers": [
31
40
  {
32
41
  "id": "background",
@@ -40,7 +49,7 @@
40
49
  {
41
50
  "id": "land",
42
51
  "type": "fill",
43
- "source": "osm",
52
+ "source": "osm_land",
44
53
  "source-layer": "land",
45
54
  "minzoom": 0,
46
55
  "maxzoom": 24,
@@ -627,11 +636,7 @@
627
636
  "type": "fill",
628
637
  "source": "osm",
629
638
  "source-layer": "amenity_areas",
630
- "filter": [
631
- "in",
632
- ["get", "type"],
633
- ["literal", ["school", "university"]]
634
- ],
639
+ "filter": ["in", ["get", "type"], ["literal", ["school", "university"]]],
635
640
  "layout": {"visibility": "none"},
636
641
  "paint": {"fill-color": "rgba(226, 214, 205, 1)"}
637
642
  },
@@ -2772,7 +2777,7 @@
2772
2777
  [
2773
2778
  "in",
2774
2779
  ["get", "type"],
2775
- ["literal", ["motorway", "motorway_link", "trunk", "trunk_link"]]
2780
+ ["literal", ["motorway", "motorway_link", "trunk", "trunk_link"]]
2776
2781
  ],
2777
2782
  ["==", ["get", "tunnel"], 1]
2778
2783
  ],
@@ -3478,11 +3483,7 @@
3478
3483
  "maxzoom": 20,
3479
3484
  "filter": [
3480
3485
  "all",
3481
- [
3482
- "in",
3483
- ["get", "type"],
3484
- ["literal", ["motorway_link", "trunk_link"]]
3485
- ],
3486
+ ["in", ["get", "type"], ["literal", ["motorway_link", "trunk_link"]]],
3486
3487
  ["!=", ["get", "tunnel"], 1],
3487
3488
  ["!=", ["get", "bridge"], 1]
3488
3489
  ],
@@ -3727,11 +3728,7 @@
3727
3728
  "maxzoom": 20,
3728
3729
  "filter": [
3729
3730
  "all",
3730
- [
3731
- "in",
3732
- ["get", "type"],
3733
- ["literal", ["motorway_link", "trunk_link"]]
3734
- ],
3731
+ ["in", ["get", "type"], ["literal", ["motorway_link", "trunk_link"]]],
3735
3732
  ["!=", ["get", "tunnel"], 1],
3736
3733
  ["!=", ["get", "bridge"], 1]
3737
3734
  ],
@@ -4454,7 +4451,10 @@
4454
4451
  "filter": [
4455
4452
  "all",
4456
4453
  ["in", ["get", "type"], ["literal", ["miniature", "narrow_gauge"]]],
4457
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]]
4454
+ [
4455
+ "!",
4456
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
4457
+ ]
4458
4458
  ],
4459
4459
  "layout": {"visibility": "visible"},
4460
4460
  "paint": {
@@ -4472,7 +4472,10 @@
4472
4472
  "filter": [
4473
4473
  "all",
4474
4474
  ["in", ["get", "type"], ["literal", ["miniature", "narrow_gauge"]]],
4475
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]]
4475
+ [
4476
+ "!",
4477
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
4478
+ ]
4476
4479
  ],
4477
4480
  "layout": {"visibility": "visible"},
4478
4481
  "paint": {
@@ -4548,7 +4551,10 @@
4548
4551
  "filter": [
4549
4552
  "all",
4550
4553
  ["==", ["get", "usage"], "main"],
4551
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
4554
+ [
4555
+ "!",
4556
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
4557
+ ],
4552
4558
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]]
4553
4559
  ],
4554
4560
  "layout": {
@@ -4572,7 +4578,10 @@
4572
4578
  "all",
4573
4579
  ["==", ["get", "usage"], "main"],
4574
4580
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
4575
- ["!", ["in", ["get", "service"], ["literal",["siding", "spur", "yard"]]]]
4581
+ [
4582
+ "!",
4583
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
4584
+ ]
4576
4585
  ],
4577
4586
  "layout": {
4578
4587
  "visibility": "visible",
@@ -4743,7 +4752,10 @@
4743
4752
  "filter": [
4744
4753
  "all",
4745
4754
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
4746
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
4755
+ [
4756
+ "!",
4757
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
4758
+ ],
4747
4759
  ["==", ["get", "usage"], "tourism"]
4748
4760
  ],
4749
4761
  "layout": {
@@ -4776,7 +4788,10 @@
4776
4788
  "filter": [
4777
4789
  "all",
4778
4790
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
4779
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
4791
+ [
4792
+ "!",
4793
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
4794
+ ],
4780
4795
  ["==", ["get", "usage"], "tourism"]
4781
4796
  ],
4782
4797
  "layout": {
@@ -4818,7 +4833,10 @@
4818
4833
  "filter": [
4819
4834
  "all",
4820
4835
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
4821
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
4836
+ [
4837
+ "!",
4838
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
4839
+ ],
4822
4840
  ["==", ["get", "usage"], "military"]
4823
4841
  ],
4824
4842
  "layout": {
@@ -4851,7 +4869,10 @@
4851
4869
  "filter": [
4852
4870
  "all",
4853
4871
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
4854
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
4872
+ [
4873
+ "!",
4874
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
4875
+ ],
4855
4876
  ["==", ["get", "usage"], "military"]
4856
4877
  ],
4857
4878
  "layout": {
@@ -4892,8 +4913,11 @@
4892
4913
  "maxzoom": 24,
4893
4914
  "filter": [
4894
4915
  "all",
4895
- ["in", ["get", "type"], ["literal" ,["preserved", "rail"]]],
4896
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
4916
+ ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
4917
+ [
4918
+ "!",
4919
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
4920
+ ],
4897
4921
  ["==", ["get", "usage"], "branch"]
4898
4922
  ],
4899
4923
  "layout": {
@@ -4916,7 +4940,10 @@
4916
4940
  "filter": [
4917
4941
  "all",
4918
4942
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
4919
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
4943
+ [
4944
+ "!",
4945
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
4946
+ ],
4920
4947
  ["==", ["get", "usage"], "branch"]
4921
4948
  ],
4922
4949
  "layout": {
@@ -4958,7 +4985,10 @@
4958
4985
  "filter": [
4959
4986
  "all",
4960
4987
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
4961
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
4988
+ [
4989
+ "!",
4990
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
4991
+ ],
4962
4992
  ["==", ["get", "usage"], "industrial"]
4963
4993
  ],
4964
4994
  "layout": {
@@ -4991,7 +5021,10 @@
4991
5021
  "filter": [
4992
5022
  "all",
4993
5023
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
4994
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
5024
+ [
5025
+ "!",
5026
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
5027
+ ],
4995
5028
  ["==", ["get", "usage"], "industrial"]
4996
5029
  ],
4997
5030
  "layout": {
@@ -5033,7 +5066,10 @@
5033
5066
  "filter": [
5034
5067
  "all",
5035
5068
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
5036
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
5069
+ [
5070
+ "!",
5071
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
5072
+ ],
5037
5073
  ["!=", ["get", "usage"], "main"],
5038
5074
  ["!=", ["get", "usage"], "industrial"],
5039
5075
  ["!=", ["get", "usage"], "branch"],
@@ -5064,7 +5100,10 @@
5064
5100
  "filter": [
5065
5101
  "all",
5066
5102
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
5067
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
5103
+ [
5104
+ "!",
5105
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
5106
+ ],
5068
5107
  ["!=", ["get", "usage"], "main"],
5069
5108
  ["!=", ["get", "usage"], "industrial"],
5070
5109
  ["!=", ["get", "usage"], "branch"],
@@ -5095,7 +5134,10 @@
5095
5134
  "filter": [
5096
5135
  "all",
5097
5136
  ["in", ["get", "type"], ["literal", ["preserved", "rail"]]],
5098
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]],
5137
+ [
5138
+ "!",
5139
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
5140
+ ],
5099
5141
  ["!=", ["get", "usage"], "main"],
5100
5142
  ["!=", ["get", "usage"], "ndustrial"],
5101
5143
  ["!=", ["get", "usage"], "branch"],
@@ -5180,12 +5222,11 @@
5180
5222
  "maxzoom": 24,
5181
5223
  "filter": [
5182
5224
  "all",
5225
+ ["in", ["get", "type"], ["literal", ["funicular", "monorail", "tram"]]],
5183
5226
  [
5184
- "in",
5185
- ["get", "type"],
5186
- ["literal", ["funicular", "monorail", "tram"]]
5187
- ],
5188
- ["!", ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]]
5227
+ "!",
5228
+ ["in", ["get", "service"], ["literal", ["siding", "spur", "yard"]]]
5229
+ ]
5189
5230
  ],
5190
5231
  "layout": {
5191
5232
  "visibility": "visible",
@@ -5738,19 +5779,22 @@
5738
5779
  [
5739
5780
  "in",
5740
5781
  ["get", "type"],
5741
- ["literal", [
5742
- "camp_site",
5743
- "garden",
5744
- "grass",
5745
- "grassland",
5746
- "park",
5747
- "picnic_site",
5748
- "playground",
5749
- "recreation_ground",
5750
- "sports_centre",
5751
- "stadium",
5752
- "village_green"
5753
- ]]
5782
+ [
5783
+ "literal",
5784
+ [
5785
+ "camp_site",
5786
+ "garden",
5787
+ "grass",
5788
+ "grassland",
5789
+ "park",
5790
+ "picnic_site",
5791
+ "playground",
5792
+ "recreation_ground",
5793
+ "sports_centre",
5794
+ "stadium",
5795
+ "village_green"
5796
+ ]
5797
+ ]
5754
5798
  ],
5755
5799
  [">", ["get", "area"], 12000]
5756
5800
  ],
@@ -5780,15 +5824,18 @@
5780
5824
  "filter": [
5781
5825
  "in",
5782
5826
  ["get", "type"],
5783
- ["literal", [
5784
- "allotmets",
5785
- "farm",
5786
- "farmland",
5787
- "farmyard",
5788
- "garden",
5789
- "orchard",
5790
- "vineyard"
5791
- ]]
5827
+ [
5828
+ "literal",
5829
+ [
5830
+ "allotmets",
5831
+ "farm",
5832
+ "farmland",
5833
+ "farmyard",
5834
+ "garden",
5835
+ "orchard",
5836
+ "vineyard"
5837
+ ]
5838
+ ]
5792
5839
  ],
5793
5840
  "layout": {
5794
5841
  "text-field": ["to-string", ["get", "name"]],
@@ -5856,9 +5903,8 @@
5856
5903
  "source-layer": "place_areas",
5857
5904
  "minzoom": 16,
5858
5905
  "filter": [
5859
- "!", ["in",
5860
- ["get", "type"],
5861
- ["literal", ["country", "state", "territory"]]]
5906
+ "!",
5907
+ ["in", ["get", "type"], ["literal", ["country", "state", "territory"]]]
5862
5908
  ],
5863
5909
  "layout": {
5864
5910
  "visibility": "visible",
@@ -5910,19 +5956,22 @@
5910
5956
  "filter": [
5911
5957
  "in",
5912
5958
  ["get", "type"],
5913
- ["literal", [
5914
- "bank",
5915
- "border_control",
5916
- "embassy",
5917
- "fire_station",
5918
- "government",
5919
- "hospital",
5920
- "police",
5921
- "school",
5922
- "taxi",
5923
- "townhall",
5924
- "university"
5925
- ]]
5959
+ [
5960
+ "literal",
5961
+ [
5962
+ "bank",
5963
+ "border_control",
5964
+ "embassy",
5965
+ "fire_station",
5966
+ "government",
5967
+ "hospital",
5968
+ "police",
5969
+ "school",
5970
+ "taxi",
5971
+ "townhall",
5972
+ "university"
5973
+ ]
5974
+ ]
5926
5975
  ],
5927
5976
  "layout": {
5928
5977
  "icon-image": ["concat", ["get", "type"], "-12"],
@@ -6270,9 +6319,12 @@
6270
6319
  "all",
6271
6320
  ["==", ["get", "type"], "place_of_worship"],
6272
6321
  [
6273
- "!", ["in",
6274
- ["get", "religion"],
6275
- ["literal", ["christian", "jewish", "muslim"]]]
6322
+ "!",
6323
+ [
6324
+ "in",
6325
+ ["get", "religion"],
6326
+ ["literal", ["christian", "jewish", "muslim"]]
6327
+ ]
6276
6328
  ]
6277
6329
  ],
6278
6330
  "layout": {
@@ -6354,9 +6406,8 @@
6354
6406
  "source-layer": "landuse_areas",
6355
6407
  "minzoom": 16,
6356
6408
  "filter": [
6357
- "!", ["in",
6358
- ["get", "type"],
6359
- ["literal", ["garden", "peak", "wetland"]]]
6409
+ "!",
6410
+ ["in", ["get", "type"], ["literal", ["garden", "peak", "wetland"]]]
6360
6411
  ],
6361
6412
  "layout": {
6362
6413
  "icon-image": ["concat", ["get", "type"], "-18"],
@@ -6470,7 +6521,10 @@
6470
6521
  "filter": [
6471
6522
  "in",
6472
6523
  ["get", "type"],
6473
- ["literal", ["hamlet", "islet", "locality", "neighborhood", "suburb", "village"]]
6524
+ [
6525
+ "literal",
6526
+ ["hamlet", "islet", "locality", "neighborhood", "suburb", "village"]
6527
+ ]
6474
6528
  ],
6475
6529
  "layout": {
6476
6530
  "text-field": ["to-string", ["get", "name"]],
@@ -6785,4 +6839,4 @@
6785
6839
  }
6786
6840
  ],
6787
6841
  "id": "io6r61fxt"
6788
- }
6842
+ }
@@ -18,8 +18,22 @@ if (!fs.existsSync(distDir)) {
18
18
  }
19
19
 
20
20
  try {
21
+ const assets = ['glyphs', 'sprite'];
22
+ let ohmVectorStyle;
21
23
  styles.forEach((style) => {
22
- ohmVectorStyles[camelCase(style, { pascalCase: true })] = JSON.parse(fs.readFileSync(path.join(baseDir.path, style, `${style}.json`)));
24
+ // Load each development style from disk, replace the scheme/domain/port, & make it the value of an ohm-website key,
25
+ // e.g., japanese_scroll => ohmVectorStyles.JapaneseScroll
26
+ const ohmWebsiteKey = camelCase(style, { pascalCase: true });
27
+ ohmVectorStyles[ohmWebsiteKey] = JSON.parse(fs.readFileSync(path.join(baseDir.path, style, `${style}.json`)));
28
+ ohmVectorStyle = ohmVectorStyles[ohmWebsiteKey];
29
+ for (const source in ohmVectorStyle.sources) {
30
+ ohmVectorStyle.sources[source].tiles[0] = ohmVectorStyle.sources[source].tiles[0].replace('vtiles.staging.openhistoricalmap.org', 'vtiles.openhistoricalmap.org')
31
+ }
32
+ assets.forEach((asset) => {
33
+ ohmVectorStyle[asset] = ohmVectorStyle[asset]
34
+ .replace('http://localhost:8888', 'https://www.openhistoricalmap.org/map-styles')
35
+ .replace('https://openhistoricalmap.github.io', 'https://www.openhistoricalmap.org')
36
+ })
23
37
  })
24
38
  fs.writeFileSync(
25
39
  path.join(distDir, `ohm.styles.js`),
@@ -0,0 +1,29 @@
1
+ # Documentation of Woodblock Style
2
+ The woodblock style was directly informed by woodblock map styles in the history of cartography. Specific aesthetic elements that captured the imperfections and textures of these old maps - plus map monsters of course - helped to bring this style to life.
3
+
4
+ ## Aesthetic Elements that Made the Map Look Old
5
+
6
+ ### Background Layer (ocean)
7
+ ![image](https://user-images.githubusercontent.com/7087091/155616674-731c9b0d-e376-4594-b008-bd9c7544488d.png) <br>
8
+ For this style, it made sense to emulate the texture of old, aged paper, as this aesthetic is something we are very used to seeing in old maps.
9
+
10
+ ### Typeface and styling
11
+ ![image](https://user-images.githubusercontent.com/7087091/155616707-ab373ef4-ef99-43dd-bca4-d3b22dd320c7.png)<br>
12
+ For the font choice, I chose the [Eadui](https://fontlibrary.org/en/font/eadui) (with [SIL Open Font License](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL)) because it was very close to a typeface style that was used often in woodblock maps, and also was easier to read on a screen than the bolder Blackletter options that also typical woodblock map fonts.I also made a thick halo in the labels, emulating the “halos” that were commonly seen in woodblock maps, due to map makers adding labels via slot cutting (read more about tools and media [here](https://vknoppkewetzel.github.io/VKW_MSthesis.pdf)), or leaving space to label by hand.
13
+
14
+ ### Linework design (roads, country boundaries)
15
+ ![image](https://user-images.githubusercontent.com/7087091/155616859-91af592c-1c12-4a27-a5b5-d9448590eb87.png)<br>
16
+ Both the tools used and the medium (wood) meant that everything carved into the wood was not perfectly linear, perfectly spaced, or perfectly circular. Additionally, using ink on the block and pressing down the block onto paper meant the ink sometimes squeezed to the side, or was patchy on the paper itself, providing even more textural elements. Essentially, the tools and mediums used mean that woodblock maps have “imperfections” as an enormous part of the aesthetic.
17
+
18
+ In order to mimic this, I created “splotchy” (ink squeezing/inconsistent) linework which is used in country boundaries and building linework, as well as “inconsistent tapering” linework for the roads.
19
+
20
+ Note, I intentionally used a light dashed-line for state boundaries rather than another textural line pattern, as it was a little too much texture to use another “imperfect” line pattern for states (alongside a more intricate font, country boundaries, paper texture, roads, and stylized icons).
21
+
22
+ ### Symbology design
23
+ ![image](https://user-images.githubusercontent.com/7087091/155616941-6627cda8-fa5e-42a3-a96f-192dfe1b01a7.png)<br>
24
+ A huge part of old maps are the illustrative elements across the map, from icons used for cities to map monsters across the old map. I created two different sized building icons, two different map monsters, and a tree grouping to provide this final aesthetic element to this map to wrap up the “woodblock map feeling” of the style.
25
+
26
+ ### Data Choices
27
+ Another important aspect of making this style work really well in emulating woodblock maps is that this map intentionally removes quite a bit of OHM data from the map. Older maps had a lot less data in them. If this map were to grow over time and have more data added, there would need to be some consideration of how design elements change to ensure that there is an appropriate hierarchy and balance of contrast.
28
+ <br><br>
29
+ For now, this style serves to highlight an older map aesthetic, in modern mapping technologies, alongside showing data over time.
@@ -14,10 +14,19 @@
14
14
  "tiles": [
15
15
  "https://vtiles.staging.openhistoricalmap.org/maps/ne/{z}/{x}/{y}.pbf"
16
16
  ]
17
+ },
18
+ "osm_land": {
19
+ "type": "vector",
20
+ "tiles": [
21
+ "https://vtiles.staging.openhistoricalmap.org/maps/osm_land/{z}/{x}/{y}.pbf"
22
+ ],
23
+ "minzoom": 0,
24
+ "maxzoom": 22,
25
+ "scheme": "xyz"
17
26
  }
18
27
  },
19
- "sprite": "https://www.openhistoricalmap.org/map-styles/woodblock/woodblock_spritesheet",
20
- "glyphs": "https://www.openhistoricalmap.org/map-styles/fonts/{fontstack}/{range}.pbf",
28
+ "sprite": "https://openhistoricalmap.github.io/map-styles/woodblock/woodblock_spritesheet",
29
+ "glyphs": "https://openhistoricalmap.github.io/map-styles/fonts/{fontstack}/{range}.pbf",
21
30
  "layers": [
22
31
  {
23
32
  "id": "background-pattern",
@@ -46,7 +55,7 @@
46
55
  {
47
56
  "id": "land-pattern",
48
57
  "type": "fill",
49
- "source": "osm",
58
+ "source": "osm_land",
50
59
  "source-layer": "land",
51
60
  "minzoom": 0,
52
61
  "maxzoom": 24,
@@ -59,7 +68,7 @@
59
68
  {
60
69
  "id": "land",
61
70
  "type": "fill",
62
- "source": "osm",
71
+ "source": "osm_land",
63
72
  "source-layer": "land",
64
73
  "minzoom": 0,
65
74
  "maxzoom": 24,
@@ -536,12 +545,8 @@
536
545
  "maxzoom": 24,
537
546
  "filter": [
538
547
  "all",
539
- [
540
- "in",
541
- ["get", "type"],
542
- ["literal", ["funicular", "monorail", "tram"]]
543
- ],
544
- ["!",["in", ["get", "service"], ["literal", ["siding", "yard"]]]]
548
+ ["in", ["get", "type"], ["literal", ["funicular", "monorail", "tram"]]],
549
+ ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]]
545
550
  ],
546
551
  "layout": {"visibility": "none"},
547
552
  "paint": {
@@ -571,7 +576,7 @@
571
576
  "filter": [
572
577
  "all",
573
578
  ["in", ["get", "type"], ["literal", ["miniature", "narrow_gauge"]]],
574
- ["!",["in", ["get", "service"], ["literal", ["siding", "yard"]]]]
579
+ ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]]
575
580
  ],
576
581
  "layout": {"visibility": "none"},
577
582
  "paint": {
@@ -619,9 +624,11 @@
619
624
  "maxzoom": 24,
620
625
  "filter": [
621
626
  "all",
622
- ["in",
627
+ [
628
+ "in",
623
629
  ["get", "type"],
624
- ["literal", ["abandoned", "dismantled", "disused", "razed"]]],
630
+ ["literal", ["abandoned", "dismantled", "disused", "razed"]]
631
+ ],
625
632
  ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]]
626
633
  ],
627
634
  "layout": {"visibility": "none"},
@@ -1156,11 +1163,7 @@
1156
1163
  "maxzoom": 20,
1157
1164
  "filter": [
1158
1165
  "all",
1159
- [
1160
- "in",
1161
- ["get", "type"],
1162
- ["literal", ["motorway_link", "trunk_link"]]
1163
- ],
1166
+ ["in", ["get", "type"], ["literal", ["motorway_link", "trunk_link"]]],
1164
1167
  ["!=", ["get", "tunnel"], 1]
1165
1168
  ],
1166
1169
  "layout": {
@@ -1500,11 +1503,7 @@
1500
1503
  "maxzoom": 20,
1501
1504
  "filter": [
1502
1505
  "all",
1503
- [
1504
- "in",
1505
- ["get", "type"],
1506
- ["literal", ["motorway_link", "trunk_link"]]
1507
- ],
1506
+ ["in", ["get", "type"], ["literal", ["motorway_link", "trunk_link"]]],
1508
1507
  ["!=", ["get", "tunnel"], 1]
1509
1508
  ],
1510
1509
  "layout": {
@@ -2095,19 +2094,22 @@
2095
2094
  [
2096
2095
  "in",
2097
2096
  ["get", "type"],
2098
- ["literal", [
2099
- "camp_site",
2100
- "garden",
2101
- "grass",
2102
- "grassland",
2103
- "park",
2104
- "picnic_site",
2105
- "playground",
2106
- "recreation_ground",
2107
- "sports_centre",
2108
- "stadium",
2109
- "village_green"
2110
- ]]
2097
+ [
2098
+ "literal",
2099
+ [
2100
+ "camp_site",
2101
+ "garden",
2102
+ "grass",
2103
+ "grassland",
2104
+ "park",
2105
+ "picnic_site",
2106
+ "playground",
2107
+ "recreation_ground",
2108
+ "sports_centre",
2109
+ "stadium",
2110
+ "village_green"
2111
+ ]
2112
+ ]
2111
2113
  ],
2112
2114
  [">", ["get", "area"], 12000]
2113
2115
  ],
@@ -2419,4 +2421,4 @@
2419
2421
  }
2420
2422
  ],
2421
2423
  "id": "io6r61fxt"
2422
- }
2424
+ }