Merge branch 'main' into 1ec5-jp-latin

style/CONTRIBUTE.md

@@ -269,3 +269,4 @@ This style strives to draw representative highway shields wherever they are tagg
 - **Italy "Diramazione" (branch) motorways**. Between their main autostrade "A" roads, the Italian motorway network has branch motorways which carry the name of both highways that they connect. For example, the A7 and A26 motorways have a branch motorway named A7/A26, which is correctly tagged `ref=A7/A26` and drawn on shields with the two motorway numbers stacked vertically. This requires special code to split ref values at the `/` and draw the two text strings in a stacked configuration.
 - **Kentucky Parkways**. Kentucky signs a network of state highways which use a common shield styling, but with full-text names of the parkways on the shields. In addition, these routes are locally known by initialisms. Because these parkways are clearly a common network due to their common shield symbology, special code is needed to convert parkway names to their locally-expected initialisms. Because the initialisms are not present on shields, it would not be appropriate to encode this data in the `ref` tag.
 - **Pittsburgh Belt System**. Shields for this system use colors, with a colored circle and the words "<COLOR> BELT". These shields are drawn as squares with colored circles, with the `ref` values correctly corresponding to the text on the shield. Because of the common design (white shield with colored circle), these shields are properly part of a common route network. Special code is needed to convert the textual ref values to the colors displayed in the shield.
+- **Yukon Routes**. The majority of Yukon Route shields are red, but certain numbered highways have yellow, blue or green shields for their entire length. Because these roads are clearly part of the Yukon system designated by `network=CA:YT`, special code is needed to apply the special coloring to these routes.

style/americana.js

@@ -17,9 +17,10 @@ import * as lyrRoadLabel from "./layer/road_label.js";
 import * as lyrWater from "./layer/water.js";
 import * as lyrBuilding from "./layer/building.js";
 import * as lyrHighwayExit from "./layer/highway_exit.js";
+import * as lyrFerry from "./layer/ferry.js";
 
 import * as maplibregl from "maplibre-gl";
-import "maplibre-gl/maplibre-gl.css";
+import "maplibre-gl/dist/maplibre-gl.css";
 import * as search from "./search.js";
 
 import SampleControl from "openmapsamples-maplibre/OpenMapSamplesControl";
@@ -49,6 +50,9 @@ americanaLayers.push(
   lyrBoundary.state,
   lyrBoundary.country,
 
+  lyrFerry.ferry,
+  lyrFerry.ferryLabel,
+
   lyrWater.waterwayLabel,
   lyrWater.waterLabel,
   lyrWater.waterPointLabel,
@@ -259,6 +263,7 @@ americanaLayers.push(
   lyrHighwayExit.exits,
 
   lyrPlace.state,
+  lyrPlace.village,
   lyrPlace.town,
   lyrPlace.city,
   lyrPlace.countryOther,