Changed tilelayer

index.html

@@ -6,7 +6,58 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="/src/assets/css/main.css" rel="stylesheet">
-    <title>Vite App</title>
+
+    <title>Vélo Park — AlexisNP</title>
+    <meta property="og:title" content="Vélo Park — AlexisNP" />
+
+    <meta name="description" content="Cartes des emplacements de parcs à vélos de l'agglomération rennaise." />
+    <meta property="og:description" content="Cartes des emplacements de parcs à vélos de l'agglomération rennaise." />
+    <meta name="twitter:description" content="Cartes des emplacements de parcs à vélos de l'agglomération rennaise." />
+
+    <meta property="author" content="Alexis Pelé" />
+    <meta property="og:author" content="Alexis Pelé" />
+    <meta property="og:author:username" content="AlexisNP" />
+
+    <link rel="apple-touch-icon" sizes="57x57" href="/favicon/light/apple-icon-57x57.png" media="(prefers-color-scheme: light)">
+    <link rel="apple-touch-icon" sizes="60x60" href="/favicon/light/apple-icon-60x60.png" media="(prefers-color-scheme: light)">
+    <link rel="apple-touch-icon" sizes="72x72" href="/favicon/light/apple-icon-72x72.png" media="(prefers-color-scheme: light)">
+    <link rel="apple-touch-icon" sizes="76x76" href="/favicon/light/apple-icon-76x76.png" media="(prefers-color-scheme: light)">
+    <link rel="apple-touch-icon" sizes="114x114" href="/favicon/light/apple-icon-114x114.png" media="(prefers-color-scheme: light)">
+    <link rel="apple-touch-icon" sizes="120x120" href="/favicon/light/apple-icon-120x120.png" media="(prefers-color-scheme: light)">
+    <link rel="apple-touch-icon" sizes="144x144" href="/favicon/light/apple-icon-144x144.png" media="(prefers-color-scheme: light)">
+    <link rel="apple-touch-icon" sizes="152x152" href="/favicon/light/apple-icon-152x152.png" media="(prefers-color-scheme: light)">
+    <link rel="apple-touch-icon" sizes="180x180" href="/favicon/light/apple-icon-180x180.png" media="(prefers-color-scheme: light)">
+    <link rel="icon" type="image/png" sizes="192x192"  href="/favicon/light/android-icon-192x192.png" media="(prefers-color-scheme: light)">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon/light/favicon-32x32.png" media="(prefers-color-scheme: light)">
+    <link rel="icon" type="image/png" sizes="96x96" href="/favicon/light/favicon-96x96.png" media="(prefers-color-scheme: light)">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon/light/favicon-16x16.png" media="(prefers-color-scheme: light)">
+    <link rel="manifest" href="/favicon/light/manifest.json" media="(prefers-color-scheme: light)">
+    <meta name="msapplication-TileImage" content="/favicon/light/ms-icon-144x144.png" media="(prefers-color-scheme: light)">
+
+    <link rel="apple-touch-icon" sizes="57x57" href="/favicon/dark/apple-icon-57x57.png" media="(prefers-color-scheme: dark)">
+    <link rel="apple-touch-icon" sizes="60x60" href="/favicon/dark/apple-icon-60x60.png" media="(prefers-color-scheme: dark)">
+    <link rel="apple-touch-icon" sizes="72x72" href="/favicon/dark/apple-icon-72x72.png" media="(prefers-color-scheme: dark)">
+    <link rel="apple-touch-icon" sizes="76x76" href="/favicon/dark/apple-icon-76x76.png" media="(prefers-color-scheme: dark)">
+    <link rel="apple-touch-icon" sizes="114x114" href="/favicon/dark/apple-icon-114x114.png" media="(prefers-color-scheme: dark)">
+    <link rel="apple-touch-icon" sizes="120x120" href="/favicon/dark/apple-icon-120x120.png" media="(prefers-color-scheme: dark)">
+    <link rel="apple-touch-icon" sizes="144x144" href="/favicon/dark/apple-icon-144x144.png" media="(prefers-color-scheme: dark)">
+    <link rel="apple-touch-icon" sizes="152x152" href="/favicon/dark/apple-icon-152x152.png" media="(prefers-color-scheme: dark)">
+    <link rel="apple-touch-icon" sizes="180x180" href="/favicon/dark/apple-icon-180x180.png" media="(prefers-color-scheme: dark)">
+    <link rel="icon" type="image/png" sizes="192x192"  href="/favicon/dark/android-icon-192x192.png" media="(prefers-color-scheme: dark)">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon/dark/favicon-32x32.png" media="(prefers-color-scheme: dark)">
+    <link rel="icon" type="image/png" sizes="96x96" href="/favicon/dark/favicon-96x96.png" media="(prefers-color-scheme: dark)">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon/dark/favicon-16x16.png" media="(prefers-color-scheme: dark)">
+    <link rel="manifest" href="/favicon/dark/manifest.json" media="(prefers-color-scheme: dark)">
+    <meta name="msapplication-TileImage" content="/favicon/dark/ms-icon-144x144.png" media="(prefers-color-scheme: dark)">
+
+    <meta name="msapplication-TileColor" content="#06df72">
+    <meta name="theme-color" content="#06df72">
+    <meta name="color-scheme" content="light" />
+
+    <meta property="og:site_name" content="bikes.alexcreates.fr" />
+    <meta name="twitter:domain" content="bikes.alexcreates.fr" />
+
+    <meta property="og:type" content="website" />
 </head>
 
 <body>

