Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Client - add controls on map to hide markers

Browse Source
This commit is contained in:
Sam
2022-01-15 16:48:53 +01:00
parent b22c965099
commit 482004926a
17 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fittrackee/dist/index.html
Vendored
+1 -1
View File
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"><link rel="stylesheet" href="/static/css/leaflet.css"><title>FitTrackee</title><link href="/static/css/admin.e77f8b26.css" rel="prefetch"><link href="/static/css/profile.8b668068.css" rel="prefetch"><link href="/static/css/reset.fc19709e.css" rel="prefetch"><link href="/static/css/statistics.2afdc8a9.css" rel="prefetch"><link href="/static/css/workouts.174e6470.css" rel="prefetch"><link href="/static/js/admin.5f46d0fe.js" rel="prefetch"><link href="/static/js/chunk-2d0c9189.c81458cc.js" rel="prefetch"><link href="/static/js/chunk-2d0cf391.020c75ea.js" rel="prefetch"><link href="/static/js/chunk-2d0da8f3.c8c3e7e8.js" rel="prefetch"><link href="/static/js/chunk-2d2248b6.d84473c1.js" rel="prefetch"><link href="/static/js/chunk-2d22523a.4b710d99.js" rel="prefetch"><link href="/static/js/profile.d25975e2.js" rel="prefetch"><link href="/static/js/reset.ca898ebe.js" rel="prefetch"><link href="/static/js/statistics.d03ca304.js" rel="prefetch"><link href="/static/js/workouts.562af40b.js" rel="prefetch"><link href="/static/css/app.b54fa5fe.css" rel="preload" as="style"><link href="/static/js/app.eec8f9f6.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.d887e943.js" rel="preload" as="script"><link href="/static/css/app.b54fa5fe.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.d887e943.js"></script><script src="/static/js/app.eec8f9f6.js"></script></body></html> <!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"><link rel="stylesheet" href="/static/css/leaflet.css"><title>FitTrackee</title><link href="/static/css/admin.e77f8b26.css" rel="prefetch"><link href="/static/css/profile.8b668068.css" rel="prefetch"><link href="/static/css/reset.fc19709e.css" rel="prefetch"><link href="/static/css/statistics.2afdc8a9.css" rel="prefetch"><link href="/static/css/workouts.366d01bb.css" rel="prefetch"><link href="/static/js/admin.5f46d0fe.js" rel="prefetch"><link href="/static/js/chunk-2d0c9189.c81458cc.js" rel="prefetch"><link href="/static/js/chunk-2d0cf391.020c75ea.js" rel="prefetch"><link href="/static/js/chunk-2d0da8f3.c8c3e7e8.js" rel="prefetch"><link href="/static/js/chunk-2d2248b6.d84473c1.js" rel="prefetch"><link href="/static/js/chunk-2d22523a.4b710d99.js" rel="prefetch"><link href="/static/js/profile.d25975e2.js" rel="prefetch"><link href="/static/js/reset.ca898ebe.js" rel="prefetch"><link href="/static/js/statistics.d03ca304.js" rel="prefetch"><link href="/static/js/workouts.04bf083b.js" rel="prefetch"><link href="/static/css/app.b54fa5fe.css" rel="preload" as="style"><link href="/static/js/app.25744daa.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.d887e943.js" rel="preload" as="script"><link href="/static/css/app.b54fa5fe.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.d887e943.js"></script><script src="/static/js/app.25744daa.js"></script></body></html>
fittrackee/dist/precache-manifest.bd701d249f39f6375883a9a6da0196ff.js → fittrackee/dist/precache-manifest.29b36534ab2908487719832360637bc8.js
Vendored
+8 -8
View File
@@ -72,7 +72,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/img/workouts/start.svg" "url": "/img/workouts/start.svg"
}, },
{ {
"revision": "924f568f416aab39ae0a5c8aff2099e2", "revision": "a65535e36703fffd4fb7c3cf35dfcc65",
"url": "/index.html" "url": "/index.html"
}, },
{ {
@@ -88,7 +88,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/css/admin.e77f8b26.css" "url": "/static/css/admin.e77f8b26.css"
}, },
{ {
"revision": "a45a19cb57e12684f42f", "revision": "5258a0fd7a39724bcd8d",
"url": "/static/css/app.b54fa5fe.css" "url": "/static/css/app.b54fa5fe.css"
}, },
{ {
@@ -112,8 +112,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/css/statistics.2afdc8a9.css" "url": "/static/css/statistics.2afdc8a9.css"
}, },
{ {
"revision": "c117380682fdc8558935", "revision": "563d753f0aed9f2c73cc",
"url": "/static/css/workouts.174e6470.css" "url": "/static/css/workouts.366d01bb.css"
}, },
{ {
"revision": "e719f9244c69e28e7d00e725ca1e280e", "revision": "e719f9244c69e28e7d00e725ca1e280e",
@@ -200,8 +200,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/js/admin.5f46d0fe.js" "url": "/static/js/admin.5f46d0fe.js"
}, },
{ {
"revision": "a45a19cb57e12684f42f", "revision": "5258a0fd7a39724bcd8d",
"url": "/static/js/app.eec8f9f6.js" "url": "/static/js/app.25744daa.js"
}, },
{ {
"revision": "bd7d183c9f68e5f4027d", "revision": "bd7d183c9f68e5f4027d",
@@ -240,7 +240,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/js/statistics.d03ca304.js" "url": "/static/js/statistics.d03ca304.js"
}, },
{ {
"revision": "c117380682fdc8558935", "revision": "563d753f0aed9f2c73cc",
"url": "/static/js/workouts.562af40b.js" "url": "/static/js/workouts.04bf083b.js"
} }
]); ]);
fittrackee/dist/service-worker.js
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js"); importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
importScripts( importScripts(
"/precache-manifest.bd701d249f39f6375883a9a6da0196ff.js" "/precache-manifest.29b36534ab2908487719832360637bc8.js"
); );
workbox.core.setCacheNameDetails({prefix: "fittrackee_client"}); workbox.core.setCacheNameDetails({prefix: "fittrackee_client"});
fittrackee/dist/static/css/workouts.174e6470.css
Vendored
-1
View File
File diff suppressed because one or more lines are too long
fittrackee/dist/static/css/workouts.366d01bb.css
Vendored
+1
View File
File diff suppressed because one or more lines are too long
fittrackee/dist/static/js/app.25744daa.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
fittrackee/dist/static/js/app.25744daa.js.map
Vendored
+1
View File
File diff suppressed because one or more lines are too long
fittrackee/dist/static/js/app.eec8f9f6.js
Vendored
-2
View File
File diff suppressed because one or more lines are too long
fittrackee/dist/static/js/app.eec8f9f6.js.map
Vendored
-1
View File
File diff suppressed because one or more lines are too long
fittrackee/dist/static/js/workouts.04bf083b.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
fittrackee/dist/static/js/workouts.04bf083b.js.map
Vendored
+1
View File
File diff suppressed because one or more lines are too long
fittrackee/dist/static/js/workouts.562af40b.js
Vendored
-2
View File
File diff suppressed because one or more lines are too long
fittrackee/dist/static/js/workouts.562af40b.js.map
Vendored
-1
View File
File diff suppressed because one or more lines are too long
fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue
+25 -11
View File
@@ -12,6 +12,7 @@
ref="workoutMap" ref="workoutMap"
@ready="fitBounds(bounds)" @ready="fitBounds(bounds)"
> >
<LControlLayers />
<LTileLayer <LTileLayer
:url="`${getApiUrl()}workouts/map_tile/{s}/{z}/{x}/{y}.png`" :url="`${getApiUrl()}workouts/map_tile/{s}/{z}/{x}/{y}.png`"
:attribution="appConfig.map_attribution" :attribution="appConfig.map_attribution"
@@ -22,16 +23,21 @@
v-if="markerCoordinates.latitude" v-if="markerCoordinates.latitude"
:lat-lng="[markerCoordinates.latitude, markerCoordinates.longitude]" :lat-lng="[markerCoordinates.latitude, markerCoordinates.longitude]"
/> />
<CustomMarker <LLayerGroup
v-if="startMarkerCoordinates.latitude" :name="$t('workouts.START_AND_FINISH')"
:markerCoordinates="startMarkerCoordinates" layer-type="overlay"
:isStart="true" >
/> <CustomMarker
<CustomMarker v-if="startMarkerCoordinates.latitude"
v-if="endMarkerCoordinates.latitude" :markerCoordinates="startMarkerCoordinates"
:markerCoordinates="endMarkerCoordinates" :isStart="true"
:isStart="false" />
/> <CustomMarker
v-if="endMarkerCoordinates.latitude"
:markerCoordinates="endMarkerCoordinates"
:isStart="false"
/>
</LLayerGroup>
</LMap> </LMap>
</div> </div>
<div v-else class="no-map">{{ $t('workouts.NO_MAP') }}</div> <div v-else class="no-map">{{ $t('workouts.NO_MAP') }}</div>
@@ -41,8 +47,16 @@
<script setup lang="ts"> <script setup lang="ts">
import { gpx } from '@tmcw/togeojson' import { gpx } from '@tmcw/togeojson'
import { LGeoJson, LMap, LMarker, LTileLayer } from '@vue-leaflet/vue-leaflet' import {
LGeoJson,
LMap,
LMarker,
LTileLayer,
LControlLayers,
LLayerGroup,
} from '@vue-leaflet/vue-leaflet'
import { ComputedRef, computed, ref, toRefs, withDefaults } from 'vue' import { ComputedRef, computed, ref, toRefs, withDefaults } from 'vue'
import 'leaflet/dist/leaflet.css'
import CustomMarker from '@/components/Workout/WorkoutDetail/WorkoutMap/CustomMarker.vue' import CustomMarker from '@/components/Workout/WorkoutDetail/WorkoutMap/CustomMarker.vue'
import { ROOT_STORE } from '@/store/constants' import { ROOT_STORE } from '@/store/constants'
fittrackee_client/src/locales/en/workouts.json
+1
View File
@@ -50,6 +50,7 @@
"SPEED": "speed", "SPEED": "speed",
"SPORT": "sport | sports", "SPORT": "sport | sports",
"START": "start", "START": "start",
"START_AND_FINISH": "Start and finish",
"START_ELEVATION_AT_ZERO": "start elevation axis at zero", "START_ELEVATION_AT_ZERO": "start elevation axis at zero",
"TITLE": "title", "TITLE": "title",
"TO": "to", "TO": "to",
fittrackee_client/src/locales/fr/workouts.json
+1
View File
@@ -50,6 +50,7 @@
"SPEED": "vitesse", "SPEED": "vitesse",
"SPORT": "sport | sports", "SPORT": "sport | sports",
"START": "début", "START": "début",
"START_AND_FINISH": "Départ et arrivée",
"START_ELEVATION_AT_ZERO": "démarrer l'axe de l'altitude à 0", "START_ELEVATION_AT_ZERO": "démarrer l'axe de l'altitude à 0",
"TITLE": "titre", "TITLE": "titre",
"TO": "jusqu'au", "TO": "jusqu'au",
fittrackee_client/src/vue-leaflet.d.ts
Vendored
+2 -3
View File
@@ -5,7 +5,6 @@ declare module '@vue-leaflet/vue-leaflet' {
export const LTileLayer: DefineComponent export const LTileLayer: DefineComponent
export const LMarker: DefineComponent export const LMarker: DefineComponent
export const LGeoJson: DefineComponent export const LGeoJson: DefineComponent
export const LPolyline: DefineComponent export const LControlLayers: DefineComponent
export const LPolygon: DefineComponent export const LLayerGroup: DefineComponent
export const LRectangle: DefineComponent
} }