diff --git a/app/scripts/MapboxStyles/json/metadata_last_process.json b/app/scripts/MapboxStyles/json/metadata_last_process.json index e214ab328..0ac5c8cc8 100644 --- a/app/scripts/MapboxStyles/json/metadata_last_process.json +++ b/app/scripts/MapboxStyles/json/metadata_last_process.json @@ -2,7 +2,7 @@ "atlas-style-package-1": { "key": "atlas-style-package-1", "about": "Metadata on the last processing of the atlas-style-package-1 styles api response", - "processed_at": "12.1.2025, 06:34:01", + "processed_at": "26.1.2025, 06:50:00", "style_last_published": { "published_at": "11.1.2025, 07:50:59", "version": 8 @@ -18,7 +18,7 @@ "atlas-style-package-2": { "key": "atlas-style-package-2", "about": "Metadata on the last processing of the atlas-style-package-2 styles api response", - "processed_at": "12.1.2025, 06:34:01", + "processed_at": "26.1.2025, 06:50:00", "style_last_published": { "published_at": "14.8.2024, 09:44:08", "version": 8 @@ -34,7 +34,7 @@ "parking": { "key": "parking", "about": "Metadata on the last processing of the parking styles api response", - "processed_at": "12.1.2025, 06:34:01", + "processed_at": "26.1.2025, 06:50:00", "style_last_published": { "published_at": "11.8.2024, 06:42:30", "version": 8 @@ -59,9 +59,9 @@ "atlas-style-package-3-radinfra": { "key": "atlas-style-package-3-radinfra", "about": "Metadata on the last processing of the atlas-style-package-3-radinfra styles api response", - "processed_at": "12.1.2025, 06:34:01", + "processed_at": "26.1.2025, 06:50:00", "style_last_published": { - "published_at": "12.1.2025, 06:33:54", + "published_at": "26.1.2025, 06:49:54", "version": 8 }, "style_id": "cm5qlrsda004401sb9c3bbc6w", diff --git a/app/src/app/regionen/(index)/_data/regions.const.ts b/app/src/app/regionen/(index)/_data/regions.const.ts index 7dd141910..80a0f0318 100644 --- a/app/src/app/regionen/(index)/_data/regions.const.ts +++ b/app/src/app/regionen/(index)/_data/regions.const.ts @@ -750,7 +750,6 @@ export const staticRegion: StaticRegion[] = [ logoWhiteBackgroundRequired: false, categories: [ // The order here specifies the order in the UI - // 'radinfra_bikelanes', 'radinfra_surface', 'radinfra_width', @@ -758,7 +757,7 @@ export const staticRegion: StaticRegion[] = [ 'radinfra_currentness', 'radinfra_campagins', 'radinfra_statistics', - 'mapillary', + 'radinfra_mapillary', ], backgroundSources: [...defaultBackgroundSources], notes: 'osmNotes', diff --git a/app/src/app/regionen/[regionSlug]/_hooks/useQueryState/useCategoriesConfig/v2/configs/_bsue6w.ts b/app/src/app/regionen/[regionSlug]/_hooks/useQueryState/useCategoriesConfig/v2/configs/_bsue6w.ts new file mode 100644 index 000000000..4561f74e2 --- /dev/null +++ b/app/src/app/regionen/[regionSlug]/_hooks/useQueryState/useCategoriesConfig/v2/configs/_bsue6w.ts @@ -0,0 +1,396 @@ +// DO NOT EDIT MANUALLY +// this file was automatically generated by `saveConfigs.ts` + +import { MapDataCategoryParam } from '../../type' + +export const _bsue6w: MapDataCategoryParam[] = [ + { + id: 'poi', + active: false, + subcategories: [ + { + id: 'poi', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'education', active: false }, + ], + }, + { + id: 'poiPlaces', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'circle', active: false }, + ], + }, + { + id: 'poiBoundaries', + styles: [ + { id: 'hidden', active: true }, + { id: 'default', active: false }, + { id: 'category_district_label', active: false }, + { id: 'category_municipality', active: false }, + { id: 'category_municipality_label', active: false }, + ], + }, + { id: 'poiPlusBarriers', styles: [{ id: 'default', active: false }] }, + { id: 'poiPlusLanduse', styles: [{ id: 'default', active: false }] }, + { id: 'poiPlusPublicTransport', styles: [{ id: 'default', active: false }] }, + ], + }, + { + id: 'boundaries', + active: false, + subcategories: [ + { + id: 'poiPlaces', + styles: [ + { id: 'hidden', active: true }, + { id: 'default', active: false }, + { id: 'circle', active: false }, + ], + }, + { + id: 'poiBoundaries', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'category_district_label', active: false }, + { id: 'category_municipality', active: false }, + { id: 'category_municipality_label', active: false }, + ], + }, + { id: 'poiPlusBarriers', styles: [{ id: 'default', active: false }] }, + ], + }, + { + id: 'roads', + active: false, + subcategories: [ + { + id: 'roads', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'sidestreets', active: false }, + { id: 'mainstreets', active: false }, + { id: 'classified', active: false }, + ], + }, + { + id: 'maxspeed', + styles: [ + { id: 'hidden', active: true }, + { id: 'default', active: false }, + { id: 'below30', active: false }, + { id: 'above40', active: false }, + ], + }, + { id: 'roads_plus_oneway', styles: [{ id: 'default', active: false }] }, + { id: 'roads_plus_footways', styles: [{ id: 'default', active: false }] }, + { id: 'roads_plus_label', styles: [{ id: 'default', active: true }] }, + ], + }, + { + id: 'bikelanes', + active: false, + subcategories: [ + { + id: 'bikelanes', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'details', active: false }, + { id: 'width', active: false }, + ], + }, + { id: 'bikelanes_plus_presence', styles: [{ id: 'default', active: false }] }, + { id: 'bikelanes_plus_width', styles: [{ id: 'default', active: false }] }, + { id: 'bikelanes_plus_surface_smoothness', styles: [{ id: 'default', active: false }] }, + { id: 'bikelanes_plus_signs', styles: [{ id: 'default', active: false }] }, + { id: 'bikelanes_plus_routes', styles: [{ id: 'default', active: false }] }, + { id: 'bikelanes_plus_bikesuitability', styles: [{ id: 'default', active: false }] }, + ], + }, + { + id: 'bikelanes-minimal', + active: false, + subcategories: [ + { + id: 'bikelanes', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'details', active: false }, + { id: 'width', active: false }, + ], + }, + ], + }, + { + id: 'lit', + active: false, + subcategories: [ + { + id: 'lit', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'lit', active: false }, + ], + }, + { id: 'lit-completeness', styles: [{ id: 'completeness', active: false }] }, + ], + }, + { + id: 'surface', + active: false, + subcategories: [ + { + id: 'surfaceRoads', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'bad', active: false }, + ], + }, + { + id: 'surfaceBikelanes', + styles: [ + { id: 'hidden', active: true }, + { id: 'default', active: false }, + { id: 'bad', active: false }, + ], + }, + ], + }, + { + id: 'parking', + active: false, + subcategories: [ + { + id: 'parking', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'presence', active: false }, + { id: 'missing', active: false }, + { id: 'surface', active: false }, + ], + }, + { + id: 'parkingPoints', + styles: [ + { id: 'hidden', active: true }, + { id: 'default', active: false }, + ], + }, + { + id: 'parkingAreas', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'street_side', active: false }, + ], + }, + { + id: 'parkingDebug', + styles: [ + { id: 'hidden', active: true }, + { id: 'default', active: false }, + ], + }, + { + id: 'parkingStats', + styles: [ + { id: 'hidden', active: true }, + { id: 'stats-admin-level-4', active: false }, + { id: 'default', active: false }, + { id: 'stats-admin-level-10', active: false }, + { id: 'length-admin-level-4', active: false }, + { id: 'length-admin-level-9', active: false }, + { id: 'length-admin-level-10', active: false }, + ], + }, + { + id: 'parkingBoundaries', + styles: [ + { id: 'hidden', active: true }, + { id: 'boundaries-admin-level-4', active: false }, + { id: 'boundaries-admin-level-9', active: false }, + { id: 'default', active: false }, + ], + }, + { + id: 'signs', + styles: [ + { id: 'hidden', active: true }, + { id: 'default', active: false }, + ], + }, + ], + }, + { + id: 'bicycleParking', + active: false, + subcategories: [ + { + id: 'bicycleParking', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + ], + }, + ], + }, + { + id: 'statistics', + active: false, + subcategories: [ + { + id: 'bikelanesStatistics', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'category_municipality', active: false }, + ], + }, + { + id: 'poiBoundaries', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'category_district_label', active: false }, + { id: 'category_municipality', active: false }, + { id: 'category_municipality_label', active: false }, + ], + }, + ], + }, + { + id: 'mapillary', + active: false, + subcategories: [ + { + id: 'mapillaryCoverage', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'all', active: false }, + { id: 'age', active: false }, + { id: 'pano', active: false }, + ], + }, + ], + }, + { + id: 'accidents', + active: false, + subcategories: [ + { + id: 'accidents', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + ], + }, + ], + }, + { + id: 'radinfra_bikelanes', + active: false, + subcategories: [ + { + id: 'bikelanes', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'details', active: false }, + ], + }, + { id: 'bikelanes_plus_routes', styles: [{ id: 'default', active: false }] }, + ], + }, + { + id: 'radinfra_surface', + active: false, + subcategories: [ + { id: 'bikelanes', styles: [{ id: 'default', active: true }] }, + { id: 'bikelanes_plus_surface_smoothness', styles: [{ id: 'default', active: false }] }, + ], + }, + { + id: 'radinfra_width', + active: false, + subcategories: [ + { id: 'bikelanes', styles: [{ id: 'default', active: true }] }, + { id: 'bikelanes_plus_width', styles: [{ id: 'default', active: false }] }, + ], + }, + { + id: 'radinfra_trafficSigns', + active: false, + subcategories: [{ id: 'bikelanes', styles: [{ id: 'default', active: true }] }], + }, + { + id: 'radinfra_currentness', + active: false, + subcategories: [{ id: 'bikelanes', styles: [{ id: 'default', active: true }] }], + }, + { + id: 'radinfra_campagins', + active: false, + subcategories: [ + { + id: 'campaigns', + styles: [ + { id: 'default', active: true }, + { id: 'adjoiningOrIsolated', active: false }, + { id: 'advisoryOrExclusive', active: false }, + { id: 'missing_access_tag_240', active: false }, + { id: 'missing_access_tag_bicycle_road', active: false }, + { id: 'missing_segregated', active: false }, + { id: 'missing_traffic_sign', active: false }, + { id: 'missing_traffic_sign_244', active: false }, + { id: 'missing_traffic_sign_but_bicycle_designated', active: false }, + { id: 'missing_traffic_sign_but_bicycle_yes', active: false }, + { id: 'missing_traffic_sign_vehicle_destination', active: false }, + { id: 'needsClarification', active: false }, + { id: 'unexpected_bicycle_access_on_footway', active: false }, + { id: 'deprecated_cycleway_shared', active: false }, + ], + }, + ], + }, + { + id: 'radinfra_statistics', + active: false, + subcategories: [ + { + id: 'stats', + styles: [ + { id: 'default', active: true }, + { id: 'level6', active: false }, + ], + }, + ], + }, + { + id: 'radinfra_mapillary', + active: false, + subcategories: [ + { + id: 'mapillaryCoverage', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'all', active: false }, + { id: 'age', active: false }, + { id: 'pano', active: false }, + ], + }, + { id: 'mapillaryPlus', styles: [{ id: 'highlight', active: false }] }, + ], + }, +] diff --git a/app/src/app/regionen/[regionSlug]/_hooks/useQueryState/useCategoriesConfig/v2/configs/_pcvinc.ts b/app/src/app/regionen/[regionSlug]/_hooks/useQueryState/useCategoriesConfig/v2/configs/_pcvinc.ts new file mode 100644 index 000000000..75c65e2c9 --- /dev/null +++ b/app/src/app/regionen/[regionSlug]/_hooks/useQueryState/useCategoriesConfig/v2/configs/_pcvinc.ts @@ -0,0 +1,103 @@ +// DO NOT EDIT MANUALLY +// this file was automatically generated by `saveConfigs.ts` + +import { MapDataCategoryParam } from '../../type' + +export const _pcvinc: MapDataCategoryParam[] = [ + { + id: 'radinfra_bikelanes', + active: false, + subcategories: [ + { + id: 'bikelanes', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'details', active: false }, + ], + }, + { id: 'bikelanes_plus_routes', styles: [{ id: 'default', active: false }] }, + ], + }, + { + id: 'radinfra_surface', + active: false, + subcategories: [ + { id: 'bikelanes', styles: [{ id: 'default', active: true }] }, + { id: 'bikelanes_plus_surface_smoothness', styles: [{ id: 'default', active: false }] }, + ], + }, + { + id: 'radinfra_width', + active: false, + subcategories: [ + { id: 'bikelanes', styles: [{ id: 'default', active: true }] }, + { id: 'bikelanes_plus_width', styles: [{ id: 'default', active: false }] }, + ], + }, + { + id: 'radinfra_trafficSigns', + active: false, + subcategories: [{ id: 'bikelanes', styles: [{ id: 'default', active: true }] }], + }, + { + id: 'radinfra_currentness', + active: false, + subcategories: [{ id: 'bikelanes', styles: [{ id: 'default', active: true }] }], + }, + { + id: 'radinfra_campagins', + active: false, + subcategories: [ + { + id: 'campaigns', + styles: [ + { id: 'default', active: true }, + { id: 'adjoiningOrIsolated', active: false }, + { id: 'advisoryOrExclusive', active: false }, + { id: 'missing_access_tag_240', active: false }, + { id: 'missing_access_tag_bicycle_road', active: false }, + { id: 'missing_segregated', active: false }, + { id: 'missing_traffic_sign', active: false }, + { id: 'missing_traffic_sign_244', active: false }, + { id: 'missing_traffic_sign_but_bicycle_designated', active: false }, + { id: 'missing_traffic_sign_but_bicycle_yes', active: false }, + { id: 'missing_traffic_sign_vehicle_destination', active: false }, + { id: 'needsClarification', active: false }, + { id: 'unexpected_bicycle_access_on_footway', active: false }, + { id: 'deprecated_cycleway_shared', active: false }, + ], + }, + ], + }, + { + id: 'radinfra_statistics', + active: false, + subcategories: [ + { + id: 'stats', + styles: [ + { id: 'default', active: true }, + { id: 'level6', active: false }, + ], + }, + ], + }, + { + id: 'radinfra_mapillary', + active: false, + subcategories: [ + { + id: 'mapillaryCoverage', + styles: [ + { id: 'hidden', active: false }, + { id: 'default', active: true }, + { id: 'all', active: false }, + { id: 'age', active: false }, + { id: 'pano', active: false }, + ], + }, + { id: 'mapillaryPlus', styles: [{ id: 'highlight', active: false }] }, + ], + }, +] diff --git a/app/src/app/regionen/[regionSlug]/_hooks/useQueryState/useCategoriesConfig/v2/configs/index.ts b/app/src/app/regionen/[regionSlug]/_hooks/useQueryState/useCategoriesConfig/v2/configs/index.ts index 5213732ff..c41479bcb 100644 --- a/app/src/app/regionen/[regionSlug]/_hooks/useQueryState/useCategoriesConfig/v2/configs/index.ts +++ b/app/src/app/regionen/[regionSlug]/_hooks/useQueryState/useCategoriesConfig/v2/configs/index.ts @@ -27,6 +27,7 @@ import { _1tdocms } from './_1tdocms' import { _1x5utcr } from './_1x5utcr' import { _1ybiojr } from './_1ybiojr' import { _b5k2yc } from './_b5k2yc' +import { _bsue6w } from './_bsue6w' import { _bv3m8i } from './_bv3m8i' import { _c8lcr0 } from './_c8lcr0' import { _diykzs } from './_diykzs' @@ -35,6 +36,7 @@ import { _eu560i } from './_eu560i' import { _gdl8v6 } from './_gdl8v6' import { _l464fe } from './_l464fe' import { _nq3m12 } from './_nq3m12' +import { _pcvinc } from './_pcvinc' import { _qver32 } from './_qver32' import { _r6m1yq } from './_r6m1yq' import { _rcqwse } from './_rcqwse' @@ -73,6 +75,7 @@ export const configs = { '1x5utcr': _1x5utcr, '1ybiojr': _1ybiojr, b5k2yc: _b5k2yc, + bsue6w: _bsue6w, bv3m8i: _bv3m8i, c8lcr0: _c8lcr0, diykzs: _diykzs, @@ -81,6 +84,7 @@ export const configs = { gdl8v6: _gdl8v6, l464fe: _l464fe, nq3m12: _nq3m12, + pcvinc: _pcvinc, qver32: _qver32, r6m1yq: _r6m1yq, rcqwse: _rcqwse, diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataCategories/MapDataCategoryId.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataCategories/MapDataCategoryId.ts index 4b2a2706f..c1c873bd8 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataCategories/MapDataCategoryId.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataCategories/MapDataCategoryId.ts @@ -26,3 +26,4 @@ export type MapDataCategoryId = | 'radinfra_width' | 'radinfra_campagins' | 'radinfra_statistics' + | 'radinfra_mapillary' diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataCategories/radinfraCategories.const.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataCategories/radinfraCategories.const.ts index 94b7f8368..086f4b167 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataCategories/radinfraCategories.const.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataCategories/radinfraCategories.const.ts @@ -1,9 +1,11 @@ import { subcat_bikelanes_plus_routes } from '../mapDataSubcategories/subcat_bikelanes_plus_routes.const' import { subcat_bikelanes_plus_surface_text } from '../mapDataSubcategories/subcat_bikelanes_plus_surface_text.const' import { subcat_bikelanes_plus_width_text } from '../mapDataSubcategories/subcat_bikelanes_plus_width_text.const' +import { subcat_mapillaryCoverage } from '../mapDataSubcategories/subcat_mapillaryCoverage.const' import { subcat_radinfra_bikelanes } from '../mapDataSubcategories/subcat_radinfra_bikelanes.const' import { subcat_radinfra_campaigns } from '../mapDataSubcategories/subcat_radinfra_campaigns.const' import { subcat_radinfra_currentness } from '../mapDataSubcategories/subcat_radinfra_currentness.const' +import { subcat_radinfraPlusMapillary } from '../mapDataSubcategories/subcat_radinfra_plus_mapillary.const' import { subcat_radinfra_smoothness } from '../mapDataSubcategories/subcat_radinfra_smoothness.const' import { subcat_radinfra_stats } from '../mapDataSubcategories/subcat_radinfra_stats' import { subcat_radinfra_trafficSigns } from '../mapDataSubcategories/subcat_radinfra_trafficSigns.const' @@ -73,4 +75,13 @@ export const radinfraCategories: StaticMapDataCategory[] = [ // { ...subcat_poi_boundaries, defaultStyle: 'default' }, ], }, + { + id: 'radinfra_mapillary', + name: 'Mapillary', + desc: 'Straßenlevel Fotos', + subcategories: [ + { ...subcat_mapillaryCoverage, defaultStyle: 'default' }, + { ...subcat_radinfraPlusMapillary, defaultStyle: 'default' }, + ], + }, ] diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_campaign.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_campaign.ts index 8a7cf35c4..39f322e37 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_campaign.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_campaign.ts @@ -5,21 +5,15 @@ import { MapboxStyleLayer } from '../types' export const mapboxStyleGroupLayers_radinfra_campaign: MapboxStyleLayer[] = [ { - maxzoom: 13, - type: 'heatmap', - id: 'campaign-heatmap', + layout: { + 'line-join': 'round', + 'line-cap': 'round', + }, + type: 'line', + id: 'campaign-fake-heatmap', paint: { - 'heatmap-color': [ - 'interpolate', - ['linear'], - ['heatmap-density'], - 0, - 'rgba(0, 0, 255, 0)', - 1, - '#a97bea', - ], - 'heatmap-radius': ['interpolate', ['linear'], ['zoom'], 0, 2, 6, 2, 8, 4, 11, 16, 13, 20], - 'heatmap-opacity': 0.8, + 'line-color': '#a97bea', + 'line-width': ['interpolate', ['linear'], ['zoom'], 0, 8, 10, 7, 14, 6, 18, 0], }, }, { @@ -29,6 +23,11 @@ export const mapboxStyleGroupLayers_radinfra_campaign: MapboxStyleLayer[] = [ paint: { 'line-color': '#a97bea', 'line-opacity': 0.6, + 'line-width': 4, + }, + layout: { + 'line-join': 'round', + 'line-cap': 'round', }, }, ] diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_currentness.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_currentness.ts index 63f67ff1d..459c1cba0 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_currentness.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_currentness.ts @@ -12,5 +12,9 @@ export const mapboxStyleGroupLayers_radinfra_currentness: MapboxStyleLayer[] = [ 'line-width': ['interpolate', ['linear'], ['zoom'], 10, 1.5, 14, 3, 16, 4], 'line-color': ['step', ['get', 'updated_age'], '#15c65c', 1095, '#f6de09', 2190, '#fda5e4'], }, + layout: { + 'line-join': 'round', + 'line-cap': 'round', + }, }, ] diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_plus_missing.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_plus_missing.ts deleted file mode 100644 index 1c820f328..000000000 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_plus_missing.ts +++ /dev/null @@ -1,22 +0,0 @@ -// Autogenerated by `scripts/MapboxStyles/process.ts` -// Do not change this file manually - -import { MapboxStyleLayer } from '../types' - -export const mapboxStyleGroupLayers_radinfra_plus_missing: MapboxStyleLayer[] = [ - { - minzoom: 11, - layout: { - 'line-cap': 'round', - 'line-join': 'round', - }, - filter: ['!', ['has', 'traffic_sign']], - type: 'line', - id: 'plus_highlight_missing', - paint: { - 'line-color': '#a97bea', - 'line-width': 10, - 'line-opacity': 0.6, - }, - }, -] diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_smoothness.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_smoothness.ts index 0d9364fbe..dd16b0985 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_smoothness.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_smoothness.ts @@ -5,6 +5,10 @@ import { MapboxStyleLayer } from '../types' export const mapboxStyleGroupLayers_radinfra_smoothness: MapboxStyleLayer[] = [ { + layout: { + 'line-join': 'round', + 'line-cap': 'round', + }, type: 'line', id: 'smooth-missing', paint: { @@ -20,6 +24,10 @@ export const mapboxStyleGroupLayers_radinfra_smoothness: MapboxStyleLayer[] = [ ], }, { + layout: { + 'line-cap': 'round', + 'line-join': 'round', + }, type: 'line', id: 'smooth-colors', paint: { diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_traffic_signs.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_traffic_signs.ts index c972d78a8..6e44c9bb4 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_traffic_signs.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_traffic_signs.ts @@ -6,6 +6,7 @@ import { MapboxStyleLayer } from '../types' export const mapboxStyleGroupLayers_radinfra_traffic_signs: MapboxStyleLayer[] = [ { maxzoom: 13, + filter: ['!', ['has', 'traffic_sign']], type: 'heatmap', id: 'sign-heatmap', paint: { diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_width.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_width.ts index 77b3c91f4..3475b6caf 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_width.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/mapboxStyles/groups/radinfra_width.ts @@ -14,6 +14,10 @@ export const mapboxStyleGroupLayers_radinfra_width: MapboxStyleLayer[] = [ 'line-dasharray': [3, 1], }, filter: ['any', ['!', ['has', 'width']], ['match', ['get', 'width'], [''], true, false]], + layout: { + 'line-cap': 'round', + 'line-join': 'round', + }, }, { type: 'line', diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_mapillaryCoverage.const.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_mapillaryCoverage.const.ts index 8b1354193..aa7e801fb 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_mapillaryCoverage.const.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_mapillaryCoverage.const.ts @@ -36,6 +36,7 @@ export const subcat_mapillaryCoverage: FileMapDataSubcategory = { name: 'Mapillary', ui: 'dropdown', sourceId: 'mapillary_coverage', + beforeId: 'atlas-app-beforeid-below-roadname', styles: [ defaultStyleHidden, { diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_campaigns.const.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_campaigns.const.ts index e007424ab..206efdf08 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_campaigns.const.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_campaigns.const.ts @@ -25,6 +25,7 @@ export const subcat_radinfra_campaigns: FileMapDataSubcategory = { id: subcatId, name: 'Kampagnen', ui: 'dropdown', + beforeId: 'atlas-app-beforeid-top', sourceId: source, styles: [ { diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_currentness.const.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_currentness.const.ts index 94540e1cf..2224a41db 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_currentness.const.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_currentness.const.ts @@ -39,6 +39,7 @@ export const subcat_radinfra_currentness: FileMapDataSubcategory = { id: subcatId, name: 'RVA Aktualität', ui: 'checkbox', + beforeId: 'atlas-app-beforeid-top', sourceId: source, styles: [ { diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_plus_mapillary.const.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_plus_mapillary.const.ts new file mode 100644 index 000000000..b76e22226 --- /dev/null +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_plus_mapillary.const.ts @@ -0,0 +1,88 @@ +import { FileMapDataSubcategory } from '../types' + +const subcatId = 'mapillaryPlus' +export type SubcatRadinfraPlusMapillaryId = typeof subcatId +export type SubcatRadinfraPlusMapillaryStyleIds = 'default' + +export const subcat_radinfraPlusMapillary: FileMapDataSubcategory = { + id: subcatId, + name: 'Verfügbarkeit hervorheben', + ui: 'checkbox', + sourceId: 'mapillary_coverage', + beforeId: 'atlas-app-beforeid-below-roadname', + styles: [ + { + id: 'default', + name: 'Verfügbarkeit hervorheben', + desc: null, + legends: [ + { + id: 'highlight-cam', + name: 'Aktuelle, klassische Fotos', + style: { + type: 'border', + color: 'green', + }, + }, + { + id: 'highlight-360', + name: 'Aktuelle 360° Fotos', + style: { + type: 'border', + color: 'blue', + }, + }, + ], + layers: [ + { + id: 'plus_highlight_mapillary', + interactive: false, // Interaction DISABLED + type: 'line', + layout: { + 'line-cap': 'round', + 'line-join': 'round', + // Sort pano on top of non-pano pictures + 'line-sort-key': ['case', ['==', ['get', 'is_pano'], true], 300, 100], + }, + source: 'mapillary-source', + 'source-layer': 'sequence', + paint: { + 'line-color': ['case', ['==', ['get', 'is_pano'], true], 'blue', 'green'], + 'line-width': ['interpolate', ['linear'], ['zoom'], 10, 10, 20, 28], + // 'line-opacity': 0.25, + // 'line-offset': 10, + }, + filter: [ + '>', + ['get', 'captured_at'], + new Date().setFullYear(new Date().getFullYear() - 3), + ], + }, + { + id: 'plus_highlight_mapillary-fill', + interactive: false, // Interaction DISABLED + type: 'line', + layout: { + 'line-cap': 'round', + 'line-join': 'round', + // Sort pano on top of non-pano pictures + 'line-sort-key': ['case', ['==', ['get', 'is_pano'], true], 300, 100], + }, + source: 'mapillary-source', + 'source-layer': 'sequence', + paint: { + 'line-color': 'white', + 'line-width': ['interpolate', ['linear'], ['zoom'], 10, 8, 20, 26], + 'line-opacity': 0.95, + // 'line-offset': 10, + }, + filter: [ + '>', + ['get', 'captured_at'], + new Date().setFullYear(new Date().getFullYear() - 3), + ], + }, + ], + }, + ], +} diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_smoothness.const.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_smoothness.const.ts index 646e6fb6f..5b19d488c 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_smoothness.const.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_smoothness.const.ts @@ -22,6 +22,7 @@ export const subcat_radinfra_smoothness: FileMapDataSubcategory = { id: subcatId, name: 'RVA Oberflächenqualität', ui: 'checkbox', + beforeId: 'atlas-app-beforeid-top', sourceId: source, styles: [ { diff --git a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_trafficSigns.const.ts b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_trafficSigns.const.ts index 0983c8140..b0aa73b69 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_trafficSigns.const.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/mapDataSubcategories/subcat_radinfra_trafficSigns.const.ts @@ -35,6 +35,7 @@ export const subcat_radinfra_trafficSigns: FileMapDataSubcategory = { id: subcatId, name: 'Beschilderung', ui: 'checkbox', + beforeId: 'atlas-app-beforeid-top', sourceId: source, styles: [ { diff --git a/app/src/app/regionen/[regionSlug]/_mapData/typeId.ts b/app/src/app/regionen/[regionSlug]/_mapData/typeId.ts index 06c2eefd0..5552b417c 100644 --- a/app/src/app/regionen/[regionSlug]/_mapData/typeId.ts +++ b/app/src/app/regionen/[regionSlug]/_mapData/typeId.ts @@ -109,6 +109,10 @@ import { SubcatRadinfraCampaignId, SubcatRadinfraCampaignStyleIds, } from './mapDataSubcategories/subcat_radinfra_campaigns.const' +import { + SubcatRadinfraPlusMapillaryId, + SubcatRadinfraPlusMapillaryStyleIds, +} from './mapDataSubcategories/subcat_radinfra_plus_mapillary.const' import { SubcatRadinfraStatsId, SubcatRadinfraStatsStyleIds, @@ -168,6 +172,7 @@ export type SubcategoryId = | SubcatPoiPlusLanduseId | SubcatPoiPlusPublicTransportId | SubcatRadinfraCampaignId + | SubcatRadinfraPlusMapillaryId | SubcatRadinfraStatsId | SubcatRadinfraStatsId | SubcatRoadsId @@ -212,6 +217,7 @@ export type StyleId = | SubcatPoiPlusPublicTransportStyleIds | SubcatPoiStyleIds | SubcatRadinfraCampaignStyleIds + | SubcatRadinfraPlusMapillaryStyleIds | SubcatRadinfraStatsStyleIds | SubcatRadinfraStatsStyleIds | SubcatRoadsPlusFootwaysStyleIds