From 75939398f4f19f7a0a3c0222b65b80169fc3e3b0 Mon Sep 17 00:00:00 2001 From: "jean-philippe.bazonnais" Date: Mon, 29 Apr 2024 10:54:41 +0200 Subject: [PATCH] Fix sur les css + ajout TODO --- src/assets/controls.css | 7 ------- src/assets/ol.css | 12 ------------ src/components/carte/Map.vue | 11 +++++++++-- src/components/carte/View.vue | 7 ++----- src/components/carte/control/Attributions.vue | 4 +++- src/components/carte/control/OverviewMap.vue | 9 ++++++++- src/components/carte/control/SearchEngine.vue | 8 ++++++-- src/components/carte/control/Zoom.vue | 4 +++- src/composables/controls.ts | 1 + src/main.ts | 2 -- src/views/Carto.vue | 2 ++ tsconfig.app.json | 4 +++- 12 files changed, 37 insertions(+), 34 deletions(-) delete mode 100644 src/assets/controls.css delete mode 100644 src/assets/ol.css diff --git a/src/assets/controls.css b/src/assets/controls.css deleted file mode 100644 index b0abdf5..0000000 --- a/src/assets/controls.css +++ /dev/null @@ -1,7 +0,0 @@ -/********************************************************** - CSS pour les extensions : geoportail-extensions-openlayers -***********************************************************/ -div[id^="GPsearchEngine-"]{ - left: 40vw; -} - diff --git a/src/assets/ol.css b/src/assets/ol.css deleted file mode 100644 index e9fa27a..0000000 --- a/src/assets/ol.css +++ /dev/null @@ -1,12 +0,0 @@ -#map { - margin-left: 0; - width: 100vw; - height: 70vh; -} - -#map .ol-custom-overviewmap { - bottom: 30px; - left: auto; - right: 20px; - top: auto; -} \ No newline at end of file diff --git a/src/components/carte/Map.vue b/src/components/carte/Map.vue index 8d09479..203fa06 100644 --- a/src/components/carte/Map.vue +++ b/src/components/carte/Map.vue @@ -10,6 +10,7 @@ const mapRef = ref(0) /** * Map + * default controls are removed (rotate, zoom and attributions) */ const map = new Map({ controls: [] // on supprime les contrôles par defaut ! @@ -34,7 +35,7 @@ const onFocusOnMap = () => { mapRef.value.focus(); } -// rendre disponible 'map' aux composants enfannts imbriqués +// rendre disponible 'map' aux composants enfants imbriqués provide('map', map) @@ -50,4 +51,10 @@ provide('map', map) - + diff --git a/src/components/carte/View.vue b/src/components/carte/View.vue index 22d2b3f..21f7b48 100644 --- a/src/components/carte/View.vue +++ b/src/components/carte/View.vue @@ -51,9 +51,6 @@ onMounted(() => { }) - + - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/carte/control/Attributions.vue b/src/components/carte/control/Attributions.vue index 704ca5c..9e3a8e4 100644 --- a/src/components/carte/control/Attributions.vue +++ b/src/components/carte/control/Attributions.vue @@ -31,4 +31,6 @@ onUpdated(() => { - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/carte/control/OverviewMap.vue b/src/components/carte/control/OverviewMap.vue index 8d9cb06..4cefcd8 100644 --- a/src/components/carte/control/OverviewMap.vue +++ b/src/components/carte/control/OverviewMap.vue @@ -32,4 +32,11 @@ onUpdated(() => { - + diff --git a/src/components/carte/control/SearchEngine.vue b/src/components/carte/control/SearchEngine.vue index d528c54..b125680 100644 --- a/src/components/carte/control/SearchEngine.vue +++ b/src/components/carte/control/SearchEngine.vue @@ -21,7 +21,7 @@ const searchEngine = ref(new SearchEngine(props.searchEngineOptions)) onMounted(() => { if (props.visibility) { map.addControl(searchEngine.value) - // abonnement au widget + /** abonnement au widget */ searchEngine.value.on("searchengine:search:click", onClickSearch); } }) @@ -51,4 +51,8 @@ const onClickSearch = (e) => { - + diff --git a/src/components/carte/control/Zoom.vue b/src/components/carte/control/Zoom.vue index 57e6ab1..5473655 100644 --- a/src/components/carte/control/Zoom.vue +++ b/src/components/carte/control/Zoom.vue @@ -31,4 +31,6 @@ onUpdated(() => { - \ No newline at end of file + \ No newline at end of file diff --git a/src/composables/controls.ts b/src/composables/controls.ts index bba277d..d68fe81 100644 --- a/src/composables/controls.ts +++ b/src/composables/controls.ts @@ -4,4 +4,5 @@ export const useControls = { ScaleLine: 'ScaleLine', Zoom: 'Zoom', // Attributions: 'Attributions' + // Rotate: 'Rotate' } diff --git a/src/main.ts b/src/main.ts index 6337a87..2b0982b 100644 --- a/src/main.ts +++ b/src/main.ts @@ -15,8 +15,6 @@ import router from './router/index' import * as icons from './icons' import './main.css' -import './assets/ol.css' -import './assets/controls.css' addIcons(...Object.values(icons)) // Autoimporté grâce à ohVueIconAutoimportPreset dans vite.config.ts diff --git a/src/views/Carto.vue b/src/views/Carto.vue index c19b721..e7dbc0d 100644 --- a/src/views/Carto.vue +++ b/src/views/Carto.vue @@ -13,6 +13,8 @@ const store = useMapStore() store.setZoom(12) store.setCenter([-234814.550892, 4774562.534805]) +// TODO enregistrer la liste des couches dans le store & localStorage +// TODO definir la couche par defaut ou les couches utilisateurs (localStorage) const layers = [ new TileLayer({ source: new OSM(), diff --git a/tsconfig.app.json b/tsconfig.app.json index 8c4ddf1..9db99f5 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -8,6 +8,8 @@ "baseUrl": ".", "paths": { "@/*": ["./src/*"] - } + }, + "allowJs": true, + "noImplicitAny": false } }