@openhistoricalmap/map-styles 0.9.3 → 0.9.5

package/dist/woodblock/woodblock_spritesheet.json

@@ -0,0 +1,73 @@
+{
+    "woodblock-paper": {
+    "height":261,
+    "pixelRatio":1,
+    "width":261,
+    "x":0,
+    "y":0
+  },
+  
+  "woodblock-splotching-light": {
+    "height":16,
+    "pixelRatio":1,
+    "width":353,
+    "x":0,
+    "y":269
+  },
+  
+  "woodblock-roadTest1c": {
+    "height":6,
+    "pixelRatio":1,
+    "width":405,
+    "x":0,
+    "y":312
+  },
+  
+  "woodblock-splotchBeige": {
+    "height":16,
+    "pixelRatio":1,
+    "width":353,
+    "x":0,
+    "y":290
+  },
+
+  "woodblock-3-tiered-house-small": {
+    "height":30,
+    "pixelRatio":1,
+    "width":45,
+    "x":268,
+    "y":196
+  },
+  
+  "woodblock-3-tiered-house-small-2": {
+    "height":25,
+    "pixelRatio":1,
+    "width":29,
+    "x":268,
+    "y":236
+  },
+  
+  "woodblock-mapmonster-smaller": {
+    "height":85,
+    "pixelRatio":1,
+    "width":136,
+    "x":360,
+    "y":200
+  },
+  
+  "woodblock-waterdragon2": {
+    "height":193,
+    "pixelRatio":1,
+    "width":210,
+    "x":283,
+    "y":1
+  },
+
+  "woodblock-forestSmlst": {
+    "height":33,
+    "pixelRatio":1,
+    "width":38,
+    "x":316,
+    "y":196
+  }
+}

package/dist/woodblock/woodblock_spritesheet@2x.json

@@ -0,0 +1,73 @@
+{
+    "woodblock-paper": {
+    "height":261,
+    "pixelRatio":1,
+    "width":261,
+    "x":0,
+    "y":0
+  },
+  
+  "woodblock-splotching-light": {
+    "height":16,
+    "pixelRatio":1,
+    "width":353,
+    "x":0,
+    "y":269
+  },
+  
+  "woodblock-roadTest1c": {
+    "height":6,
+    "pixelRatio":1,
+    "width":405,
+    "x":0,
+    "y":312
+  },
+  
+  "woodblock-splotchBeige": {
+    "height":16,
+    "pixelRatio":1,
+    "width":353,
+    "x":0,
+    "y":290
+  },
+
+  "woodblock-3-tiered-house-small": {
+    "height":30,
+    "pixelRatio":1,
+    "width":45,
+    "x":268,
+    "y":196
+  },
+  
+  "woodblock-3-tiered-house-small-2": {
+    "height":25,
+    "pixelRatio":1,
+    "width":29,
+    "x":268,
+    "y":236
+  },
+  
+  "woodblock-mapmonster-smaller": {
+    "height":85,
+    "pixelRatio":1,
+    "width":136,
+    "x":360,
+    "y":200
+  },
+  
+  "woodblock-waterdragon2": {
+    "height":193,
+    "pixelRatio":1,
+    "width":210,
+    "x":283,
+    "y":1
+  },
+
+  "woodblock-forestSmlst": {
+    "height":33,
+    "pixelRatio":1,
+    "width":38,
+    "x":316,
+    "y":196
+  }
+}

package/historical/historical.json

@@ -18,9 +18,7 @@
     },
     "ne": {
       "type": "vector",
-      "tiles": [
-        "https://vtiles.staging.openhistoricalmap.org/maps/ne/{z}/{x}/{y}.pbf"
-      ]
+      "tiles": ["https://vtiles.openhistoricalmap.org/maps/ne/{z}/{x}/{y}.pbf"]
     },
     "osm_land": {
       "type": "vector",
@@ -32,8 +30,8 @@
       "scheme": "xyz"
     }
   },
