@openhistoricalmap/map-styles 0.9.14 → 0.9.16

package/.github/workflows/release.yml

@@ -0,0 +1,70 @@
+name: Release to npm
+
+on:
+  workflow_dispatch:
+    inputs:
+      bump:
+        description: 'Version bump'
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+        default: patch
+
+concurrency:
+  group: release
+  cancel-in-progress: false
+
+jobs:
+  release:
+    if: github.ref_name == 'staging'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - name: Verify staging branch
+        run: |
+          if [ "${{ github.ref_name }}" != "staging" ]; then
+            echo "::error::Releases can only be triggered from the 'staging' branch (got: ${{ github.ref_name }})"
+            exit 1
+          fi
+
+      - uses: actions/checkout@v4
+        with:
+          ref: staging
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Upgrade npm (required for Trusted Publishers)
+        run: npm install -g npm@latest
+
+      - run: npm ci
+
+      - name: Configure git identity
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Bump version, rebuild /dist, commit and tag
+        run: |
+          NEW_VERSION=$(npm version ${{ inputs.bump }} --no-git-tag-version)
+          NEW_VERSION="${NEW_VERSION#v}"
+          npm run build
+          git add package.json package-lock.json dist/
+          git commit -m "Packaging ${NEW_VERSION} with rebuilt /dist"
+          git tag -a "v${NEW_VERSION}" -m "v${NEW_VERSION}"
+          echo "NEW_VERSION=${NEW_VERSION}" >> "$GITHUB_ENV"
+
+      - name: Push to GitHub
+        run: |
+          git push origin staging
+          git push origin "v${NEW_VERSION}"
+
+      - name: Publish to npm with provenance
+        run: npm publish --provenance --access public

package/.github/workflows/validate.yml

@@ -0,0 +1,25 @@
+name: Validate build
+
+on:
+  push:
+    branches-ignore:
+      - staging
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          registry-url: 'https://registry.npmjs.org'
+
+      - run: npm ci
+
+      - name: Build /dist
+        run: npm run build
+
+      - name: Validate npm package (dry-run)
+        run: npm publish --dry-run

package/.nvmrc

@@ -1 +1 @@
-v22.13.0
+v22.22.3

package/README.md

@@ -70,6 +70,27 @@ Miscellaneous notes:
 
 ## Versioning and publishing to npm
 
