@minmaps-dev/mm-web-sdk 1.0.0-rc.34 → 1.0.0-rc.36

package/src/themes/alt3-hybrid-style.json

@@ -518,7 +518,7 @@
       "filter": [
         "in",
         ["get", "kind"],
-        ["literal", ["place_of_worship", "fire_station", "post_office", "library", "townhall", "school", "hospital"]]
+        ["literal", ["place_of_worship", "fire_station", "post_office", "library", "townhall", "school"]]
       ],
       "layout": {
         "symbol-sort-key": 25,
@@ -635,44 +635,10 @@
       "minzoom": 16.5,
       "filter": ["==", ["get", "featureType"], "Pattern-Water"],
       "paint": {
-        "fill-color": "#cfe1ec",
-        "fill-opacity": 0.6
-      }
-    },
-    {
-      "id": "pattern-grass",
-      "type": "fill",
-      "source": "indoor-data",
-      "minzoom": 16.5,
-      "filter": ["==", ["get", "featureType"], "Pattern-Grass"],
-      "paint": {
-        "fill-color": "#d2e0c6",
-        "fill-opacity": 0.5
-      }
-    },
-    {
-      "id": "pattern-trees",
-      "type": "fill",
-      "source": "indoor-data",
-      "minzoom": 16.5,
-      "filter": ["==", ["get", "featureType"], "Pattern-Trees"],
-      "paint": {
-        "fill-color": "#7D9F64",
-        "fill-opacity": 0.8
-      }
-    },
-    {
-      "id": "pattern-pavement",
-      "type": "fill",
-      "source": "indoor-data",
-      "minzoom": 16.5,
-      "filter": ["==", ["get", "featureType"], "Pattern-Pavement"],
-      "paint": {
-        "fill-color": "#E0E0E0",
-        "fill-opacity": 0.6
+        "fill-color": "#cfe1ec"
+        
       }
     },
-
     {
       "id": "pattern-outdoor-terrace",
       "type": "fill",
@@ -689,7 +655,7 @@
       "id": "parking-lots",
       "type": "fill",
       "source": "indoor-data",
-      "minzoom": 16.5,
+      
       "filter": ["==", ["get", "featureType"], "Parking-Lots"],
       "paint": {
         "fill-color": "#adadad",
@@ -708,15 +674,13 @@
         "line-dasharray": [3, 2]
       }
     },
-
     {
       "id": "boundary-fill",
       "type": "fill",
       "source": "indoor-data",
-      "minzoom": 16.5,
       "filter": ["==", ["get", "featureType"], "Boundary"],
       "paint": {
-        "fill-color": "#edeef1",
+        "fill-color": "#162e51",
         "fill-opacity": 1
       }
     },
@@ -732,11 +696,21 @@
           "interpolate",
           ["linear"],
           ["zoom"],
-          15.8, 0,
-          16.5, 1
+          15.8, 1,
+          16.5, 0
         ]
       }
     },
+    {
+      "id": "pattern-pavement",
+      "type": "fill",
+      "source": "indoor-data",
+      "minzoom": 16.5,
+      "filter": ["==", ["get", "featureType"], "Pattern-Pavement"],
+      "paint": {
+        "fill-color": "#adadad"
+      }
+    },       
     {
       "id": "corridors-fill",
       "type": "fill",
@@ -748,11 +722,72 @@
         ["==", ["get", "featureType"], "Corridor"]
       ],
       "paint": {
-        "fill-color": "#f0f0f0"
+        "fill-color": "#f0f0f0"        
       }
     },
