diff --git a/website/src/lib/assets/layers.ts b/website/src/lib/assets/layers.ts index 9a3307ae..67d239e8 100644 --- a/website/src/lib/assets/layers.ts +++ b/website/src/lib/assets/layers.ts @@ -410,62 +410,6 @@ export const overlays: { [key: string]: AnySourceData; } = { maxzoom: 18, attribution: '© Waymarked Trails' }, - stravaHeatmapRun: { - type: 'raster', - tiles: [], - tileSize: 1024, - maxzoom: 15, - attribution: '© Strava' - }, - stravaHeatmapTrailRun: { - type: 'raster', - tiles: [], - tileSize: 1024, - maxzoom: 15, - attribution: '© Strava' - }, - stravaHeatmapHike: { - type: 'raster', - tiles: [], - tileSize: 1024, - maxzoom: 15, - attribution: '© Strava' - }, - stravaHeatmapRide: { - type: 'raster', - tiles: [], - tileSize: 1024, - maxzoom: 15, - attribution: '© Strava' - }, - stravaHeatmapGravel: { - type: 'raster', - tiles: [], - tileSize: 1024, - maxzoom: 15, - attribution: '© Strava' - }, - stravaHeatmapMTB: { - type: 'raster', - tiles: [], - tileSize: 1024, - maxzoom: 15, - attribution: '© Strava' - }, - stravaHeatmapWater: { - type: 'raster', - tiles: [], - tileSize: 1024, - maxzoom: 15, - attribution: '© Strava' - }, - stravaHeatmapWinter: { - type: 'raster', - tiles: [], - tileSize: 1024, - maxzoom: 15, - attribution: '© Strava' - }, }; export const defaultOpacities: { [key: string]: number; } = { @@ -538,16 +482,6 @@ export const overlayTree: LayerTreeType = { cyclOSM: { cyclOSMlite: true, }, - /*strava: { - stravaHeatmapRun: true, - stravaHeatmapTrailRun: true, - stravaHeatmapHike: true, - stravaHeatmapRide: true, - stravaHeatmapGravel: true, - stravaHeatmapMTB: true, - stravaHeatmapWater: true, - stravaHeatmapWinter: true, - },*/ waymarked_trails: { waymarkedTrailsHiking: true, waymarkedTrailsCycling: true, @@ -630,16 +564,6 @@ export const defaultOverlays = { cyclOSM: { cyclOSMlite: false, }, - /*strava: { - stravaHeatmapRun: false, - stravaHeatmapTrailRun: false, - stravaHeatmapHike: false, - stravaHeatmapRide: false, - stravaHeatmapGravel: false, - stravaHeatmapMTB: false, - stravaHeatmapWater: false, - stravaHeatmapWinter: false, - },*/ waymarked_trails: { waymarkedTrailsHiking: false, waymarkedTrailsCycling: false, @@ -774,16 +698,6 @@ export const defaultOverlayTree: LayerTreeType = { cyclOSM: { cyclOSMlite: false, }, - /*strava: { - stravaHeatmapRun: true, - stravaHeatmapTrailRun: true, - stravaHeatmapHike: true, - stravaHeatmapRide: true, - stravaHeatmapGravel: true, - stravaHeatmapMTB: true, - stravaHeatmapWater: true, - stravaHeatmapWinter: true, - },*/ waymarked_trails: { waymarkedTrailsHiking: true, waymarkedTrailsCycling: true, @@ -1122,16 +1036,4 @@ export const overpassQueryData: Record = { amenity: "ferry_terminal" } } -}; - -export const stravaHeatmapServers = ['https://heatmap-external-a.strava.com/tiles-auth', 'https://heatmap-external-b.strava.com/tiles-auth', 'https://heatmap-external-c.strava.com/tiles-auth']; -export const stravaHeatmapActivityIds: { [key: string]: string } = { - stravaHeatmapRun: 'sport_Run', - stravaHeatmapTrailRun: 'sport_TrailRun', - stravaHeatmapHike: 'sport_Hike', - stravaHeatmapRide: 'sport_Ride', - stravaHeatmapGravel: 'sport_GravelRide', - stravaHeatmapMTB: 'sport_MountainBikeRide', - stravaHeatmapWater: 'water', - stravaHeatmapWinter: 'winter', -} \ No newline at end of file +}; \ No newline at end of file diff --git a/website/src/lib/components/layer-control/LayerControlSettings.svelte b/website/src/lib/components/layer-control/LayerControlSettings.svelte index 7fc29634..47ba04d7 100644 --- a/website/src/lib/components/layer-control/LayerControlSettings.svelte +++ b/website/src/lib/components/layer-control/LayerControlSettings.svelte @@ -14,16 +14,14 @@ import { settings } from '$lib/db'; import { _ } from 'svelte-i18n'; - import { writable, get } from 'svelte/store'; - import { map, setStravaHeatmapURLs } from '$lib/stores'; - import { browser } from '$app/environment'; + import { writable } from 'svelte/store'; + import { map } from '$lib/stores'; import CustomLayers from './CustomLayers.svelte'; const { selectedBasemapTree, selectedOverlayTree, selectedOverpassTree, - stravaHeatmapColor, currentOverlays, customLayers, opacities @@ -51,63 +49,6 @@ $: if ($selectedOverlay) { setOpacityFromSelection(); } - - const heatmapColors = [ - { value: '', label: '' }, - { value: 'blue', label: $_('layers.color.blue') }, - { value: 'bluered', label: $_('layers.color.bluered') }, - { value: 'gray', label: $_('layers.color.gray') }, - { value: 'hot', label: $_('layers.color.hot') }, - { value: 'orange', label: $_('layers.color.orange') }, - { value: 'purple', label: $_('layers.color.purple') } - ]; - - let selectedHeatmapColor = writable(heatmapColors[0]); - - $: if ($selectedHeatmapColor !== heatmapColors[0]) { - stravaHeatmapColor.set($selectedHeatmapColor.value); - - // remove and add the heatmap layers - let m = get(map); - if (m) { - let currentStravaLayers = []; - if (overlayTree.overlays.world.strava) { - for (let layer of Object.keys(overlayTree.overlays.world.strava)) { - if (m.getLayer(layer)) { - m.removeLayer(layer); - currentStravaLayers.push(layer); - } - if (m.getSource(layer)) { - m.removeSource(layer); - } - } - } - if (currentStravaLayers.length > 0) { - currentOverlays.update(($currentOverlays) => { - for (let layer of currentStravaLayers) { - $currentOverlays.overlays.world.strava[layer] = false; - } - return $currentOverlays; - }); - currentOverlays.update(($currentOverlays) => { - for (let layer of currentStravaLayers) { - $currentOverlays.overlays.world.strava[layer] = true; - } - return $currentOverlays; - }); - } - } - } - - $: if ($stravaHeatmapColor && browser) { - setStravaHeatmapURLs(); - if ($stravaHeatmapColor !== get(selectedHeatmapColor).value) { - let toSelect = heatmapColors.find(({ value }) => value === $stravaHeatmapColor); - if (toSelect) { - selectedHeatmapColor.set(toSelect); - } - } - } @@ -209,26 +150,6 @@ - diff --git a/website/src/lib/db.ts b/website/src/lib/db.ts index 6753eb4f..1e86fec8 100644 --- a/website/src/lib/db.ts +++ b/website/src/lib/db.ts @@ -105,7 +105,6 @@ export const settings = { customOverlayOrder: dexieSettingStore('customOverlayOrder', []), directionMarkers: dexieSettingStore('directionMarkers', false), distanceMarkers: dexieSettingStore('distanceMarkers', false), - stravaHeatmapColor: dexieSettingStore('stravaHeatmapColor', 'bluered'), streetViewSource: dexieSettingStore('streetViewSource', 'mapillary'), fileOrder: dexieSettingStore('fileOrder', []), defaultOpacity: dexieSettingStore('defaultOpacity', 0.7), diff --git a/website/src/lib/stores.ts b/website/src/lib/stores.ts index c2adc535..397ae336 100644 --- a/website/src/lib/stores.ts +++ b/website/src/lib/stores.ts @@ -393,47 +393,3 @@ export enum ExportState { ALL } export const exportState = writable(ExportState.NONE); - -let stravaCookies: any = null; -function refreshStravaCookies() { - /* - TODO - if (stravaCookies === null) { - return fetch('https://s.gpx.studio') - .then(response => { - if (response.ok) { - return response.json(); - } else { - throw new Error('Failed to fetch Strava cookies'); - } - }) - .then(data => { - stravaCookies = data; - console.log('Strava cookies:', stravaCookies); - }); - } else { - return Promise.resolve(); - } - */ - return Promise.resolve(); -} - -export function setStravaHeatmapURLs() { - /*refreshStravaCookies().then(() => { - overlays.stravaHeatmapRun.tiles = []; - overlays.stravaHeatmapTrailRun.tiles = []; - overlays.stravaHeatmapHike.tiles = []; - overlays.stravaHeatmapRide.tiles = []; - overlays.stravaHeatmapGravel.tiles = []; - overlays.stravaHeatmapMTB.tiles = []; - overlays.stravaHeatmapWater.tiles = []; - overlays.stravaHeatmapWinter.tiles = []; - - for (let activity of Object.keys(overlayTree.overlays.world.strava)) { - overlays[activity].tiles = []; - for (let server of stravaHeatmapServers) { - overlays[activity].tiles.push(`${server}/${stravaHeatmapActivityIds[activity]}/${get(settings.stravaHeatmapColor)}/{z}/{x}/{y}@2x.png`); //?Signature=${stravaCookies['CloudFront-Signature']}&Key-Pair-Id=${stravaCookies['CloudFront-Key-Pair-Id']}&Policy=${stravaCookies['CloudFront-Policy']}`); - } - } - });*/ -} \ No newline at end of file diff --git a/website/src/locales/en.json b/website/src/locales/en.json index f9ff3f2d..554e27be 100644 --- a/website/src/locales/en.json +++ b/website/src/locales/en.json @@ -228,7 +228,6 @@ "update": "Update layer" }, "opacity": "Overlay opacity", - "heatmap": "Strava Heatmap", "label": { "basemaps": "Basemaps", "overlays": "Overlays", @@ -281,15 +280,6 @@ "ignFrCadastre": "IGN Cadastre", "ignSlope": "IGN Slope", "ignSkiTouring": "IGN Ski Touring", - "strava": "Strava", - "stravaHeatmapRun": "Running", - "stravaHeatmapTrailRun": "Trail Running", - "stravaHeatmapHike": "Hiking", - "stravaHeatmapRide": "Cycling", - "stravaHeatmapGravel": "Gravel Cycling", - "stravaHeatmapMTB": "MTB", - "stravaHeatmapWater": "Water", - "stravaHeatmapWinter": "Winter", "waymarked_trails": "Waymarked Trails", "waymarkedTrailsHiking": "Hiking", "waymarkedTrailsCycling": "Cycling",