@vcmap/ui 6.0.0-rc.1 → 6.0.0-rc.10

package/src/obliqueFallbackWarnings.d.ts

@@ -0,0 +1,5 @@
+/**
+ * @param {import("./vcsUiApp.js").default} app
+ * @returns {() => void}
+ */
+export default function createObliqueFallbackWarnings(app: import("./vcsUiApp.js").default): () => void;

package/src/obliqueFallbackWarnings.js

@@ -0,0 +1,54 @@
+import { ObliqueMap } from '@vcmap/core';
+import { NotificationType } from './notifier/notifier.js';
+
+function createNotification(app) {
+  app.notifier.add({
+    title: 'navigation.obliqueFallback.title',
+    type: NotificationType.WARNING,
+    message: 'navigation.obliqueFallback.message',
+  });
+}
+
+/**
+ * @param {import("./vcsUiApp.js").default} app
+ * @returns {() => void}
+ */
+export default function createObliqueFallbackWarnings(app) {
+  const fallbackMapEventListener =
+    app.maps.fallbackMapActivated.addEventListener(() => {
+      createNotification(app);
+    });
+
+  const mapListeners = new Map();
+  const setMapListener = (map) => {
+    mapListeners.set(
+      map,
+      map.failedToSetCollection.addEventListener(() => {
+        createNotification(app);
+      }),
+    );
+  };
+
+  app.maps.getByType(ObliqueMap.className).forEach(setMapListener);
+
+  const mapAddedListener = app.maps.added.addEventListener((map) => {
+    if (map instanceof ObliqueMap) {
+      setMapListener(map);
+    }
+  });
+
+  const mapRemovedListener = app.maps.removed.addEventListener((map) => {
+    mapListeners.get(map)?.();
+    mapListeners.delete(map);
+  });
+
+  return () => {
+    fallbackMapEventListener();
+    mapAddedListener();
+    mapRemovedListener();
+    [...mapListeners.values()].forEach((cb) => {
+      cb();
+    });
+    mapListeners.clear();
+  };
+}

package/src/search/ResultItem.vue

@@ -1,13 +1,18 @@
 <template>
-  <v-list-item class="ma-2 d-flex flex-row align-center" v-if="item">
+  <v-list-item v-if="item" v-bind="$attrs" class="result-item">
     <template #prepend v-if="item.icon">
       <v-icon>
         {{ item.icon }}
       </v-icon>
     </template>
-    <div class="px-2 d-flex align-center" :title="$t('search.select')">
-      <span v-html="marked" />
-    </div>
+    <template #title>
+      <v-list-item-title>
+        <span v-html="marked" />
+      </v-list-item-title>
+    </template>
+    <v-tooltip activator="parent">
+      {{ $st('search.select') }}
+    </v-tooltip>
     <template #append>
       <VcsActionButtonList
         v-if="hasActions"
@@ -21,7 +26,12 @@
 
 <script>
   import { computed } from 'vue';