-
-
+    {
+      "id": "pattern-grass",
+      "type": "fill",
+      "source": "indoor-data",
+      
+      "filter": ["==", ["get", "featureType"], "Pattern-Grass"],
+      "paint": {
+        "fill-color": "#B6D0AE",
+        "fill-opacity": 1
+      }
+    },     
+    {
+      "id": "pattern-trees",
+      "type": "fill",
+      "source": "indoor-data",
+      "minzoom": 16.5,
+      "filter": ["==", ["get", "featureType"], "Pattern-Trees"],
+      "paint": {
+        "fill-color": "#7D9F64",
+        "fill-opacity": 1
+      }
+    },     
+    {
+      "id": "custom-artLayer-5-fill",
+      "type": "fill",
+      "source": "indoor-data",
+      "minzoom": 16.5,  
+      "filter": ["==", ["get", "featureType"], "CustomArtLayer-5"],    
+      "paint": {
+        "fill-color": "#DDE9F0",
+        "fill-opacity": 0.8
+      }
+    },     
+    {
+      "id": "custom-artLayer-4-fill",
+      "type": "fill",
+      "source": "indoor-data",
+      "minzoom": 16.5,  
+      "filter": ["==", ["get", "featureType"], "CustomArtLayer-4"],    
+      "paint": {
+        "fill-color": "#D1D1D1"
+      }
+    },
+    {
+      "id": "custom-artLayer-2-fill",
+      "type": "fill",
+      "source": "indoor-data",
+      "minzoom": 16.5,  
+      "filter": ["==", ["get", "featureType"], "CustomArtLayer-2"],    
+      "paint": {
+        "fill-color": "#B7C3CB"
+      }
+    },          
+    {
+      "id": "custom-artLayer-1-fill",
+      "type": "fill",
+      "source": "indoor-data",
+      "minzoom": 16.5,  
+      "filter": ["==", ["get", "featureType"], "CustomArtLayer-1"],    
+      "paint": {
+        "fill-color": "#B7C3CB"
+      }
+    },                
     {
       "id": "units-fill",
       "type": "fill",
@@ -771,7 +806,7 @@
           17,
           0.92,
           19,
-          0.95
+          1
         ]
       }
     },
@@ -800,7 +835,7 @@
       "filter": ["==", ["get", "featureType"], "Back-of-house"],
       "paint": {
         "fill-color": "#e6e6e2",
-        "fill-opacity": 0.7
+        "fill-opacity": 1
       }
     },
 
@@ -815,7 +850,7 @@
         "line-cap": "round"
       },
       "paint": {
-        "line-color": "#b0b1b5",
+        "line-color": "#121213",
         "line-width": [
           "interpolate",
           ["linear"],
@@ -827,7 +862,7 @@
           20,
           1.4
         ],
-        "line-opacity": 0.9
+        "line-opacity": 1
       }
     },
 
@@ -876,8 +911,9 @@
       "minzoom": 16.5,
       "filter": ["==", ["get", "featureType"], "Obstacles"],
       "paint": {
-        "fill-color": "#E8E9ED",
-        "fill-opacity": 0.85
+        "fill-color": "#e8e9ed",
+        "fill-opacity": 1,
+        "fill-outline-color": "#7f7f7f"
       }
     },
     {
@@ -891,7 +927,7 @@
         "line-cap": "round"
       },
       "paint": {
-        "line-color": "#B0B1B5",
+        "line-color": "#7f7f7f",
         "line-width": [
           "interpolate",
           ["linear"],
@@ -903,7 +939,7 @@
           20,
           1.2
         ],
-        "line-opacity": 0.9
+        "line-opacity": 1
       }
     },
 
@@ -919,7 +955,8 @@
       ],
       "paint": {
         "fill-color": "#a9aeb1",
-        "fill-opacity": 1
+        "fill-opacity": 1,
+        "fill-outline-color": "#053851"
       }
     },
     {
@@ -937,19 +974,19 @@
         "line-cap": "round"
       },
       "paint": {
-        "line-color": "#6f7780",
+        "line-color": "#4A4C4D",
         "line-width": [
           "interpolate",
           ["linear"],
           ["zoom"],
           16,
-          0.6,
+          1,
           18,
-          1.0,
+          1.5,
           20,
-          1.4
+          4
         ],
-        "line-opacity": 0.9
+        "line-opacity": 1
       }
     },
 