+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.
+
+### How to release
+
+1. Make sure your changes are merged into `staging` (PRs are validated automatically by [`validate.yml`](.github/workflows/validate.yml) on every push).
+2. Go to [Actions → "Release to npm" → Run workflow](https://github.com/OpenHistoricalMap/map-styles/actions/workflows/release.yml).
+3. Pick the branch `staging` and the bump type (`patch` / `minor` / `major`), then click **Run workflow**.
+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.
+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.
+
+### Why manual?
+
+Manual triggering lets us:
+- Batch multiple PRs into a single release (no version churn).
+- Choose `patch` / `minor` / `major` per release.
+- Avoid publishing on irrelevant changes (README edits, refactors, etc.).
+
+### Manual fallback (without the workflow)
+
+If the GitHub Action is unavailable, the release can be done locally:
+
 1. increment the version in `package.json`, e.g., `0.9.7`
 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`
 1. publish to npm using `npm publish`

package/dist/historical/historical.json

@@ -844,7 +844,6 @@
         [
           "literal",
           [
-            "grave_yard",
             "picnic_site",
             "camp_site",
             "playground",
@@ -873,8 +872,6 @@
               "get",
               "type"
             ],
-            "grave_yard",
-            "rgba(214, 222, 210, 1)",
             "picnic_site",
             "rgba(208, 220, 174, 1)",
             "camp_site",
@@ -914,6 +911,34 @@
         ]
       }
     },
+    {
+      "id": "landuse_areas_cemetery_pattern",
+      "type": "fill",
+      "source": "ohm",
+      "source-layer": "landuse_areas",
+      "minzoom": 11,
+      "maxzoom": 24,
+      "filter": [
+        "in",
+        [
+          "get",
+          "type"
+        ],
+        [
+          "literal",
+          [
+            "cemetery"
+          ]
+        ]
+      ],
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "fill-pattern": "cross_space_18px",
+        "fill-opacity": 0.3
+      }
+    },
     {
       "id": "parking_lots",
       "type": "fill",
@@ -1094,7 +1119,8 @@
           "literal",
           [
             "school",
-            "university"
+            "university",
+            "grave_yard"
           ]
         ]
       ],
@@ -1102,7 +1128,39 @@
         "visibility": "visible"
       },
       "paint": {
-        "fill-color": "rgba(226, 214, 205, 1)"
+        "fill-color": [
+          "match",
+          [
+            "get",
+            "type"
+          ],
+          "grave_yard",
+          "rgba(214, 222, 210, 1)",
+          "rgba(226, 214, 205, 1)"
+        ]
+      }
+    },
+    {
+      "id": "amenity_areas_grave_yard_pattern",
+      "type": "fill",
+      "source": "ohm",
+      "source-layer": "amenity_areas",
+      "minzoom": 11,
+      "maxzoom": 24,
+      "filter": [
+        "==",
+        [
+          "get",
+          "type"
+        ],
+        "grave_yard"
+      ],
+      "layout": {
+        "visibility": "visible"
+      },
+      "paint": {
+        "fill-pattern": "grave_yard_space_18px",
+        "fill-opacity": 0.3
       }
     },
     {
@@ -1566,7 +1624,7 @@
       "id": "water_lines_cliff_line",
       "type": "line",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "minzoom": 15,
       "maxzoom": 24,
       "filter": [
@@ -1608,7 +1666,7 @@
       "id": "water_lines_cliff_line_triangles",
       "type": "line",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "minzoom": 15,
       "maxzoom": 24,
       "filter": [
@@ -1652,7 +1710,7 @@
       "id": "water_lines_waterfall_triangle",
       "type": "line",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "minzoom": 15,
       "maxzoom": 24,
       "filter": [
@@ -2582,7 +2640,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 5,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -2819,7 +2877,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 5,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -3345,12 +3403,16 @@
           "construction"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "bridge"
+            "coalesce",
+            [
+              "get",
+              "bridge"
+            ],
+            0
           ],
-          0
+          1
         ],
         [
           "==",
@@ -3402,12 +3464,16 @@
           "construction"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "bridge"
+            "coalesce",
+            [
+              "get",
+              "bridge"
+            ],
+            0
           ],
-          0
+          1
         ],
         [
           "in",
@@ -5607,7 +5673,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 9,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -5812,7 +5878,7 @@
       "type": "line",
       "source": "ohm",
       "source-layer": "transport_lines",
-      "minzoom": 5,
+      "minzoom": 6,
       "maxzoom": 20,
       "filter": [
         "all",
@@ -7486,7 +7552,19 @@
         "line-join": "round"
       },
       "paint": {
-        "line-color": "#ffffff",
+        "line-color": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          10,
+          "rgba(240, 240, 240, 1)",
+          12,
+          "#ffffff"
+        ],
         "line-width": [
           "interpolate",
           [
@@ -7815,12 +7893,16 @@
           ]
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -8061,12 +8143,16 @@
           ]
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -8253,12 +8339,16 @@
           "main"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -8570,12 +8660,16 @@
           "main"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -8664,12 +8758,16 @@
           "main"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -8885,12 +8983,16 @@
           "main"
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "tunnel"
+            "coalesce",
+            [
+              "get",
+              "tunnel"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {
@@ -10853,7 +10955,7 @@
       "id": "water_lines_labels_cliff",
       "type": "symbol",
       "source": "ohm",
-      "source-layer": "water_lines",
+      "source-layer": "natural_lines",
       "filter": [
         "==",
         [
@@ -12649,7 +12751,18 @@
       ],
       "layout": {
         "icon-image": "airport-18",
-        "icon-size": [
+        "icon-offset": [
+          -1,
+          0
+        ],
+        "text-font": [
+          "OpenHistorical"
+        ],
+        "text-field": [
+          "get",
+          "ref"
+        ],
+        "text-size": [
           "interpolate",
           [
             "linear"
@@ -12657,13 +12770,43 @@
           [
             "zoom"
           ],
-          10,
-          1.2,
+          11.99,
+          12,
+          13,
           14,
-          1.5
+          14,
+          14,
+          14.01,
+          0
         ],
-        "text-font": [
-          "OpenHistorical"
+        "text-anchor": "left",
+        "text-offset": [
+          1,
+          0
+        ],
+        "visibility": "visible"
+      },
+      "paint": {
+        "text-color": "rgba(80, 80, 80, 1)",
+        "text-halo-color": "rgba(255, 255, 255, 1)",
+        "text-halo-width": 0.5,
+        "text-halo-blur": 1,
+        "text-opacity": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          11.99,
+          0,
+          12,
+          0.8,
+          14,
+          0.8,
+          14.01,
+          0
         ]
       }
     },
@@ -13147,7 +13290,7 @@
           "literal",
           [
             "hamlet",
-            "neighborhood",
+            "neighbourhood",
             "suburb",
             "village"
           ]

package/dist/historical/historical_spritesheet.json

@@ -377,6 +377,13 @@
     "x": 48,
     "y": 166
   },
+  "cross_space_18px": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 18,
+    "x": 0,
+    "y": 256
+  },
   "dentist-18": {
     "height": 17,
     "pixelRatio": 1,
@@ -559,6 +566,13 @@
     "x": 33,
     "y": 130
   },
+  "grave_yard_space_18px": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 18,
+    "x": 18,
+    "y": 256
+  },
   "grocery-18": {
     "height": 15,
     "pixelRatio": 1,

package/dist/historical/historical_spritesheet@2x.json

@@ -377,6 +377,13 @@
     "x": 48,
     "y": 166
   },
+  "cross_space_18px": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 18,
+    "x": 0,
+    "y": 256
+  },
   "dentist-18": {
     "height": 17,
     "pixelRatio": 1,
@@ -559,6 +566,13 @@
     "x": 33,
     "y": 130
   },
+  "grave_yard_space_18px": {
+    "height": 18,
+    "pixelRatio": 1,
+    "width": 18,
+    "x": 18,
+    "y": 256
+  },
   "grocery-18": {
     "height": 15,
     "pixelRatio": 1,

package/dist/japanese_scroll/japanese_scroll.json

@@ -1832,12 +1832,16 @@
           ]
         ],
         [
-          "==",
+          "!=",
           [
-            "get",
-            "bridge"
+            "coalesce",
+            [
+              "get",
+              "bridge"
+            ],
+            0
           ],
-          0
+          1
         ]
       ],
       "layout": {