-  "sprite": "http://localhost:8888/historical/historical_spritesheet",
-  "glyphs": "http://localhost:8888/fonts/{fontstack}/{range}.pbf",
+  "sprite": "https://localhost:8888/historical/historical_spritesheet",
+  "glyphs": "https://localhost:8888/fonts/{fontstack}/{range}.pbf",
   "layers": [
     {
       "id": "background",
@@ -6384,7 +6382,7 @@
       }
     },
     {
-      "id": "city_capital_labels_z6",
+      "id": "city_labels_z6",
       "type": "symbol",
       "source": "osm",
       "source-layer": "place_points",
@@ -6393,12 +6391,12 @@
       "filter": [
         "all",
         ["==", ["get", "type"], "city"],
-        ["==", ["get", "capital"], "yes"]
+        ["!=", ["get", "capital"], "yes"]
       ],
       "layout": {
         "text-size": ["interpolate", ["linear"], ["zoom"], 6, 12, 10, 15],
         "icon-offset": [0, 0],
-        "icon-image": "capital-18",
+        "icon-image": "city-18",
         "text-font": ["OpenHistorical"],
         "visibility": "visible",
         "text-offset": [0, 0.25],
@@ -6414,7 +6412,7 @@
       }
     },
     {
-      "id": "city_labels_z6",
+      "id": "city_capital_labels_z6",
       "type": "symbol",
       "source": "osm",
       "source-layer": "place_points",
@@ -6423,12 +6421,12 @@
       "filter": [
         "all",
         ["==", ["get", "type"], "city"],
-        ["!=", ["get", "capital"], "yes"]
+        ["==", ["get", "capital"], "yes"]
       ],
       "layout": {
         "text-size": ["interpolate", ["linear"], ["zoom"], 6, 12, 10, 15],
         "icon-offset": [0, 0],
-        "icon-image": "city-18",
+        "icon-image": "capital-18",
         "text-font": ["OpenHistorical"],
         "visibility": "visible",
         "text-offset": [0, 0.25],
@@ -6573,6 +6571,7 @@
         ["==", ["get", "admin_level"], 2]
       ],
       "layout": {
+        "symbol-sort-key": ["get", "area_km2"],
         "text-line-height": 1,
         "text-size": [
           "interpolate",
@@ -6590,7 +6589,18 @@
         "symbol-avoid-edges": false,
         "text-font": ["OpenHistorical Bold"],
         "symbol-placement": "point",
-        "text-justify": "center",
+        "text-variable-anchor-offset": [
+          "top",
+          [0, 0.5],
+          "bottom",
+          [0, -0.5],
+          "left",
+          [0.5, 0],
+          "right",
+          [-0.5, 0]
+        ],
+        "text-radial-offset": 0.5,
+        "text-justify": "auto",
         "visibility": "visible",
         "text-field": ["get", "name"],
         "text-max-width": 7
@@ -6651,6 +6661,16 @@
         "text-font": ["OpenHistorical Bold"],
         "symbol-placement": "point",
         "text-justify": "center",
+        "text-variable-anchor-offset": [
+          "top",
+          [0, 1],
+          "bottom",
+          [0, -2],
+          "left",
+          [1, 0],
+          "right",
+          [-2, 0]
+        ],
         "visibility": "visible",
         "text-field": ["get", "name"],
         "text-max-width": 7

package/img/README.md

@@ -0,0 +1 @@
+pngs in this directory are used by `maplibre-gl-style-flipper` to switch between individual styles during local development.

package/index.html

@@ -11,18 +11,22 @@
   const mapStyles = {
     "historical": {
       code: "historical",
+      image: "./img/historical.png",
       url: "./historical/historical.json"
     },
     "japanese_scroll": {
       code: "japanese_scroll",
+      image: "./img/japanese_scroll.png",
       url: "./japanese_scroll/japanese_scroll.json"
     },
     "railway": {
       code: "railway",
+      image: "./img/railway.png",
       url: "./railway/railway.json"
     },
     "woodblock": {
       code: "woodblock",
+      image: "./img/woodblock.png",
       url: "./woodblock/woodblock.json"
     },
   };

package/japanese_scroll/japanese_scroll.json

@@ -14,10 +14,19 @@
       "tiles": [
         "https://vtiles.staging.openhistoricalmap.org/maps/ne/{z}/{x}/{y}.pbf"
       ]
+    },
+    "osm_land": {
+      "type": "vector",
+      "tiles": [
+        "https://vtiles.staging.openhistoricalmap.org/maps/osm_land/{z}/{x}/{y}.pbf"
+      ],
+      "minzoom": 0,
+      "maxzoom": 22,
+      "scheme": "xyz"
     }
   },
-  "sprite": "http://localhost:8888/japanese_scroll/japanese_scroll_spritesheet_template",
-  "glyphs": "http://localhost:8888/fonts/{fontstack}/{range}.pbf",
+  "sprite": "https://localhost:8888/japanese_scroll/japanese_scroll_spritesheet",
+  "glyphs": "https://localhost:8888/fonts/{fontstack}/{range}.pbf",
   "layers": [
     {
       "id": "background",
@@ -43,7 +52,7 @@
     {
       "id": "land",
       "type": "fill",
-      "source": "osm",
+      "source": "osm_land",
       "source-layer": "land",
       "minzoom": 0,
       "maxzoom": 24,
@@ -53,7 +62,7 @@
     {
       "id": "land-pattern",
       "type": "fill",
-      "source": "osm",
+      "source": "osm_land",
       "source-layer": "land",
       "minzoom": 0,
       "maxzoom": 24,
@@ -537,11 +546,7 @@
       "maxzoom": 24,
       "filter": [
         "all",
-        [
-          "in",
-          ["get", "type"],
-          ["literal", ["funicular", "monorail", "tram"]]
-        ],
+        ["in", ["get", "type"], ["literal", ["funicular", "monorail", "tram"]]],
         ["!", ["in", ["get", "service"], ["literal", ["siding", "yard"]]]]
       ],
       "layout": {"visibility": "none"},
@@ -1159,11 +1164,7 @@
       "maxzoom": 20,
       "filter": [
         "all",
-        [
-          "in",
-          ["get", "type"],
-          ["literal", ["motorway_link", "trunk_link"]]
-        ],
+        ["in", ["get", "type"], ["literal", ["motorway_link", "trunk_link"]]],
         ["!=", ["get", "tunnel"], 1]
       ],
       "layout": {
@@ -1503,11 +1504,7 @@
       "maxzoom": 20,
       "filter": [
         "all",
-        [
-          "in",
-          ["get", "type"],
-          ["literal", ["motorway_link", "trunk_link"]]
-        ],
+        ["in", ["get", "type"], ["literal", ["motorway_link", "trunk_link"]]],
         ["!=", ["get", "tunnel"], 1]
       ],
       "layout": {
@@ -2285,4 +2282,4 @@
     }
   ],
   "id": "io6r61fxt"
-}
+}

package/japanese_scroll/japanese_scroll_spritesheet.json

@@ -0,0 +1,39 @@
+{
+  "jp-paper": {
+    "height":261,
+    "pixelRatio":1,
+    "width":261,
+    "x":0,
+    "y":0
+  },
+  "jp-water": {
+    "height":182,
+    "pixelRatio":1,
+    "width":250,
+    "x":274,
+    "y":0
+  },
+  "adminbound": {
+    "height":6,
+    "pixelRatio":1,
+    "width":405,
+    "x":0,
+    "y":283
+  },
+  
+  "jproad": {
+    "height":6,
+    "pixelRatio":1,
+    "width":370,
+    "x":0,
+    "y":270
+  },
+  
+  "mountain": {
+    "height":54,
+    "pixelRatio":1,
+    "width":100,
+    "x":274,
+    "y":199
+  }
+}

package/japanese_scroll/japanese_scroll_spritesheet@2x.json

@@ -0,0 +1,39 @@
+{
+  "jp-paper": {
+    "height":261,
+    "pixelRatio":1,
+    "width":261,
+    "x":0,
+    "y":0
+  },
+  "jp-water": {
+    "height":182,
+    "pixelRatio":1,
+    "width":250,
+    "x":274,
+    "y":0
+  },
+  "adminbound": {
+    "height":6,
+    "pixelRatio":1,
+    "width":405,
+    "x":0,
+    "y":283
+  },
+  
+  "jproad": {
+    "height":6,
+    "pixelRatio":1,
+    "width":370,
+    "x":0,
+    "y":270
+  },
+  
+  "mountain": {
+    "height":54,
+    "pixelRatio":1,
+    "width":100,
+    "x":274,
+    "y":199
+  }
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@openhistoricalmap/map-styles",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "A collection of map styles for OpenHistoricalMap",
   "main": "''",
   "type": "module",
   "scripts": {
-    "prepare": "scripts/prepare.js",
-    "test": "http-server --port 8888 --cors -o '#7.33/40.487/-73.554'"
+    "build": "scripts/prepare.js",
+    "start": "http-server -a localhost --port 8888 --ssl --cert ssl/cert.pem --key ssl/key.pem --cors -o '#7.33/40.487/-73.554'"
   },
   "repository": {
     "type": "git",
@@ -24,6 +24,7 @@
   "homepage": "https://github.com/OpenHistoricalMap/map-styles#readme",
   "dependencies": {
     "camelcase": "^8.0.0",
+    "fs-extra": "^11.3.0",
     "http-server": "^14.1.1",
     "maplibre-gl": "^5.1.0",
     "maplibre-gl-style-flipper": "^1.0.7"