@@ -974,7 +1011,7 @@
       "filter": ["==", ["get", "featureType"], "Pattern-Lounge"],
       "paint": {
         "fill-color": "#ddd2e0",
-        "fill-opacity": 0.5
+        "fill-opacity": 1
       }
     },
 
@@ -986,7 +1023,7 @@
       "filter": ["==", ["get", "featureType"], "Pattern-Indoor-FoodCourt-Seating"],
       "paint": {
         "fill-color": "#f3e4c4",
-        "fill-opacity": 0.6
+        "fill-opacity": 1
       }
     },
 
@@ -1001,7 +1038,7 @@
         ["==", ["get", "featureType"], "Corridor"]
       ],
       "paint": {
-        "line-color": "#c6cace",
+        "line-color": "#343a40",
         "line-width": [
           "interpolate",
           ["linear"],
@@ -1084,7 +1121,7 @@
       "filter": ["==", ["get", "featureType"], "Interior-ParkingLots"],
       "paint": {
         "fill-color": "#757575",
-        "fill-opacity": 0.8
+        "fill-opacity": 1
       }
     },
     {
@@ -1252,7 +1289,7 @@
       "type": "fill-extrusion",
       "source": "indoor-data",
       "minzoom": 16.5,
-      "filter": ["==", ["get", "featureType"], "Back-of-house"],
+      "filter": ["==", ["get", "featureType"], "Back-of-houseBlock"],
       "paint": {
         "fill-extrusion-color": "#e6e6e2",
         "fill-extrusion-height": [
@@ -1278,7 +1315,7 @@
       "type": "fill-extrusion",
       "source": "indoor-data",
       "minzoom": 16.5,
-      "filter": ["==", ["get", "featureType"], "Restrooms"],
+      "filter": ["==", ["get", "featureType"], "RestroomsBlock"],
       "paint": {
         "fill-extrusion-color": "#5f9070",
         "fill-extrusion-height": [
@@ -1304,7 +1341,7 @@
       "type": "fill-extrusion",
       "source": "indoor-data",
       "minzoom": 16.5,
-      "filter": ["==", ["get", "featureType"], "Obstacles"],
+      "filter": ["==", ["get", "featureType"], "ObstaclesBlock"],
       "paint": {
         "fill-extrusion-color": "#E8E9ED",
         "fill-extrusion-height": [
@@ -1333,7 +1370,7 @@
       "filter": [
         "in",
         ["get", "featureType"],
-        ["literal", ["Escalators", "Stairs", "Elevators"]]
+        ["literal", ["EscalatorsBlock", "StairsBlock", "ElevatorsBlock"]]
       ],
       "paint": {
         "fill-extrusion-color": "#a9aeb1",
@@ -1542,61 +1579,6 @@
       }
     },
 
-    {
-      "id": "poi-destination-circles",
-      "type": "circle",
-      "source": "poi-data",
-      "filter": ["==", ["get", "poiType"], "destination"],
-      "minzoom": 16.5,
-      "paint": {
-        "circle-radius": [
-          "interpolate", ["linear"], ["zoom"],
-          14, 3,
-          16, 5,
-          18, 7,
-          20, 10
-        ],
-        "circle-color": "#ffffff",
-        "circle-stroke-width": 3,
-        "circle-stroke-color": "#162e51",
-        "circle-opacity": 1
-      }
-    },
-
-    {
-      "id": "poi-destination-labels",
-      "type": "symbol",
-      "source": "poi-data",
-      "filter": [
-        "all",
-        ["==", ["get", "poiType"], "destination"],
-        ["==", ["get", "showLabel"], true]
-      ],
-      "minzoom": 16.5,
-      "layout": {
-        "symbol-sort-key": 0,
-        "text-field": ["get", "name"],
-        "text-size": [
-          "interpolate", ["linear"], ["zoom"],
-          16.5, 18,
-          18,   20,
-          20,   23
-        ],
-        "text-variable-anchor-offset": ["top", [0, 0.9], "right", [-0.9, 0], "bottom", [0, -0.9], "left", [0.9, 0]],
-        "text-variable-anchor": ["top", "right" , "bottom", "left"],
-        "text-font": ["Noto Sans Bold"],
-        "text-max-width": 12,
-        "text-allow-overlap": false,
-        "text-padding": 4,
-        "text-rotation-alignment": "viewport"
-      },
-      "paint": {
-        "text-color": "#242930",
-        "text-halo-color": "#FFFFFF",
-        "text-halo-width": 2,
-        "text-halo-blur": 0
-      }
-    },
 {
       "id": "map-labels",
       "type": "symbol",
@@ -1605,37 +1587,35 @@
       "filter": ["!", ["in", "Building", ["get", "name"]]],
       "layout": {
         "symbol-sort-key": 10,
-        "icon-image": "map-label-bg",
-        "icon-text-fit": "both",
-        "icon-text-fit-padding": [2, 2, 2, 2],
-        "icon-allow-overlap": false,
-        "icon-ignore-placement": false,
         "text-field": ["get", "name"],
         "text-size": [
           "interpolate", ["linear"], ["zoom"],
-          15.5, 13,
-          16.5, 16,
-          18,   19,
-          20,   22
+          15.5, 12,
+          16.5, 15,
+          18,   18,
+          20,   20
         ],
         "text-font": ["Noto Sans Bold"],
         "text-letter-spacing": 0.04,
         "text-max-width": 10,
         "text-anchor": "center",
-        
+        "text-rotate": ["get", "rotation"],
         "text-rotation-alignment": "viewport",
         "text-allow-overlap": false,
         "text-padding": 4
       },
       "paint": {
-        "text-color": "#ffffff"
+        "text-color": "#3d4551",
+        "text-halo-color": "#FFFFFF",
+        "text-halo-width": 1.4,
+        "text-halo-blur": 0.5
       }
-    },    
+    },
     {
       "id": "map-labels-buildings",
       "type": "symbol",
       "source": "map-labels-data",
-      "minzoom": 15.5,
+      "minzoom": 17,
       "filter": [
         "all",
         ["in", "Building", ["get", "name"]]
@@ -1651,7 +1631,7 @@
           "format",
           "\uea40", {"text-font": ["literal", ["Material Icons"]]},
           
-          ["slice", ["get", "name"], 8, 10], {}
+          ["slice", ["get", "name"], ["+", ["index-of", "Building", ["get", "name"]], 9]], {}
         ],
         "text-size": [
           "interpolate", ["linear"], ["zoom"],
@@ -1670,7 +1650,7 @@
         "text-padding": 4
       },
       "paint": {
-        "text-color": "#ffffff"
+        "text-color": "#fffffe"
       }
     },
 
@@ -1685,19 +1665,62 @@
         "icon-image": ["get", "iconId"],
         "icon-size": [
           "interpolate", ["exponential", 1.3], ["zoom"],
-          14, 0.28,
-          16, 0.4,
-          18, 0.58,
-          20, 0.85,
-          22, 1.2
+          14, 0.18,
+          16, 0.3,
+          18, 0.48,
+          20, 0.5,
+          22, 0.85
         ],
-        "icon-allow-overlap": false,
-        "icon-padding": [
+
+        "icon-optional": false,
+        "icon-rotation-alignment": "viewport",
+        "icon-pitch-alignment": "viewport",
+        "icon-allow-overlap":true,
+        "text-field": ["get", "name"],
+        "text-size": [
           "interpolate", ["linear"], ["zoom"],
-          15, 8,
-          17, 4,
-          19, 2
+          16, ["case", ["!=", ["coalesce", ["get", "iconId"], ""], ""], 0, 17],
+          19, ["case", ["!=", ["coalesce", ["get", "iconId"], ""], ""], 0, 19],
+          20, ["case", ["!=", ["coalesce", ["get", "iconId"], ""], ""], 0, 22]
         ],
+        
+        "text-anchor": "top",
+        "text-optional": true,
+        "text-padding": 2,
+        "text-font": ["Noto Sans Bold"],
+        "text-rotation-alignment": "viewport"
+      },
+      "paint": {
+        "icon-halo-color": "#FFFFFF",
+        "icon-halo-width": 1.5,
+        "icon-halo-blur": 0.5,
+        "text-color": "#242930",
+        "text-halo-color": "#FFFFFF",
+        "text-halo-width": 1.5,
+        "text-halo-blur": 1,
+        "icon-translate": [0, -20],
+        "icon-translate-anchor": "viewport"
+      }
+    },
+    {
+      "id": "poi-parking-icons",
+      "type": "symbol",
+      "source": "poi-data",
+      "filter": ["==", ["get", "amenityCategory"], "parking"],
+      "minzoom": 14,
+      "layout": {
+        "symbol-sort-key": ["get", "rank"],
+        "icon-image": ["get", "iconId"],
+        "icon-size": [
+          "interpolate", ["exponential", 1.3], ["zoom"],
+          14, 0.18,
+          16, 0.3,
+          18, 0.48,
+          20, 0.5,
+          22, 0.85
+        ],
+        "icon-allow-overlap": true,
+
         "icon-optional": false,
         "icon-rotation-alignment": "viewport",
         "icon-pitch-alignment": "viewport",
@@ -1729,21 +1752,21 @@
       }
     },
     {
-      "id": "poi-parking-icons",
+      "id": "poi-bus-icons",
       "type": "symbol",
       "source": "poi-data",
-      "filter": ["==", ["get", "amenityCategory"], "parking"],
+      "filter": ["==", ["get", "amenityCategory"], "bus"],
       "minzoom": 14,
       "layout": {
         "symbol-sort-key": ["get", "rank"],
         "icon-image": ["get", "iconId"],
         "icon-size": [
           "interpolate", ["exponential", 1.3], ["zoom"],
-          14, 0.28,
-          16, 0.4,
-          18, 0.58,
-          20, 0.85,
-          22, 1.2
+          14, 0.18,
+          16, 0.3,
+          18, 0.48,
+          20, 0.5,
+          22, 0.85
         ],
         "icon-allow-overlap": false,
         "icon-padding": [
@@ -1783,21 +1806,21 @@
       }
     },
     {
-      "id": "poi-bus-icons",
+      "id": "poi-connector-icons",
       "type": "symbol",
       "source": "poi-data",
-      "filter": ["==", ["get", "amenityCategory"], "bus"],
-      "minzoom": 14,
+      "filter": ["==", ["get", "amenityCategory"], "connector"],
+      "minzoom": 16.5,
       "layout": {
         "symbol-sort-key": ["get", "rank"],
         "icon-image": ["get", "iconId"],
         "icon-size": [
           "interpolate", ["exponential", 1.3], ["zoom"],
-          14, 0.28,
-          16, 0.4,
-          18, 0.58,
-          20, 0.85,
-          22, 1.2
+          14, 0.18,
+          16, 0.3,
+          18, 0.48,
+          20, 0.5,
+          22, 0.85
         ],
         "icon-allow-overlap": false,
         "icon-padding": [
@@ -1837,21 +1860,21 @@
       }
     },
     {
-      "id": "poi-connector-icons",
+      "id": "poi-information-icons",
       "type": "symbol",
       "source": "poi-data",
-      "filter": ["==", ["get", "amenityCategory"], "connector"],
+      "filter": ["==", ["get", "amenityCategory"], "information"],
       "minzoom": 16.5,
       "layout": {
         "symbol-sort-key": ["get", "rank"],
         "icon-image": ["get", "iconId"],
         "icon-size": [
           "interpolate", ["exponential", 1.3], ["zoom"],
-          14, 0.28,
-          16, 0.4,
-          18, 0.58,
-          20, 0.85,
-          22, 1.2
+          14, 0.18,
+          16, 0.3,
+          18, 0.48,
+          20, 0.5,
+          22, 0.85
         ],
         "icon-allow-overlap": false,
         "icon-padding": [
@@ -1905,11 +1928,11 @@
         "icon-image": ["get", "iconId"],
         "icon-size": [
           "interpolate", ["exponential", 1.3], ["zoom"],
-          14, 0.28,
-          16, 0.4,
-          18, 0.58,
-          20, 0.85,
-          22, 1.2
+          14, 0.18,
+          16, 0.3,
+          18, 0.48,
+          20, 0.5,
+          22, 0.85
         ],
         "icon-allow-overlap": false,
         "icon-padding": [
@@ -1948,6 +1971,148 @@
         "icon-translate-anchor": "viewport"
       }
     },
+    {
+      "id": "poi-restroom-group-icons",
+      "type": "symbol",
+      "source": "restroom-group-data",
+      "minzoom": 16.5,
+      "layout": {
+        "symbol-sort-key": 0,
+        "icon-image": "material-wc",
+        "icon-size": [
+          "interpolate", ["exponential", 1.3], ["zoom"],
+          14, 0.18,
+          16, 0.3,
+          18, 0.48,
+          20, 0.5,
+          22, 0.85
+        ],
+        "icon-allow-overlap": false,
+        "icon-padding": [
+          "interpolate", ["linear"], ["zoom"],
+          15, 8,
+          17, 4,
+          19, 2
+        ],
+        "icon-optional": false,
+        "icon-rotation-alignment": "viewport",
+        "icon-pitch-alignment": "viewport"
+      },
+      "paint": {
+        "icon-halo-color": "#FFFFFF",
+        "icon-halo-width": 1.5,
+        "icon-halo-blur": 0.5,
+        "icon-translate": [0, -20],
+        "icon-translate-anchor": "viewport"
+      }
+    },
+    {
+      "id": "poi-amenity-instance-labels",
+      "type": "symbol",
+      "source": "poi-data",
+      "filter": ["all", ["==", ["get", "poiType"], "amenity"], ["has", "instanceName"]],
+      
+      "layout": {
+        "symbol-sort-key": ["get", "rank"],
+        "text-field": ["get", "instanceName"],
+        "text-size": [
+          "interpolate", ["linear"], ["zoom"],
+          16, 14,
+          19, 15,
+          22, 17
+        ],
+        "text-offset": [
+          "interpolate", ["linear"], ["zoom"],
+          16, ["literal", [0, 0.25]],
+          17, ["literal", [0, 0.15]],
+          19, ["literal", [0, 0.25]],
+          20, ["literal", [0, 0.45]],
+          22, ["literal", [0, 0.85]]
+        ],                
+        "text-anchor": "top",
+        "text-optional": true,
+        "text-padding": 4,
+        "text-font": ["Noto Sans Bold"],
+        "text-rotation-alignment": "viewport"
+      },
+      "paint": {
+        "text-color": "#0F1114",
+        "text-halo-color": "#FFFFFF",
+        "text-halo-width": 1.5,
+        "text-halo-blur": 0.1
+      }
+    },
+    {
+      "id": "poi-destination-labels",
+      "type": "symbol",
+      "source": "poi-data",
+      "filter": [
+        "all",
+        ["==", ["get", "poiType"], "destination"],
+        ["==", ["get", "showLabel"], true]
+      ],
+      "layout": {
+        "symbol-sort-key": 0,
+        "icon-image": "destination-dot",
+        "icon-size": [
+          "interpolate", ["linear"], ["zoom"],
+          14, 0.1,
+          16, 0.8,
+          17.30, 0.8,
+          18, 0.5,
+          20, 0.8
+        ],
+        "icon-overlap": "cooperative",
+        "icon-ignore-placement": false,
+        "icon-padding": 0,
+        "icon-optional": false,
+        "icon-rotation-alignment": "viewport",
+        "icon-pitch-alignment": "viewport",
+        "text-field": ["get", "name"],
+        "text-size": 16,
+        "text-variable-anchor-offset": ["top", [0, 0.5], "right", [-0.5, 0], "bottom", [0, -0.5], "left", [0.5, 0]],
+        "text-variable-anchor": ["top", "right" , "bottom", "left"],
+        "text-font": ["Noto Sans Bold"],
+        "text-max-width": 12,
+        "text-overlap": "never",
+        "text-padding": 4,
+        "text-optional": true,
+        "text-rotation-alignment": "viewport"
+      },
+      "paint": {
+        "text-color": "#F2F2F2",
+        "text-halo-color": "#242930",
+        "text-halo-width": 2,
+        "text-halo-blur": 0
+      }
+    },
+    {
+      "id": "poi-destination-circles",
+      "type": "symbol",
+      "source": "poi-data",
+      "filter": [
+        "all",
+        ["==", ["get", "poiType"], "destination"],
+        ["!=", ["get", "showLabel"], true]
+      ],
+      "minzoom": 16.5,
+      "layout": {
+        "icon-image": "destination-dot",
+        "icon-size": [
+          "interpolate", ["linear"], ["zoom"],
+          14, 0.1,
+          16, 0.8,
+          17.30, 0.8,
+          18, 0.5,
+          20, 0.8
+        ],
+        "icon-overlap": "cooperative",
+        "icon-ignore-placement": false,
+        "icon-padding": 0,
+        "icon-rotation-alignment": "viewport",
+        "icon-pitch-alignment": "viewport"
+      }
+    },
     {
       "id": "poi-you-are-here-heading",
       "type": "symbol",
@@ -1962,18 +2127,18 @@
         "text-field": "▲",
         "text-size": [
           "interpolate", ["linear"], ["zoom"],
-          16, 28,
-          18, 34,
-          20, 42
+          16, 20,
+          18, 22,
+          20, 28
         ],
         "text-font": ["Noto Sans Bold"],
-        "text-anchor": "bottom",
-        "text-offset": [0, -0.45],
+        "text-anchor": "bottom",        
         "text-rotate": ["-", ["get", "heading"], 180],
         "text-rotation-alignment": "map",
         "text-pitch-alignment": "map",
-        "text-allow-overlap": true,
-        "text-ignore-placement": true
+        "text-overlap": "always",
+        "text-ignore-placement": false,
+        "text-padding": 4
       },
       "paint": {
         "text-color": "#E31C3D",
@@ -2009,32 +2174,48 @@
       "layout": {
         "icon-image": "YouAreHereKiosk",
         "icon-anchor": "bottom",
-        "icon-offset": [0, 0],
-        "icon-allow-overlap": true,
-        "icon-ignore-placement": true,
+        "icon-offset": [
+          "interpolate", ["linear"], ["zoom"],
+          16, ["literal", [0, 20]],
+          18, ["literal", [0, 0]]
+        ],
         "icon-size": [
           "interpolate", ["linear"], ["zoom"],
-          16, 2,
-          18, 1,
-          20, 1
+          16, 0.9,
+          18, 0.8
+        ],
+        "icon-overlap": "never",
+        "icon-ignore-placement": false,
+        "icon-padding": [
+          "interpolate", ["linear"], ["zoom"],
+          16, 12,
+          18, 14,
+          20, 18
         ],
         "text-field": ["get", "name"],
         "text-size": [
           "interpolate", ["linear"], ["zoom"],
-          16, 20,
-          18, 19,
-          20, 22
+          16, 16,
+          18, 16,
+          20, 18
         ],
         "text-offset": [
           "interpolate", ["linear"], ["zoom"],
-          16, ["literal", [0, -4]],
+          16, ["literal", [0, -1.5]],
           18, ["literal", [0, -2.5]]
         ],
         "text-anchor": "bottom",
         "text-font": ["Noto Sans Bold"],
-        "text-allow-overlap": true,
-        "text-ignore-placement": true,
-        "text-optional": false
+        "text-overlap": "never",
+        "text-ignore-placement": false,
+        "text-padding": [
+          "interpolate", ["linear"], ["zoom"],
+          16, 8,
+          18, 10,
+          20, 12
+        ],
+        "text-optional": false,
+        "text-transform": "uppercase"
       },
       "paint": {
         "text-color": "#E31C3D",