-  import { VIcon, VListItem } from 'vuetify/components';
+  import {
+    VIcon,
+    VListItem,
+    VListItemTitle,
+    VTooltip,
+  } from 'vuetify/components';
   import VcsActionButtonList from '../components/buttons/VcsActionButtonList.vue';
 
   /**
@@ -38,7 +48,7 @@
       partials.forEach((partial) => {
         replacement = replacement.replaceAll(
           new RegExp(`(^|[^>])(${partial})`, 'ig'),
-          '<span>$1<span class="primary--text">$2</span></span>',
+          '<span>$1<span class="text-primary">$2</span></span>',
         );
       });
     }
@@ -58,6 +68,8 @@
       VcsActionButtonList,
       VIcon,
       VListItem,
+      VListItemTitle,
+      VTooltip,
     },
     props: {
       query: {

package/src/search/ResultsComponent.vue

@@ -1,15 +1,16 @@
 <template>
   <v-list
-    density="compact"
-    class="ma-0 overflow-y-auto vcs-search-results"
-    v-model="highlighted"
+    class="ma-0 overflow-y-auto vcs-search-results results-component"
+    v-model:selected="highlighted"
   >
     <ResultItem
       :item="item"
       :query="query"
-      class="cursor-pointer px-0"
-      v-for="(item, index) in results"
+      class="cursor-pointer"
+      :class="{ 'vcs-search-result-border': index < items.length - 1 }"
+      v-for="(item, index) in items"
       :key="index"
+      :value="item.value"
     />
   </v-list>
 </template>
@@ -22,7 +23,7 @@
   /**
    * @description ResultsComponent listing all available result items in a scrollable list
    * @vue-prop {string} query - The query string forwarded to mark results within resultItem component.
-   * @vue-prop {Array<ResultItem>} results - Array of results.
+   * @vue-prop {Array<import("./search.js").ResultItem>} results - Array of results.
    * @vue-computed {import("vue").Ref<string>} highlighted - The highlighted result item. Updates also on feature select.
    */
   export default {
@@ -42,23 +43,27 @@
       },
     },
     setup(props) {
-      const highlightedRef = ref(-1);
+      const items = computed(() => {
+        return props.results.map((item, index) => ({
+          ...item,
+          value: index,
+        }));
+      });
+      const selectedRef = ref([]);
       /** @type {import("@src/vcsUiApp.js").default} */
       const app = inject('vcsApp');
       const selectedListener = app.featureInfo.featureChanged.addEventListener(
         (feature) => {
-          if (highlightedRef.value >= 0) {
-            if (
-              feature &&
-              props.results[highlightedRef.value].feature === feature
-            ) {
+          if (selectedRef.value.length > 0) {
+            const [index] = selectedRef.value;
+            if (feature && items.value[index].feature === feature) {
               return;
             }
-            highlightedRef.value = -1;
+            selectedRef.value = [];
           } else if (feature) {
-            highlightedRef.value = props.results.findIndex(
-              (r) => r.feature === feature,
-            );
+            selectedRef.value = [
+              items.value.findIndex((r) => r.feature === feature),
+            ];
           }
         },
       );
@@ -68,14 +73,16 @@
       });
 
       return {
+        items,
         highlighted: computed({
           get() {
-            return highlightedRef.value;
+            return selectedRef.value;
           },
           set(value) {
-            highlightedRef.value = value;
-            if (value >= 0) {
-              const item = props.results[value];
+            selectedRef.value = value;
+            const [index] = value;
+            if (index >= 0) {
+              const item = items.value[index];
               item.clicked();
             }
           },
@@ -85,8 +92,12 @@
   };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
   .vcs-search-results {
     max-height: 400px;
   }
+  .vcs-search-result-border {
+    border-bottom: thin solid;
+    border-color: rgb(var(--v-theme-base-lighten-2));
+  }
 </style>

package/src/search/ResultsComponent.vue.d.ts

@@ -8,7 +8,8 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
 }, {
-    highlighted: import("vue").WritableComputedRef<number>;
+    items: import("vue").ComputedRef<any[]>;
+    highlighted: import("vue").WritableComputedRef<never[]>;
 }, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     query: {
         type: StringConstructor;

package/src/search/SearchComponent.vue

@@ -1,17 +1,19 @@
 <template>
   <v-sheet>
-    <span class="d-flex justify-space-between align-center mt-1 ml-2">
-      <v-icon class="pa-1"> $vcsSearch </v-icon>
+    <span
+      class="d-flex justify-space-between align-center mt-1 ml-2 search-component"
+    >
+      <v-icon class="pa-1" :size="searchIconSize"> $vcsSearch </v-icon>
       <VcsTextField
         class="d-inline-block user-select-none w-100 mx-1"
         autofocus
         :loading="searching"
         clearable
-        dense
         :placeholder="$t('search.placeholder')"
         v-model.trim="query"
         @keydown.enter="search"
         @input="reset"
+        @click:clear="reset"
       />
     </span>
     <v-divider class="mt-1 base-darken-1" v-if="!!results.length" />
@@ -26,18 +28,8 @@
 </template>
 
 <style lang="scss" scoped>
-  :deep(.v-input) {
-    fieldset {
-      padding: 0 !important;
-    }
-    fieldset,
-    input {
-      border-color: transparent !important;
-    }
-  }
-  :deep(.v-icon .v-icon__component) {
-    width: 16px;
-    height: 16px;
+  :deep(.v-field .v-field__outline *) {
+    border-color: transparent !important;
   }
   .user-select-none {
     user-select: none;
@@ -45,12 +37,13 @@
 </style>
 
 <script>
-  import { inject, onUnmounted, ref } from 'vue';
+  import { inject, onUnmounted, ref, computed } from 'vue';
   import { getLogger } from '@vcsuite/logger';
   import { VSheet, VDivider, VIcon } from 'vuetify/components';
   import VcsTextField from '../components/form-inputs-controls/VcsTextField.vue';
   import ResultsComponent from './ResultsComponent.vue';
   import VcsFormButton from '../components/buttons/VcsFormButton.vue';
+  import { useFontSize } from '../vuePlugins/vuetify.js';
 
   /**
    * @description Stylized search component providing an input field for search inputs.
@@ -103,6 +96,10 @@
         clear();
       });
 
+      const fontSize = useFontSize();
+      const searchIconSize = computed(() => {
+        return fontSize.value + 11;
+      });
       return {
         query,
         searching,
@@ -111,6 +108,7 @@
         clear,
         search,
         zoomToAll,
+        searchIconSize,
       };
     },
   };

package/src/search/SearchComponent.vue.d.ts

@@ -6,5 +6,6 @@ declare const _default: import("vue").DefineComponent<{}, {
     clear: () => void;
     search: () => Promise<void>;
     zoomToAll: () => void;
+    searchIconSize: import("vue").ComputedRef<number>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
 export default _default;

package/src/search/search.js

@@ -10,7 +10,7 @@ import {
   Viewpoint,
 } from '@vcmap/core';
 import { shallowRef } from 'vue';
-import { check } from '@vcsuite/check';
+import { check, oneOf } from '@vcsuite/check';
 import { Icon } from 'ol/style.js';
 import { getLogger } from '@vcsuite/logger';
 import { vcsAppSymbol } from '../pluginHelper.js';
@@ -183,7 +183,7 @@ class Search extends IndexedCollection {
    * @param {number=} index
    */
   add(item, owner, index) {
-    check(owner, [String, vcsAppSymbol]);
+    check(owner, oneOf(String, vcsAppSymbol));
     check(item.search, Function);
 
     item[searchImplOwnerSymbol] = owner;

package/src/siteConfig.js

@@ -35,7 +35,7 @@ function setHeaderTitle(title) {
   document.head.appendChild(titleElement);
 }
 
-const defaultFavicon = './assets/favicon.svg';
+const defaultFavicon = './assets/favicon-4c4ce5df.svg';
 
 const defaultHeaderTitle = 'VC Map';
 
@@ -44,25 +44,25 @@ const defaultHeaderTitle = 'VC Map';
  * @returns {() => void}
  */
 export default function createSiteConfig(uiConfig) {
-  if (typeof uiConfig.config.value.favicon === 'string') {
-    setFavicon(uiConfig.config.value.favicon);
+  if (typeof uiConfig.config.favicon === 'string') {
+    setFavicon(uiConfig.config.favicon);
   }
 
-  if (typeof uiConfig.config.value.headerTitle === 'string') {
-    setHeaderTitle(uiConfig.config.value.headerTitle);
+  if (typeof uiConfig.config.headerTitle === 'string') {
+    setHeaderTitle(uiConfig.config.headerTitle);
   }
 
   const updateFavicon = () => {
-    if (typeof uiConfig.config.value.favicon === 'string') {
-      setFavicon(uiConfig.config.value.favicon);
+    if (typeof uiConfig.config.favicon === 'string') {
+      setFavicon(uiConfig.config.favicon);
     } else {
       setFavicon(defaultFavicon);
     }
   };
 
   const updateHeaderTitle = () => {
-    if (typeof uiConfig.config.value.headerTitle === 'string') {
-      setHeaderTitle(uiConfig.config.value.headerTitle);
+    if (typeof uiConfig.config.headerTitle === 'string') {
+      setHeaderTitle(uiConfig.config.headerTitle);
     } else {
       setHeaderTitle(defaultHeaderTitle);
     }

package/src/state.js

@@ -1,4 +1,4 @@
-import { check } from '@vcsuite/check';
+import { check, optional } from '@vcsuite/check';
 import { getLogger } from '@vcsuite/logger';
 import { Viewpoint } from '@vcmap/core';
 
@@ -257,9 +257,9 @@ export function getStateFromURL(url) {
  */
 export function setStateToUrl(state, url) {
   check(state, {
-    activeMap: [String, undefined],
-    activeViewpoint: [Object, undefined],
-    activeObliqueCollection: [String, undefined],
+    activeMap: optional(String),
+    activeViewpoint: optional(Object),
+    activeObliqueCollection: optional(String),
     layers: Array,
     plugins: Array,
     moduleIds: [String],

package/src/styles/_typography.scss

@@ -1,5 +1,3 @@
-@import 'vcsFont.scss';
-
 .v-application,
 .v-overlay-container {
   h1,
@@ -12,6 +10,7 @@
   span,
   button,
   input,
+  textarea,
   .caption,
   .tooltip,
   label,

package/src/styles/main.scss

@@ -1,8 +1,4 @@
 @import './typography';
-@import './shades';
-@import './variables';
-@import './vcsFont';
-@import './vcsGrid';
 @import './vcsList';
 
 /* latin-ext */

package/src/styles/vcsList.scss

@@ -3,6 +3,6 @@
 
 .vcsList {
   .v-list-item--density-compact.v-list-item--one-line {
-    min-height: var(--v-vcs-item-height);
+    min-height: calc(var(--v-vcs-font-size) * 2 + 6px);
   }
 }