@openhistoricalmap/map-styles 0.9.2 → 0.9.3

package/.nvmrc

@@ -0,0 +1 @@
+v22.13.0

package/LICENSE.md

@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

package/README.md

@@ -7,27 +7,45 @@ Here, you can save your worries about tile servers and data updates and instead
 
 Style file to load in Maputnik:
 
-- OHM style: https://openhistoricalmap.github.io/map-styles/main/main.json
+- OHM style: https://openhistoricalmap.github.io/map-styles/historical/historical.json
 
 - Woodblock style:  [https://github.com/OpenHistoricalMap/map-styles/blob/staging/woodblock/woodblock.json](https://raw.githubusercontent.com/OpenHistoricalMap/map-styles/staging/woodblock/woodblock.json)
 
+Note that we may disable these Github.io links in the future, so do not reference them in external applications.
+
 Copy the vector-based style to your Mapbox account [here](https://api.mapbox.com/styles/v1/vanessa-gin/ckz5r3zdy001215ofoeq1k7wm.html?title=copy&access_token=pk.eyJ1IjoidmFuZXNzYS1naW4iLCJhIjoiY2t3d2dzYXhxMDNtZDJ1bGFsY2c5dXV3ciJ9.jJ1Ujxks-kpcwSiiNdemfA&zoomwheel=true&fresh=true#12.63/40.68942/-74.02352). Note: the data layers are a little different because Mapbox uses Streets v8 now, and OHM styles are on Streets v7, but the style elements are all there.
 
 If you make changes you want to commit back here:
 1. Clone the repo locally.
 2. Load the style file.
 3. Use Export to write a new JSON over the top of the old one on your local copy (or save a new style).
-4. Commit and push the changes, which will then be avalaible at a GH Pages URL similar to the one above.
+4. Commit and push the changes, which will then be available at a GH Pages URL similar to the one above.
 
 If you make a new style, just change the URL for the style file with the new one you made.
 
-Note that changes here do not publish automagically to the OHM website. The latest styles get deployed to staging/openhistoricalmap.org by updating the Git commit sha on the `staging` branch here https://github.com/OpenHistoricalMap/ohm-deploy/blob/b71bc19d95f00fbb96ec33bd5149e0cd1b454935/images/web/Dockerfile#L117
+Note that changes here do not publish automagically to the OHM website. The styles are published via an NPM module, which is then consumed by the website.
+
+## Review styles locally
+With the move to npm packaging it's now possible to view and switch between map styles locally. The first time you `git clone` this repository be sure to run `nvm use` (install Node version if needed) and then run `npm install`. Afterward, running `npm test` will start the lightweight `http-server` and launch a new browser window on port 8888.
+
+Use `control-c` to end the browser session.
+
+This is a new feature, with three known issues/milestones:
+ * images for the style switcher are broken
+ * the OpenHistoricalMap `timeslider` is not yet incorporated; it, too, is being readied for npm packaging
+ * it would be better if the local port were configurable by individual users. This is complicated slightly as our staging and production deployment process searches-and-replaces `http://localhost:8888/` with urls suitable for those environments.
+
+## Versioning and publishing to npm
+
+ * increment the version in `package.json`, e.g., `0.9.3`
+ * [create a corresponding release on GitHub](https://github.com/OpenHistoricalMap/map-styles/releases/new), e.g., `v0.9.3`
+ * publish to npm `npm publish`
 
 ## Review styles while they are in staging
-To review the styles with the latest updates to the map-styles repo before they are live, use the below links. These are pulled from the `staging` branch. The `staging` branch will reflect 1) recently made updates before they are merged into `main` and occassionally 2) iterative cartography testing. 
+To review the styles with the latest updates to the map-styles repo before they are live, use the below links. These are pulled from the `staging` branch. The `staging` branch will reflect 1) recently made updates before they are merged into `main` and occasionally 2) iterative cartography testing. 
 
 To see a specific year in history, change the target year in the URL:
 - Main/Historical: https://embed.openhistoricalmap.org/#map=16/40.70486/-74.01313&date=1700&layer=O_staging
 - Rail style: https://embed.openhistoricalmap.org/#map=16/40.70486/-74.01313&date=1700&layer=R_staging
 - Woodblock: https://embed.openhistoricalmap.org/#map=16/40.70486/-74.01313&date=1700&layer=W_staging
