feat rooting WIP

Express/barAndCafe/jest.config.js

@@ -1,8 +1,5 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
-  testPathIgnorePatterns: [
-    "<rootDir>/dist/"
-  ],
   testTimeout: 10000,
   preset: 'ts-jest',
   testEnvironment: 'node',

Express/barAndCafe/src/openTripMaps.ts

@@ -13,7 +13,7 @@ const key = process.env.OPEN_TRIP_MAPS_KEY
  * @param {string} lat2 Latitude of the 2nd point of the box
  * @returns {FeatureCollection} a list of POIs with their type, id, etc. (cf: [opentripmap](https://dev.opentripmap.org/docs#))
  */
-async function callBox(lon1:string, lat1:string, lon2: string, lat2: string, rate: string) {
+async function callBox(lon1:string, lat1:string, lon2: string, lat2: string) {
     const lonMin = Math.min(parseFloat(lon1), parseFloat(lon2))
     const lonMax = Math.max(parseFloat(lon1), parseFloat(lon2))
     const latMin = Math.min(parseFloat(lat1), parseFloat(lat2))
@@ -27,7 +27,6 @@ async function callBox(lon1:string, lat1:string, lon2: string, lat2: string, rat
             lon_max: lonMax,
             lat_min: latMin,
             lat_max: latMax,
-            rate: rate,
             apikey: key,
             kinds: 'bars,cafes,pubs,biergartens'
         },
@@ -136,8 +135,9 @@ export async function getCity(req: express.Request, res: express.Response) {
         radius = "1000"
     }
     const cityPose = await callCity(cityName as string)
-    res.send( await callRadius(cityPose.lon,cityPose.lat, radius as string))
+    const poi = await callRadius(cityPose.lon,cityPose.lat, radius as string)
-}
+    res.send( {...poi, ...cityPose})
+}//XXX: refaire test avec city
 
 /**
  * Handle GET request for radius search route ('/otm/radius').
@@ -183,16 +183,11 @@ export async function getBox(req:express.Request, res: express.Response) {
     const lat1 = req.query["lat1"] as string
     const lon2 = req.query["lon2"] as string
     const lat2 = req.query["lat2"] as string
-    let rate = req.query["rate"] as string
     if(!lon1 || !lat1 || !lon2 || !lat2){
         res.status(400).send("Missing Argument")
         return
     }
 
-    if(!rate){
+    res.send( await callBox(lon1, lat1, lon2, lat2))
-        rate = "1";
-    }
-
-    res.send( await callBox(lon1, lat1, lon2, lat2, rate))
 }
 

Express/barAndCafe/test/openTripMaps.test.ts

@@ -219,14 +219,6 @@ describe("Test the otm city path", () => {
             }
             ]
         }
-        function sleep(milliseconds: number) {
-            const date = Date.now();
-            let currentDate = null;
-            do {
-              currentDate = Date.now();
-            } while (currentDate - date < milliseconds);
-          }
-        sleep(2000);
         request(app)
         .get("/otm/box")
         .query({'lon1':'-1.435199','lon2':'-1.43519', 'lat1':'46.668460', 'lat2':'46.668461'})

Ratrapage_WEB.code-workspace

@@ -1,18 +0,0 @@
-{
-	"folders": [
-		{
-			"name": "Ratrapage_WEB",
-			"path": "."
-		},
-		{
-			"name": "barAndCafe",
-			"path": "Express/barAndCafe"
-		},
-		{
-			"path": "front"
-		}
-	],
-	"settings": {
-		"typescript.tsdk": "node_modules/typescript/lib"
-	}
-}

bruno/OpenData datatourisme/environments/prod.bru

@@ -1,8 +1,3 @@
 vars {
   EXPRESS_API: https://drink-tweb.cb85.fr
-  PB_URL: https://pb-tweb.cb85.fr
-  TRIPMAP_URL: https://api.opentripmap.com/0.1/
 }
-vars:secret [
-  OTM_KEY
-]

bruno/OpenData datatourisme/poketBase_api/connexion.bru

@@ -1,18 +0,0 @@
-meta {
-  name: connexion
-  type: http
-  seq: 1
-}
-
-post {
-  url: {{PB_URL}}/api/collections/users/auth-with-password
-  body: json
-  auth: none
-}
-
-body:json {
-  {
-    "identity": "michel.biche@aptatio.com",
-    "password": "123456789"
-  }
-}

bruno/OpenData datatourisme/poketBase_api/get all poi.bru

@@ -1,27 +0,0 @@
-meta {
-  name: get all poi
-  type: http
-  seq: 5
-}
-
-get {
-  url: {{PB_URL}}/api/collections/user_poi/records?filter=owner='vvy93m1hoaeshwy'&&poi_list='cabkkovmjsfoapa'
-  body: json
-  auth: bearer
-}
-
-query {
-  filter: owner
-  poi_list: 'cabkkovmjsfoapa'
-}
-
-auth:bearer {
-  token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb2xsZWN0aW9uSWQiOiJfcGJfdXNlcnNfYXV0aF8iLCJleHAiOjE3MTg4Mjg0NzEsImlkIjoidnZ5OTNtMWhvYWVzaHd5IiwidHlwZSI6ImF1dGhSZWNvcmQifQ.pC7u-QaZ_BYqWA5wG8wu1lRbbd4mKuKeAveWe_IBnfU
-}
-
-body:json {
-  {
-    "owner": "vvy93m1hoaeshwy",
-    "poi_list": "sh430u0im37cxm5"
-  }
-}

bruno/OpenData datatourisme/poketBase_api/link user to poi.bru

@@ -1,22 +0,0 @@
-meta {
-  name: link user to poi
-  type: http
-  seq: 3
-}
-
-post {
-  url: {{PB_URL}}/api/collections/user_poi/records
-  body: json
-  auth: bearer
-}
-
-auth:bearer {
-  token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb2xsZWN0aW9uSWQiOiJfcGJfdXNlcnNfYXV0aF8iLCJleHAiOjE3MTg4Mjg0NzEsImlkIjoidnZ5OTNtMWhvYWVzaHd5IiwidHlwZSI6ImF1dGhSZWNvcmQifQ.pC7u-QaZ_BYqWA5wG8wu1lRbbd4mKuKeAveWe_IBnfU
-}
-
-body:json {
-  {
-    "owner": "vvy93m1hoaeshwy",
-    "poi_list": "sh430u0im37cxm5"
-  }
-}

bruno/OpenData datatourisme/poketBase_api/send a poi.bru

@@ -1,40 +0,0 @@
-meta {
-  name: send a poi
-  type: http
-  seq: 2
-}
-
-post {
-  url: {{PB_URL}}/api/collections/POI/records
-  body: json
-  auth: bearer
-}
-
-auth:bearer {
-  token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb2xsZWN0aW9uSWQiOiJfcGJfdXNlcnNfYXV0aF8iLCJleHAiOjE3MTg4Mjg0NzEsImlkIjoidnZ5OTNtMWhvYWVzaHd5IiwidHlwZSI6ImF1dGhSZWNvcmQifQ.pC7u-QaZ_BYqWA5wG8wu1lRbbd4mKuKeAveWe_IBnfU
-}
-
-body:json {
-  {
-    "Poi_id": "11472887",
-    "Poi": {
-      "type": "Feature",
-      "id": "11472887",
-      "geometry": {
-        "type": "Point",
-        "coordinates": [
-          -0.0626024,
-          51.4924088
-        ]
-      },
-      "properties": {
-        "xid": "W544344833",
-        "name": "The Blue Anchor",
-        "rate": 2,
-        "osm": "way/544344833",
-        "wikidata": "Q7718716",
-        "kinds": "pubs,foods,shops,marketplaces,tourist_facilities"
-      }
-    }
-  }
-}

bruno/OpenData datatourisme/poketBase_api/send fav to astro.bru

@@ -1,37 +0,0 @@
-meta {
-  name: send fav to astro
-  type: http
-  seq: 4
-}
-
-post {
-  url: http://localhost:3000/maps/save_poi
-  body: json
-  auth: bearer
-}
-
-auth:bearer {
-  token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb2xsZWN0aW9uSWQiOiJfcGJfdXNlcnNfYXV0aF8iLCJleHAiOjE3MTg4ODY2OTIsImlkIjoidnZ5OTNtMWhvYWVzaHd5IiwidHlwZSI6ImF1dGhSZWNvcmQifQ.R9PBGlHn6aBHt89g6G0NykMh_Vye24OpKEUYtz6R6Og
-}
-
-body:json {
-  {
-      "type": "Feature",
-      "id": "11472888",
-      "geometry": {
-        "type": "Point",
-        "coordinates": [
-          -0.0626024,
-          51.4924088
-        ]
-      },
-      "properties": {
-        "xid": "W544344833",
-        "name": "The Blue Anchor",
-        "rate": 2,
-        "osm": "way/544344833",
-        "wikidata": "Q7718716",
-        "kinds": "pubs,foods,shops,marketplaces,tourist_facilities"
-      }
-  }
-}

front/package-lock.json

@@ -20,7 +20,6 @@
         "astro-embed": "^0.7.2",
         "astro-icon": "^1.1.0",
         "leaflet": "^1.9.4",
-        "leaflet-control-geocoder": "^2.4.0",
         "leaflet-geosearch": "^4.0.0",
         "leaflet-routing-machine": "^3.2.12",
         "limax": "4.1.0",
@@ -8154,17 +8153,6 @@
       "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz",
       "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA=="
     },
-    "node_modules/leaflet-control-geocoder": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/leaflet-control-geocoder/-/leaflet-control-geocoder-2.4.0.tgz",
-      "integrity": "sha512-b2QlxuFd40uIDbnoUI3U9fzfnB4yKUYlmsXjquJ2d2YjoJqnyVYcIJeErAVv3kPvX3nI0gzvBq1XHMgSVFrGkQ==",
-      "optionalDependencies": {
-        "open-location-code": "^1.0.0"
-      },
-      "peerDependencies": {
-        "leaflet": "^1.6.0"
-      }
-    },
     "node_modules/leaflet-geosearch": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/leaflet-geosearch/-/leaflet-geosearch-4.0.0.tgz",
@@ -10064,12 +10052,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/open-location-code": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/open-location-code/-/open-location-code-1.0.3.tgz",
-      "integrity": "sha512-DBm14BSn40Ee241n80zIFXIT6+y8Tb0I+jTdosLJ8Sidvr2qONvymwqymVbHV2nS+1gkDZ5eTNpnOIVV0Kn2fw==",
-      "optional": true
-    },
     "node_modules/optionator": {
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",

front/package.json

@@ -27,7 +27,6 @@
     "astro-embed": "^0.7.2",
     "astro-icon": "^1.1.0",
     "leaflet": "^1.9.4",
-    "leaflet-control-geocoder": "^2.4.0",
     "leaflet-geosearch": "^4.0.0",
     "leaflet-routing-machine": "^3.2.12",
     "limax": "4.1.0",

front/src/components/CheckBox.astro

@@ -1,30 +0,0 @@
----
-import type { Input as Props } from 'types';
-
-const {value, checked ,name, label, autocomplete, placeholder, divClass, inputClass} = Astro.props;
-
----
-
-<>
-  {
-    name && (
-      <div class={"flex flex-row items-center " + divClass}>
-        <input
-          type="checkbox"
-          name={name}
-          id={name}
-          checked={checked}
-          value={value}
-          autocomplete={autocomplete}
-          placeholder={placeholder}
-          class={"mr-2 size-5 " + inputClass}
-        />
-        {label && (
-          <label for={name} class="block text-lg font-medium">
-            {label}
-          </label>
-        )}
-      </div>
-    )
-  }
-</>

front/src/components/Radios.astro

@@ -1,19 +0,0 @@
----
-
-export interface Props {
-  values: Array<{label:String, name:string, checked?:boolean | undefined}>
-}
-
-
-const fields = Astro.props.values
-
----
-
-<>
-  <div class="flex, flex-col">
-    {fields.map(value => (
-          <input type="radio" id={value.name} name="note-min" value={value.name} checked={value.checked}>
-          <label for={value.name} class="ml-1">{value.label}</label><br>
-    ))}
-  </div>
-</>

front/src/navigation.js

@@ -3,16 +3,119 @@ import { getPermalink, getBlogPermalink } from './utils/permalinks'
 export const headerData = {
 	links: [
 		{
-			text: 'Explorer POI',
+			text: 'Homes',
-			href: '/maps',
+			links: [
+				{
+					text: 'SaaS',
+					href: getPermalink('/homes/saas'),
+				},
+				{
+					text: 'Startup',
+					href: getPermalink('/homes/startup'),
+				},
+				{
+					text: 'Mobile App',
+					href: getPermalink('/homes/mobile-app'),
+				},
+				{
+					text: 'Personal',
+					href: getPermalink('/homes/personal'),
+				},
+			],
 		},
-    {
+		{
-			text: 'itinéraire',
+			text: 'Pages',
-			href: '/maps/find_route',
+			links: [
+				{
+					text: 'Features (Anchor Link)',
+					href: getPermalink('/#features'),
+				},
+				{
+					text: 'Services',
+					href: getPermalink('/services'),
+				},
+				{
+					text: 'Pricing',
+					href: getPermalink('/pricing'),
+				},
+				{
+					text: 'About us',
+					href: getPermalink('/about'),
+				},
+				{
+					text: 'Contact',
+					href: getPermalink('/contact'),
+				},
+				{
+					text: 'Terms',
+					href: getPermalink('/terms'),
+				},
+				{
+					text: 'Privacy policy',
+					href: getPermalink('/privacy'),
+				},
+			],
 		},
-    {
+		{
-			text: 'Compte',
+			text: 'Landing',
-			href: '/account',
+			links: [
+				{
+					text: 'Lead Generation',
+					href: getPermalink('/landing/lead-generation'),
+				},
+				{
+					text: 'Long-form Sales',
+					href: getPermalink('/landing/sales'),
+				},
+				{
+					text: 'Click-Through',
+					href: getPermalink('/landing/click-through'),
+				},
+				{
+					text: 'Product Details (or Services)',
+					href: getPermalink('/landing/product'),
+				},
+				{
+					text: 'Coming Soon or Pre-Launch',
+					href: getPermalink('/landing/pre-launch'),
+				},
+				{
+					text: 'Subscription',
+					href: getPermalink('/landing/subscription'),
+				},
+			],
+		},
+		{
+			text: 'Blog',
+			links: [
+				{
+					text: 'Blog List',
+					href: getBlogPermalink(),
+				},
+				{
+					text: 'Article',
+					href: getPermalink(
+						'get-started-website-with-astro-tailwind-css',
+						'post'
+					),
+				},
+				{
+					text: 'Article (with MDX)',
+					href: getPermalink('markdown-elements-demo-post', 'post'),
+				},
+				{
+					text: 'Category Page',
+					href: getPermalink('tutorials', 'category'),
+				},
+				{
+					text: 'Tag Page',
+					href: getPermalink('astro', 'tag'),
+				},
+			],
+		},
+		{
+			text: 'Widgets',
+			href: '#',
 		},
 	],
 	// actions: [

front/src/pages/maps.astro

@@ -0,0 +1,158 @@
+---
+import Layout from 'layouts/PageLayout.astro'
+import 'leaflet/dist/leaflet.css'
+import 'leaflet-geosearch/dist/geosearch.css'
+import 'leaflet-routing-machine/dist/leaflet-routing-machine.css'
+import FormContainer from 'components/ui/Form.astro'
+import Input from 'components/Input.astro'
+import Button from 'components/ui/Button.astro'
+
+const metadata = {
+  title: 'Maps',
+  ignoreTitleTemplate: true,
+}
+---
+
+<Layout metadata={metadata}>
+
+  <div class="h-[calc(100vh-16rem)] flex flex-col">
+    <div class="w-full h-96 grow" id="map" />
+  </div>
+  
+  <script src='leaflet-routing-machine/dist/leaflet-routing-machine.js'></script>
+
+  <!-- for remouve footer -->
+  <!-- <div slot="footer"></div> -->
+  <!-- penser a rm  11 au rem au dessus pour la taille -->
+</Layout>
+
+<script>
+  import L, { geoJSON, Icon, Popup, type LatLngTuple } from 'leaflet'
+  import markerShadow from "leaflet/dist/images/marker-shadow.png"
+  import markerIcon from "leaflet/dist/images/marker-icon.png"
+  import { OpenStreetMapProvider } from 'leaflet-geosearch'
+  import { GeoSearchControl } from 'leaflet-geosearch'
+  
+
+  const icon = {icon: new L.Icon({iconUrl: markerIcon.src, shadowUrl: markerShadow.src, iconAnchor: [13,41]})}
+
+  // const BACK_URL = "https://drink-tweb.cb85.fr/"
+  const BACK_URL = "http://localhost:3001/"
+
+  let mapsCenter : L.LatLngTuple
+
+  const map = L.map('map', {
+    center: [51.5, -0.09],
+    zoom: 13,
+    preferCanvas: true
+  })
+
+  L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    maxZoom: 19,
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+  }).addTo(map)
+
+  const provider = new OpenStreetMapProvider()
+  
+  map.addControl(
+    GeoSearchControl({
+      notFoundMessage: 'Adresse introuvable !',
+      provider,
+      showMarker: false,
+      style: 'bar',
+    }),
+  )
+  // L.Routing.control({
+  //     waypoints: [
+  //         L.latLng(57.74, 11.94),
+  //         L.latLng(57.6792, 11.949)
+  //     ],
+  //     routeWhileDragging: true
+  // }).addTo(map)
+
+  let poiMarkers = new Array<L.Marker>
+
+  // run api search
+  function searchBox(){
+    const nordWest = map.getBounds().getNorthWest()
+    const southEast = map.getBounds().getSouthEast()
+    const params: URLSearchParams = new URLSearchParams();
+
+    params.append("lon1", nordWest.lng.toString())
+    params.append("lat1", nordWest.lat.toString())
+    params.append("lon2", southEast.lng.toString())
+    params.append("lat2", southEast.lat.toString())
+    
+    fetch(`${BACK_URL}otm/box?${params.toString()}`,{method: 'GET',headers: {'Content-Type': 'application/json'}}).then(function (response) {
+      return response.json();
+    }).then(function (data) {
+      poiMarkers.forEach(element => {
+        element.remove();
+      });
+      console.log(data);
+      data.features.forEach(element => {
+        const prop = element.properties
+        const popup: Popup = new Popup()
+        let tags = new String()
+        prop.kinds.split(",").forEach(element => {
+          tags += "- " + element + "<br/>"
+        });
+        const poiMarker = L.marker([element.geometry.coordinates[1],element.geometry.coordinates[0]],icon)
+          .bindPopup(`<b>${prop.name}</b><br/>note : ${prop.rate} <br/>tags:<br/> ${tags}`)
+        poiMarker.addTo(map)
+        poiMarkers.push(poiMarker);
+      });
+    }).catch(function (err) {
+      console.warn('Something went wrong.', err);
+    });
+  }
+
+  // fonciton pour lancer la recherche de box sur l'api
+  function sender(){
+    console.log("SEND")
+    if(map.getZoom() >= 13){
+      console.log("zoom OKAY")
+      //TODO: mettre un message de recherche en cour
+      searchBox();
+    }else{
+      console.log("zoom more to see result");
+      //TODO: faire en sorte d'avoir un message
+    }
+  }
+  // envent pour lancer la recherche
+  const cooldown = 1000;
+  sender()
+  let timeoutHandle = window.setTimeout(sender, cooldown)
+  
+  window.clearTimeout(timeoutHandle);
+  
+  map.addEventListener("move",() =>{
+    console.log("move")
+    window.clearTimeout(timeoutHandle);
+    timeoutHandle = window.setTimeout(sender, cooldown);
+  })//searchBox)
+
+  function search() {
+    const params: URLSearchParams = new URLSearchParams();
+    params.append("name", input!.value)
+
+    fetch(`${BACK_URL}otm/city?${params.toString()}`,{method: 'GET',headers: {'Content-Type': 'application/json'}}).then(function (response) {
+      // The API call was successful!
+      return response.json();
+    }).then(function (data) {
+      console.log(data);
+      mapsCenter = [data.lat, data.lon]
+      marker.setLatLng(mapsCenter)
+      map.setView(mapsCenter)
+      data.features.forEach(element => {
+        const prop = element.properties
+        const popup: Popup = new Popup()
+        const poiMarker = L.marker([element.geometry.coordinates[1],element.geometry.coordinates[0]],icon).bindPopup(prop.name + "\n" + prop.rate + "\n" + prop.kinds)
+        poiMarker.addTo(map)
+      });
+    }).catch(function (err) {
+      console.warn('Something went wrong.', err);
+    });
+  }
+
+</script>

front/src/pages/maps/find_route.astro

@@ -1,87 +0,0 @@
----
-import Layout from 'layouts/PageLayout.astro'
-import 'leaflet/dist/leaflet.css'
-import 'leaflet-routing-machine/dist/leaflet-routing-machine.css'
-import FormContainer from 'components/ui/Form.astro'
-import Input from 'components/Input.astro'
-import Button from 'components/ui/Button.astro'
-
-const metadata = {
-  title: 'Maps',
-  ignoreTitleTemplate: true,
-}
----
-
-<Layout metadata={metadata}>
-
-  <div class="h-[calc(100vh-5rem)] flex flex-col">
-    <div class="w-full h-96 grow" id="map" />
-    <Button id="test-btn">test</Button>
-  </div>
-  <!-- for remouve footer -->
-  <div slot="footer"></div>
-</Layout>
-
-<script>
-  import * as L from 'leaflet'
-  import markerShadow from "leaflet/dist/images/marker-shadow.png"
-  import markerIcon from "leaflet/dist/images/marker-icon.png"
-  import 'leaflet-routing-machine/dist/leaflet-routing-machine.js'
-  import 'leaflet-control-geocoder/dist/Control.Geocoder.js'
-  
-  const icon = {icon: new L.Icon({iconUrl: markerIcon.src, shadowUrl: markerShadow.src, iconAnchor: [13,41]})}
-
-  // declare map
-  const map = L.map('map', {
-    center: [51.5, -0.09],
-    zoom: 13,
-    preferCanvas: true,
-    zoomControl: false
-  })
-  L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
-    maxZoom: 19,
-    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
-  }).addTo(map)
-
-  // move zoom ctl to bottom
-  L.control.zoom({
-    position: 'bottomleft'
-  }).addTo(map);
-
-  const routing = L.Routing.control({
-    // utile pour afficher des route stocké
-    // waypoints: [
-    //   L.latLng(46.6705431, -1.4269698),
-    //   L.latLng(47.218536, -1.554075)
-    // ],
-    routeWhileDragging: true,
-    //@ts-ignore
-    geocoder: L.Control.Geocoder.nominatim(),
-    //@ts-ignore
-    position: 'topleft',
-    showAlternatives: true,
-    reverseWaypoints: true,
-    altLineOptions: {
-      missingRouteTolerance: 50,
-      extendToWaypoints: true,
-      styles: [
-        {color: 'black', opacity: 0.15, weight: 9},
-        {color: 'white', opacity: 0.2, weight: 6},
-        {color: 'blue', opacity: 5, weight: 2}
-      ]
-    }
-  }).addTo(map).on('routeselected', (e) => {
-    console.log("iténeraire choisie")
-    console.log(e)
-  }).on('routesfound', (e) =>{
-    console.log("route trouvé")
-    console.log(e)
-  })
-  document.querySelector<HTMLButtonElement>('#test-btn')?.addEventListener('click', () => {
-    routing.setWaypoints(
-      [L.latLng(46.6705431, -1.4269698),L.latLng(47.218536, -1.554075)]
-    )
-    routing.route();
-  })
-
-</script>

front/src/pages/maps/index.astro

@@ -1,281 +0,0 @@
----
-import Layout from 'layouts/PageLayout.astro'
-import 'leaflet/dist/leaflet.css'
-import 'leaflet-geosearch/dist/geosearch.css'
-import CheckBox from 'components/CheckBox.astro'
-import Radios from 'components/Radios.astro'
-import ListResult, { type RecordModel } from 'pocketbase'
-import { Expand, Trash } from 'lucide-astro'
-
-const pb = Astro.locals.pb
-const connected = pb.authStore.isValid
-
-const metadata = {
-  title: 'Maps',
-  ignoreTitleTemplate: true,
-}
-
-let fav = new Array<any>
-
-if(connected){
-  try {
-    const request = await pb.collection('user_poi').getList(1,10,{filter:`owner="${pb.authStore.model!.id}"`, expand:"poi_list"})
-    request.items.forEach(element => {
-      fav.push(element.expand!.poi_list.Poi)
-    });
-  } catch (error) {
-    console.log(error);
-  }
-}
-
-console.log(fav);
-
-
----
-
-<Layout metadata={metadata}>
-
-  <div class="h-[calc(100vh-5rem)] flex flex-row">
-    <div class="w-1/5 flex flex-col">
-      <p id="message" class="hidden text-center mb-3">pouet</p>
-      <p class="text-center text-2xl mb-3">Filtre :</p>
-      <div class="">
-        <p>note minimal :</p>
-        <Radios
-          values={[
-              {name: "1", label: "1", checked: true},
-              {name: "2", label: "2"},
-              {name: "3", label: "3"},
-              {name: "1h", label: "1h"},
-              {name: "2h", label: "2h"},
-              {name: "3h", label: "3h"},
-            ]}
-        />
-        <p class="text-center text-xl mb-3">Type POI :</p>
-        <CheckBox
-          label="Bar, Pub, Café,..."
-          name="filter"
-          value="drink"
-          checked
-        />
-      </div>
-      <div class="mb-3 grow">
-        <p class="text-center text-xl mb-3">Source :</p>
-        <CheckBox
-          label="Open Trip Maps"
-          name="filter"
-          value="otm"
-          checked
-        />
-      </div>
-      {connected && (
-      <div class="mb-2">
-        <p class="text-center text-xl mb-3">Favori :</p>
-        {fav.map(val =>(
-          <div class="ml-2 flex flex-row mb-1" id="fav-div">
-            <p class="grow poi-favori" id={val.id} data-pos={val.geometry.coordinates}>{val.properties.name}</p>
-            <Trash id={val.id} class="poi-trash"/>
-          </div>
-        ))}
-      </div>
-      )}
-    </div>
-    <div class="flex flex-col h-full grow">
-      <div class="w-full h-full grow" id="map" />
-    </div>
-  </div>
-  <!-- TODO: faire en sort que le style soit propre -->
-
-  <!-- for remouve footer -->
-  <div slot="footer"></div>
-  <!-- penser a rm  11 au rem au dessus pour la taille -->
-</Layout>
-
-<script>
-  import L, {Popup} from 'leaflet'
-  import markerShadow from "leaflet/dist/images/marker-shadow.png"
-  import markerIcon from "leaflet/dist/images/marker-icon.png"
-  import { OpenStreetMapProvider } from 'leaflet-geosearch'
-  import { GeoSearchControl } from 'leaflet-geosearch'
-
-  const showFav = document.querySelectorAll(".poi-favori")
-  const trashFav = document.querySelectorAll(".poi-trash")
-  const favDiv = document.querySelector('#fav-div')
-
-  const icon = {icon: new L.Icon({iconUrl: markerIcon.src, shadowUrl: markerShadow.src, iconAnchor: [13,41]})}
-
-  // const BACK_URL = "http://localhost:3001/" //XXX : mettre url de prod
-  const BACK_URL = "https://drink-tweb.cb85.fr/" //XXX : mettre url de prod
-
-  // declare map
-  const map = L.map('map', {
-    center: [51.5, -0.09],
-    zoom: 13,
-    preferCanvas: true,
-    zoomControl: false
-  })
-  L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
-    maxZoom: 19,
-    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
-  }).addTo(map)
-
-  // move zoom ctl to bottom
-  L.control.zoom({
-    position: 'bottomleft'
-  }).addTo(map)
-
-  const provider = new OpenStreetMapProvider()
-  
-  map.addControl(
-    GeoSearchControl({
-      notFoundMessage: 'Adresse introuvable !',
-      provider,
-      showMarker: false,
-      style: 'bar',
-    }),
-  )
-
-  async function saveToFav(element: any, save: boolean){
-    const url = '/maps/save_poi';
-    const options = {
-      method: 'POST',
-      body: JSON.stringify({Poi : element, save: save})
-    };
-
-    try {
-      const response = await fetch(url, options);
-      const data = await response.json();
-      console.log(data);
-    } catch (error) {
-      console.error(error);
-    }
-  }
-
-  function eventGotoFav(e: Element){
-    e.addEventListener('click', () =>{
-      const pose = e.getAttribute('data-pos')?.split(',')
-      map.panTo(new L.LatLng(parseFloat(pose![1]),parseFloat(pose![0])))
-    })
-  }
-
-  function eventRemoveFav(e: Element){
-    e.addEventListener('click', async () => {
-      await saveToFav({id:e.id, type:"Feature"},false)
-      document.location.reload()
-    })
-  }
-
-  showFav.forEach(e => {eventGotoFav(e)})
-  trashFav.forEach(e => {eventRemoveFav(e)})
-
-  let poiMarkers = new Array<L.Marker>
-  let minimalNote = "1"
-  let drink = true
-  let otm = true
-  
-  // run api search
-  function searchBox(){
-    const nordWest = map.getBounds().getNorthWest()
-    const southEast = map.getBounds().getSouthEast()
-    const params: URLSearchParams = new URLSearchParams()
-
-    params.append("lon1", nordWest.lng.toString())
-    params.append("lat1", nordWest.lat.toString())
-    params.append("lon2", southEast.lng.toString())
-    params.append("lat2", southEast.lat.toString())
-    params.append("rate", minimalNote)
-
-    if(drink && otm){
-      fetch(`${BACK_URL}otm/box?${params.toString()}`,{method: 'GET',headers: {'Content-Type': 'application/json',}}).then(function (response) {
-        return response.json()
-      }).then(function (data) {
-        poiMarkers.forEach(element => {
-          element.remove()
-        })
-        console.log(data)
-        data.features.forEach(element => {
-          const prop = element.properties
-          const popup: Popup = new Popup()
-          let tags = new String()
-          prop.kinds.split(",").forEach(element => {
-            tags += "- " + element + "<br/>"
-          })
-          const poiMarker = L.marker([element.geometry.coordinates[1],element.geometry.coordinates[0]],icon)
-            .bindPopup(`<b>${prop.name}</b><br/>note : ${prop.rate} <br/>tags:<br/> ${tags} <p>favori : <input type="checkbox" name="like" id=${element.id}/><p>`)
-            .on("click", () => {
-              document.querySelectorAll<HTMLInputElement>('input[name="like"]').forEach(e => {
-                e.addEventListener("click", () => {
-                  console.log(element)
-                  saveToFav(element, e.checked)
-                  document.location.reload()
-                })
-              })
-            })
-          poiMarker.addTo(map)
-          poiMarkers.push(poiMarker)
-        })
-      }).catch(function (err) {
-        console.warn('Something went wrong.', err)
-      })
-    }
-  }
-
-  // fonciton pour lancer la recherche de box sur l'api
-  function sender(){
-    if(map.getZoom() >= 13){
-      console.log("zoom OKAY")
-      //TODO: mettre un message de recherche en cour
-      searchBox()
-    }else{
-      console.log("zoom more to see result")
-    }
-  }
-  // envent pour lancer la recherche
-  const cooldown = 400
-  sender()
-  let timeoutHandle = window.setTimeout(sender, cooldown)
-  
-  window.clearTimeout(timeoutHandle)
-  
-  map.addEventListener("move",() =>{
-    window.clearTimeout(timeoutHandle)
-    timeoutHandle = window.setTimeout(sender, cooldown)
-  })
-
-  map.addEventListener("zoom", () => {
-    if(map.getZoom() <= 11){
-      poiMarkers.forEach(element => {
-        element.remove()
-      })
-    }
-  })
-
-  document.querySelectorAll<HTMLInputElement>("input[name='filter']").forEach(e =>{
-    e.addEventListener("click", () => {
-      switch (e.value) {
-        case "drink":
-          drink = e.checked
-        break;
-      
-        case "otm":
-          otm = e.checked
-        break;
-
-        default:
-          break;
-      }
-      poiMarkers.forEach(element => {
-          element.remove()
-      })
-      searchBox()
-    })
-  })
-
-  document.querySelectorAll<HTMLInputElement>('input[name="note-min"]').forEach(e => {
-    e.addEventListener("click", () => {
-      minimalNote = e.value
-      searchBox()
-    })
-  })
-
-</script>

front/src/pages/maps/save_poi.astro

@@ -1,47 +0,0 @@
----
-import AstroUtils from "libs/AstroUtils";
-import type { RecordModel } from "pocketbase";
-
-
-const pb = Astro.locals.pb
-
-if(!pb.authStore.isValid){
-		return Astro.redirect("/account")
-}
-
-await AstroUtils.wrap(async () => {
-	if (Astro.request.method !== 'POST') {
-		return
-	}
-  const poiJson = await Astro.request.json()
-
-  const data = {Poi: poiJson.Poi, Poi_id:poiJson.Poi.id}
-
-  let record: RecordModel
-
-  try {
-    record = await pb.collection('POI').create(data);
-  } catch (error) {
-    try{
-      record = await pb.collection('POI').getFirstListItem(`Poi_id="${poiJson.Poi.id}"`)
-    } catch (error2) {
-      console.log("error 1 :")
-      console.log(error)
-      console.log("error 2 :")
-      console.log(error2)
-    }
-  }
-
-  try {
-    if(poiJson.save){
-      await pb.collection('user_poi').create({owner: pb.authStore.model!.id, poi_list:record!.id})
-      }else{
-        record = await pb.collection('user_poi').getFirstListItem(`poi_list="${record!.id}"&&owner="${pb.authStore.model!.id}"`)
-        await pb.collection('user_poi').delete(record.id)
-    }
-  } catch (error) {
-    console.log(error)
-  }
-
-})
----

front/src/types.d.ts

@@ -162,15 +162,13 @@ export interface Testimonial {
 }
 
 export interface Input {
-  type?: HTMLInputTypeAttribute
+  type: HTMLInputTypeAttribute
   name: string
   label?: string
   autocomplete?: string
   placeholder?: string
   divClass?: string
   inputClass?: string
-  checked?: bool
-  value?:string
 }
 
 export interface Textarea {