package.json

@@ -16,39 +16,40 @@
   },
   "dependencies": {
     "@phosphor-icons/vue": "^2.2.1",
-    "@pinia/colada": "^1.0.0",
+    "@pinia/colada": "^1.3.1",
-    "@tailwindcss/vite": "^4.2.2",
+    "@tailwindcss/vite": "^4.3.0",
     "@vue-leaflet/vue-leaflet": "^0.10.1",
-    "@vueuse/core": "^14.2.1",
+    "@vueuse/core": "^14.3.0",
     "leaflet": "^1.9.4",
     "pinia": "^3.0.4",
-    "tailwindcss": "^4.2.2",
+    "reka-ui": "^2.9.9",
-    "vue": "^3.5.30",
+    "tailwindcss": "^4.3.0",
+    "vue": "^3.5.35",
     "vue-leaflet-markercluster": "^0.6.1",
-    "vue-router": "^5.0.3"
+    "vue-router": "^5.1.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
     "@types/leaflet": "^1.9.21",
-    "@types/node": "^24.12.0",
+    "@types/node": "^25.9.1",
-    "@vitejs/plugin-vue": "^6.0.4",
+    "@vitejs/plugin-vue": "^6.0.7",
-    "@vue/eslint-config-typescript": "^14.7.0",
+    "@vue/eslint-config-typescript": "^14.8.0",
-    "@vue/tsconfig": "^0.9.0",
+    "@vue/tsconfig": "^0.9.1",
     "clsx": "^2.1.1",
-    "eslint": "^10.0.3",
+    "eslint": "^10.4.1",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-oxlint": "~1.51.0",
+    "eslint-plugin-oxlint": "~1.68.0",
-    "eslint-plugin-vue": "~10.8.0",
+    "eslint-plugin-vue": "~10.9.2",
-    "jiti": "^2.6.1",
+    "jiti": "^2.7.0",
-    "npm-run-all2": "^8.0.4",
+    "npm-run-all2": "^9.0.1",
-    "oxfmt": "^0.37.0",
+    "oxfmt": "^0.53.0",
-    "oxlint": "~1.51.0",
+    "oxlint": "~1.68.0",
-    "sass-embedded": "^1.98.0",
+    "sass-embedded": "^1.100.0",
-    "tailwind-merge": "^3.5.0",
+    "tailwind-merge": "^3.6.0",
-    "typescript": "~5.9.3",
+    "typescript": "~6.0.3",
-    "vite": "^7.3.1",
+    "vite": "^8.0.16",
-    "vite-plugin-vue-devtools": "^8.0.7",
+    "vite-plugin-vue-devtools": "^8.1.2",
-    "vue-tsc": "^3.2.5"
+    "vue-tsc": "^3.3.3"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0"

pnpm-workspace.yaml

@@ -1,2 +1,4 @@
 onlyBuiltDependencies:
+  - '@parcel/watcher'
   - esbuild
+  - vue-demi

public/favicon/dark/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#065f46</TileColor></tile></msapplication></browserconfig>

public/favicon/dark/manifest.json

@@ -0,0 +1,46 @@
+{
+  "name": "alexcreates.fr",
+  "theme_color": "#065f46",
+  "background_color": "#065f46",
+  "display": "browser",
+  "scope": "/",
+  "start_url": "https://alexcreates.fr",
+  "icons": [
+    {
+      "src": "\/android-icon-36x36.png",
+      "sizes": "36x36",
+      "type": "image\/png",
+      "density": "0.75"
+    },
+    {
+      "src": "\/android-icon-48x48.png",
+      "sizes": "48x48",
+      "type": "image\/png",
+      "density": "1.0"
+    },
+    {
+      "src": "\/android-icon-72x72.png",
+      "sizes": "72x72",
+      "type": "image\/png",
+      "density": "1.5"
+    },
+    {
+      "src": "\/android-icon-96x96.png",
+      "sizes": "96x96",
+      "type": "image\/png",
+      "density": "2.0"
+    },
+    {
+      "src": "\/android-icon-144x144.png",
+      "sizes": "144x144",
+      "type": "image\/png",
+      "density": "3.0"
+    },
+    {
+      "src": "\/android-icon-192x192.png",
+      "sizes": "192x192",
+      "type": "image\/png",
+      "density": "4.0"
+    }
+  ]
+}

public/favicon/light/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#065f46</TileColor></tile></msapplication></browserconfig>

public/favicon/light/manifest.json

@@ -0,0 +1,46 @@
+{
+  "name": "alexcreates.fr",
+  "theme_color": "#065f46",
+  "background_color": "#065f46",
+  "display": "browser",
+  "scope": "/",
+  "start_url": "https://alexcreates.fr",
+  "icons": [
+    {
+      "src": "\/android-icon-36x36.png",
+      "sizes": "36x36",
+      "type": "image\/png",
+      "density": "0.75"
+    },
+    {
+      "src": "\/android-icon-48x48.png",
+      "sizes": "48x48",
+      "type": "image\/png",
+      "density": "1.0"
+    },
+    {
+      "src": "\/android-icon-72x72.png",
+      "sizes": "72x72",
+      "type": "image\/png",
+      "density": "1.5"
+    },
+    {
+      "src": "\/android-icon-96x96.png",
+      "sizes": "96x96",
+      "type": "image\/png",
+      "density": "2.0"
+    },
+    {
+      "src": "\/android-icon-144x144.png",
+      "sizes": "144x144",
+      "type": "image\/png",
+      "density": "3.0"
+    },
+    {
+      "src": "\/android-icon-192x192.png",
+      "sizes": "192x192",
+      "type": "image\/png",
+      "density": "4.0"
+    }
+  ]
+}

public/robots.txt

@@ -0,0 +1,49 @@
+User-agent: GPTBot
+Disallow: /
+User-agent: ChatGPT-User
+Disallow: /
+User-agent: Google-Extended
+Disallow: /
+User-agent: PerplexityBot
+Disallow: /
+User-agent: Amazonbot
+Disallow: /
+User-agent: ClaudeBot
+Disallow: /
+User-agent: Omgilibot
+Disallow: /
+User-Agent: FacebookBot
+Disallow: /
+User-Agent: Applebot
+Disallow: /
+User-agent: anthropic-ai
+Disallow: /
+User-agent: Bytespider
+Disallow: /
+User-agent: Claude-Web
+Disallow: /
+User-agent: Diffbot
+Disallow: /
+User-agent: ImagesiftBot
+Disallow: /
+User-agent: Omgilibot
+Disallow: /
+User-agent: Omgili
+Disallow: /
+User-agent: YouBot
+Disallow: /
+
+User-agent: AhrefsBot
+Disallow: /
+User-agent: AhrefsSiteAudit
+Disallow: /
+User-agent: SemrushBot
+Disallow: /
+User-agent: YandexMarket
+Disallow: /
+User-agent: YandexBot
+Disallow: /
+User-agent: DataForSeoBot
+Disallow: /
+
+Sitemap: https://alexcreates.fr/sitemap-index.xml

src/assets/css/main.css

@@ -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: oklch(87.173% 0.17182 90.995);
-  --primary-foreground: oklch(0.985 0 0);
+  --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);

