@dative-gpi/foundation-shared-components 1.0.137 → 1.0.138

package/components/FSCheckbox.vue

@@ -50,6 +50,7 @@
         v-if="$props.description"
         class="fs-checkbox-description"
         font="text-overline"
+        :lineClamp="2"
         :style="style"
       >
         {{ $props.description }}

package/components/FSChipGroup.vue

@@ -0,0 +1,69 @@
+<template>
+  <FSWrapGroup
+    v-if="$props.variant === 'wrap'"
+    v-bind="$attrs"
+  >
+    <FSChip
+      v-for="(label, index) in $props.labels"
+      :key="index"
+      :variant="$props.chipVariant"
+      :color="$props.color"
+      :label="label"
+    />
+    <slot />
+  </FSWrapGroup>
+  <FSSlideGroup
+    v-if="$props.variant === 'slide'"
+    v-bind="$attrs"
+  >
+    <FSChip
+      v-for="(label, index) in $props.labels"
+      :key="index"
+      :variant="$props.chipVariant"
+      :color="$props.color"
+      :label="label"
+    />
+    <slot />
+  </FSSlideGroup>
+</template>
+  
+  <script lang="ts">
+import { defineComponent, type PropType } from "vue";
+  
+import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
+  
+import FSSlideGroup from "./FSSlideGroup.vue";
+import FSWrapGroup from "./FSWrapGroup.vue";
+import FSChip from "./FSChip.vue";
+  
+export default defineComponent({
+  name: "FSChipGroup",
+  components: {
+    FSSlideGroup,
+    FSWrapGroup,
+    FSChip
+  },
+  props: {
+    labels: {
+      type: Array as PropType<string[]>,
+      required: false,
+      default: () => []
+    },
+    variant: {
+      type: String as PropType<"wrap" | "slide">,
+      required: false,
+      default: "wrap"
+    },
+    chipVariant: {
+      type: String as PropType<"standard" | "full" | "borderless">,
+      required: false,
+      default: "full"
+    },
+    color: {
+      type: String as PropType<ColorBase>,
+      required: false,
+      default: ColorEnum.Light
+    }
+  }
+});
+  </script>

package/components/FSRadio.vue

@@ -50,6 +50,7 @@
         v-if="$props.description"
         class="fs-radio-description"
         font="text-overline"
+        :lineClamp="2"
         :style="style"
       >
         {{ $props.description }}

package/components/FSSlider.vue

@@ -35,7 +35,7 @@
       :elevation="0"
       :tickSize="4"
       :modelValue="$props.modelValue ?? undefined"
-      @update:modelValue="(value) => $emit('update:modelValue', value)"
+      @update:modelValue="$emit('update:modelValue', $event)"
       v-bind="$attrs"
     >
       <template
@@ -55,6 +55,7 @@
         v-if="$props.description"
         class="fs-slider-description"
         font="text-overline"
+        :lineClamp="2"
         :style="style"
       >
         {{ $props.description }}

package/components/FSSwitch.vue

@@ -1,29 +1,25 @@
 <template>
-  <FSRow
-    width="hug"
-    align="top-left"
-    gap="16px"
+  <FSCol
     padding="8px 0px"
-    :wrap="false"
   >
-    <v-switch
-      v-if="variant == 'left'"
-      class="fs-switch"
-      hide-details
-      inset
-      :validateOn="validateOn"
-      :rules="$props.rules"
-      :ripple="false"
-      :style="style"
-      :modelValue="$props.modelValue"
-      @update:modelValue="onToggle"
-      v-bind="$attrs"
-    />
-    <slot>
-      <FSCol
-        width="hug"
-        v-if="$props.label || $props.description || $slots.description"
-      >
+    <FSRow
+      gap="16px"
+      :wrap="false"
+    >
+      <v-switch
+        v-if="variant == 'left'"
+        class="fs-switch"
+        hide-details
+        inset
+        :validateOn="validateOn"
+        :rules="$props.rules"
+        :ripple="false"
+        :style="style"
+        :modelValue="$props.modelValue"
+        @update:modelValue="onToggle"
+        v-bind="$attrs"
+      />
+      <FSCol>
         <FSSpan
           v-if="$props.label"
           class="fs-switch-label"
@@ -41,33 +37,31 @@
             class="fs-switch-description"
             font="text-overline"
             :style="style"
+            :lineClamp="2"
           >
             {{ $props.description }}
           </FSSpan>
         </slot>
-        <slot
-          name="footer"
-        />
       </FSCol>