-- Japanese scroll: https://embed.openhistoricalmap.org/#map=16/40.70486/-74.01313&date=1700&layer=J_staging
+- Japanese Scroll: https://embed.openhistoricalmap.org/#map=16/40.70486/-74.01313&date=1700&layer=J_staging

package/dist/ohm.styles.js

@@ -28,9 +28,18 @@ ohmVectorStyles = {
         "tiles": [
           "https://vtiles.staging.openhistoricalmap.org/maps/ne/{z}/{x}/{y}.pbf"
         ]
+      },
+      "osm_land": {
+        "type": "vector",
+        "tiles": [
+          "https://vtiles.openhistoricalmap.org/maps/osm_land/{z}/{x}/{y}.pbf"
+        ],
+        "minzoom": 0,
+        "maxzoom": 22,
+        "scheme": "xyz"
       }
     },
-    "sprite": "https://www.openhistoricalmap.org/map-styles/main/main_spritesheet",
+    "sprite": "https://www.openhistoricalmap.org/map-styles/historical/historical_spritesheet",
     "glyphs": "https://www.openhistoricalmap.org/map-styles/fonts/{fontstack}/{range}.pbf",
     "layers": [
       {
@@ -63,7 +72,7 @@ ohmVectorStyles = {
       {
         "id": "land",
         "type": "fill",
-        "source": "osm",
+        "source": "osm_land",
         "source-layer": "land",
         "minzoom": 0,
         "maxzoom": 24,
@@ -446,8 +455,6 @@ ohmVectorStyles = {
               "rgba(238, 229, 178, 1)",
               "basin",
               "rgba(144, 204, 203, 1)",
-              "wetland",
-              "rgba(227, 233, 226, 1)",
               "salt_pond",
               "rgba(236, 240, 241, 1)",
               "mud",
@@ -532,45 +539,6 @@ ohmVectorStyles = {
           ]
         }
       },
-      {
-        "id": "landuse_areas_z12_glacier-outline",
-        "type": "line",
-        "source": "osm",
-        "source-layer": "landuse_areas",
-        "minzoom": 9,
-        "maxzoom": 24,
-        "filter": [
-          "==",
-          [
-            "get",
-            "type"
-          ],
-          "glacier"
-        ],
-        "layout": {
-          "visibility": "visible"
-        },
-        "paint": {
-          "line-color": "rgba(180, 211, 218, 1)",
-          "line-dasharray": [
-            2,
-            2
-          ],
-          "line-width": [
-            "interpolate",
-            [
-              "linear"
-            ],
-            [
-              "zoom"
-            ],
-            9,
-            1,
-            14,
-            1.5
-          ]
-        }
-      },
       {
         "id": "landuse_areas_z12_food_and_farming",
         "type": "fill",
@@ -877,7 +845,7 @@ ohmVectorStyles = {
         "type": "fill",
         "source": "osm",
         "source-layer": "water_areas",
-        "minzoom": 8,
+        "minzoom": 0,
         "maxzoom": 24,
         "layout": {
           "visibility": "visible"
@@ -898,6 +866,32 @@ ohmVectorStyles = {
           ]
         }
       },
+      {
+        "id": "water_areas-ne",
+        "type": "fill",
+        "source": "ne",
+        "source-layer": "water_areas",
+        "minzoom": 0,
+        "maxzoom": 8,
+        "layout": {
+          "visibility": "visible"
+        },
+        "paint": {
+          "fill-color": [
+            "interpolate",
+            [
+              "linear"
+            ],
+            [
+              "zoom"
+            ],
+            0,
+            "rgba(185, 228, 228, 1)",
+            10,
+            "rgba(126, 218, 218, 1)"
+          ]
+        }
+      },
       {
         "id": "landuse_areas_z12_watercover",
         "type": "fill",
@@ -932,45 +926,72 @@ ohmVectorStyles = {
               "rgba(144, 204, 203, 1)",
               "swimming_pool",
               "rgba(144, 204, 203, 1)",
+              "wetland",
+              "rgba(228, 242, 227, 1)",
               "transparent"
             ]
           ]
         }
       },
       {
-        "id": "landuse_areas_z11_wetland_watercover",
+        "id": "wetlands_z11-pattern",
         "type": "fill",
         "source": "osm",
         "source-layer": "landuse_areas",
         "minzoom": 11,
         "maxzoom": 24,
         "filter": [
-          "all",
+          "==",
           [
-            "==",
-            "type",
-            "wetland"
-          ]
+            "get",
+            "type"
+          ],
+          "wetland"
         ],
         "layout": {
           "visibility": "visible"
         },
         "paint": {
-          "fill-color": "rgba(228, 242, 227, 1)"
+          "fill-color": "rgba(255, 255, 255, 1)",
+          "fill-pattern": {
+            "stops": [
+              [
+                12,
+                "cattails_space_60px"
+              ],
+              [
+                14,
+                "cattails_space_70px"
+              ]
+            ]
+          }
         }
       },
       {
-        "id": "water_areas-ne",
-        "type": "fill",
-        "source": "ne",
-        "source-layer": "water_areas",
-        "minzoom": 0,
-        "maxzoom": 8,
+        "id": "landuse_areas_z12_glacier-outline",
+        "type": "line",
+        "source": "osm",
+        "source-layer": "landuse_areas",
+        "minzoom": 9,
+        "maxzoom": 24,
+        "filter": [
+          "==",
+          [
+            "get",
+            "type"
+          ],
+          "glacier"
+        ],
         "layout": {
           "visibility": "visible"
         },
         "paint": {
-          "fill-color": [
+          "line-color": "rgba(180, 211, 218, 1)",
+          "line-dasharray": [
+            2,
+            2
+          ],
+          "line-width": [
             "interpolate",
             [
               "linear"
@@ -978,10 +999,10 @@ ohmVectorStyles = {
             [
               "zoom"
             ],
-            0,
-            "rgba(185, 228, 228, 1)",
-            10,
-            "rgba(126, 218, 218, 1)"
+            9,
+            1,
+            14,
+            1.5
           ]
         }
       },
@@ -1081,40 +1102,6 @@ ohmVectorStyles = {
           "fill-outline-color": "rgba(226, 223, 215, 1)"
         }
       },
-      {
-        "id": "wetlands_z11-pattern",
-        "type": "fill",
-        "source": "osm",
-        "source-layer": "landuse_areas",
-        "minzoom": 11,
-        "maxzoom": 24,
-        "filter": [
-          "==",
-          [
-            "get",
-            "type"
-          ],
-          "wetland"
-        ],
-        "layout": {
-          "visibility": "visible"
-        },
-        "paint": {
-          "fill-color": "rgba(255, 255, 255, 1)",
-          "fill-pattern": {
-            "stops": [
-              [
-                12,
-                "cattails_space_60px"
-              ],
-              [
-                14,
-                "cattails_space_70px"
-              ]
-            ]
-          }
-        }
-      },
       {
         "id": "water_lines_stream_no_name",
         "type": "line",
@@ -1836,7 +1823,7 @@ ohmVectorStyles = {
         "type": "fill",
         "source": "osm",
         "source-layer": "transport_areas",
-        "minzoom": 14,
+        "minzoom": 12,
         "maxzoom": 24,
         "filter": [
           "==",
@@ -1859,7 +1846,7 @@ ohmVectorStyles = {
         "type": "fill",
         "source": "osm",
         "source-layer": "transport_areas",
-        "minzoom": 14,
+        "minzoom": 12,
         "maxzoom": 24,
         "filter": [
           "==",
@@ -4964,7 +4951,7 @@ ohmVectorStyles = {
         "type": "line",
         "source": "osm",
         "source-layer": "transport_lines",
-        "minzoom": 14,
+        "minzoom": 12,
         "filter": [
           "==",
           [
@@ -4987,7 +4974,7 @@ ohmVectorStyles = {
               "zoom"
             ],
             12,
-            1,
+            0.8,
             13,
             1,
             14,
@@ -5733,6 +5720,60 @@ ohmVectorStyles = {
           ]
         }
       },
+      {
+        "id": "roads_servicecase_z13",
+        "type": "line",
+        "source": "osm",
+        "source-layer": "transport_lines",
+        "minzoom": 13,
+        "maxzoom": 24,
+        "filter": [
+          "all",
+          [
+            "in",
+            [
+              "get",
+              "type"
+            ],
+            [
+              "literal",
+              [
+                "service"
+              ]
+            ]
+          ],
+          [
+            "!=",
+            [
+              "get",
+              "bridge"
+            ],
+            1
+          ]
+        ],
+        "layout": {
+          "visibility": "visible",
+          "line-cap": "round",
+          "line-join": "round"
+        },
+        "paint": {
+          "line-color": "#D2D2D5",
+          "line-width": [
+            "interpolate",
+            [
+              "exponential",
+              1.5
+            ],
+            [
+              "zoom"
+            ],
+            13,
+            2,
+            18,
+            12
+          ]
+        }
+      },
       {
         "id": "roads_residentialcase_z13",
         "type": "line",
@@ -5752,7 +5793,6 @@ ohmVectorStyles = {
               "literal",
               [
                 "residential",
-                "service",
                 "unclassified"
               ]
             ]
@@ -6379,6 +6419,49 @@ ohmVectorStyles = {
           ]
         }
       },
+      {
+        "id": "roads_service",
+        "type": "line",
+        "source": "osm",
+        "source-layer": "transport_lines",
+        "minzoom": 12,
+        "maxzoom": 24,
+        "filter": [
+          "in",
+          [
+            "get",
+            "type"
+          ],
+          [
+            "literal",
+            [
+              "service"
+            ]
+          ]
+        ],
+        "layout": {
+          "visibility": "visible",
+          "line-cap": "round",
+          "line-join": "round"
+        },
+        "paint": {
+          "line-color": "#ffffff",
+          "line-width": [
+            "interpolate",
+            [
+              "exponential",
+              1.5
+            ],
+            [
+              "zoom"
+            ],
+            12,
+            1.6,
+            18,
+            7
+          ]
+        }
+      },
       {
         "id": "roads_residential",
         "type": "line",
@@ -6396,7 +6479,6 @@ ohmVectorStyles = {
             "literal",
             [
               "residential",
-              "service",
               "unclassified"
             ]
           ]
@@ -10393,7 +10475,12 @@ ohmVectorStyles = {
         "source-layer": "buildings_centroids",
         "minzoom": 16,
         "filter": [
-          "all"
+          "!=",
+          [
+            "get",
+            "type"
+          ],
+          "parking"
         ],
         "layout": {
           "icon-image": "{tourism}-18",
@@ -11092,7 +11179,7 @@ ohmVectorStyles = {
         "source": "osm",
         "source-layer": "transport_areas",
         "minzoom": 10,
-        "maxzoom": 16,
+        "maxzoom": 14,
         "filter": [
           "==",
           [
@@ -12257,7 +12344,7 @@ ohmVectorStyles = {
         ]
       }
     },
-    "sprite": "https://www.openhistoricalmap.org/map-styles/japanese_scroll/jp_spritesheet_template",
+    "sprite": "https://www.openhistoricalmap.org/map-styles/japanese_scroll/japanese_scroll_spritesheet_template",
     "glyphs": "https://www.openhistoricalmap.org/map-styles/fonts/{fontstack}/{range}.pbf",
     "layers": [
       {
@@ -16320,7 +16407,7 @@ ohmVectorStyles = {
         ]
       }
     },
-    "sprite": "https://www.openhistoricalmap.org/map-styles/rail/rail_spritesheet",
+    "sprite": "https://www.openhistoricalmap.org/map-styles/railway/railway_spritesheet",
     "glyphs": "https://www.openhistoricalmap.org/map-styles/fonts/{fontstack}/{range}.pbf",
     "layers": [
       {