src/components/BikeClusterLayer.vue

@@ -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: .95em;
+}
+
+.marker-cluster span {
+  font-weight: var(--font-weight-bold);
+  opacity: .5;
+}
+
+.marker-cluster-small {
+  background-color: color-mix(in srgb, var(--color-green-400) 7.5%, transparent);
+
+  div {
+    background-color: color-mix(in srgb, var(--color-green-400) 10%, 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) 15%, 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) 20%, transparent);
+  }
+}
+</style>

src/components/BikeFilters.vue

@@ -0,0 +1,98 @@
+<script lang="ts" setup>
+import { useMap } from '@/stores/map'
+import { PhMapPin, PhSpinner } from '@phosphor-icons/vue'
+import { useGeolocation, usePermission } from '@vueuse/core'
+import { storeToRefs } from 'pinia'
+import { computed, ref, watch } from 'vue'
+import ParkingSpaceRange from './filters/ParkingSpaceRange.vue'
+import Checkbox from './forms/Checkbox.vue'
+
+const { userCoords, filterCovered, filterUncovered, filterKorrigo, filterCargoOnly, filterStdOnly } = storeToRefs(useMap())
+
+defineProps<{
+  nbUncovered?: number
+  nbCovered?: number
+  nbKorrigo?: number
+}>()
+
+// Geolocation features
+const { coords, error, resume, pause, locatedAt } = useGeolocation({ immediate: false })
+
+const geolocationPermission = usePermission('geolocation')
+
+const isRequesting = ref(false)
+const hasLocation = computed(() => locatedAt.value !== null && !error.value)
+
+// Auto-start if permission was already granted
+watch(geolocationPermission, (permission) => {
+  if (permission === 'granted' && !hasLocation.value) {
+    resume()
+  }
+}, { immediate: true })
+
+function toggleGeolocation() {
+  if (hasLocation.value) {
+    pause()
+    isRequesting.value = false
+    emit('click-geoloc')
+  } else {
+    isRequesting.value = true
+    resume()
+  }
+}
+
+watch(locatedAt, () => { isRequesting.value = false })
+watch(error, () => { isRequesting.value = false })
+watch(coords, () => {
+  if (coords.value.latitude && coords.value.longitude) {
+    userCoords.value = coords.value
+  }
+})
+
+const emit = defineEmits(['click-geoloc'])
+</script>
+
+<template>
+  <div class="max-w-xs absolute top-5 left-5 z-10 grid gap-2">
+    <button @click="toggleGeolocation" :title="error?.message ?? (hasLocation ? 'Aller à ma position' : 'Me localiser')"
+      :class="[
+        'size-9 grid place-items-center border shadow rounded-full cursor-pointer transition-colors',
+        hasLocation
+          ? 'bg-primary text-primary-foreground border-primary'
+          : 'bg-slate-50 text-slate-950 border-transparent hover:bg-background hover:text-primary hover:border-primary',
+        error ? 'text-destructive border-destructive hover:text-destructive hover:border-destructive' : ''
+      ]">
+      <PhSpinner v-if="isRequesting" :size="20" class="animate-spin" />
+      <PhMapPin v-else :size="20" weight="fill" />
+    </button>
+
+    <form class="p-2 bg-slate-50 text-slate-950 rounded-xs 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>
+  </div>
+</template>