-    </slot>
-    <FSRow
-      v-if="variant == 'right'"
-      align="center-right"
-    >
-      <v-switch
-        class="fs-switch"
-        hide-details
-        inset
-        :validateOn="validateOn"
-        :rules="$props.rules"
-        :ripple="false"
-        :style="style"
-        :modelValue="$props.modelValue"
-        @update:modelValue="onToggle"
-        v-bind="$attrs"
-      />
+      <FSRow
+        v-if="variant == 'right'"
+        align="center-right"
+      >
+        <v-switch
+          class="fs-switch"
+          hide-details
+          inset
+          :validateOn="validateOn"
+          :rules="$props.rules"
+          :ripple="false"
+          :style="style"
+          :modelValue="$props.modelValue"
+          @update:modelValue="onToggle"
+          v-bind="$attrs"
+        />
+      </FSRow>
     </FSRow>
-  </FSRow>
+  </FSCol>
 </template>
 
 <script lang="ts">

package/components/fields/FSBaseField.vue

@@ -54,6 +54,7 @@
         v-if="$props.description"
         class="fs-base-field-description"
         font="text-overline"
+        :lineClamp="2"
       >
         {{ $props.description }}
       </FSSpan>

package/components/fields/FSEntityFieldUI.vue

@@ -14,18 +14,20 @@
         :wrap="false"
       >
         <FSSelectField
+          :editable="$props.editable"
+          :items="actualEntityTypes"
           :hideHeader="true"
+          :clearable="false"
           :modelValue="$props.entityType"
           @update:modelValue="$emit('update:entityType', $event)"
-          :items="actualEntityTypes"
-          :clearable="false"
         />
         <template
           v-if="itemsCount > 0"
         >
           <FSButton
-            :label="$tr('ui.common.edit', 'Edit')"
             icon="mdi-pencil"
+            :label="$tr('ui.common.edit', 'Edit')"
+            :editable="$props.editable"
             @click="$emit('click:select')"
           />
         </template>
@@ -33,8 +35,9 @@
           v-else
         >
           <FSButton
-            :label="$tr('ui.common.select', 'Select')"
             icon="mdi-plus-circle-multiple-outline"
+            :label="$tr('ui.common.select', 'Select')"
+            :editable="$props.editable"
             @click="$emit('click:select')"
           />
         </template>

package/components/fields/FSRichTextField.vue

@@ -215,7 +215,8 @@
       <FSSpan
         v-if="!readonly && $props.description"
         class="fs-rich-text-field-description"
-        font="text-underline"
+        font="text-overline"
+        :lineClamp="2"
         :style="style"
       >
         {{ $props.description }}

package/components/fields/FSTranslateRichTextField.vue

@@ -32,7 +32,9 @@
             >
               {{ $tr('translate-rich-text-field.translate-in', 'Translate in {0}', language.label) }}
             </FSSpan>
-            <FSIcon>{{ language.icon }}</FSIcon>
+            <FSIcon>
+              {{ language.icon }}
+            </FSIcon>
           </FSRow>
         </template>
       </FSRichTextField>

package/components/map/FSMap.vue

@@ -14,7 +14,7 @@
         v-if="map"
       >
         <FSMapTileLayer
-          :layer="actualLayer"
+          :layers="actualLayer"
         />
         <FSMapMarker 
           v-if="gpsPosition"
@@ -22,38 +22,7 @@
           :color="ColorEnum.Primary"
           :latlng="gpsPosition"
         />
-  
-        <FSMapFeatureGroup
-          v-if="$props.areas"
-          :expected-layers="$props.areas.length"
-          @update:bounds="(bounds) => areaGroupBounds = bounds"
-        >
-          <FSMapPolygon
-            v-for="area in areas"
-            :key="area.id"
-            :color="area.color"
-            :latlngs="area.coordinates.map((coord) => ({lat: coord.latitude, lng: coord.longitude}))"
-            @click="$emit('update:selectedAreaId', area.id)"
-          />
-        </FSMapFeatureGroup>
-  
-        <FSMapMarkerClusterGroup
-          v-if="$props.locations"
-          :expected-layers="$props.locations.length"
-          :disableClusteringAtZoom="defaultZoom"
-          @update:bounds="(bounds) => locationGroupBounds = bounds"
-        >
-          <FSMapMarker
-            v-for="location in $props.locations"
-            :selected="location.id === $props.selectedLocationId"
-            :key="location.id"
-            :label="location.label"
-            :color="location.color ?? ColorEnum.Primary"
-            :icon="location.icon ?? 'mdi-map-marker'"
-            :latlng="{lat: location.address.latitude, lng: location.address.longitude}"
-            @click="$emit('update:selectedLocationId', location.id)"
-          />
-        </FSMapMarkerClusterGroup>
+        <slot />
       </template>
     </div>
 
