@openhistoricalmap/map-styles 0.9.15 → 0.9.17

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.
@@ -58,10 +58,13 @@ jobs:
58
58
  npm run build
59
59
  git add package.json package-lock.json dist/
60
60
  git commit -m "Packaging ${NEW_VERSION} with rebuilt /dist"
61
- git tag "v${NEW_VERSION}"
61
+ git tag -a "v${NEW_VERSION}" -m "v${NEW_VERSION}"
62
+ echo "NEW_VERSION=${NEW_VERSION}" >> "$GITHUB_ENV"
62
63
 
63
64
  - name: Push to GitHub
64
- run: git push origin staging --follow-tags
65
+ run: |
66
+ git push origin staging
67
+ git push origin "v${NEW_VERSION}"
65
68
 
66
69
  - name: Publish to npm with provenance
67
70
  run: npm publish --provenance --access public
package/.nvmrc CHANGED
@@ -1 +1 @@
1
- v22.13.0
1
+ v22.22.3
package/README.md CHANGED
@@ -70,7 +70,26 @@ Miscellaneous notes:
70
70
 
71
71
  ## Versioning and publishing to npm
72
72
 
73
- > Releases can be automated via [Actions → "Release to npm"](https://github.com/OpenHistoricalMap/map-styles/actions/workflows/release.yml) click **Run workflow**, choose `patch` / `minor` / `major`, and it builds `/dist`, commits, tags, and publishes with provenance via npm Trusted Publishers (no token required). Manual steps below remain as a fallback.
73
+ Releases are **manually triggered** via the [Release to npm](https://github.com/OpenHistoricalMap/map-styles/actions/workflows/release.yml) GitHub Action. Authentication uses npm [Trusted Publishers](https://docs.npmjs.com/trusted-publishers) (OIDC) no tokens required.
74
+
75
+ ### How to release
76
+
77
+ 1. Make sure your changes are merged into `staging` (PRs are validated automatically by [`validate.yml`](.github/workflows/validate.yml) on every push).
78
+ 2. Go to [Actions → "Release to npm" → Run workflow](https://github.com/OpenHistoricalMap/map-styles/actions/workflows/release.yml).
79
+ 3. Pick the branch `staging` and the bump type (`patch` / `minor` / `major`), then click **Run workflow**.
80
+ 4. The workflow rebuilds `/dist`, creates a single commit `Packaging X.Y.Z with rebuilt /dist`, tags it `vX.Y.Z`, pushes to `staging`, and publishes to npm with verified provenance.
81
+ 5. Update the OHM properties that depend on `map-styles`. For `ohm-website`, [Dependabot](https://docs.github.com/en/code-security/dependabot) runs daily and will automatically open a PR bumping the `yarn.lock` within ~24 hours of the publish — just review and merge it. The manual fallback steps are documented in the [ohm-website](#ohm-website) section below.
82
+
83
+ ### Why manual?
84
+
85
+ Manual triggering lets us:
86
+ - Batch multiple PRs into a single release (no version churn).
87
+ - Choose `patch` / `minor` / `major` per release.
88
+ - Avoid publishing on irrelevant changes (README edits, refactors, etc.).
89
+
90
+ ### Manual fallback (without the workflow)
91
+
92
+ If the GitHub Action is unavailable, the release can be done locally:
74
93
 
75
94
  1. increment the version in `package.json`, e.g., `0.9.7`
76
95
  1. commit your style changes, including `/dist/*` & `package.json`, push to GitHub, and [create a corresponding release](https://github.com/OpenHistoricalMap/map-styles/releases/new), e.g., `v0.9.7`
@@ -14,7 +14,7 @@
14
14
  "ohm_landcover_hillshade": {
15
15
  "type": "raster",
16
16
  "tiles": [
17
- "https://static-tiles-lclu.s3.us-west-1.amazonaws.com/{z}/{x}/{y}.png"
17
+ "https://static-tiles.openhistoricalmap.org/{z}/{x}/{y}.png"
18
18
  ],
19
19
  "minzoom": 0,
20
20
  "maxzoom": 8,
@@ -844,7 +844,6 @@
844
844
  [
845
845
  "literal",
846
846
  [
847
- "grave_yard",
848
847
  "picnic_site",
849
848
  "camp_site",
850
849
  "playground",
@@ -873,8 +872,6 @@
873
872
  "get",
874
873
  "type"
875
874
  ],
876
- "grave_yard",
877
- "rgba(214, 222, 210, 1)",
878
875
  "picnic_site",
879
876
  "rgba(208, 220, 174, 1)",
880
877
  "camp_site",
@@ -914,6 +911,34 @@
914
911
  ]
915
912
  }
916
913
  },
914
+ {
915
+ "id": "landuse_areas_cemetery_pattern",
916
+ "type": "fill",
917
+ "source": "ohm",
918
+ "source-layer": "landuse_areas",
919
+ "minzoom": 11,
920
+ "maxzoom": 24,
921
+ "filter": [
922
+ "in",
923
+ [
924
+ "get",
925
+ "type"
926
+ ],
927
+ [
928
+ "literal",
929
+ [
930
+ "cemetery"
931
+ ]
932
+ ]
933
+ ],
934
+ "layout": {
935
+ "visibility": "visible"
936
+ },
937
+ "paint": {
938
+ "fill-pattern": "cross_space_18px",
939
+ "fill-opacity": 0.3
940
+ }
941
+ },
917
942
  {
918
943
  "id": "parking_lots",
919
944
  "type": "fill",
@@ -1094,7 +1119,8 @@
1094
1119
  "literal",
1095
1120
  [
1096
1121
  "school",
1097
- "university"
1122
+ "university",
1123
+ "grave_yard"
1098
1124
  ]
1099
1125
  ]
1100
1126
  ],
@@ -1102,7 +1128,39 @@
1102
1128
  "visibility": "visible"
1103
1129
  },
1104
1130
  "paint": {
1105
- "fill-color": "rgba(226, 214, 205, 1)"
1131
+ "fill-color": [
1132
+ "match",
1133
+ [
1134
+ "get",
1135
+ "type"
1136
+ ],
1137
+ "grave_yard",
1138
+ "rgba(214, 222, 210, 1)",
1139
+ "rgba(226, 214, 205, 1)"
1140
+ ]
1141
+ }
1142
+ },
1143
+ {
1144
+ "id": "amenity_areas_grave_yard_pattern",
1145
+ "type": "fill",
1146
+ "source": "ohm",
1147
+ "source-layer": "amenity_areas",
1148
+ "minzoom": 11,
1149
+ "maxzoom": 24,
1150
+ "filter": [
1151
+ "==",
1152
+ [
1153
+ "get",
1154
+ "type"
1155
+ ],
1156
+ "grave_yard"
1157
+ ],
1158
+ "layout": {
1159
+ "visibility": "visible"
1160
+ },
1161
+ "paint": {
1162
+ "fill-pattern": "grave_yard_space_18px",
1163
+ "fill-opacity": 0.3
1106
1164
  }
1107
1165
  },
1108
1166
  {
@@ -1566,7 +1624,7 @@
1566
1624
  "id": "water_lines_cliff_line",
1567
1625
  "type": "line",
1568
1626
  "source": "ohm",
1569
- "source-layer": "water_lines",
1627
+ "source-layer": "natural_lines",
1570
1628
  "minzoom": 15,
1571
1629
  "maxzoom": 24,
1572
1630
  "filter": [
@@ -1608,7 +1666,7 @@
1608
1666
  "id": "water_lines_cliff_line_triangles",
1609
1667
  "type": "line",
1610
1668
  "source": "ohm",
1611
- "source-layer": "water_lines",
1669
+ "source-layer": "natural_lines",
1612
1670
  "minzoom": 15,
1613
1671
  "maxzoom": 24,
1614
1672
  "filter": [
@@ -1652,7 +1710,7 @@
1652
1710
  "id": "water_lines_waterfall_triangle",
1653
1711
  "type": "line",
1654
1712
  "source": "ohm",
1655
- "source-layer": "water_lines",
1713
+ "source-layer": "natural_lines",
1656
1714
  "minzoom": 15,
1657
1715
  "maxzoom": 24,
1658
1716
  "filter": [
@@ -2582,7 +2640,7 @@
2582
2640
  "type": "line",
2583
2641
  "source": "ohm",
2584
2642
  "source-layer": "transport_lines",
2585
- "minzoom": 5,
2643
+ "minzoom": 6,
2586
2644
  "maxzoom": 20,
2587
2645
  "filter": [
2588
2646
  "all",
@@ -2819,7 +2877,7 @@
2819
2877
  "type": "line",
2820
2878
  "source": "ohm",
2821
2879
  "source-layer": "transport_lines",
2822
- "minzoom": 5,
2880
+ "minzoom": 6,
2823
2881
  "maxzoom": 20,
2824
2882
  "filter": [
2825
2883
  "all",
@@ -5615,7 +5673,7 @@
5615
5673
  "type": "line",
5616
5674
  "source": "ohm",
5617
5675
  "source-layer": "transport_lines",
5618
- "minzoom": 9,
5676
+ "minzoom": 6,
5619
5677
  "maxzoom": 20,
5620
5678
  "filter": [
5621
5679
  "all",
@@ -5820,7 +5878,7 @@
5820
5878
  "type": "line",
5821
5879
  "source": "ohm",
5822
5880
  "source-layer": "transport_lines",
5823
- "minzoom": 5,
5881
+ "minzoom": 6,
5824
5882
  "maxzoom": 20,
5825
5883
  "filter": [
5826
5884
  "all",
@@ -7494,7 +7552,19 @@
7494
7552
  "line-join": "round"
7495
7553
  },
7496
7554
  "paint": {
7497
- "line-color": "#ffffff",
7555
+ "line-color": [
7556
+ "interpolate",
7557
+ [
7558
+ "linear"
7559
+ ],
7560
+ [
7561
+ "zoom"
7562
+ ],
7563
+ 10,
7564
+ "rgba(240, 240, 240, 1)",
7565
+ 12,
7566
+ "#ffffff"
7567
+ ],
7498
7568
  "line-width": [
7499
7569
  "interpolate",
7500
7570
  [
@@ -10885,7 +10955,7 @@
10885
10955
  "id": "water_lines_labels_cliff",
10886
10956
  "type": "symbol",
10887
10957
  "source": "ohm",
10888
- "source-layer": "water_lines",
10958
+ "source-layer": "natural_lines",
10889
10959
  "filter": [
10890
10960
  "==",
10891
10961
  [
@@ -12681,7 +12751,18 @@
12681
12751
  ],
12682
12752
  "layout": {
12683
12753
  "icon-image": "airport-18",
12684
- "icon-size": [
12754
+ "icon-offset": [
12755
+ -1,
12756
+ 0
12757
+ ],
12758
+ "text-font": [
12759
+ "OpenHistorical"
12760
+ ],
12761
+ "text-field": [
12762
+ "get",
12763
+ "ref"
12764
+ ],
12765
+ "text-size": [
12685
12766
  "interpolate",
12686
12767
  [
12687
12768
  "linear"
@@ -12689,13 +12770,43 @@
12689
12770
  [
12690
12771
  "zoom"
12691
12772
  ],
12692
- 10,
12693
- 1.2,
12773
+ 11.99,
12774
+ 12,
12775
+ 13,
12694
12776
  14,
12695
- 1.5
12777
+ 14,
12778
+ 14,
12779
+ 14.01,
12780
+ 0
12696
12781
  ],
12697
- "text-font": [
12698
- "OpenHistorical"
12782
+ "text-anchor": "left",
12783
+ "text-offset": [
12784
+ 1,
12785
+ 0
12786
+ ],
12787
+ "visibility": "visible"
12788
+ },
12789
+ "paint": {
12790
+ "text-color": "rgba(80, 80, 80, 1)",
12791
+ "text-halo-color": "rgba(255, 255, 255, 1)",
12792
+ "text-halo-width": 0.5,
12793
+ "text-halo-blur": 1,
12794
+ "text-opacity": [
12795
+ "interpolate",
12796
+ [
12797
+ "linear"
12798
+ ],
12799
+ [
12800
+ "zoom"
12801
+ ],
12802
+ 11.99,
12803
+ 0,
12804
+ 12,
12805
+ 0.8,
12806
+ 14,
12807
+ 0.8,
12808
+ 14.01,
12809
+ 0
12699
12810
  ]
12700
12811
  }
12701
12812
  },
@@ -13179,7 +13290,7 @@
13179
13290
  "literal",
13180
13291
  [
13181
13292
  "hamlet",
13182
- "neighborhood",
13293
+ "neighbourhood",
13183
13294
  "suburb",
13184
13295
  "village"
13185
13296
  ]
@@ -377,6 +377,13 @@
377
377
  "x": 48,
378
378
  "y": 166
379
379
  },
380
+ "cross_space_18px": {
381
+ "height": 18,
382
+ "pixelRatio": 1,
383
+ "width": 18,
384
+ "x": 0,
385
+ "y": 256
386
+ },
380
387
  "dentist-18": {
381
388
  "height": 17,
382
389
  "pixelRatio": 1,
@@ -559,6 +566,13 @@
559
566
  "x": 33,
560
567
  "y": 130
561
568
  },
569
+ "grave_yard_space_18px": {
570
+ "height": 18,
571
+ "pixelRatio": 1,
572
+ "width": 18,
573
+ "x": 18,
574
+ "y": 256
575
+ },
562
576
  "grocery-18": {
563
577
  "height": 15,
564
578
  "pixelRatio": 1,
@@ -377,6 +377,13 @@
377
377
  "x": 48,
378
378
  "y": 166
379
379
  },
380
+ "cross_space_18px": {
381
+ "height": 18,
382
+ "pixelRatio": 1,
383
+ "width": 18,
384
+ "x": 0,
385
+ "y": 256
386
+ },
380
387
  "dentist-18": {
381
388
  "height": 17,
382
389
  "pixelRatio": 1,
@@ -559,6 +566,13 @@
559
566
  "x": 33,
560
567
  "y": 130
561
568
  },
569
+ "grave_yard_space_18px": {
570
+ "height": 18,
571
+ "pixelRatio": 1,
572
+ "width": 18,
573
+ "x": 18,
574
+ "y": 256
575
+ },
562
576
  "grocery-18": {
563
577
  "height": 15,
564
578
  "pixelRatio": 1,
@@ -17,7 +17,7 @@ ohmVectorStyles = {
17
17
  "ohm_landcover_hillshade": {
18
18
  "type": "raster",
19
19
  "tiles": [
20
- "https://static-tiles-lclu.s3.us-west-1.amazonaws.com/{z}/{x}/{y}.png"
20
+ "https://static-tiles.openhistoricalmap.org/{z}/{x}/{y}.png"
21
21
  ],
22
22
  "minzoom": 0,
23
23
  "maxzoom": 8,
@@ -847,7 +847,6 @@ ohmVectorStyles = {
847
847
  [
848
848
  "literal",
849
849
  [
850
- "grave_yard",
851
850
  "picnic_site",
852
851
  "camp_site",
853
852
  "playground",
@@ -876,8 +875,6 @@ ohmVectorStyles = {
876
875
  "get",
877
876
  "type"
878
877
  ],
879
- "grave_yard",
880
- "rgba(214, 222, 210, 1)",
881
878
  "picnic_site",
882
879
  "rgba(208, 220, 174, 1)",
883
880
  "camp_site",
@@ -917,6 +914,34 @@ ohmVectorStyles = {
917
914
  ]
918
915
  }
919
916
  },
917
+ {
918
+ "id": "landuse_areas_cemetery_pattern",
919
+ "type": "fill",
920
+ "source": "ohm",
921
+ "source-layer": "landuse_areas",
922
+ "minzoom": 11,
923
+ "maxzoom": 24,
924
+ "filter": [
925
+ "in",
926
+ [
927
+ "get",
928
+ "type"
929
+ ],
930
+ [
931
+ "literal",
932
+ [
933
+ "cemetery"
934
+ ]
935
+ ]
936
+ ],
937
+ "layout": {
938
+ "visibility": "visible"
939
+ },
940
+ "paint": {
941
+ "fill-pattern": "cross_space_18px",
942
+ "fill-opacity": 0.3
943
+ }
944
+ },
920
945
  {
921
946
  "id": "parking_lots",
922
947
  "type": "fill",
@@ -1097,7 +1122,8 @@ ohmVectorStyles = {
1097
1122
  "literal",
1098
1123
  [
1099
1124
  "school",
1100
- "university"
1125
+ "university",
1126
+ "grave_yard"
1101
1127
  ]
1102
1128
  ]
1103
1129
  ],
@@ -1105,7 +1131,39 @@ ohmVectorStyles = {
1105
1131
  "visibility": "visible"
1106
1132
  },
1107
1133
  "paint": {
1108
- "fill-color": "rgba(226, 214, 205, 1)"
1134
+ "fill-color": [
1135
+ "match",
1136
+ [
1137
+ "get",
1138
+ "type"
1139
+ ],
1140
+ "grave_yard",
1141
+ "rgba(214, 222, 210, 1)",
1142
+ "rgba(226, 214, 205, 1)"
1143
+ ]
1144
+ }
1145
+ },
1146
+ {
1147
+ "id": "amenity_areas_grave_yard_pattern",
1148
+ "type": "fill",
1149
+ "source": "ohm",
1150
+ "source-layer": "amenity_areas",
1151
+ "minzoom": 11,
1152
+ "maxzoom": 24,
1153
+ "filter": [
1154
+ "==",
1155
+ [
1156
+ "get",
1157
+ "type"
1158
+ ],
1159
+ "grave_yard"
1160
+ ],
1161
+ "layout": {
1162
+ "visibility": "visible"
1163
+ },
1164
+ "paint": {
1165
+ "fill-pattern": "grave_yard_space_18px",
1166
+ "fill-opacity": 0.3
1109
1167
  }
1110
1168
  },
1111
1169
  {
@@ -1569,7 +1627,7 @@ ohmVectorStyles = {
1569
1627
  "id": "water_lines_cliff_line",
1570
1628
  "type": "line",
1571
1629
  "source": "ohm",
1572
- "source-layer": "water_lines",
1630
+ "source-layer": "natural_lines",
1573
1631
  "minzoom": 15,
1574
1632
  "maxzoom": 24,
1575
1633
  "filter": [
@@ -1611,7 +1669,7 @@ ohmVectorStyles = {
1611
1669
  "id": "water_lines_cliff_line_triangles",
1612
1670
  "type": "line",
1613
1671
  "source": "ohm",
1614
- "source-layer": "water_lines",
1672
+ "source-layer": "natural_lines",
1615
1673
  "minzoom": 15,
1616
1674
  "maxzoom": 24,
1617
1675
  "filter": [
@@ -1655,7 +1713,7 @@ ohmVectorStyles = {
1655
1713
  "id": "water_lines_waterfall_triangle",
1656
1714
  "type": "line",
1657
1715
  "source": "ohm",
1658
- "source-layer": "water_lines",
1716
+ "source-layer": "natural_lines",
1659
1717
  "minzoom": 15,
1660
1718
  "maxzoom": 24,
1661
1719
  "filter": [
@@ -2585,7 +2643,7 @@ ohmVectorStyles = {
2585
2643
  "type": "line",
2586
2644
  "source": "ohm",
2587
2645
  "source-layer": "transport_lines",
2588
- "minzoom": 5,
2646
+ "minzoom": 6,
2589
2647
  "maxzoom": 20,
2590
2648
  "filter": [
2591
2649
  "all",
@@ -2822,7 +2880,7 @@ ohmVectorStyles = {
2822
2880
  "type": "line",
2823
2881
  "source": "ohm",
2824
2882
  "source-layer": "transport_lines",
2825
- "minzoom": 5,
2883
+ "minzoom": 6,
2826
2884
  "maxzoom": 20,
2827
2885
  "filter": [
2828
2886
  "all",
@@ -5618,7 +5676,7 @@ ohmVectorStyles = {
5618
5676
  "type": "line",
5619
5677
  "source": "ohm",
5620
5678
  "source-layer": "transport_lines",
5621
- "minzoom": 9,
5679
+ "minzoom": 6,
5622
5680
  "maxzoom": 20,
5623
5681
  "filter": [
5624
5682
  "all",
@@ -5823,7 +5881,7 @@ ohmVectorStyles = {
5823
5881
  "type": "line",
5824
5882
  "source": "ohm",
5825
5883
  "source-layer": "transport_lines",
5826
- "minzoom": 5,
5884
+ "minzoom": 6,
5827
5885
  "maxzoom": 20,
5828
5886
  "filter": [
5829
5887
  "all",
@@ -7497,7 +7555,19 @@ ohmVectorStyles = {
7497
7555
  "line-join": "round"
7498
7556
  },
7499
7557
  "paint": {
7500
- "line-color": "#ffffff",
7558
+ "line-color": [
7559
+ "interpolate",
7560
+ [
7561
+ "linear"
7562
+ ],
7563
+ [
7564
+ "zoom"
7565
+ ],
7566
+ 10,
7567
+ "rgba(240, 240, 240, 1)",
7568
+ 12,
7569
+ "#ffffff"
7570
+ ],
7501
7571
  "line-width": [
7502
7572
  "interpolate",
7503
7573
  [
@@ -10888,7 +10958,7 @@ ohmVectorStyles = {
10888
10958
  "id": "water_lines_labels_cliff",
10889
10959
  "type": "symbol",
10890
10960
  "source": "ohm",
10891
- "source-layer": "water_lines",
10961
+ "source-layer": "natural_lines",
10892
10962
  "filter": [
10893
10963
  "==",
10894
10964
  [
@@ -12684,7 +12754,18 @@ ohmVectorStyles = {
12684
12754
  ],
12685
12755
  "layout": {
12686
12756
  "icon-image": "airport-18",
12687
- "icon-size": [
12757
+ "icon-offset": [
12758
+ -1,
12759
+ 0
12760
+ ],
12761
+ "text-font": [
12762
+ "OpenHistorical"
12763
+ ],
12764
+ "text-field": [
12765
+ "get",
12766
+ "ref"
12767
+ ],
12768
+ "text-size": [
12688
12769
  "interpolate",
12689
12770
  [
12690
12771
  "linear"
@@ -12692,13 +12773,43 @@ ohmVectorStyles = {
12692
12773
  [
12693
12774
  "zoom"
12694
12775
  ],
12695
- 10,
12696
- 1.2,
12776
+ 11.99,
12777
+ 12,
12778
+ 13,
12697
12779
  14,
12698
- 1.5
12780
+ 14,
12781
+ 14,
12782
+ 14.01,
12783
+ 0
12699
12784
  ],
12700
- "text-font": [
12701
- "OpenHistorical"
12785
+ "text-anchor": "left",
12786
+ "text-offset": [
12787
+ 1,
12788
+ 0
12789
+ ],
12790
+ "visibility": "visible"
12791
+ },
12792
+ "paint": {
12793
+ "text-color": "rgba(80, 80, 80, 1)",
12794
+ "text-halo-color": "rgba(255, 255, 255, 1)",
12795
+ "text-halo-width": 0.5,
12796
+ "text-halo-blur": 1,
12797
+ "text-opacity": [
12798
+ "interpolate",
12799
+ [
12800
+ "linear"
12801
+ ],
12802
+ [
12803
+ "zoom"
12804
+ ],
12805
+ 11.99,
12806
+ 0,
12807
+ 12,
12808
+ 0.8,
12809
+ 14,
12810
+ 0.8,
12811
+ 14.01,
12812
+ 0
12702
12813
  ]
12703
12814
  }
12704
12815
  },
@@ -13182,7 +13293,7 @@ ohmVectorStyles = {
13182
13293
  "literal",
13183
13294
  [
13184
13295
  "hamlet",
13185
- "neighborhood",
13296
+ "neighbourhood",
13186
13297
  "suburb",
13187
13298
  "village"
13188
13299
  ]
@@ -17978,7 +18089,7 @@ ohmVectorStyles = {
17978
18089
  "ohm_landcover_hillshade": {
17979
18090
  "type": "raster",
17980
18091
  "tiles": [
17981
- "https://static-tiles-lclu.s3.us-west-1.amazonaws.com/{z}/{x}/{y}.png"
18092
+ "https://static-tiles.openhistoricalmap.org/{z}/{x}/{y}.png"
17982
18093
  ],
17983
18094
  "minzoom": 0,
17984
18095
  "maxzoom": 8,
@@ -19126,7 +19237,7 @@ ohmVectorStyles = {
19126
19237
  "id": "water_lines_cliff_line",
19127
19238
  "type": "line",
19128
19239
  "source": "ohm",
19129
- "source-layer": "water_lines",
19240
+ "source-layer": "natural_lines",
19130
19241
  "minzoom": 15,
19131
19242
  "maxzoom": 24,
19132
19243
  "filter": [
@@ -19176,7 +19287,7 @@ ohmVectorStyles = {
19176
19287
  "id": "water_lines_cliff_line_triangles",
19177
19288
  "type": "line",
19178
19289
  "source": "ohm",
19179
- "source-layer": "water_lines",
19290
+ "source-layer": "natural_lines",
19180
19291
  "minzoom": 15,
19181
19292
  "maxzoom": 24,
19182
19293
  "filter": [
@@ -19228,7 +19339,7 @@ ohmVectorStyles = {
19228
19339
  "id": "water_lines_waterfall_triangle",
19229
19340
  "type": "line",
19230
19341
  "source": "ohm",
19231
- "source-layer": "water_lines",
19342
+ "source-layer": "natural_lines",
19232
19343
  "minzoom": 15,
19233
19344
  "maxzoom": 24,
19234
19345
  "filter": [
@@ -20104,7 +20215,7 @@ ohmVectorStyles = {
20104
20215
  "type": "line",
20105
20216
  "source": "ohm",
20106
20217
  "source-layer": "transport_lines",
20107
- "minzoom": 5,
20218
+ "minzoom": 6,
20108
20219
  "maxzoom": 20,
20109
20220
  "filter": [
20110
20221
  "all",
@@ -20346,7 +20457,7 @@ ohmVectorStyles = {
20346
20457
  "type": "line",
20347
20458
  "source": "ohm",
20348
20459
  "source-layer": "transport_lines",
20349
- "minzoom": 5,
20460
+ "minzoom": 6,
20350
20461
  "maxzoom": 20,
20351
20462
  "filter": [
20352
20463
  "all",
@@ -23516,7 +23627,7 @@ ohmVectorStyles = {
23516
23627
  "type": "line",
23517
23628
  "source": "ohm",
23518
23629
  "source-layer": "transport_lines",
23519
- "minzoom": 9,
23630
+ "minzoom": 6,
23520
23631
  "maxzoom": 20,
23521
23632
  "filter": [
23522
23633
  "all",
@@ -23769,7 +23880,7 @@ ohmVectorStyles = {
23769
23880
  "type": "line",
23770
23881
  "source": "ohm",
23771
23882
  "source-layer": "transport_lines",
23772
- "minzoom": 5,
23883
+ "minzoom": 6,
23773
23884
  "maxzoom": 20,
23774
23885
  "filter": [
23775
23886
  "all",
@@ -29937,7 +30048,7 @@ ohmVectorStyles = {
29937
30048
  "id": "water_lineslabels-cliff",
29938
30049
  "type": "symbol",
29939
30050
  "source": "ohm",
29940
- "source-layer": "water_lines",
30051
+ "source-layer": "natural_lines",
29941
30052
  "filter": [
29942
30053
  "in",
29943
30054
  [
@@ -31569,7 +31680,7 @@ ohmVectorStyles = {
31569
31680
  "hamlet",
31570
31681
  "islet",
31571
31682
  "locality",
31572
- "neighborhood",
31683
+ "neighbourhood",
31573
31684
  "suburb",
31574
31685
  "village"
31575
31686
  ]
@@ -15,7 +15,7 @@
15
15
  "ohm_landcover_hillshade": {
16
16
  "type": "raster",
17
17
  "tiles": [
18
- "https://static-tiles-lclu.s3.us-west-1.amazonaws.com/{z}/{x}/{y}.png"
18
+ "https://static-tiles.openhistoricalmap.org/{z}/{x}/{y}.png"
19
19
  ],
20
20
  "minzoom": 0,
21
21
  "maxzoom": 8,
@@ -1163,7 +1163,7 @@
1163
1163
  "id": "water_lines_cliff_line",
1164
1164
  "type": "line",
1165
1165
  "source": "ohm",
1166
- "source-layer": "water_lines",
1166
+ "source-layer": "natural_lines",
1167
1167
  "minzoom": 15,
1168
1168
  "maxzoom": 24,
1169
1169
  "filter": [
@@ -1213,7 +1213,7 @@
1213
1213
  "id": "water_lines_cliff_line_triangles",
1214
1214
  "type": "line",
1215
1215
  "source": "ohm",
1216
- "source-layer": "water_lines",
1216
+ "source-layer": "natural_lines",
1217
1217
  "minzoom": 15,
1218
1218
  "maxzoom": 24,
1219
1219
  "filter": [
@@ -1265,7 +1265,7 @@
1265
1265
  "id": "water_lines_waterfall_triangle",
1266
1266
  "type": "line",
1267
1267
  "source": "ohm",
1268
- "source-layer": "water_lines",
1268
+ "source-layer": "natural_lines",
1269
1269
  "minzoom": 15,
1270
1270
  "maxzoom": 24,
1271
1271
  "filter": [
@@ -2141,7 +2141,7 @@
2141
2141
  "type": "line",
2142
2142
  "source": "ohm",
2143
2143
  "source-layer": "transport_lines",
2144
- "minzoom": 5,
2144
+ "minzoom": 6,
2145
2145
  "maxzoom": 20,
2146
2146
  "filter": [
2147
2147
  "all",
@@ -2383,7 +2383,7 @@
2383
2383
  "type": "line",
2384
2384
  "source": "ohm",
2385
2385
  "source-layer": "transport_lines",
2386
- "minzoom": 5,
2386
+ "minzoom": 6,
2387
2387
  "maxzoom": 20,
2388
2388
  "filter": [
2389
2389
  "all",
@@ -5553,7 +5553,7 @@
5553
5553
  "type": "line",
5554
5554
  "source": "ohm",
5555
5555
  "source-layer": "transport_lines",
5556
- "minzoom": 9,
5556
+ "minzoom": 6,
5557
5557
  "maxzoom": 20,
5558
5558
  "filter": [
5559
5559
  "all",
@@ -5806,7 +5806,7 @@
5806
5806
  "type": "line",
5807
5807
  "source": "ohm",
5808
5808
  "source-layer": "transport_lines",
5809
- "minzoom": 5,
5809
+ "minzoom": 6,
5810
5810
  "maxzoom": 20,
5811
5811
  "filter": [
5812
5812
  "all",
@@ -11974,7 +11974,7 @@
11974
11974
  "id": "water_lineslabels-cliff",
11975
11975
  "type": "symbol",
11976
11976
  "source": "ohm",
11977
- "source-layer": "water_lines",
11977
+ "source-layer": "natural_lines",
11978
11978
  "filter": [
11979
11979
  "in",
11980
11980
  [
@@ -13606,7 +13606,7 @@
13606
13606
  "hamlet",
13607
13607
  "islet",
13608
13608
  "locality",
13609
- "neighborhood",
13609
+ "neighbourhood",
13610
13610
  "suburb",
13611
13611
  "village"
13612
13612
  ]
@@ -10,7 +10,7 @@
10
10
  "ohm_landcover_hillshade": {
11
11
  "type": "raster",
12
12
  "tiles": [
13
- "https://static-tiles-lclu.s3.us-west-1.amazonaws.com/{z}/{x}/{y}.png"
13
+ "https://static-tiles.openhistoricalmap.org/{z}/{x}/{y}.png"
14
14
  ],
15
15
  "minzoom": 0,
16
16
  "maxzoom": 8,
@@ -528,7 +528,7 @@
528
528
  "filter": [
529
529
  "in",
530
530
  ["get", "type"],
531
- ["literal", ["grave_yard", "picnic_site", "camp_site", "playground", "pitch", "track", "bleachers"]]
531
+ ["literal", ["picnic_site", "camp_site", "playground", "pitch", "track", "bleachers"]]
532
532
  ],
533
533
  "layout": {"visibility": "visible"},
534
534
  "paint": {
@@ -540,8 +540,6 @@
540
540
  [
541
541
  "match",
542
542
  ["get", "type"],
543
- "grave_yard",
544
- "rgba(214, 222, 210, 1)",
545
543
  "picnic_site",
546
544
  "rgba(208, 220, 174, 1)",
547
545
  "camp_site",
@@ -574,6 +572,24 @@
574
572
  ]
575
573
  }
576
574
  },
575
+ {
576
+ "id": "landuse_areas_cemetery_pattern",
577
+ "type": "fill",
578
+ "source": "ohm",
579
+ "source-layer": "landuse_areas",
580
+ "minzoom": 11,
581
+ "maxzoom": 24,
582
+ "filter": [
583
+ "in",
584
+ ["get", "type"],
585
+ ["literal", ["cemetery"]]
586
+ ],
587
+ "layout": {"visibility": "visible"},
588
+ "paint": {
589
+ "fill-pattern": "cross_space_18px",
590
+ "fill-opacity": 0.3
591
+ }
592
+ },
577
593
  {
578
594
  "id": "parking_lots",
579
595
  "type": "fill",
@@ -662,9 +678,31 @@
662
678
  "type": "fill",
663
679
  "source": "ohm",
664
680
  "source-layer": "amenity_areas",
665
- "filter": ["in", ["get", "type"], ["literal", ["school", "university"]]],
681
+ "filter": ["in", ["get", "type"], ["literal", ["school", "university", "grave_yard"]]],
666
682
  "layout": {"visibility": "visible"},
667
- "paint": {"fill-color": "rgba(226, 214, 205, 1)"}
683
+ "paint": {
684
+ "fill-color": [
685
+ "match",
686
+ ["get", "type"],
687
+ "grave_yard",
688
+ "rgba(214, 222, 210, 1)",
689
+ "rgba(226, 214, 205, 1)"
690
+ ]
691
+ }
692
+ },
693
+ {
694
+ "id": "amenity_areas_grave_yard_pattern",
695
+ "type": "fill",
696
+ "source": "ohm",
697
+ "source-layer": "amenity_areas",
698
+ "minzoom": 11,
699
+ "maxzoom": 24,
700
+ "filter": ["==", ["get", "type"], "grave_yard"],
701
+ "layout": {"visibility": "visible"},
702
+ "paint": {
703
+ "fill-pattern": "grave_yard_space_18px",
704
+ "fill-opacity": 0.3
705
+ }
668
706
  },
669
707
  {
670
708
  "id": "water_lines_canal-casing",
@@ -912,7 +950,7 @@
912
950
  "id": "water_lines_cliff_line",
913
951
  "type": "line",
914
952
  "source": "ohm",
915
- "source-layer": "water_lines",
953
+ "source-layer": "natural_lines",
916
954
  "minzoom": 15,
917
955
  "maxzoom": 24,
918
956
  "filter": [
@@ -935,7 +973,7 @@
935
973
  "id": "water_lines_cliff_line_triangles",
936
974
  "type": "line",
937
975
  "source": "ohm",
938
- "source-layer": "water_lines",
976
+ "source-layer": "natural_lines",
939
977
  "minzoom": 15,
940
978
  "maxzoom": 24,
941
979
  "filter": [
@@ -960,7 +998,7 @@
960
998
  "id": "water_lines_waterfall_triangle",
961
999
  "type": "line",
962
1000
  "source": "ohm",
963
- "source-layer": "water_lines",
1001
+ "source-layer": "natural_lines",
964
1002
  "minzoom": 15,
965
1003
  "maxzoom": 24,
966
1004
  "filter": [
@@ -1440,7 +1478,7 @@
1440
1478
  "type": "line",
1441
1479
  "source": "ohm",
1442
1480
  "source-layer": "transport_lines",
1443
- "minzoom": 5,
1481
+ "minzoom": 6,
1444
1482
  "maxzoom": 20,
1445
1483
  "filter": [
1446
1484
  "all",
@@ -1566,7 +1604,7 @@
1566
1604
  "type": "line",
1567
1605
  "source": "ohm",
1568
1606
  "source-layer": "transport_lines",
1569
- "minzoom": 5,
1607
+ "minzoom": 6,
1570
1608
  "maxzoom": 20,
1571
1609
  "filter": [
1572
1610
  "all",
@@ -2974,7 +3012,7 @@
2974
3012
  "type": "line",
2975
3013
  "source": "ohm",
2976
3014
  "source-layer": "transport_lines",
2977
- "minzoom": 9,
3015
+ "minzoom": 6,
2978
3016
  "maxzoom": 20,
2979
3017
  "filter": [
2980
3018
  "all",
@@ -3096,7 +3134,7 @@
3096
3134
  "type": "line",
3097
3135
  "source": "ohm",
3098
3136
  "source-layer": "transport_lines",
3099
- "minzoom": 5,
3137
+ "minzoom": 6,
3100
3138
  "maxzoom": 20,
3101
3139
  "filter": [
3102
3140
  "all",
@@ -3965,7 +4003,15 @@
3965
4003
  "line-join": "round"
3966
4004
  },
3967
4005
  "paint": {
3968
- "line-color": "#ffffff",
4006
+ "line-color": [
4007
+ "interpolate",
4008
+ ["linear"],
4009
+ ["zoom"],
4010
+ 10,
4011
+ "rgba(240, 240, 240, 1)",
4012
+ 12,
4013
+ "#ffffff"
4014
+ ],
3969
4015
  "line-width": [
3970
4016
  "interpolate",
3971
4017
  ["exponential", 1.5],
@@ -5665,7 +5711,7 @@
5665
5711
  "id": "water_lines_labels_cliff",
5666
5712
  "type": "symbol",
5667
5713
  "source": "ohm",
5668
- "source-layer": "water_lines",
5714
+ "source-layer": "natural_lines",
5669
5715
  "filter": ["==", ["get", "type"], "cliff"],
5670
5716
  "layout": {
5671
5717
  "text-size": ["interpolate", ["linear"], ["zoom"], 11, 9, 13, 11],
@@ -6548,8 +6594,21 @@
6548
6594
  "filter": ["==", ["get", "type"], "aerodrome"],
6549
6595
  "layout": {
6550
6596
  "icon-image": "airport-18",
6551
- "icon-size": ["interpolate", ["linear"], ["zoom"], 10, 1.2, 14, 1.5],
6552
- "text-font": ["OpenHistorical"]}
6597
+ "icon-offset": [-1.0, 0],
6598
+ "text-font": ["OpenHistorical"],
6599
+ "text-field": ["get", "ref"],
6600
+ "text-size": ["interpolate", ["linear"], ["zoom"], 11.99, 12, 13, 14, 14, 14, 14.01, 0],
6601
+ "text-anchor": "left",
6602
+ "text-offset": [1, 0],
6603
+ "visibility": "visible"
6604
+ },
6605
+ "paint": {
6606
+ "text-color": "rgba(80, 80, 80, 1)",
6607
+ "text-halo-color": "rgba(255, 255, 255, 1)",
6608
+ "text-halo-width": 0.5,
6609
+ "text-halo-blur": 1,
6610
+ "text-opacity": ["interpolate", ["linear"], ["zoom"], 11.99, 0, 12, 0.8, 14, 0.8, 14.01, 0]
6611
+ }
6553
6612
  },
6554
6613
  {
6555
6614
  "id": "transport_points_labels_medium",
@@ -6823,7 +6882,7 @@
6823
6882
  "filter": [
6824
6883
  "in",
6825
6884
  ["get", "type"],
6826
- ["literal", ["hamlet", "neighborhood", "suburb", "village"]]
6885
+ ["literal", ["hamlet", "neighbourhood", "suburb", "village"]]
6827
6886
  ],
6828
6887
  "layout": {
6829
6888
  "text-field": ["get", "name"],
@@ -7215,4 +7274,4 @@
7215
7274
  ],
7216
7275
  "attribution": "<a href=\"https://www.openhistoricalmap.org/\">OpenHistoricalMap</a>",
7217
7276
  "id": "ab271ed3-6fe4-403a-b5ae-07113f8c57ab"
7218
- }
7277
+ }
@@ -377,6 +377,13 @@
377
377
  "x": 48,
378
378
  "y": 166
379
379
  },
380
+ "cross_space_18px": {
381
+ "height": 18,
382
+ "pixelRatio": 1,
383
+ "width": 18,
384
+ "x": 0,
385
+ "y": 256
386
+ },
380
387
  "dentist-18": {
381
388
  "height": 17,
382
389
  "pixelRatio": 1,
@@ -559,6 +566,13 @@
559
566
  "x": 33,
560
567
  "y": 130
561
568
  },
569
+ "grave_yard_space_18px": {
570
+ "height": 18,
571
+ "pixelRatio": 1,
572
+ "width": 18,
573
+ "x": 18,
574
+ "y": 256
575
+ },
562
576
  "grocery-18": {
563
577
  "height": 15,
564
578
  "pixelRatio": 1,
@@ -377,6 +377,13 @@
377
377
  "x": 48,
378
378
  "y": 166
379
379
  },
380
+ "cross_space_18px": {
381
+ "height": 18,
382
+ "pixelRatio": 1,
383
+ "width": 18,
384
+ "x": 0,
385
+ "y": 256
386
+ },
380
387
  "dentist-18": {
381
388
  "height": 17,
382
389
  "pixelRatio": 1,
@@ -559,6 +566,13 @@
559
566
  "x": 33,
560
567
  "y": 130
561
568
  },
569
+ "grave_yard_space_18px": {
570
+ "height": 18,
571
+ "pixelRatio": 1,
572
+ "width": 18,
573
+ "x": 18,
574
+ "y": 256
575
+ },
562
576
  "grocery-18": {
563
577
  "height": 15,
564
578
  "pixelRatio": 1,
@@ -0,0 +1,41 @@
1
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
+ <!-- Created with Inkscape (http://www.inkscape.org/) -->
3
+
4
+ <svg
5
+ width="18"
6
+ height="18"
7
+ viewBox="0 0 4.7625 4.7625"
8
+ version="1.1"
9
+ id="svg1"
10
+ xml:space="preserve"
11
+ sodipodi:docname="cross_space_18px.svg"
12
+ inkscape:export-filename="cross_space_18px.svg"
13
+ inkscape:export-xdpi="96"
14
+ inkscape:export-ydpi="96"
15
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
16
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
17
+ xmlns="http://www.w3.org/2000/svg"
18
+ xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
19
+ id="namedview1"
20
+ pagecolor="#505050"
21
+ bordercolor="#ffffff"
22
+ borderopacity="1"
23
+ inkscape:showpageshadow="0"
24
+ inkscape:pageopacity="0"
25
+ inkscape:pagecheckerboard="1"
26
+ inkscape:deskcolor="#d1d1d1"
27
+ inkscape:document-units="mm"><inkscape:page
28
+ x="0"
29
+ y="0"
30
+ width="4.7624998"
31
+ height="4.7624998"
32
+ id="page2"
33
+ margin="0"
34
+ bleed="0" /></sodipodi:namedview><defs
35
+ id="defs1" /><g
36
+ inkscape:label="Layer 1"
37
+ inkscape:groupmode="layer"
38
+ id="layer1"><path
39
+ id="rect2"
40
+ style="opacity:1;fill:#747474;stroke:#d9e2dc;stroke-width:0.261322;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.3;stroke-opacity:0.43739;paint-order:stroke fill markers"
41
+ d="m 2.2893902,1.4535777 h 0.1753542 c 0.035338,0 0.063784,0.02813 0.063784,0.063074 v 1.7291976 c 0,0.034942 -0.028446,0.063073 -0.063784,0.063073 H 2.2893902 c -0.035338,0 -0.063784,-0.02813 -0.063784,-0.063073 V 1.5166517 c 0,-0.034942 0.028446,-0.063074 0.063784,-0.063074 z M 1.780753,1.9242403 h 1.2009946 c 0.034676,0 0.062592,0.027606 0.062592,0.061894 v 0.1767282 c 0,0.03429 -0.027918,0.061894 -0.062592,0.061894 H 1.780753 c -0.034676,0 -0.062592,-0.027606 -0.062592,-0.061894 V 1.9861343 c 0,-0.03429 0.027918,-0.061894 0.062592,-0.061894 z" /></g></svg>
@@ -0,0 +1,49 @@
1
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
+ <!-- Created with Inkscape (http://www.inkscape.org/) -->
3
+
4
+ <svg
5
+ width="18"
6
+ height="18"
7
+ viewBox="0 0 4.7625 4.7625"
8
+ version="1.1"
9
+ id="svg1"
10
+ xml:space="preserve"
11
+ inkscape:export-filename="grave_yard_space_18px.svg"
12
+ inkscape:export-xdpi="96"
13
+ inkscape:export-ydpi="96"
14
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
15
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
16
+ xmlns="http://www.w3.org/2000/svg"
17
+ xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
18
+ id="namedview1"
19
+ pagecolor="#505050"
20
+ bordercolor="#ffffff"
21
+ borderopacity="1"
22
+ inkscape:showpageshadow="0"
23
+ inkscape:pageopacity="0"
24
+ inkscape:pagecheckerboard="1"
25
+ inkscape:deskcolor="#d1d1d1"
26
+ inkscape:document-units="mm"><inkscape:page
27
+ x="0"
28
+ y="0"
29
+ width="4.7624998"
30
+ height="4.7624998"
31
+ id="page2"
32
+ margin="0"
33
+ bleed="0" /></sodipodi:namedview><defs
34
+ id="defs1" /><g
35
+ inkscape:label="Layer 1"
36
+ inkscape:groupmode="layer"
37
+ id="layer1"><path
38
+ id="rect4"
39
+ style="opacity:1;fill:#747474;stroke:#d9e2dc;stroke-width:0.259368;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.3;stroke-dasharray:none;stroke-opacity:0.43739;paint-order:stroke fill markers"
40
+ d="M 1.8494757,2.3138299 H 2.9130229 V 3.3098994 H 1.8494757 Z M 2.3767963,1.4526007 h 0.00892 c 0.2921354,0 0.5273206,0.2469242 0.5273206,0.5536418 v 0.7448536 c 0,0.3067175 -0.2351852,0.5536417 -0.5273206,0.5536417 h -0.00892 c -0.2921358,0 -0.5273206,-0.2469242 -0.5273206,-0.5536417 V 2.0062425 c 0,-0.3067176 0.2351848,-0.5536418 0.5273206,-0.5536418 z" /><path
41
+ id="rect2"
42
+ style="opacity:1;fill:#2f2f2f;fill-opacity:1;stroke:none;stroke-width:0.119276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.3;stroke-dasharray:none;stroke-opacity:0.43739;paint-order:stroke fill markers"
43
+ d="m 2.3400139,1.6536455 h 0.078716 c 0.01586,0 0.028632,0.01304 0.028632,0.029234 v 0.8014298 c 0,0.0162 -0.01276,0.029232 -0.028632,0.029232 h -0.078716 c -0.01586,0 -0.028632,-0.01304 -0.028632,-0.029232 V 1.6828785 c 0,-0.0162 0.01276,-0.029234 0.028632,-0.029233 z M 2.1116901,1.8717833 h 0.5391184 c 0.01556,0 0.028096,0.0128 0.028096,0.028688 v 0.081908 c 0,0.0159 -0.01254,0.028686 -0.028096,0.028686 H 2.1116901 c -0.01556,0 -0.028096,-0.0128 -0.028096,-0.028686 v -0.081908 c 0,-0.0159 0.01254,-0.028688 0.028096,-0.028688 z" /><rect
44
+ style="opacity:1;fill:#2f2f2f;fill-opacity:1;stroke:none;stroke-width:0.25824;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.3;stroke-dasharray:none;stroke-opacity:0.43739;paint-order:stroke fill markers"
45
+ id="rect5"
46
+ width="0.72760379"
47
+ height="0.29765636"
48
+ x="2.0174475"
49
+ y="2.8442712" /></g></svg>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openhistoricalmap/map-styles",
3
- "version": "0.9.15",
3
+ "version": "0.9.17",
4
4
  "description": "A collection of map styles for OpenHistoricalMap",
5
5
  "main": "''",
6
6
  "type": "module",
@@ -12,9 +12,10 @@
12
12
  "type": "git",
13
13
  "url": "git+ssh://git@github.com/OpenHistoricalMap/map-styles.git"
14
14
  },
15
- "author": "tsinn <tim@greeninfo.org>",
15
+ "author": "OpenHistoricalMap <dev@openhistoricalmap.org>",
16
16
  "contributors": [
17
17
  "Vanessa Knoppke-Wetzel <run.for.funner@gmail.com>",
18
+ "Tim Sinnott <tim@greeninfo.org>",
18
19
  "Eric Theise <erictheise@gmail.com>"
19
20
  ],
20
21
  "license": "CC0 1.0 Universal",
@@ -11,7 +11,7 @@
11
11
  "ohm_landcover_hillshade": {
12
12
  "type": "raster",
13
13
  "tiles": [
14
- "https://static-tiles-lclu.s3.us-west-1.amazonaws.com/{z}/{x}/{y}.png"
14
+ "https://static-tiles.openhistoricalmap.org/{z}/{x}/{y}.png"
15
15
  ],
16
16
  "minzoom": 0,
17
17
  "maxzoom": 8,
@@ -719,7 +719,7 @@
719
719
  "id": "water_lines_cliff_line",
720
720
  "type": "line",
721
721
  "source": "ohm",
722
- "source-layer": "water_lines",
722
+ "source-layer": "natural_lines",
723
723
  "minzoom": 15,
724
724
  "maxzoom": 24,
725
725
  "filter": [
@@ -742,7 +742,7 @@
742
742
  "id": "water_lines_cliff_line_triangles",
743
743
  "type": "line",
744
744
  "source": "ohm",
745
- "source-layer": "water_lines",
745
+ "source-layer": "natural_lines",
746
746
  "minzoom": 15,
747
747
  "maxzoom": 24,
748
748
  "filter": [
@@ -767,7 +767,7 @@
767
767
  "id": "water_lines_waterfall_triangle",
768
768
  "type": "line",
769
769
  "source": "ohm",
770
- "source-layer": "water_lines",
770
+ "source-layer": "natural_lines",
771
771
  "minzoom": 15,
772
772
  "maxzoom": 24,
773
773
  "filter": [
@@ -1207,7 +1207,7 @@
1207
1207
  "type": "line",
1208
1208
  "source": "ohm",
1209
1209
  "source-layer": "transport_lines",
1210
- "minzoom": 5,
1210
+ "minzoom": 6,
1211
1211
  "maxzoom": 20,
1212
1212
  "filter": [
1213
1213
  "all",
@@ -1333,7 +1333,7 @@
1333
1333
  "type": "line",
1334
1334
  "source": "ohm",
1335
1335
  "source-layer": "transport_lines",
1336
- "minzoom": 5,
1336
+ "minzoom": 6,
1337
1337
  "maxzoom": 20,
1338
1338
  "filter": [
1339
1339
  "all",
@@ -2807,7 +2807,7 @@
2807
2807
  "type": "line",
2808
2808
  "source": "ohm",
2809
2809
  "source-layer": "transport_lines",
2810
- "minzoom": 9,
2810
+ "minzoom": 6,
2811
2811
  "maxzoom": 20,
2812
2812
  "filter": [
2813
2813
  "all",
@@ -2958,7 +2958,7 @@
2958
2958
  "type": "line",
2959
2959
  "source": "ohm",
2960
2960
  "source-layer": "transport_lines",
2961
- "minzoom": 5,
2961
+ "minzoom": 6,
2962
2962
  "maxzoom": 20,
2963
2963
  "filter": [
2964
2964
  "all",
@@ -5752,7 +5752,7 @@
5752
5752
  "id": "water_lineslabels-cliff",
5753
5753
  "type": "symbol",
5754
5754
  "source": "ohm",
5755
- "source-layer": "water_lines",
5755
+ "source-layer": "natural_lines",
5756
5756
  "filter": ["in", ["get", "type"], ["literal", ["cliff"]]],
5757
5757
  "layout": {
5758
5758
  "text-field": ["get", "name"],
@@ -6576,7 +6576,7 @@
6576
6576
  ["get", "type"],
6577
6577
  [
6578
6578
  "literal",
6579
- ["hamlet", "islet", "locality", "neighborhood", "suburb", "village"]
6579
+ ["hamlet", "islet", "locality", "neighbourhood", "suburb", "village"]
6580
6580
  ]
6581
6581
  ],
6582
6582
  "layout": {