src/components/BikeMap.vue

@@ -0,0 +1,143 @@
+<script lang="ts" setup>
+import 'leaflet/dist/leaflet.css'
+import 'vue-leaflet-markercluster/dist/style.css'
+
+import L, { Map } 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_DARK, MAP_TILELAYER_URL_LIGHT, 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, ref, useTemplateRef } from 'vue'
+import { storeToRefs } from 'pinia'
+import BikeClusterLayer from './BikeClusterLayer.vue'
+import { PhCircleNotch } from '@phosphor-icons/vue'
+import { useDark } from '@vueuse/core'
+import BikeUserMarker from './BikeUserMarker.vue'
+
+// Map setup
+const mapRef = useTemplateRef<{ leafletObject: Map }>('map')
+const isDark = useDark({ storageKey: "theme" })
+
+const mapTilelayer = computed(() => {
+  return isDark.value ? MAP_TILELAYER_URL_DARK : MAP_TILELAYER_URL_LIGHT
+})
+
+// Data fetching
+const fetchedPages = ref(0)
+const totalPages = ref(1)
+const progress = computed(() => Math.round((fetchedPages.value / totalPages.value) * 100))
+
+async function fetchAllBikeParkings(): Promise<BikeParking[]> {
+  fetchedPages.value = 0
+
+  const firstPage = await fetch(`${API_BASE_URL}?limit=${API_LIMIT}`).then(r => r.json()) as ApiResponse
+  const { total_count } = firstPage
+
+  const remainingCount = Math.ceil((total_count - API_LIMIT) / API_LIMIT)
+  totalPages.value = remainingCount + 1
+  fetchedPages.value = 1
+
+  const results: BikeParking[] = [...(firstPage.results ?? [])]
+
+  await Promise.all(
+    Array.from({ length: remainingCount }, (_, i) =>
+      fetch(`${API_BASE_URL}?limit=${API_LIMIT}&offset=${(i + 1) * API_LIMIT}`)
+        .then(r => r.json() as Promise<ApiResponse>)
+        .then(page => {
+          results.push(...(page.results ?? []))
+          fetchedPages.value++
+        })
+    )
+  )
+
+  return 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(() =>
+  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(() =>
+  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(() =>
+  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())
+
+// Geolocation
+const { userCoords } = storeToRefs(useMap())
+
+function handleClickGeoloc() {
+  if (userCoords.value) {
+    mapRef.value?.leafletObject.flyTo([userCoords.value.latitude, userCoords.value.longitude], 12)
+  }
+}
+</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" @click-geoloc="handleClickGeoloc" />
+  </Transition>
+
+  <main class="relative z-0 h-screen w-screen grid place-items-center">
+    <div v-if="state.status === 'pending'" class="flex flex-col items-center gap-3 text-sm">
+      <span>Chargement des parkings… {{ progress }}%</span>
+      <progress :value="progress" max="100"
+        class="w-48 h-1.5 rounded-full bg-muted [&::-webkit-progress-bar]:bg-muted-foreground [&::-webkit-progress-value]:bg-primary [&::-moz-progress-bar]:bg-primary" />
+      <PhCircleNotch :size="24" class="animate-spin text-primary" />
+    </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="mapTilelayer" layer-type="base" />
+
+        <BikeUserMarker v-if="userCoords" />
+
+        <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>

src/components/BikeMarker.vue

@@ -5,9 +5,13 @@ import { PhBicycle, PhLockKey, PhSquareHalf, PhWarehouse } from '@phosphor-icons
 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';
 
-defineProps<{
+const props = defineProps<{
   park: BikeParking
+  group: 'covered' | 'non-covered' | 'premium'
 }>()
 
 const normalIconSize: PointTuple = [30, 30]
@@ -15,10 +19,31 @@ 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]">
+  <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">
@@ -27,6 +52,16 @@ const popupOffset = [0, iconSize.value[0] * -0.66]
 
         <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'">
@@ -45,13 +80,14 @@ const popupOffset = [0, iconSize.value[0] * -0.66]
     </LPopup>
 
     <LIcon :icon-size :icon-anchor :class-name="cn(
-      { 'korrigo': park.condition_acces === 'Abonnement Korrigo' },
+      `group-${group}`,
-      { 'highlight': park.type === 'Box individuel' || park.type === 'Abrité' },
+      { 'korrigo': park.condition_acces === KORRIGO_KEY },
+      { 'highlight': park.type === BOXED_KEY || park.type === COVERED_KEY },
     )">
-      <PhBicycle v-if="park.type === 'Non abrité'" size="18" />
+      <PhBicycle v-if="park.type === UNCOVERED_KEY" size="18" weight="fill" />
-      <PhWarehouse v-else-if="park.type === 'Abrité'" size="18" />
+      <PhWarehouse v-else-if="park.type === COVERED_KEY" size="18" weight="light" />
-      <PhSquareHalf v-else-if="park.type === 'Box individuel'" size="18" />
+      <PhSquareHalf v-else-if="park.type === BOXED_KEY" size="18" weight="light" />
-      <PhLockKey v-else-if="park.type === 'Collectif sécurisé'" size="18" weight="fill" />
+      <PhLockKey v-else-if="park.condition_acces === KORRIGO_KEY" size="18" weight="fill" />
     </LIcon>
   </LMarker>
 </template>
@@ -59,8 +95,10 @@ const popupOffset = [0, iconSize.value[0] * -0.66]
 <style lang="scss">
 .leaflet-marker-icon:not(.marker-cluster) {
   border-radius: 50%;
-  color: var(--color-muted-foreground);
+  color: color-mix(in srgb, var(--color-foreground) 80%, var(--color-background));
-  background-color: var(--color-background);
+  background-color: color-mix(in srgb, var(--color-background) 85%, var(--color-foreground));
+  border: 1px solid color-mix(in srgb, var(--color-muted-foreground) 50%, var(--color-background));
+  box-shadow: var(--shadow);
   display: grid;
   place-items: center;
 
@@ -70,9 +108,8 @@ const popupOffset = [0, iconSize.value[0] * -0.66]
   }
 
   &.highlight {
-    color: var(--color-background);
+    color: var(--color-amber-400);
-    border: 2px solid var(--color-muted-foreground);
+    border: 2px solid color-mix(in srgb, var(--color-amber-400) 50%, var(--color-background));
-    background-color: var(--color-foreground);
   }
 }
 

src/components/BikeUserMarker.vue

@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import { useMap } from '@/stores/map';
+import { PhMapPin } from '@phosphor-icons/vue';
+import { LIcon, LMarker } from '@vue-leaflet/vue-leaflet';
+import type { PointTuple } from 'leaflet';
+import { storeToRefs } from 'pinia';
+import { computed, ref } from 'vue';
+
+const normalIconSize: PointTuple = [30, 30]
+
+const iconSize = ref<PointTuple>(normalIconSize)
+const iconAnchor = computed<PointTuple>(() => [iconSize.value[0] / 2, iconSize.value[1]])
+
+// Geolocation
+const { userCoords } = storeToRefs(useMap())
+</script>
+
+<template>
+  <LMarker v-if="userCoords" :lat-lng="[userCoords.latitude, userCoords.longitude]" :icon-size :icon-anchor>
+    <LIcon>
+      <PhMapPin size="20" weight="fill" class="text-amber-400" />
+    </LIcon>
+  </LMarker>
+</template>

src/components/Map.vue

@@ -1,92 +0,0 @@
-<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 } from '@/utils/const'
-import { useQuery } from '@pinia/colada'
-import { LControlZoom, LMap, LTileLayer } from '@vue-leaflet/vue-leaflet'
-import { LMarkerClusterGroup } from 'vue-leaflet-markercluster'
-import BikeMarker from './BikeMarker.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,
-})
-
-const { zoom, minZoom, center } = useMap()
-</script>
-
-<template>
-  <header class="sr-only">
-    <h1>
-      Carte interactive des parkings vélo de Rennes Métropole
-    </h1>
-  </header>
-
-  <main class="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" v-model:center="center" :options="{ zoomControl: false }"
-        :useGlobalLeaflet="true">
-        <LControlZoom position="bottomright" />
-
-        <LTileLayer url="https://tiles.stadiamaps.com/tiles/alidade_smooth_dark/{z}/{x}/{y}{r}.png" layer-type="base" />
-
-        <!-- Review CSGroup -->
-        <LMarkerClusterGroup v-if="state.data.length > 0" :max-cluster-radius="30" :disable-clustering-at-zoom="17">
-          <BikeMarker v-once v-for="park in state.data" :key="park.code_insee" :park />
-        </LMarkerClusterGroup>
-      </LMap>
-    </template>
-  </main>
-</template>
-
-<style lang="scss">
-.marker-cluster-small {
-  background-color: color-mix(in srgb, var(--color-green-500) 25%, transparent);
-
-  div {
-    background-color: color-mix(in srgb, var(--color-green-500) 33%, transparent);
-  }
-}
-
-.marker-cluster-medium {
-  background-color: color-mix(in srgb, var(--color-yellow-400) 25%, transparent);
-
-  div {
-    background-color: color-mix(in srgb, var(--color-yellow-400) 33%, transparent);
-  }
-}
-
-.marker-cluster-large {
-  background-color: color-mix(in srgb, var(--color-rose-400) 25%, transparent);
-
-  div {
-    background-color: color-mix(in srgb, var(--color-rose-400) 33%, transparent);
-  }
-}
-</style>

