Compare commits
21 Commits
main
...
feature/ma
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74f1629bf4 | ||
|
|
1d57cc3c3d | ||
|
|
d386a57928 | ||
|
|
3cb6043859 | ||
|
|
3b81dea46c | ||
|
|
83a7e14355 | ||
|
|
d6565f8e03 | ||
|
|
b665982abb | ||
|
|
f5170e5b04 | ||
|
|
45fd18afa7 | ||
|
|
05e0bb58ee | ||
|
|
8b88b2bebb | ||
|
|
782162d410 | ||
|
|
07feed0355 | ||
|
|
18a71bdacf | ||
|
|
51e624ba2e | ||
|
|
ff773e1d1c | ||
|
|
e7cc6c432e | ||
|
|
6ab92ba64f | ||
|
|
2685a7c868 | ||
|
|
5a52b08107 |
10
package.json
10
package.json
@@ -15,19 +15,27 @@
|
||||
"format": "oxfmt src/"
|
||||
},
|
||||
"dependencies": {
|
||||
"@phosphor-icons/vue": "^2.2.1",
|
||||
"@pinia/colada": "^1.0.0",
|
||||
"@tailwindcss/vite": "^4.2.2",
|
||||
"@vue-leaflet/vue-leaflet": "^0.10.1",
|
||||
"@vueuse/core": "^14.2.1",
|
||||
"leaflet": "^1.9.4",
|
||||
"pinia": "^3.0.4",
|
||||
"reka-ui": "^2.9.2",
|
||||
"tailwindcss": "^4.2.2",
|
||||
"vue": "^3.5.30",
|
||||
"vue-leaflet-markercluster": "^0.6.1",
|
||||
"vue-router": "^5.0.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tsconfig/node24": "^24.0.4",
|
||||
"@types/leaflet": "^1.9.21",
|
||||
"@types/node": "^24.12.0",
|
||||
"@vitejs/plugin-vue": "^6.0.4",
|
||||
"@vue/eslint-config-typescript": "^14.7.0",
|
||||
"@vue/tsconfig": "^0.9.0",
|
||||
"clsx": "^2.1.1",
|
||||
"eslint": "^10.0.3",
|
||||
"eslint-config-prettier": "^10.1.8",
|
||||
"eslint-plugin-oxlint": "~1.51.0",
|
||||
@@ -36,6 +44,8 @@
|
||||
"npm-run-all2": "^8.0.4",
|
||||
"oxfmt": "^0.37.0",
|
||||
"oxlint": "~1.51.0",
|
||||
"sass-embedded": "^1.98.0",
|
||||
"tailwind-merge": "^3.5.0",
|
||||
"typescript": "~5.9.3",
|
||||
"vite": "^7.3.1",
|
||||
"vite-plugin-vue-devtools": "^8.0.7",
|
||||
|
||||
728
pnpm-lock.yaml
generated
728
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -1,2 +1,3 @@
|
||||
onlyBuiltDependencies:
|
||||
- esbuild
|
||||
- vue-demi
|
||||
|
||||
BIN
public/korrigo-logo.webp
Normal file
BIN
public/korrigo-logo.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
@@ -9,8 +9,8 @@
|
||||
--card-foreground: oklch(0.145 0 0);
|
||||
--popover: oklch(1 0 0);
|
||||
--popover-foreground: oklch(0.145 0 0);
|
||||
--primary: oklch(0.205 0 0);
|
||||
--primary-foreground: oklch(0.985 0 0);
|
||||
--primary: oklch(87.173% 0.17182 90.995);
|
||||
--primary-foreground: oklch(0.205 0 0);
|
||||
--secondary: oklch(0.97 0 0);
|
||||
--secondary-foreground: oklch(0.205 0 0);
|
||||
--muted: oklch(0.97 0 0);
|
||||
@@ -45,7 +45,7 @@
|
||||
--card-foreground: oklch(0.985 0 0);
|
||||
--popover: oklch(0.145 0 0);
|
||||
--popover-foreground: oklch(0.985 0 0);
|
||||
--primary: oklch(0.985 0 0);
|
||||
--primary: oklch(87.173% 0.17182 90.995);
|
||||
--primary-foreground: oklch(0.205 0 0);
|
||||
--secondary: oklch(0.269 0 0);
|
||||
--secondary-foreground: oklch(0.985 0 0);
|
||||
@@ -120,3 +120,7 @@
|
||||
@apply bg-background text-foreground;
|
||||
}
|
||||
}
|
||||
|
||||
.flow > * + * {
|
||||
margin: .5em 0 0 !important;
|
||||
}
|
||||
|
||||
55
src/components/BikeClusterLayer.vue
Normal file
55
src/components/BikeClusterLayer.vue
Normal file
@@ -0,0 +1,55 @@
|
||||
<script lang="ts" setup>
|
||||
import type { BikeParking } from '@/types/Bikes'
|
||||
import { LMarkerClusterGroup } from 'vue-leaflet-markercluster'
|
||||
import BikeMarker from './BikeMarker.vue'
|
||||
|
||||
defineProps<{
|
||||
parkings: BikeParking[]
|
||||
group: 'covered' | 'non-covered' | 'premium'
|
||||
visible: boolean
|
||||
maxClusterRadius: number
|
||||
disableClusteringAtZoom: number
|
||||
}>()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<LMarkerClusterGroup v-if="parkings.length > 0" :visible :max-cluster-radius :disable-clustering-at-zoom>
|
||||
<BikeMarker v-once v-for="park in parkings" :key="park.id_parc_velo" :park :group />
|
||||
</LMarkerClusterGroup>
|
||||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
.marker-cluster div {
|
||||
font-family: var(--default-font-family);
|
||||
font-size: .9em;
|
||||
}
|
||||
|
||||
.marker-cluster span {
|
||||
font-weight: var(--font-weight-bold);
|
||||
opacity: .85;
|
||||
}
|
||||
|
||||
.marker-cluster-small {
|
||||
background-color: color-mix(in srgb, var(--color-green-400) 10%, transparent);
|
||||
|
||||
div {
|
||||
background-color: color-mix(in srgb, var(--color-green-400) 15%, transparent);
|
||||
}
|
||||
}
|
||||
|
||||
.marker-cluster-medium {
|
||||
background-color: color-mix(in srgb, var(--color-amber-500) 12.5%, transparent);
|
||||
|
||||
div {
|
||||
background-color: color-mix(in srgb, var(--color-amber-500) 20%, transparent);
|
||||
}
|
||||
}
|
||||
|
||||
.marker-cluster-large {
|
||||
background-color: color-mix(in srgb, var(--color-rose-500) 15%, transparent);
|
||||
|
||||
div {
|
||||
background-color: color-mix(in srgb, var(--color-rose-500) 25%, transparent);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
47
src/components/BikeFilters.vue
Normal file
47
src/components/BikeFilters.vue
Normal file
@@ -0,0 +1,47 @@
|
||||
<script lang="ts" setup>
|
||||
import { useMap } from '@/stores/map'
|
||||
import { storeToRefs } from 'pinia'
|
||||
import Checkbox from './forms/Checkbox.vue'
|
||||
import ParkingSpaceRange from './filters/ParkingSpaceRange.vue';
|
||||
|
||||
const { filterCovered, filterUncovered, filterKorrigo, filterCargoOnly, filterStdOnly } = storeToRefs(useMap())
|
||||
|
||||
defineProps<{
|
||||
nbUncovered?: number
|
||||
nbCovered?: number
|
||||
nbKorrigo?: number
|
||||
}>()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<aside class="max-w-xs absolute top-5 left-5 z-10 p-2 bg-slate-50 text-slate-950 rounded-xs">
|
||||
<form class="grid grid-cols-1 gap-3">
|
||||
<fieldset>
|
||||
<legend
|
||||
class="mb-1.5 text-sm font-medium relative isolate before:contents-[''] before:block before:w-full before:bg-amber-500/15 before:h-2 before:absolute before:bottom-0.5 before:-z-10">
|
||||
Types d'emplacements
|
||||
</legend>
|
||||
|
||||
<div class="grid grid-cols-1 gap-1.5">
|
||||
<Checkbox v-model="filterUncovered" :count="nbUncovered">Non-abrités</Checkbox>
|
||||
<Checkbox v-model="filterCovered" :count="nbCovered">Abrités</Checkbox>
|
||||
<Checkbox v-model="filterKorrigo" :count="nbKorrigo">Abonnement Korrigo</Checkbox>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<ParkingSpaceRange />
|
||||
|
||||
<fieldset>
|
||||
<legend
|
||||
class="mb-1.5 text-sm font-medium relative isolate before:contents-[''] before:block before:w-full before:bg-amber-500/15 before:h-2 before:absolute before:bottom-0.5 before:-z-10">
|
||||
Équipements
|
||||
</legend>
|
||||
|
||||
<div class="grid grid-cols-1 gap-1.5">
|
||||
<Checkbox v-model="filterCargoOnly">Cargos</Checkbox>
|
||||
<Checkbox v-model="filterStdOnly">STD</Checkbox>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</aside>
|
||||
</template>
|
||||
103
src/components/BikeMap.vue
Normal file
103
src/components/BikeMap.vue
Normal file
@@ -0,0 +1,103 @@
|
||||
<script lang="ts" setup>
|
||||
import 'leaflet/dist/leaflet.css'
|
||||
import 'vue-leaflet-markercluster/dist/style.css'
|
||||
|
||||
import L from 'leaflet'
|
||||
globalThis.L = L
|
||||
|
||||
import { useMap } from '@/stores/map'
|
||||
import type { ApiResponse } from '@/types/Api'
|
||||
import type { BikeParking } from '@/types/Bikes'
|
||||
import { API_BASE_URL, API_LIMIT, MAP_TILELAYER_URL, SpotAccess, SpotType } from '@/utils/const'
|
||||
import { useQuery } from '@pinia/colada'
|
||||
import { LControlZoom, LMap, LTileLayer } from '@vue-leaflet/vue-leaflet'
|
||||
import BikeFilters from './BikeFilters.vue'
|
||||
import { computed } from 'vue'
|
||||
import { storeToRefs } from 'pinia'
|
||||
import BikeClusterLayer from './BikeClusterLayer.vue'
|
||||
|
||||
async function fetchAllBikeParkings(): Promise<BikeParking[]> {
|
||||
const firstPage = await fetch(`${API_BASE_URL}?limit=${API_LIMIT}`).then(r => r.json()) as ApiResponse
|
||||
const { total_count } = firstPage
|
||||
|
||||
const remainingPages = await Promise.all(
|
||||
Array.from(
|
||||
{ length: Math.ceil((total_count - API_LIMIT) / API_LIMIT) },
|
||||
(_, i) => fetch(`${API_BASE_URL}?limit=${API_LIMIT}&offset=${(i + 1) * API_LIMIT}`).then(r => r.json()) as Promise<ApiResponse>
|
||||
)
|
||||
)
|
||||
|
||||
return [
|
||||
...(firstPage.results ?? []),
|
||||
...remainingPages.flatMap(page => page.results ?? [])
|
||||
]
|
||||
}
|
||||
|
||||
const { state } = useQuery({
|
||||
key: ['bike-parkings'],
|
||||
query: fetchAllBikeParkings,
|
||||
})
|
||||
|
||||
// Groups different parking spot by types
|
||||
const nonCoveredParkings = computed(() =>
|
||||
state.value.data?.filter(p => p.type === SpotType.Uncovered) ?? []
|
||||
)
|
||||
const nonCoveredParkingsSpots = computed(() => {
|
||||
return nonCoveredParkings.value.reduce((acc, val) => acc + val.nb_total_place, 0)
|
||||
})
|
||||
|
||||
const coveredTypes = new Set([SpotType.Covered, SpotType.Boxed])
|
||||
|
||||
const coveredParkings = computed(() =>
|
||||
state.value.data?.filter(p => coveredTypes.has(p.type as SpotType)) ?? []
|
||||
)
|
||||
const coveredParkingsSpots = computed(() => {
|
||||
return coveredParkings.value.reduce((acc, val) => acc + val.nb_total_place, 0)
|
||||
})
|
||||
|
||||
const premiumParkings = computed(() =>
|
||||
state.value.data?.filter(p => p.condition_acces === SpotAccess.Korrigo) ?? []
|
||||
)
|
||||
const premiumParkingsSpots = computed(() => {
|
||||
return premiumParkings.value.reduce((acc, val) => acc + val.nb_total_place, 0)
|
||||
})
|
||||
|
||||
const { zoom, minZoom, center, maxBounds, maxBoundsViscosity, maxClusterRadius, disableClusteringAtZoom, extraOptions } = useMap()
|
||||
const { filterUncovered, filterCovered, filterKorrigo } = storeToRefs(useMap())
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Transition enter-from-class="opacity-0 translate-y-2"
|
||||
enter-active-class="transition-all duration-300 ease-out delay-500" enter-to-class="opacity-100 translate-y-0">
|
||||
<BikeFilters v-if="state.status === 'success'" :nb-uncovered="nonCoveredParkingsSpots"
|
||||
:nb-covered="coveredParkingsSpots" :nb-korrigo="premiumParkingsSpots" />
|
||||
</Transition>
|
||||
|
||||
<main class="relative z-0 h-screen w-screen grid place-items-center">
|
||||
<div v-if="state.status === 'pending'">Loading...</div>
|
||||
<div v-else-if="state.status === 'error'">Error: {{ state.error.message }}</div>
|
||||
<template v-else>
|
||||
<LMap ref="map" :min-zoom v-model:zoom="zoom" :center="center" :max-bounds :max-bounds-viscosity
|
||||
:options="extraOptions" :useGlobalLeaflet="true">
|
||||
<LControlZoom position="bottomright" />
|
||||
|
||||
<LTileLayer v-once :url="MAP_TILELAYER_URL" layer-type="base" />
|
||||
|
||||
<BikeClusterLayer :parkings="coveredParkings" group="covered" :visible="filterCovered" :max-cluster-radius
|
||||
:disable-clustering-at-zoom />
|
||||
|
||||
<BikeClusterLayer :parkings="nonCoveredParkings" group="non-covered" :visible="filterUncovered"
|
||||
:max-cluster-radius :disable-clustering-at-zoom />
|
||||
|
||||
<BikeClusterLayer :parkings="premiumParkings" group="premium" :visible="filterKorrigo" :max-cluster-radius
|
||||
:disable-clustering-at-zoom />
|
||||
</LMap>
|
||||
</template>
|
||||
</main>
|
||||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
.leaflet-container {
|
||||
background-color: var(--background);
|
||||
}
|
||||
</style>
|
||||
129
src/components/BikeMarker.vue
Normal file
129
src/components/BikeMarker.vue
Normal file
@@ -0,0 +1,129 @@
|
||||
<script lang="ts" setup>
|
||||
import { cn } from '@/utils/cn';
|
||||
import type { BikeParking } from '@/types/Bikes';
|
||||
import { PhBicycle, PhLockKey, PhSquareHalf, PhWarehouse } from '@phosphor-icons/vue';
|
||||
import { LIcon, LMarker, LPopup } from '@vue-leaflet/vue-leaflet';
|
||||
import type { PointTuple } from 'leaflet';
|
||||
import { computed, ref } from 'vue';
|
||||
import { UNCOVERED_KEY, COVERED_KEY, BOXED_KEY, KORRIGO_KEY } from '@/utils/const';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import { SPOTS_MAX, useMap } from '@/stores/map';
|
||||
|
||||
const props = defineProps<{
|
||||
park: BikeParking
|
||||
group: 'covered' | 'non-covered' | 'premium'
|
||||
}>()
|
||||
|
||||
const normalIconSize: PointTuple = [30, 30]
|
||||
|
||||
const iconSize = ref<PointTuple>(normalIconSize)
|
||||
const iconAnchor = computed<PointTuple>(() => [iconSize.value[0] / 2, iconSize.value[1]])
|
||||
const popupOffset = [0, iconSize.value[0] * -0.66]
|
||||
|
||||
const { spotsRange, filterCargoOnly, filterStdOnly } = storeToRefs(useMap())
|
||||
|
||||
const isMarkerVisibleLayers = computed(() => {
|
||||
const [min, max] = spotsRange.value
|
||||
const spots = props.park.nb_total_place
|
||||
|
||||
if (max >= SPOTS_MAX) return spots >= min
|
||||
return spots >= min && spots <= max
|
||||
})
|
||||
|
||||
const isMarkerVisibleEquipments = computed(() => {
|
||||
const checks = [
|
||||
[filterCargoOnly.value, (props.park.nb_support_cargo ?? 0) > 0],
|
||||
[filterStdOnly.value, (props.park.nb_support_std ?? 0) > 0],
|
||||
] as const
|
||||
|
||||
return checks.every(([active, passes]) => !active || passes)
|
||||
})
|
||||
|
||||
const isMarkerVisible = computed(() => isMarkerVisibleLayers.value && isMarkerVisibleEquipments.value)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<LMarker :lat-lng="[park.geo_point_2d.lat, park.geo_point_2d.lon]" :visible="isMarkerVisible">
|
||||
<LPopup :options="{ offset: popupOffset, maxWidth: 520, minWidth: 240 }">
|
||||
<div>
|
||||
<h2 class="font-bold">
|
||||
{{ park.nom_voie }}, {{ park.nom_commune }}
|
||||
</h2>
|
||||
|
||||
<div class="text-xs">
|
||||
{{ park.type }}, <strong>{{ park.nb_total_place }} places</strong>
|
||||
|
||||
<template v-if="park.nb_support_cargo">
|
||||
<br>
|
||||
…dont <strong>{{ park.nb_support_cargo }} cargo</strong>
|
||||
</template>
|
||||
|
||||
<template v-if="park.nb_support_std">
|
||||
<br>
|
||||
…dont <strong>{{ park.nb_support_std }} STD</strong>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<div v-if="park.condition_acces === 'Abonnement Korrigo'">
|
||||
<img src="/korrigo-logo.webp" alt="" width="50" class="max-w-12" title="Requiert un abonnement Korrigo">
|
||||
</div>
|
||||
|
||||
<hr class="border-muted-foreground opacity-50 my-1">
|
||||
|
||||
<div v-if="park.annee_mes" class="italic text-xs">
|
||||
Mis en service en {{ park.annee_mes }}
|
||||
</div>
|
||||
|
||||
<div v-if="park.commentaire" v-html="park.commentaire"
|
||||
class="before:content-[''] before:inline-block before:w-1 before:h-[1em] before:-my-0.5 before:mr-1 before:rounded-xs before:bg-muted-foreground italic text-xs text-muted-foreground" />
|
||||
</div>
|
||||
</LPopup>
|
||||
|
||||
<LIcon :icon-size :icon-anchor :class-name="cn(
|
||||
`group-${group}`,
|
||||
{ 'korrigo': park.condition_acces === KORRIGO_KEY },
|
||||
{ 'highlight': park.type === BOXED_KEY || park.type === COVERED_KEY },
|
||||
)">
|
||||
<PhBicycle v-if="park.type === UNCOVERED_KEY" size="18" />
|
||||
<PhWarehouse v-else-if="park.type === COVERED_KEY" size="18" weight="light" />
|
||||
<PhSquareHalf v-else-if="park.type === BOXED_KEY" size="18" weight="light" />
|
||||
<PhLockKey v-else-if="park.condition_acces === KORRIGO_KEY" size="18" weight="fill" />
|
||||
</LIcon>
|
||||
</LMarker>
|
||||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
.leaflet-marker-icon:not(.marker-cluster) {
|
||||
border-radius: 50%;
|
||||
color: var(--color-muted-foreground);
|
||||
background-color: var(--color-background);
|
||||
display: grid;
|
||||
place-items: center;
|
||||
|
||||
&.korrigo {
|
||||
color: var(--color-background);
|
||||
background-color: var(--color-amber-400);
|
||||
}
|
||||
|
||||
&.highlight {
|
||||
color: var(--color-amber-400);
|
||||
border: 2px solid color-mix(in srgb, var(--color-amber-400) 50%, var(--color-background));
|
||||
}
|
||||
}
|
||||
|
||||
.leaflet-popup-content-wrapper {
|
||||
border-radius: 5px;
|
||||
|
||||
.leaflet-popup-content {
|
||||
margin: 10px 20px 10px 15px;
|
||||
|
||||
p {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.marker-cluster span {
|
||||
font-weight: var(--font-weight-medium);
|
||||
}
|
||||
</style>
|
||||
51
src/components/filters/ParkingSpaceRange.vue
Normal file
51
src/components/filters/ParkingSpaceRange.vue
Normal file
@@ -0,0 +1,51 @@
|
||||
<script lang="ts" setup>
|
||||
import { SliderRange, SliderRoot, SliderThumb, SliderTrack } from 'reka-ui'
|
||||
import { storeToRefs } from 'pinia'
|
||||
import { useMap, SPOTS_MIN, SPOTS_MAX } from '@/stores/map'
|
||||
import { ref } from 'vue'
|
||||
import { useDebounceFn } from '@vueuse/core'
|
||||
|
||||
const { spotsRange } = storeToRefs(useMap())
|
||||
|
||||
const MIN = SPOTS_MIN
|
||||
const MAX = SPOTS_MAX
|
||||
|
||||
const localRange = ref<[number, number]>([...spotsRange.value] as [number, number])
|
||||
|
||||
const commitToStore = useDebounceFn((val: [number, number]) => {
|
||||
spotsRange.value = val
|
||||
}, 500)
|
||||
|
||||
function onRangeUpdate(val: number[] | undefined) {
|
||||
if (!val) return
|
||||
|
||||
localRange.value = val as [number, number]
|
||||
commitToStore(val as [number, number])
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div>
|
||||
<div class="flex items-center justify-between">
|
||||
<span
|
||||
class="text-sm font-medium relative isolate before:contents-[''] before:block before:w-full before:bg-amber-500/15 before:h-2 before:absolute before:bottom-0.5 before:-z-10">Places
|
||||
totales</span>
|
||||
<span class="text-xs text-muted-foreground">
|
||||
{{ localRange[0] }} – {{ localRange[1] }}<template v-if="localRange[1] === MAX">+</template>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="mt-1">
|
||||
<SliderRoot :model-value="localRange" @update:model-value="onRangeUpdate"
|
||||
class="relative flex items-center select-none touch-none w-full pt-2 pb-1" :min="MIN" :max="MAX" :step="5">
|
||||
<SliderTrack class="bg-muted/10 relative grow rounded-full h-1.5">
|
||||
<SliderRange class="absolute bg-primary rounded-full h-full" />
|
||||
</SliderTrack>
|
||||
<SliderThumb
|
||||
class="cursor-pointer size-4 bg-white rounded-full hover:bg-primary shadow-sm focus:outline-none focus:ring-2" />
|
||||
<SliderThumb
|
||||
class="cursor-pointer size-4 bg-white rounded-full hover:bg-primary shadow-sm focus:outline-none focus:ring-2" />
|
||||
</SliderRoot>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
29
src/components/forms/Checkbox.vue
Normal file
29
src/components/forms/Checkbox.vue
Normal file
@@ -0,0 +1,29 @@
|
||||
<script lang="ts" setup>
|
||||
import { PhCheck } from '@phosphor-icons/vue'
|
||||
import { CheckboxIndicator, CheckboxRoot } from 'reka-ui'
|
||||
|
||||
defineProps<{
|
||||
count?: number
|
||||
}>()
|
||||
|
||||
const checked = defineModel<boolean>()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<label class="flex flex-row gap-1.5 items-center text-sm cursor-pointer group">
|
||||
<CheckboxRoot v-model="checked"
|
||||
class="hover:bg-stone-100 flex size-4 appearance-none items-center justify-center rounded-xs bg-foreground shadow-sm border focus-within:ring-1 cursor-pointer">
|
||||
<CheckboxIndicator class="size-full flex items-center justify-center bg-primary text-primary-foreground">
|
||||
<PhCheck :size="10" weight="bold" />
|
||||
</CheckboxIndicator>
|
||||
</CheckboxRoot>
|
||||
|
||||
<span class="select-none">
|
||||
<span class="group-hover:underline underline-offset-2">
|
||||
<slot />
|
||||
</span>
|
||||
|
||||
<small v-if="count" class="ml-1 opacity-50">({{ count }})</small>
|
||||
</span>
|
||||
</label>
|
||||
</template>
|
||||
@@ -1,5 +1,6 @@
|
||||
import { createApp } from 'vue'
|
||||
import { createPinia } from 'pinia'
|
||||
import { PiniaColada } from '@pinia/colada'
|
||||
|
||||
import App from './App.vue'
|
||||
import router from './router'
|
||||
@@ -7,6 +8,8 @@ import router from './router'
|
||||
const app = createApp(App)
|
||||
|
||||
app.use(createPinia())
|
||||
app.use(PiniaColada)
|
||||
|
||||
app.use(router)
|
||||
|
||||
app.mount('#app')
|
||||
|
||||
@@ -1,5 +1,15 @@
|
||||
<script setup lang="ts">
|
||||
import BikeMap from '@/components/BikeMap.vue';
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<main>
|
||||
Home
|
||||
</main>
|
||||
<header class="sr-only">
|
||||
<h1>
|
||||
Carte interactive des parkings vélo de Rennes Métropole
|
||||
</h1>
|
||||
</header>
|
||||
|
||||
<Suspense>
|
||||
<BikeMap />
|
||||
</Suspense>
|
||||
</template>
|
||||
|
||||
49
src/stores/map.ts
Normal file
49
src/stores/map.ts
Normal file
@@ -0,0 +1,49 @@
|
||||
import type { PointTuple } from 'leaflet'
|
||||
import { defineStore } from 'pinia'
|
||||
import { ref } from 'vue'
|
||||
|
||||
export const SPOTS_MIN = 1
|
||||
export const SPOTS_MAX = 99
|
||||
|
||||
export const useMap = defineStore('map', () => {
|
||||
const zoom = ref(10)
|
||||
const minZoom = 8
|
||||
const center = ref<PointTuple>([48.11180645878813, -1.6637869497745246])
|
||||
const topLeftCorner: PointTuple = [48.88261491330733, -3.437430524894775]
|
||||
const bottomRightCorner: PointTuple = [47.31027605502938, 0.6437600778583776]
|
||||
const maxBounds: PointTuple[] = [topLeftCorner, bottomRightCorner]
|
||||
const maxBoundsViscosity = 0.9
|
||||
|
||||
const extraOptions: Record<string, any> = {
|
||||
zoomControl: false,
|
||||
}
|
||||
|
||||
const maxClusterRadius = 28
|
||||
const disableClusteringAtZoom = 17
|
||||
|
||||
const filterUncovered = ref(true)
|
||||
const filterCovered = ref(true)
|
||||
const filterKorrigo = ref(true)
|
||||
|
||||
const filterCargoOnly = ref(false)
|
||||
const filterStdOnly = ref(false)
|
||||
|
||||
const spotsRange = ref<[number, number]>([SPOTS_MIN, SPOTS_MAX])
|
||||
|
||||
return {
|
||||
zoom,
|
||||
minZoom,
|
||||
center,
|
||||
maxBounds,
|
||||
maxBoundsViscosity,
|
||||
maxClusterRadius,
|
||||
disableClusteringAtZoom,
|
||||
extraOptions,
|
||||
filterUncovered,
|
||||
filterCovered,
|
||||
filterKorrigo,
|
||||
filterCargoOnly,
|
||||
filterStdOnly,
|
||||
spotsRange,
|
||||
}
|
||||
})
|
||||
6
src/types/Api.ts
Normal file
6
src/types/Api.ts
Normal file
@@ -0,0 +1,6 @@
|
||||
import type { BikeParking } from './Bikes'
|
||||
|
||||
export interface ApiResponse {
|
||||
total_count: number
|
||||
results: BikeParking[]
|
||||
}
|
||||
23
src/types/Bikes.ts
Normal file
23
src/types/Bikes.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import type { GeoPoint, GeoShape } from './Geo'
|
||||
|
||||
export interface BikeParking {
|
||||
geo_point_2d: GeoPoint
|
||||
geo_shape: GeoShape
|
||||
gml_id: string
|
||||
id_parc_velo: number
|
||||
nom: string | null
|
||||
code_insee: number
|
||||
nom_commune: string
|
||||
nom_voie: string
|
||||
id_voie: number
|
||||
type: string
|
||||
gestionnaire: string
|
||||
localisation: string
|
||||
condition_acces: string
|
||||
annee_mes: number
|
||||
nb_support_std: number | null
|
||||
nb_support_cargo: number | null
|
||||
nb_total_place: number
|
||||
date_maj: string
|
||||
commentaire: string | null
|
||||
}
|
||||
13
src/types/Geo.ts
Normal file
13
src/types/Geo.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
export interface GeoPoint {
|
||||
lon: number
|
||||
lat: number
|
||||
}
|
||||
|
||||
export interface GeoShape {
|
||||
type: 'Feature'
|
||||
geometry: {
|
||||
coordinates: [number, number]
|
||||
type: 'Point'
|
||||
}
|
||||
properties: Record<string, unknown>
|
||||
}
|
||||
4
src/utils/cn.ts
Normal file
4
src/utils/cn.ts
Normal file
@@ -0,0 +1,4 @@
|
||||
import { clsx, type ClassValue } from 'clsx'
|
||||
import { twMerge } from 'tailwind-merge'
|
||||
|
||||
export const cn = (...inputs: ClassValue[]) => twMerge(clsx(inputs))
|
||||
21
src/utils/const.ts
Normal file
21
src/utils/const.ts
Normal file
@@ -0,0 +1,21 @@
|
||||
export const MAP_TILELAYER_URL =
|
||||
'https://tiles.stadiamaps.com/tiles/alidade_smooth_dark/{z}/{x}/{y}{r}.png'
|
||||
|
||||
export const API_BASE_URL =
|
||||
'https://data.rennesmetropole.fr/api/explore/v2.1/catalog/datasets/parkings_velos_sur_rennes_metropole/records'
|
||||
export const API_LIMIT = 100
|
||||
|
||||
export const UNCOVERED_KEY = 'Non abrité'
|
||||
export const COVERED_KEY = 'Abrité'
|
||||
export const BOXED_KEY = 'Box individuel'
|
||||
export const KORRIGO_KEY = 'Abonnement Korrigo'
|
||||
|
||||
export enum SpotType {
|
||||
Uncovered = UNCOVERED_KEY,
|
||||
Covered = COVERED_KEY,
|
||||
Boxed = BOXED_KEY,
|
||||
}
|
||||
|
||||
export enum SpotAccess {
|
||||
Korrigo = KORRIGO_KEY,
|
||||
}
|
||||
Reference in New Issue
Block a user