@@ -100,6 +69,7 @@
     </FSCol>
 
     <FSMapOverlay
+      v-if="overlaySlots && Object.keys(overlaySlots).length"
       :mode="$props.overlayMode"
       @update:mode="$emit('update:overlayMode', $event)"
       @update:height="(height) => overlayHeight = height"
@@ -125,10 +95,9 @@ import type {} from "leaflet.markercluster";
 import { map as createMap, control, tileLayer, latLngBounds, latLng, type LatLng, type FitBoundsOptions, type ZoomPanOptions, type LatLngBounds } from "leaflet";
 
 import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
-import { type FSArea } from '@dative-gpi/foundation-shared-domain/models';
 
 import { useBreakpoints, useColors, useSlots } from "../../composables";
-import { ColorEnum, type FSLocation, type MapLayer } from "../../models";
+import { ColorEnum, MapLayers, MapOverlayPositions, type MapLayer } from "../../models";
 
 import FSMapLayerButton from "./FSMapLayerButton.vue";
 import FSMapOverlay from "./FSMapOverlay.vue";
@@ -138,19 +107,12 @@ import FSCol from "../FSCol.vue";
 
 import FSMapMarker from "./FSMapMarker.vue";
 import FSMapTileLayer from "./FSMapTileLayer.vue";
