Merge branch 'main' into shields-south-africa

src/americana.js

@@ -75,65 +75,9 @@ americanaLayers.push(
 
   lyrConstruction.road,
 
-  lyrRoad.motorwayLinkTunnel.casing(),
-  lyrRoad.trunkLinkTunnel.casing(),
-  lyrRoad.primaryLinkTunnel.casing(),
-  lyrRoad.secondaryLinkTunnel.casing(),
-  lyrRoad.tertiaryLinkTunnel.casing(),
-
-  lyrRoad.primaryLinkTollTunnel.casing(),
-  lyrRoad.secondaryLinkTollTunnel.casing(),
-  lyrRoad.tertiaryLinkTollTunnel.casing(),
-
-  lyrRoad.motorwayTunnel.casing(),
-  lyrRoad.trunkExpresswayTunnel.casing(),
-  lyrRoad.trunkTunnel.casing(),
-  lyrRoad.primaryExpresswayTunnel.casing(),
-  lyrRoad.primaryTunnel.casing(),
-  lyrRoad.secondaryExpresswayTunnel.casing(),
-  lyrRoad.secondaryTunnel.casing(),
-  lyrRoad.tertiaryExpresswayTunnel.casing(),
-  lyrRoad.tertiaryTunnel.casing(),
-  lyrRoad.minorTunnel.casing(),
-  lyrRoad.serviceTunnel.casing(),
-  lyrRoad.smallServiceTunnel.casing(),
-
-  lyrRoad.primaryTollTunnel.casing(),
-  lyrRoad.secondaryTollTunnel.casing(),
-  lyrRoad.tertiaryTollTunnel.casing(),
-  lyrRoad.minorTollTunnel.casing(),
-  lyrRoad.serviceTollTunnel.casing(),
-  lyrRoad.smallServiceTollTunnel.casing(),
-
-  lyrRoad.motorwayLinkTunnel.fill(),
-  lyrRoad.trunkLinkTunnel.fill(),
-  lyrRoad.primaryLinkTunnel.fill(),
-  lyrRoad.secondaryLinkTunnel.fill(),
-  lyrRoad.tertiaryLinkTunnel.fill(),
-
-  lyrRoad.primaryLinkTollTunnel.fill(),
-  lyrRoad.secondaryLinkTollTunnel.fill(),
-  lyrRoad.tertiaryLinkTollTunnel.fill(),
-
-  lyrRoad.motorwayTunnel.fill(),
-  lyrRoad.trunkExpresswayTunnel.fill(),
-  lyrRoad.trunkTunnel.fill(),
-  lyrRoad.primaryExpresswayTunnel.fill(),
-  lyrRoad.primaryTunnel.fill(),
-  lyrRoad.secondaryExpresswayTunnel.fill(),
-  lyrRoad.secondaryTunnel.fill(),
-  lyrRoad.tertiaryExpresswayTunnel.fill(),
-  lyrRoad.tertiaryTunnel.fill(),
-  lyrRoad.minorTunnel.fill(),
-  lyrRoad.serviceTunnel.fill(),
-  lyrRoad.smallServiceTunnel.fill(),
-
-  lyrRoad.primaryTollTunnel.fill(),
-  lyrRoad.secondaryTollTunnel.fill(),
-  lyrRoad.tertiaryTollTunnel.fill(),
-  lyrRoad.minorTollTunnel.fill(),
-  lyrRoad.serviceTollTunnel.fill(),
-  lyrRoad.smallServiceTollTunnel.fill(),
+  lyrRoad.roadTunnel.casing(),
+
+  lyrRoad.roadTunnel.fill(),
 
   lyrOneway.tunnel,
   lyrOneway.tunnelLink,
@@ -147,94 +91,38 @@ americanaLayers.push(
 
   lyrRoad.motorwayLink.casing(),
   lyrRoad.trunkLink.casing(),
-  lyrRoad.primaryLink.casing(),
-  lyrRoad.secondaryLink.casing(),
-  lyrRoad.tertiaryLink.casing(),
 
-  lyrRoad.primaryLinkToll.casing(),
-  lyrRoad.secondaryLinkToll.casing(),
-  lyrRoad.tertiaryLinkToll.casing(),
+  lyrRoad.roadLinkSimpleCasing.casing(),
 
   lyrRoad.motorway.casing(),
-  lyrRoad.trunkExpressway.casing(),
   lyrRoad.trunk.casing(),
   lyrRoad.primaryExpressway.casing(),
-  lyrRoad.primary.casing(),
   lyrRoad.secondaryExpressway.casing(),
-  lyrRoad.secondary.casing(),
   lyrRoad.tertiaryExpressway.casing(),
-  lyrRoad.tertiary.casing(),
-  lyrRoad.minor.casing(),
-  lyrRoad.service.casing(),
-  lyrRoad.smallService.casing(),
-
-  lyrRoad.primaryToll.casing(),
-  lyrRoad.secondaryToll.casing(),
-  lyrRoad.tertiaryToll.casing(),
-  lyrRoad.minorToll.casing(),
-  lyrRoad.serviceToll.casing(),
-  lyrRoad.smallServiceToll.casing(),
+
+  lyrRoad.roadSimpleCasing.casing(),
 
   lyrRoad.motorwayLink.fill(),
-  lyrRoad.trunkLink.fill(),
+  lyrRoad.roadLinkSimpleFill.fill(),
   lyrRoad.primaryLink.fill(),
-  lyrRoad.secondaryLink.fill(),
-  lyrRoad.tertiaryLink.fill(),
-
   lyrRoad.primaryLinkToll.fill(),
+  lyrRoad.secondaryLink.fill(),
   lyrRoad.secondaryLinkToll.fill(),
+  lyrRoad.tertiaryLink.fill(),
   lyrRoad.tertiaryLinkToll.fill(),
 
-  lyrRoad.smallService.fill(),
-  lyrRoad.service.fill(),
   lyrRoad.minor.fill(),
-  lyrRoad.tertiary.fill(),
-  lyrRoad.tertiaryExpressway.fill(),
-  lyrRoad.secondary.fill(),
-  lyrRoad.secondaryExpressway.fill(),
-  lyrRoad.primary.fill(),
-  lyrRoad.primaryExpressway.fill(),
-  lyrRoad.trunk.fill(),
-  lyrRoad.trunkExpressway.fill(),
-  lyrRoad.motorway.fill(),
-  lyrRoad.interstate.fill(),
-
-  lyrRoad.smallServiceToll.fill(),
-  lyrRoad.serviceToll.fill(),
   lyrRoad.minorToll.fill(),
+  lyrRoad.tertiary.fill(),
   lyrRoad.tertiaryToll.fill(),
+  lyrRoad.secondary.fill(),
   lyrRoad.secondaryToll.fill(),
+  lyrRoad.primary.fill(),
   lyrRoad.primaryToll.fill(),
+  lyrRoad.roadSimpleFill.fill(),
+  lyrRoad.motorway.fill(),
 
-  lyrRoad.motorwayLink.surface(),
-  lyrRoad.trunkLink.surface(),
-  lyrRoad.primaryLink.surface(),
-  lyrRoad.secondaryLink.surface(),
-  lyrRoad.tertiaryLink.surface(),
-
-  lyrRoad.primaryLinkToll.surface(),
-  lyrRoad.secondaryLinkToll.surface(),
-  lyrRoad.tertiaryLinkToll.surface(),
-
-  lyrRoad.smallService.surface(),
-  lyrRoad.service.surface(),
-  lyrRoad.minor.surface(),
-  lyrRoad.tertiary.surface(),
-  lyrRoad.tertiaryExpressway.surface(),
-  lyrRoad.secondary.surface(),
-  lyrRoad.secondaryExpressway.surface(),
-  lyrRoad.primary.surface(),
-  lyrRoad.primaryExpressway.surface(),
-  lyrRoad.trunk.surface(),
-  lyrRoad.trunkExpressway.surface(),
-  lyrRoad.motorway.surface(),
-
-  lyrRoad.smallServiceToll.surface(),
-  lyrRoad.serviceToll.surface(),
-  lyrRoad.minorToll.surface(),
-  lyrRoad.tertiaryToll.surface(),
-  lyrRoad.secondaryToll.surface(),
-  lyrRoad.primaryToll.surface(),
+  lyrRoad.road.surface(),
 
   lyrRail.rail.dashes(),
   lyrRail.railService.dashes(),
@@ -258,86 +146,40 @@ americanaLayers.push(lyrBuilding.building);
 var bridgeLayers = [
   lyrRail.bridgeCasing,
 
-  lyrRoad.tertiaryLinkBridge.casing(),
-  lyrRoad.secondaryLinkBridge.casing(),
-  lyrRoad.primaryLinkBridge.casing(),
   lyrRoad.trunkLinkBridge.casing(),
   lyrRoad.motorwayLinkBridge.casing(),
 
-  lyrRoad.tertiaryLinkTollBridge.casing(),
-  lyrRoad.secondaryLinkTollBridge.casing(),
-  lyrRoad.primaryLinkTollBridge.casing(),
+  lyrRoad.roadLinkSimpleCasingBridge.casing(),
 
-  lyrRoad.smallServiceBridge.casing(),
-  lyrRoad.serviceBridge.casing(),
-  lyrRoad.minorBridge.casing(),
-  lyrRoad.tertiaryBridge.casing(),
   lyrRoad.tertiaryExpresswayBridge.casing(),
-  lyrRoad.secondaryBridge.casing(),
   lyrRoad.secondaryExpresswayBridge.casing(),
-  lyrRoad.primaryBridge.casing(),
   lyrRoad.primaryExpresswayBridge.casing(),
   lyrRoad.trunkBridge.casing(),
-  lyrRoad.trunkExpresswayBridge.casing(),
   lyrRoad.motorwayBridge.casing(),
 
-  lyrRoad.smallServiceTollBridge.casing(),
-  lyrRoad.serviceTollBridge.casing(),
-  lyrRoad.minorTollBridge.casing(),
-  lyrRoad.tertiaryTollBridge.casing(),
-  lyrRoad.secondaryTollBridge.casing(),
-  lyrRoad.primaryTollBridge.casing(),
+  lyrRoad.roadSimpleCasingBridge.casing(),
 
   lyrRoad.tertiaryLinkBridge.fill(),
-  lyrRoad.secondaryLinkBridge.fill(),
-  lyrRoad.primaryLinkBridge.fill(),
-  lyrRoad.trunkLinkBridge.fill(),
-  lyrRoad.motorwayLinkBridge.fill(),
-
   lyrRoad.tertiaryLinkTollBridge.fill(),
+  lyrRoad.secondaryLinkBridge.fill(),
   lyrRoad.secondaryLinkTollBridge.fill(),
+  lyrRoad.primaryLinkBridge.fill(),
   lyrRoad.primaryLinkTollBridge.fill(),
+  lyrRoad.roadLinkSimpleFillBridge.fill(),
+  lyrRoad.motorwayLinkBridge.fill(),
 
-  lyrRoad.smallServiceBridge.fill(),
-  lyrRoad.serviceBridge.fill(),
   lyrRoad.minorBridge.fill(),
-  lyrRoad.tertiaryBridge.fill(),
-  lyrRoad.tertiaryExpresswayBridge.fill(),
-  lyrRoad.secondaryBridge.fill(),
-  lyrRoad.secondaryExpresswayBridge.fill(),
-  lyrRoad.primaryBridge.fill(),
-  lyrRoad.primaryExpresswayBridge.fill(),
-  lyrRoad.trunkBridge.fill(),
-  lyrRoad.trunkExpresswayBridge.fill(),
-  lyrRoad.motorwayBridge.fill(),
-
-  lyrRoad.smallServiceTollBridge.fill(),
-  lyrRoad.serviceTollBridge.fill(),
   lyrRoad.minorTollBridge.fill(),
+  lyrRoad.tertiaryBridge.fill(),
   lyrRoad.tertiaryTollBridge.fill(),
+  lyrRoad.secondaryBridge.fill(),
   lyrRoad.secondaryTollBridge.fill(),
+  lyrRoad.primaryBridge.fill(),
   lyrRoad.primaryTollBridge.fill(),
+  lyrRoad.roadSimpleFillBridge.fill(),
+  lyrRoad.motorwayBridge.fill(),
 
-  lyrRoad.tertiaryLinkBridge.surface(),
-  lyrRoad.secondaryLinkBridge.surface(),
-  lyrRoad.primaryLinkBridge.surface(),
-  lyrRoad.trunkLinkBridge.surface(),
-  lyrRoad.motorwayLinkBridge.surface(),
-
-  lyrRoad.tertiaryLinkTollBridge.surface(),
-  lyrRoad.secondaryLinkTollBridge.surface(),
-  lyrRoad.primaryLinkTollBridge.surface(),
-
-  lyrRoad.tertiaryBridge.surface(),
-  lyrRoad.secondaryBridge.surface(),
-  lyrRoad.primaryBridge.surface(),
-  lyrRoad.trunkBridge.surface(),
-  lyrRoad.trunkExpresswayBridge.surface(),
-  lyrRoad.motorwayBridge.surface(),
-
-  lyrRoad.tertiaryTollBridge.surface(),
-  lyrRoad.secondaryTollBridge.surface(),
-  lyrRoad.primaryTollBridge.surface(),
+  lyrRoad.roadBridge.surface(),
 
   lyrRail.railBridge.dashes(),
   lyrRail.railServiceBridge.dashes(),
@@ -359,7 +201,7 @@ var bridgeLayers = [
 //Render bridge without layer on the lowest bridge layer
 bridgeLayers.forEach((layer) =>
   americanaLayers.push(
-    Util.filteredClone(layer, ["!has", "layer"], "_layer_bottom")
+    Util.filteredClone(layer, ["!", ["has", "layer"]], "_layer_bottom")
   )
 );
 
@@ -373,7 +215,11 @@ for (let i = 1; i <= 4; i++) {
 //If layer is more than 5, just give up and render on a single layer.
 bridgeLayers.forEach((layer) =>
   americanaLayers.push(
-    Util.filteredClone(layer, [">=", "layer", 5], "_layer_top")
+    Util.filteredClone(
+      layer,
+      [">=", ["coalesce", ["get", "layer"], 0], 5],
+      "_layer_top"
+    )
   )
 );
 

src/js/util.js

@@ -3,7 +3,11 @@
 
 //Limit the specified definition to a single numbered layer
 export function restrictLayer(def, layer) {
-  return filteredClone(def, ["==", "layer", layer], "_layer_" + layer);
+  return filteredClone(
+    def,
+    ["==", ["coalesce", ["get", "layer"], 0], layer],
+    "_layer_" + layer
+  );
 }
 
 export function cp(obj) {