src/components/filters/ParkingSpaceRange.vue

@@ -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>

src/components/forms/Checkbox.vue

@@ -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>

src/pages/Home.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Map from '@/components/Map.vue';
+import BikeMap from '@/components/BikeMap.vue';
 </script>
 
 <template>
@@ -10,6 +10,6 @@ import Map from '@/components/Map.vue';
   </header>
 
   <Suspense>
-    <Map />
+    <BikeMap />
   </Suspense>
 </template>

src/stores/map.ts

@@ -2,14 +2,55 @@ 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', () => {
+  // Map config and options
   const zoom = ref(10)
-  const minZoom = 6
+  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,
+  }
+
+  // Cluster layers options
+  const maxClusterRadius = 60
+  const disableClusteringAtZoom = 17
+
+  // Geolocation
+  const userCoords = ref<Omit<GeolocationCoordinates, 'toJSON'> | null>(null)
+
+  // Active filters
+  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,
+    extraOptions,
+    maxClusterRadius,
+    disableClusteringAtZoom,
+    userCoords,
+    filterUncovered,
+    filterCovered,
+    filterKorrigo,
+    filterCargoOnly,
+    filterStdOnly,
+    spotsRange,
   }
 })

src/utils/const.ts

@@ -1,3 +1,21 @@
+export const MAP_TILELAYER_URL_LIGHT = 'http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png'
+export const MAP_TILELAYER_URL_DARK = 'http://{s}.tile.osm.org/{z}/{x}/{y}.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,
+}