-import FSMapFeatureGroup from "./FSMapFeatureGroup.vue";
-import FSMapMarkerClusterGroup from "./FSMapMarkerClusterGroup.vue";
-import FSMapPolygon from "./FSMapPolygon.vue";
 
 export default defineComponent({
   name: "FSMap",
   components: {
     FSMapMarker,
     FSMapTileLayer,
-    FSMapFeatureGroup,
-    FSMapMarkerClusterGroup,
-    FSMapPolygon,
-
     FSMapLayerButton,
     FSMapOverlay,
     FSButton,
@@ -174,9 +136,9 @@ export default defineComponent({
       default: false
     },
     overlayMode: {
-      type: String as PropType<'collapse' | 'half' | 'expand'>,
+      type: String as PropType<MapOverlayPositions>,
       required: false,
-      default: 'collapse'
+      default: MapOverlayPositions.Collapse
     },
     showMyLocation: {
       type: Boolean,
@@ -194,39 +156,29 @@ export default defineComponent({
       default: false
     },
     center: {
-      type: Array as PropType<number[]>,
+      type: Array as PropType<number[] | null>,
       required: false,
-      default: () => [45.71, 5.07]
-    },
-    locations: {
-      type: Array as PropType<FSLocation[]>,
-      required: false,
-      default: () => [],
+      default: null
     },
-    areas: {
-      type: Array as PropType<FSArea[]>,
+    bounds: {
+      type: Object as PropType<LatLngBounds | null>,
       required: false,
-      default: () => [],
+      default: null
     },
     currentLayer: {
-      type: String as PropType<"map" | "imagery">,
+      type: String as PropType<MapLayers>,
       required: false,
-      default: "map"
+      default: MapLayers.Map
     },
     allowedLayers: {
-      type: Array as PropType<string[]>,
+      type: Array as PropType<MapLayers[]>,
       required: false,
-      default: () => ["map", "imagery"]
+      default: () => [MapLayers.Map, MapLayers.Imagery]
     },
-    selectedLocationId: {
-      type: String as PropType<string | null>,
+    dirtyZoom: {
+      type: Number,
       required: false,
-      default: null
-    },
-    selectedAreaId: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
+      default: 16
     }
   },
   emits: ["update:modelValue", "update:selectedLocationId", "update:selectedAreaId", 'update:overlayMode', 'update:currentLayer', "click:latlng"],
@@ -246,7 +198,7 @@ export default defineComponent({
 
     provide('map', map);
 
-    const defaultZoom = 16;
+    const defaultZoom = ref(props.dirtyZoom);
     const mapResizeObserver = new ResizeObserver(() => {
       if(!map.value) {
         return;
@@ -256,29 +208,53 @@ export default defineComponent({
 
     const mapLayers: MapLayer[] = [
       {
-        name: "map",
+        name: MapLayers.Map,
         label: $tr("ui.map-layer.map", "Map"),
         image: new URL("../../assets/images/map/map.png", import.meta.url).href,
-        layer: tileLayer(`https://{s}.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&key=${import.meta.env.VITE_GOOGLE_MAPS_API_KEY ?? ""}`, {
-          maxZoom: 22,
-          subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
-          attribution: '© Google Map Data'
-        })
+        layers: [
+          tileLayer(`https://{s}.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&key=${import.meta.env.VITE_GOOGLE_MAPS_API_KEY ?? ""}`, {
+            maxZoom: 22,
+            subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
+            attribution: '© Google Map Data',
+            className: 'fs-map-tile-base-layer'
+          })
+        ]
       },
       {
-        name: "imagery",
+        name: MapLayers.Imagery,
         label: $tr("ui.map-layer.imagery", "Imagery"),
         image: new URL("../../assets/images/map/imagery.png", import.meta.url).href,
-        layer: tileLayer(`https://{s}.google.com/vt/lyrs=s,h&x={x}&y={y}&z={z}&key=${import.meta.env.VITE_GOOGLE_MAPS_API_KEY ?? ""}`, {
-          maxZoom: 22,
-          subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
-          attribution: '© Google Map Data'
-        })
+        layers: [
+          tileLayer(`https://{s}.google.com/vt/lyrs=s,h&x={x}&y={y}&z={z}&key=${import.meta.env.VITE_GOOGLE_MAPS_API_KEY ?? ""}`, {
+            maxZoom: 22,
+            subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
+            attribution: '© Google Map Data',
+            className: 'fs-map-tile-base-layer'
+          })
+        ]
+      },
+      {
+        name: MapLayers.Snow,
+        label: $tr("ui.map-layer.snow", "Snow ski map"),
+        image: new URL("../../assets/images/map/snow.png", import.meta.url).href,
+        layers: [
+          tileLayer(`https://{s}.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&key=${import.meta.env.VITE_GOOGLE_MAPS_API_KEY ?? ""}`, {
+            maxZoom: 22,
+            subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
+            attribution: '© Google Map Data',
+            className: 'fs-map-tile-base-layer fs-map-tile-grayscale-layer'
+          }),
+          tileLayer(`https://tiles.opensnowmap.org/pistes/{z}/{x}/{y}.png`, {
+            maxZoom: 18,
+            attribution: 'Map data: &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors & ODbL, &copy; <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+            className: 'fs-map-tile-base-layer'
+          })
+        ]
       }
     ];
 
     const bottomOffset = computed(() => {
-      if (props.overlayMode !== 'expand' && overlayHeight.value && isExtraSmall.value) {
+      if (props.overlayMode !== MapOverlayPositions.Expand && overlayHeight.value && isExtraSmall.value) {
         return overlayHeight.value;
       }
       return 0;
@@ -300,20 +276,7 @@ export default defineComponent({
     }));
 
     const actualLayer = computed(() => {
-      return mapLayers.find((layer) => layer.name === props.currentLayer)?.layer ?? mapLayers[0].layer;
-    });
-
-    const bounds = computed<LatLngBounds | null>(() => {
-      if(!locationGroupBounds.value && !areaGroupBounds.value) {
-        return null;
-      }
-      let bounds = locationGroupBounds.value;
-      if(bounds && areaGroupBounds.value) {
-        bounds.extend(areaGroupBounds.value);
-      } else if(areaGroupBounds.value) {
-        bounds = areaGroupBounds.value;
-      }
-      return bounds as LatLngBounds;
+      return mapLayers.find((mapLayer) => mapLayer.name === props.currentLayer)?.layers ?? mapLayers[0].layers;
     });
 
     const overlaySlots = computed(() => {
@@ -332,7 +295,7 @@ export default defineComponent({
       return map.value.unproject(targetPoint, zoom);
     }
 
-    const flyTo = (lat: number, lng: number, zoom: number = defaultZoom, options?: ZoomPanOptions) => {
+    const flyTo = (lat: number, lng: number, zoom: number = defaultZoom.value, options?: ZoomPanOptions) => {
       if(!map.value) {
         return;
       }
@@ -360,7 +323,7 @@ export default defineComponent({
       if(!map.value) {
         return;
       }
-      map.value.setView(calculateTargetPosition(latLng(lat, lng)), zoom);
+      map.value.setView(calculateTargetPosition(latLng(lat, lng), zoom), zoom);
     }
 
     const fitBounds = (bounds: LatLngBounds, options?: FitBoundsOptions) => {
@@ -394,11 +357,12 @@ export default defineComponent({
         minZoom: 2,
         maxZoom: 22,
         maxBounds: latLngBounds(latLng(-90, -180), latLng(90, 180)),
-        maxBoundsViscosity: 1.0
+        maxBoundsViscosity: 1.0,
+        zoom: defaultZoom.value,
+        center: props.center ? latLng(props.center[0], props.center[1]) : latLng(48.85782, 2.29521)
       };
 
       map.value = markRaw(createMap(leafletContainer.value, mapOptions));
-      setView(props.center[0], props.center[1], defaultZoom);
       
       map.value.on('click', (e: L.LeafletMouseEvent) => {
         emit('click:latlng', e.latlng);
@@ -428,42 +392,26 @@ export default defineComponent({
       mapResizeObserver.disconnect();
     });
 
-    watch (() => props.center, (center) => {
-      if(!map.value) {
-        return;
-      }
-      setView(center[0], center[1], defaultZoom);
-    });
-
-    watch (() => props.selectedLocationId, (selectedLocationId) => {
-      if(!map.value) {
-        return;
-      }
-      const selectedLocation = props.locations.find((location) => location.id === selectedLocationId);
-      if(!selectedLocation) {
+    watch ([() => props.center, () => map.value], () => {
+      if(!map.value || !props.center) {
         return;
       }
-      flyTo(selectedLocation?.address.latitude, selectedLocation?.address.longitude, defaultZoom, { animate: false });
+      setView(props.center[0], props.center[1], defaultZoom.value);
     }, { immediate: true });
 
-    watch(() => props.selectedAreaId, (selectedAreaId) => {
-      if(!map.value) {
-        return;
-      }
-      const selectedArea = props.areas.find((area) => area.id === selectedAreaId);
-      if(!selectedArea) {
+    watch([() => props.bounds, () => map.value], () => {
+      if(!map.value || !props.bounds) {
         return;
       }
-      const bounds = latLngBounds(selectedArea.coordinates.map((coord) => latLng(coord.latitude, coord.longitude)));
-      fitBounds(bounds);
-    }, { immediate: true });
+      fitBounds(props.bounds, { maxZoom: defaultZoom.value });
+    });
 
-    watch( () => bounds.value, (bounds) => {
-      if(!map.value || !bounds) {
-        return;
+    watch(() => props.dirtyZoom, (newZoom) => {
+      defaultZoom.value = newZoom;
+      if(map.value) {
+        map.value.setZoom(newZoom);
       }
-      fitBounds(bounds, { maxZoom: defaultZoom });
-    });
+    }, { immediate: true });
 
     return {
       ColorEnum,

package/components/map/FSMapMarker.vue

@@ -82,20 +82,20 @@ export default {
           iconSize: [size, size],
           iconAnchor: [size / 2, size / 2],
         });
-      } else if(props.variant === 'location' && props.icon) {
+      } else if(props.variant === 'location') {
         const size = 36;
         icon = divIcon({
-          html: locationMarkerHtml(props.icon, getColors(props.color).base, props.label),
+          html: locationMarkerHtml(props.icon ?? "mdi-map-marker", getColors(props.color).base, props.label),
           iconSize: [size, size],
-          className: props.selected ? 'fs-map-location fs-map-location-selected' : 'fs-map-location',
+          className: props.selected ? 'fs-map-marker fs-map-location fs-map-location-selected' : 'fs-map-marker fs-map-location',
           iconAnchor: [size / 2, size / 2],
         });
       } else {
-        const size = 20;
+        const size = 16;
         icon = divIcon({
-          html: pinMarkerHtml(getColors(props.color).base),
+          html: pinMarkerHtml(getColors(props.color).base, props.label),
           iconSize: [size, size],
-          className: props.selected ? 'fs-map-location fs-map-location-selected' : 'fs-map-location',
+          className: props.selected ? 'fs-map-marker fs-map-pin fs-map-pin-selected' : 'fs-map-marker fs-map-pin',
           iconAnchor: [size / 2, size / 2],
         });
       }

package/components/map/FSMapMarkerClusterGroup.vue

@@ -45,7 +45,7 @@ export default {
 
         return divIcon({
           html: clusterMarkerHtml(cluster.getChildCount()),
-          className: 'fs-map-location fs-map-location-full',
+          className: 'fs-map-marker fs-map-cluster-marker',
           iconSize: [size, size],
           iconAnchor: [size / 2, size / 2],
         });

package/components/map/FSMapOverlay.vue

@@ -1,16 +1,16 @@
 <template>
   <v-overlay
     v-if="isExtraSmall"
-    :modelValue="$props.mode === 'expand'"
+    :modelValue="$props.mode === MapOverlayPositions.Expand"
     :contained="true"
-    @click="$emit('update:mode', 'collapse')"
+    @click="$emit('update:mode', MapOverlayPositions.Collapse)"
     zIndex="0"
   />
   <div
     v-show="isExtraSmall"
     ref="mobileOverlayWrapper"
     class="fs-map-overlay-mobile"
-    :style="{ height: $props.mode === 'expand' ? '90%' : ($props.mode === 'half' ? '60%' : 'auto') }"
+    :style="{ height: $props.mode === MapOverlayPositions.Expand ? '90%' : ($props.mode === MapOverlayPositions.Half ? '60%' : 'auto') }"
   >
     <FSCard
       width="100%"
@@ -29,15 +29,15 @@
           @mousedown="onClick"
         >
           <FSIcon>
-            {{ $props.mode === 'expand' ? 'mdi-chevron-down' : 'mdi-chevron-up' }}
+            {{ $props.mode === MapOverlayPositions.Expand ? 'mdi-chevron-down' : 'mdi-chevron-up' }}
           </FSIcon>
         </FSRow>
         <slot
-          v-if="$props.mode === 'collapse'"
+          v-if="$props.mode === MapOverlayPositions.Collapse"
           name="collapsed"
         />
         <FSCol
-          v-if="$props.mode !== 'collapse'"
+          v-if="$props.mode !== MapOverlayPositions.Collapse"
           height="fill"
           style="min-height: 0;"
         >
@@ -70,6 +70,8 @@ import { defineComponent, type PropType, onUnmounted, onMounted, ref } from "vue
 
 import { useBreakpoints } from "../../composables";
 
+import { MapOverlayPositions } from '@dative-gpi/foundation-shared-components/models';
+
 import FSCard from "../FSCard.vue";
 import FSIcon from "../FSIcon.vue";
 import FSCol from "../FSCol.vue";
@@ -85,9 +87,9 @@ export default defineComponent({
   },
   props: {
     mode: {
-      type: String as PropType<"collapse" | "half" | "expand">,
+      type: String as PropType<MapOverlayPositions>,
       required: false,
-      default: "collapse"
+      default: MapOverlayPositions.Collapse
     }
   },
   emits: ["update:mode", "update:height", "update:width"],
@@ -101,11 +103,11 @@ export default defineComponent({
     const desktopResizeObserver = ref<ResizeObserver | null>(null);
 
     const onClick = (): void => {
-      if (props.mode === "expand") {
-        emit("update:mode", "collapse");
+      if (props.mode === MapOverlayPositions.Expand) {
+        emit("update:mode", MapOverlayPositions.Collapse);
         return;
       }
-      emit("update:mode", "expand");
+      emit("update:mode", MapOverlayPositions.Expand);
     }
 
     onMounted(() => {
@@ -144,6 +146,7 @@ export default defineComponent({
     return {
       mobileOverlayWrapper,
       isTouchScreenEnabled,
+      MapOverlayPositions,
       desktopOverlay,
       isExtraSmall,
       onClick

package/components/map/FSMapTileLayer.vue

@@ -12,15 +12,15 @@ import { MAP } from './keys';
 export default {
   name: 'FSMapTileLayer',
   props: {
-    layer: {
-      type: Object as PropType<Layer>,
+    layers: {
+      type: Object as PropType<Layer[]>,
       required: false
     }
   },
   setup(props) {
     const map = inject<Ref<Map | null>>(MAP);
 
-    const lastLayer = props.layer;
+    let lastLayers = props.layers;
 
     if(!map) {
       throw new Error('FSMapTileLayer must be used inside a FSMap component');
@@ -31,20 +31,26 @@ export default {
     }
 
     const updateLayer = () => {
-      if (!props.layer || !map.value) {
+      if (!props.layers || !map.value) {
         return;
       }
 
-      if(lastLayer) {
-        map.value.removeLayer(lastLayer);
+      if(lastLayers) {
+        lastLayers.forEach(layer => {
+          layer.removeFrom(map.value!);
+        });
       }
 
-      props.layer.addTo(map.value);
+      lastLayers = [];
+
+      props.layers.forEach(layer => {
+        lastLayers?.push(layer.addTo(map.value!));
+      });
     };
 
     onMounted(updateLayer);
 
-    watch(() => props.layer, updateLayer);
+    watch(() => props.layers, updateLayer);
   }
 };
 </script>

package/components/selects/FSSelectMapLayer.vue

@@ -0,0 +1,68 @@
+<template>
+  <FSSelectField
+    :items="items"
+    :modelValue="$props.modelValue"
+    @update:modelValue="$emit('update:modelValue', $event)"
+    v-bind="$attrs"
+  >
+    <template
+      #item-prepend="{ item }"
+    >
+      <FSIcon
+        :icon="item.icon"
+      />
+    </template>
+  </FSSelectField>
+</template>
+
+<script lang="ts">
+import type { PropType} from "vue";
+import { defineComponent } from "vue";
+
+import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
+
+import { MapLayers } from '@dative-gpi/foundation-shared-components/models';
+
+import FSSelectField from "../fields/FSSelectField.vue";
+import FSIcon from '@dative-gpi/foundation-shared-components/components/FSIcon.vue';
+
+export default defineComponent({
+  name: "FSSelectMapLayer",
+  components: {
+    FSIcon,
+    FSSelectField
+  },
+  props: {
+    modelValue: {
+      type: [String, Array] as PropType<MapLayers | MapLayers[]>,
+      required: false
+    }
+  },
+  emits: ["update:modelValue"],
+  setup() {
+    const { $tr } = useTranslationsProvider();
+
+    const items = [
+      {
+        id: MapLayers.Map,
+        icon: 'mdi-map',
+        label: $tr("ui.map-layer.map", "Map")
+      },
+      {
+        id: MapLayers.Imagery,
+        icon: 'mdi-satellite',
+        label: $tr("ui.map-layer.imagery", "Imagery")
+      },
+      {
+        id: MapLayers.Snow,
+        icon: 'mdi-snowflake',
+        label: $tr("ui.map-layer.snow", "Snow ski map")
+      }
+    ]
+
+    return {
+      items
+    };
+  }
+});
+</script>

package/components/tiles/FSTile.vue

@@ -4,48 +4,52 @@
     :height="$props.height"
     :width="$props.width"
   >
-    <FSClickable
-      v-if="$props.singleSelect"
-      padding="12px"
-      :variant="variant"
-      :color="color"
-      :style="style"
-      width="100%"
-      height="100%"
-      @click="() => $emit('update:modelValue', !$props.modelValue)"
-      v-bind="$attrs"
-    >
-      <slot />
-    </FSClickable>
-    <FSClickable
-      v-else-if="$props.href || $props.to || $attrs.onClick"
-      variant="background"
-      class="fs-tile"
-      padding="12px"
-      :color="ColorEnum.Background"
-      :href="$props.href"
-      width="100%"
-      height="100%"
-      :to="$props.to"
-      :style="style"
-      v-bind="$attrs"
+    <template
+      v-if="$props.editable"
     >
-      <slot />
-      <FSCard
-        v-if="$props.editable"
-        class="fs-tile-checkbox"
+      <FSClickable
+        v-if="$props.singleSelect"
+        padding="12px"
+        :variant="variant"
+        :color="color"
+        :style="style"
+        width="100%"
+        height="100%"
+        @click="() => $emit('update:modelValue', !$props.modelValue)"
+        v-bind="$attrs"
+      >
+        <slot />
+      </FSClickable>
+      <FSClickable
+        v-else-if="$props.href || $props.to || $attrs.onClick"
         variant="background"
-        :height="['40px', '32px']"
-        :width="['40px', '32px']"
-        :border="false"
+        class="fs-tile"
+        padding="12px"
+        :color="ColorEnum.Background"
+        :href="$props.href"
+        width="100%"
+        height="100%"
+        :to="$props.to"
+        :style="style"
         v-bind="$attrs"
       >
-        <FSCheckbox
-          :modelValue="$props.modelValue"
-          @update:modelValue="() => $emit('update:modelValue', !$props.modelValue)"
-        />
-      </FSCard>
-    </FSClickable>
+        <slot />
+        <FSCard
+          v-if="$props.editable"
+          class="fs-tile-checkbox"
+          variant="background"
+          :height="['40px', '32px']"
+          :width="['40px', '32px']"
+          :border="false"
+          v-bind="$attrs"
+        >
+          <FSCheckbox
+            :modelValue="$props.modelValue"
+            @update:modelValue="() => $emit('update:modelValue', !$props.modelValue)"
+          />
+        </FSCard>
+      </FSClickable>
+    </template>
     <FSCard
       v-else
       variant="background"

package/models/map.ts

@@ -1,18 +1,20 @@
 import { type Layer } from "leaflet";
 
-import { type Address } from "@dative-gpi/foundation-shared-domain/models";
-
 export interface MapLayer {
-  name : string;
+  name : MapLayers;
   label: string;
   image: string;
-  layer: Layer;
+  layers: Layer[];
 }
 
-export interface FSLocation {
-  id: string;
-  label: string;
-  icon: string | null;
-  address: Address;
-  color: string | null;
+export enum MapLayers {
+  Map = "map",
+  Imagery = "imagery",
+  Snow= "snow"
+}
+
+export enum MapOverlayPositions {
+  Expand = "expand",
+  Half = "half",
+  Collapse = "collapse",
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.137",
+  "version": "1.0.138",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.137",
-    "@dative-gpi/foundation-shared-services": "1.0.137"
+    "@dative-gpi/foundation-shared-domain": "1.0.138",
+    "@dative-gpi/foundation-shared-services": "1.0.138"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "676162c4362dd556d5ef714f7b17a047ad7f2bad"
+  "gitHead": "ec1370eef99afdec2bd4425c7010c1012c23563e"
 }

package/styles/components/fs_map.scss

@@ -6,7 +6,15 @@
   .fs-leaflet-container {
     width: 100%;
     height: 100%;
-    filter: grayscale(var(--fs-map-container-grayscale));
+    z-index: 0;
+
+    .fs-map-tile-base-layer {
+      filter: grayscale(var(--fs-map-container-grayscale));
+    }
+
+    .fs-map-tile-grayscale-layer {
+      filter: grayscale(100%);
+    }
   }
 
   .fs-map-overlay-mobile {
@@ -77,17 +85,10 @@
     }
   }
 
-  .fs-map-point-pin {
-    background-color: var(--fs-map-point-pin-color);
-    border-radius: 100%;
-  }
-
-  .fs-map-location > div {
+  .fs-map-marker > div {
     display: flex;
     height: 100%;
-    color: var(--fs-map-location-pin-color);
     border-radius: 50%;
-    background-color: white;
     filter: drop-shadow(0px 2px 4px rgba(0, 0, 0, 0.4));
     align-items: center;
     justify-content: center;
@@ -103,7 +104,7 @@
     }
   }
 
-  .fs-map-location-full > div {
+  .fs-map-cluster-marker > div {
     background-color: var(--fs-map-location-pin-color);
     color: white;
   }
@@ -126,6 +127,41 @@
     }
   }
 
+  .fs-map-location > div {
+    color: var(--fs-map-location-pin-color);
+    background-color: white;
+  }
+
+  .fs-map-pin > div {
+    background-color: var(--fs-map-point-pin-color);
+    position: relative;
+
+    transition: transform 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+  }
+
+  .fs-map-pin > div::before {
+    content: "";
+    position: absolute;
+    top: -4px;
+    left: -4px;
+    width: calc(100% + 8px);
+    height: calc(100% + 8px);
+    border-radius: 50%;
+    border: 2px solid var(--fs-map-point-pin-color);
+    opacity: 0.4;
+
+    @include clickscreen {
+      &:hover {
+        opacity: 1;
+      }
+    }
+  }
+
+  .fs-map-pin-selected > div {
+    transform: scale(1.35);
+  }
+
+
   .fs-map-site {
     opacity: 0.6;
     transition: opacity 0.28s cubic-bezier(0.4, 0, 0.2, 1);

package/tools/index.ts

@@ -1,3 +1,4 @@
 export * from "./alertsTools";
 export * from "./chartsTools";
+export * from "./reportsTools";
 export * from "./timeRangeTools";

package/tools/reportsTools.ts

@@ -0,0 +1,38 @@
+import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
+import { ColorEnum } from "../models";
+import { JobState } from "@dative-gpi/foundation-shared-domain/enums";
+
+const { $tr } = useTranslationsProvider();
+
+export const getColorByState = (state: number | JobState | undefined) => {
+  switch (state) {
+    case JobState.Succeeded:
+      return ColorEnum.Success;
+    case JobState.Failed:
+      return ColorEnum.Error;
+    default:
+      return ColorEnum.Primary;
+  }
+};
+
+export const getIconByState = (state: number | JobState | undefined) => {
+  switch (state) {
+    case JobState.Succeeded:
+      return 'mdi-check-circle-outline';
+    case JobState.Failed:
+      return 'mdi-alert-circle-outline';
+    default:
+      return 'mdi-alert-circle-outline';
+  }
+};
+
+export const getLabelByState = (state: number | JobState | undefined) => {
+  switch (state) {
+    case JobState.Succeeded:
+      return $tr('ui.common.success', 'Success');
+    case JobState.Failed:
+      return $tr('ui.common.error', 'Error');
+    default:
+      return $tr('ui.common.executed', 'Executed');
+  }
+};