teritorio · wazolab · Oct 28, 2024 · Oct 28, 2024 · Oct 28, 2024
diff --git a/components/Home/Embedded.vue b/components/Home/Embedded.vue
@@ -72,10 +72,6 @@ onMounted(() => {
 //
 // Computed
 //
-const explorerModeEnabled = computed(() => {
-  return settings!.themes[0]?.explorer_mode ?? true
-})
-
 const filters = computed(() => {
   return route.query.menuItemIds
     ? route.query.menuItemIds
@@ -187,8 +183,6 @@ function toggleExploreAroundSelectedPoi() {
       <PoiCardContent
         :details-is-external="true"
         :poi="selectedFeature"
-        :explorer-mode-enabled="explorerModeEnabled"
-        :favorites-mode-enabled="false"
         @explore-click="toggleExploreAroundSelectedPoi"
         @zoom-click="goToSelectedFeature"
       />
@@ -207,7 +201,6 @@ function toggleExploreAroundSelectedPoi() {
           :features="mapFeatures"
           :selected-categories-ids="selectedCategoryIds"
           :style-icon-filter="poiFilters"
-          :explorer-mode-enabled="explorerModeEnabled"
           :cooperative-gestures="false"
           :boundary-area="boundaryArea || settings!.polygon.data"
         />

diff --git a/components/Home/Home.vue b/components/Home/Home.vue
@@ -47,7 +47,9 @@ const menuStore = useMenuStore()
 const { apiMenuCategory, features, selectedCategoryIds } = storeToRefs(menuStore)
 const favoriteStore = useFavoriteStore()
 const { favoritesIds, favoriteAddresses, favoriteFeatures, favoriteCount } = storeToRefs(favoriteStore)
-const { config, settings, contents } = useSiteStore()
+const siteStore = useSiteStore()
+const { config, settings, contents } = siteStore
+const { favoritesModeEnabled } = storeToRefs(siteStore)
 const { $tracking } = useNuxtApp()
 const route = useRoute()
 const router = useRouter()
@@ -141,14 +143,6 @@ onMounted(async () => {
 //
 // Computed
 //
-const explorerModeEnabled = computed(() => {
-  return settings!.themes[0]?.explorer_mode ?? true
-})
-
-const favoritesModeEnabled = computed(() => {
-  return settings!.themes[0]?.favorites_mode ?? true
-})
-
 const isBottomMenuOpened = computed(() => {
   return ((device.value.smallScreen && isPoiCardShown.value) || isMenuItemOpen.value)
 })
@@ -288,7 +282,10 @@ watch(isModeFavorites, async (isEnabled) => {
 //
 // Methods
 //
-function goToSelectedFeature() {
+function goToSelectedFeature(feature?: ApiPoi) {
+  if (feature)
+    mapStore.setSelectedFeature(feature)
+
   if (mapFeaturesRef.value)
     mapFeaturesRef.value.goToSelectedFeature()
 }
@@ -557,12 +554,11 @@ function handlePoiCardClose() {
         >
           <FavoriteMenu
             v-if="favoritesModeEnabled"
-            :explore-around-selected-poi="toggleExploreAroundSelectedPoi"
-            :go-to-selected-poi="goToSelectedFeature"
-            :toggle-favorite="toggleFavorite"
-            :explorer-mode-enabled="explorerModeEnabled"
+            @explore-click="toggleExploreAroundSelectedPoi"
+            @favorite-click="toggleFavorite"
             @toggle-favorite-mode="toggleFavoriteMode"
             @toggle-note-book-mode="toggleNoteBookMode"
+            @zoom-click="goToSelectedFeature"
           />
           <NavMenu
             id="nav-menu"
@@ -585,7 +581,6 @@ function handlePoiCardClose() {
           :features="mapFeatures"
           :selected-categories-ids="isModeExplorer ? [] : selectedCategoryIds"
           :style-icon-filter="poiFilters"
-          :explorer-mode-enabled="explorerModeEnabled"
           :enable-filter-route-by-categories="!isModeFavorites"
           :enable-filter-route-by-features="isModeFavorites"
           :boundary-area="boundaryArea || settings!.polygon.data"
@@ -625,8 +620,6 @@ function handlePoiCardClose() {
           "
           :poi="selectedFeature"
           class="tw-grow-0"
-          :explorer-mode-enabled="explorerModeEnabled"
-          :favorites-mode-enabled="favoritesModeEnabled"
           @explore-click="toggleExploreAroundSelectedPoi(undefined)"
           @favorite-click="toggleFavorite"
           @zoom-click="goToSelectedFeature"
@@ -656,8 +649,6 @@ function handlePoiCardClose() {
             "
             :poi="selectedFeature"
             class="tw-grow-0 tw-text-left tw-h-full"
-            :explorer-mode-enabled="explorerModeEnabled"
-            :favorites-mode-enabled="favoritesModeEnabled"
             @explore-click="toggleExploreAroundSelectedPoi(undefined)"
             @favorite-click="toggleFavorite"
             @zoom-click="goToSelectedFeature"

diff --git a/components/MainMap/FavoriteMenu.vue b/components/MainMap/FavoriteMenu.vue
@@ -9,25 +9,24 @@ import type { ApiPoi } from '~/lib/apiPois'
 import { mapStore as useMapStore } from '~/stores/map'
 import { favoriteStore as useFavoriteStore } from '~/stores/favorite'
 
-const props = defineProps<{
-  exploreAroundSelectedPoi: Function
-  explorerModeEnabled: boolean
-  goToSelectedPoi: Function
-  toggleFavorite: Function
+const emit = defineEmits<{
+  (e: 'exploreClick', poi: ApiPoi): void
+  (e: 'favoriteClick', poi: ApiPoi): void
+  (e: 'toggleFavoriteMode'): void
+  (e: 'toggleNoteBookMode'): void
+  (e: 'zoomClick', poi: ApiPoi): void
 }>()
 
-const emit = defineEmits(['toggleFavoriteMode', 'toggleNoteBookMode'])
-
 const device = useDevice()
 const notebookModal = ref<boolean>(false)
 
 const mapStore = useMapStore()
 const { isModeFavorites } = storeToRefs(mapStore)
 const { favoriteCount } = storeToRefs(useFavoriteStore())
 
-function explore(poi: ApiPoi) {
+function onExploreClick(poi: ApiPoi) {
   notebookModal.value = false
-  props.exploreAroundSelectedPoi(poi)
+  emit('exploreClick', poi)
 }
 
 function onClose() {
@@ -36,13 +35,8 @@ function onClose() {
 }
 
 function onZoomClick(poi: ApiPoi) {
-  mapStore.setSelectedFeature(poi)
   notebookModal.value = false
-  props.goToSelectedPoi(poi)
-}
-
-function handleFavorite(poi: ApiPoi) {
-  props.toggleFavorite(poi)
+  emit('zoomClick', poi)
 }
 
 const { $tracking } = useNuxtApp()
@@ -108,9 +102,8 @@ async function toggleNoteBookMode() {
         max-width="80rem"
       >
         <FavoriteNoteBook
-          :explorer-mode-enabled="explorerModeEnabled"
-          @explore-click="explore"
-          @favorite-click="handleFavorite"
+          @explore-click="onExploreClick"
+          @favorite-click="$emit('favoriteClick', $event)"
           @zoom-click="onZoomClick"
           @on-close="onClose"
         />

diff --git a/components/MainMap/FavoriteNoteBook.vue b/components/MainMap/FavoriteNoteBook.vue
@@ -10,10 +10,6 @@ import type { ApiPoi } from '~/lib/apiPois'
 import { favoriteStore as useFavoriteStore } from '~/stores/favorite'
 import { siteStore as useSiteStore } from '~/stores/site'
 
-defineProps<{
-  explorerModeEnabled: boolean
-}>()
-
 defineEmits<{
   (e: 'onClose'): void
   (e: 'exploreClick', poi: ApiPoi): void
@@ -131,8 +127,6 @@ function removeFavorites() {
     <PoisDeck
       :pois="favoriteFeatures"
       :is-card-light="false"
-      :explorer-mode-enabled="explorerModeEnabled"
-      :favorites-mode-enabled="true"
       class="tw-pb-4"
       @explore-click="$emit('exploreClick', $event)"
       @favorite-click="$emit('favoriteClick', $event)"

diff --git a/components/MainMap/MapFeatures.stories.ts b/components/MainMap/MapFeatures.stories.ts
@@ -39,7 +39,6 @@ const defaultProps = {
       },
     } as ApiMenuCategory,
   ],
-  explorerModeEnabled: false,
 }
 
 export const Default = bind(

diff --git a/components/MainMap/MapFeatures.story.vue b/components/MainMap/MapFeatures.story.vue
@@ -34,7 +34,6 @@ const defaultProps = {
       },
     } as ApiMenuCategory,
   ],
-  explorerModeEnabled: false,
 }
 
 const feature1: ApiPoi = {

diff --git a/components/MainMap/MapFeatures.vue b/components/MainMap/MapFeatures.vue
@@ -94,10 +94,6 @@ export default defineNuxtComponent({
       type: Array as PropType<Array<string[]> | null>,
       default: null,
     },
-    explorerModeEnabled: {
-      type: Boolean,
-      required: true,
-    },
     enableFilterRouteByCategories: {
       type: Boolean,
       default: true,
@@ -122,7 +118,9 @@ export default defineNuxtComponent({
 
   setup() {
     const device = useDevice()
-    const { config } = storeToRefs(useSiteStore())
+    const siteStore = useSiteStore()
+    const { config } = siteStore
+    const { explorerModeEnabled } = storeToRefs(useSiteStore())
     const mapStore = useMapStore()
     const { center, selectedFeature, pinMarker, teritorioCluster } = storeToRefs(mapStore)
     const mapStyleLoaded = ref(false)
@@ -131,6 +129,7 @@ export default defineNuxtComponent({
       center,
       config,
       device,
+      explorerModeEnabled,
       mapBase: ref<InstanceType<typeof MapBase>>(),
       mapStore,
       mapStyleLoaded,

diff --git a/components/PoisCard/PoiCard.stories.ts b/components/PoisCard/PoiCard.stories.ts
@@ -11,8 +11,6 @@ export default {
 
 const defaultProps = {
   poi,
-  explorerModeEnabled: false,
-  favoritesModeEnabled: false,
 }
 
 export const Default = bind(PoiCard, {

diff --git a/components/PoisCard/PoiCard.story.vue b/components/PoisCard/PoiCard.story.vue
@@ -5,8 +5,6 @@ import type { ApiPoi } from '~/lib/apiPois'
 
 const defaultProps = {
   poi: poi as ApiPoi,
-  explorerModeEnabled: false,
-  favoritesModeEnabled: false,
 }
 
 const props = {

diff --git a/components/PoisCard/PoiCard.vue b/components/PoisCard/PoiCard.vue
@@ -11,8 +11,6 @@ import type { ApiPoi } from '~/lib/apiPois'
 withDefaults(defineProps<{
   canClose?: boolean
   poi: ApiPoi
-  explorerModeEnabled: boolean
-  favoritesModeEnabled: boolean
   showImage?: boolean
 }>(), {
   canClose: true,
@@ -85,8 +83,6 @@ const closeBtnStyles = reactive({
 
     <PoiCardContent
       :poi="poi"
-      :explorer-mode-enabled="explorerModeEnabled"
-      :favorites-mode-enabled="favoritesModeEnabled"
       class="tw-px-4 tw-py-5 tw-flex tw-flex-col md:tw-overflow-y-auto tw-flex-grow md:tw-max-h-full tw-box-border tw-w-full md:tw-h-80 md:tw-w-96"
       @explore-click="$emit('exploreClick', $event)"
       @favorite-click="$emit('favoriteClick', $event)"

diff --git a/components/PoisCard/PoiCardContent.vue b/components/PoisCard/PoiCardContent.vue
@@ -8,6 +8,7 @@ import type { ApiPoi } from '~/lib/apiPois'
 import { coordinatesHref } from '~/lib/coordinates'
 import { favoriteStore as useFavoriteStore } from '~/stores/favorite'
 import { mapStore as useMapStore } from '~/stores/map'
+import { siteStore as useSiteStore } from '~/stores/site'
 import ContribFieldGroup from '~/components/Fields/ContribFieldGroup.vue'
 import useDevice from '~/composables/useDevice'
 import IsochroneTrigger from '~/components/Isochrone/IsochroneTrigger.vue'
@@ -17,8 +18,6 @@ import IsochroneTrigger from '~/components/Isochrone/IsochroneTrigger.vue'
 //
 const props = withDefaults(defineProps<{
   detailsIsExternal?: boolean
-  explorerModeEnabled: boolean
-  favoritesModeEnabled: boolean
   poi: ApiPoi
 }>(), {
   detailsIsExternal: false,
@@ -43,6 +42,7 @@ const { contribMode, isContribEligible, getContributorFields } = useContrib()
 const { isModeExplorer } = storeToRefs(useMapStore())
 const device = useDevice()
 const { enabled: isochroneEnabled } = useIsochrone()
+const { explorerModeEnabled, favoritesModeEnabled } = storeToRefs(useSiteStore())
 
 //
 // Data

diff --git a/components/PoisCard/PoisDeck.stories.ts b/components/PoisCard/PoisDeck.stories.ts
@@ -25,8 +25,6 @@ const defaultProps = {
     ),
   ),
   selectedPoiIds: points.map(feature => feature.properties.id),
-  explorerModeEnabled: false,
-  favoritesModeEnabled: false,
 }
 
 export const Default = bind(PoisDeck, {

diff --git a/components/PoisCard/PoisDeck.story.vue b/components/PoisCard/PoisDeck.story.vue
@@ -18,8 +18,6 @@ const defaultProps = {
     ),
   ),
   selectedPoiIds: points.map(feature => feature.properties.id as ApiPoiId),
-  explorerModeEnabled: false,
-  favoritesModeEnabled: false,
   isCardLight: true,
 }
 

diff --git a/components/PoisCard/PoisDeck.vue b/components/PoisCard/PoisDeck.vue
@@ -3,15 +3,10 @@ import type { ApiPoi } from '~/lib/apiPois'
 import PoiCard from '~/components/PoisCard/PoiCard.vue'
 import PoiCardLight from '~/components/PoisCard/PoiCardLight.vue'
 
-withDefaults(defineProps<{
-  explorerModeEnabled?: boolean
-  favoritesModeEnabled?: boolean
+defineProps<{
   pois: ApiPoi[]
   isCardLight: boolean
-}>(), {
-  explorerModeEnabled: false,
-  favoritesModeEnabled: false,
-})
+}>()
 
 defineEmits<{
   (e: 'exploreClick', poi: ApiPoi): void
@@ -38,8 +33,6 @@ defineEmits<{
       :can-close="false"
       :poi="item"
       class="tw-grow-1 poi-deck"
-      :explorer-mode-enabled="explorerModeEnabled"
-      :favorites-mode-enabled="favoritesModeEnabled"
       @explore-click="$emit('exploreClick', $event)"
       @favorite-click="$emit('favoriteClick', $event)"
       @zoom-click="$emit('zoomClick', $event)"

diff --git a/components/PoisDetails/PoiDetails.vue b/components/PoisDetails/PoiDetails.vue
@@ -86,10 +86,6 @@ export default defineNuxtComponent({
       return PropertyTranslationsContextEnum.Details
     },
 
-    favoritesModeEnabled(): boolean {
-      return this.settings.themes[0]?.favorites_mode ?? true
-    },
-
     properties(): ApiPoi['properties'] {
       if (!this.isLargeLayeout) {
         return this.poi.properties
@@ -306,7 +302,6 @@ export default defineNuxtComponent({
         :route="poiDeps"
         :color-fill="colorFill"
         :color-line="colorLine"
-        :favorites-mode-enabled="favoritesModeEnabled"
       />
     </template>
 

diff --git a/components/PoisDetails/Route/RouteMap.vue b/components/PoisDetails/Route/RouteMap.vue
@@ -43,10 +43,6 @@ export default defineNuxtComponent({
       type: String as PropType<string>,
       required: true,
     },
-    favoritesModeEnabled: {
-      type: Boolean,
-      required: true,
-    },
   },
 
   data(): {
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,6 @@ const defaultProps = { @@
           },
         } as ApiMenuCategory,
       ],
-      explorerModeEnabled: false,
     }
     export const Default = bind(
@@ Expand Down @@