Radinfra: Fix traffic sign style; improve currentness style

Author: tordans

app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_currentness.ts

@@ -9,8 +9,18 @@ export const mapboxStyleGroupLayers_radinfra_currentness: MapboxStyleLayer[] = [
     id: 'current-colors',
     paint: {
       'line-offset': ['interpolate', ['linear'], ['zoom'], 12, 0, 15, -1],
-      'line-width': ['interpolate', ['linear'], ['zoom'], 10, 1.5, 14, 3, 16, 4],
-      'line-color': ['step', ['get', 'updated_age'], '#15c65c', 2370, '#f6de09', 3650, '#fda5e4'],
+      'line-width': ['interpolate', ['linear'], ['zoom'], 10, 1.5, 16, 4],
+      'line-color': [
+        'step',
+        ['get', 'updated_age'],
+        '#15c65c',
+        1185,
+        '#b5c615',
+        2370,
+        '#ffe500',
+        3650,
+        '#fda5e4',
+      ],
     },
     layout: {
       'line-join': 'round',
@@ -23,7 +33,7 @@ export const mapboxStyleGroupLayers_radinfra_currentness: MapboxStyleLayer[] = [
     id: 'current-zoomed-out',
     paint: {
       'line-offset': ['interpolate', ['linear'], ['zoom'], 12, 0, 15, -1],
-      'line-width': ['interpolate', ['linear'], ['zoom'], 10, 1.5, 14, 3, 16, 4],
+      'line-width': ['interpolate', ['linear'], ['zoom'], 10, 1.5, 16, 4],
       'line-color': 'gray',
     },
     layout: {

app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_traffic_signs.ts

@@ -5,7 +5,7 @@ import { MapboxStyleLayer } from '../types'
 
 export const mapboxStyleGroupLayers_radinfra_traffic_signs: MapboxStyleLayer[] = [
   {
-    minzoom: 11,
+    minzoom: 8,
     layout: {
       'line-cap': 'round',
       'line-join': 'round',
@@ -15,14 +15,14 @@ export const mapboxStyleGroupLayers_radinfra_traffic_signs: MapboxStyleLayer[] =
     id: 'sign-missing',
     paint: {
       'line-color': '#fda5e4',
-      'line-width': ['interpolate', ['linear'], ['zoom'], 12, 1, 22, 4],
+      'line-width': ['interpolate', ['linear'], ['zoom'], 10, 1.5, 20, 4],
       'line-opacity': 0.6,
       'line-offset': ['interpolate', ['linear'], ['zoom'], 12, 0, 15, -1],
       'line-dasharray': [3, 1],
     },
   },
   {
-    minzoom: 11,
+    minzoom: 8,
     layout: {
       'line-cap': 'round',
       'line-join': 'round',
@@ -32,8 +32,23 @@ export const mapboxStyleGroupLayers_radinfra_traffic_signs: MapboxStyleLayer[] =
     id: 'sign-colors',
     paint: {
       'line-color': ['match', ['get', 'traffic_sign'], ['none'], '#00c29e', '#a1e217'],
-      'line-width': ['interpolate', ['linear'], ['zoom'], 10, 1.5, 14, 3, 16, 4],
+      'line-width': ['interpolate', ['linear'], ['zoom'], 10, 1.5, 16, 4],
       'line-opacity': 0.6,
     },
   },
+  {
+    layout: {
+      'line-join': 'round',
+      'line-cap': 'round',
+    },
+    maxzoom: 9,
+    filter: ['!', ['has', 'traffic_sign']],
+    type: 'line',
+    id: 'current-zoomed-out-traffic-signs',
+    paint: {
+      'line-offset': ['interpolate', ['linear'], ['zoom'], 12, 0, 15, -1],
+      'line-width': ['interpolate', ['linear'], ['zoom'], 10, 1.5, 16, 4],
+      'line-color': 'gray',
+    },
+  },
 ]

app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_currentness.const.ts

@@ -18,19 +18,26 @@ export const bikelanesCurrentnessLegend: FileMapDataSubcategoryStyleLegend[] = [
     },
   },
   {
-    id: 'ok',
-    name: '3-6 Jahre', // From 3*365=1.095
+    id: 'check3',
+    name: '3-6 Jahre',
     style: {
       type: 'line',
-      color: '#f6de09',
+      color: '#b5c615',
+    },
+  },
+  {
+    id: 'check6',
+    name: '6-10 Jahre',
+    style: {
+      type: 'line',
+      color: '#ffe500',
     },
   },
   {
     id: 'old',
-    name: 'Dringed prüfen (6+ Jahre)', // From 6*365=2.190
+    name: 'Dringed prüfen (10+ Jahre)',
     style: {
       type: 'line',
-      // color: '#d8035c',
       color: '#fda5e4',
     },
   },

app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_trafficSigns.const.ts

@@ -27,7 +27,18 @@ export const bikelanesTrafficSignLegend: FileMapDataSubcategoryStyleLegend[] = [
   {
     id: 'missing',
     name: 'Angaben fehlen',
-    style: { type: 'line', color: '#fda5e4', dasharray: [3, 2], width: 2 },
+    style: {
+      type: 'line',
+      color: '#fda5e4',
+    },
+  },
+  {
+    id: 'missing',
+    name: 'Auf dieser Zoomstufe können die Daten nicht angezeigt werden',
+    style: {
+      type: 'line',
+      color: 'gray',
+    },
   },
 ]