@eodash/eodash 5.0.0-rc.2.1 → 5.0.0-rc.2.2

package/core/client/components/DashboardLayout.vue

@@ -3,6 +3,7 @@
     <eox-layout :gap="gap" :style="`padding: ${gap}px`">
       <eox-layout-item
         v-if="bgWidget?.component"
+        :key="bgWidget.id"
         class="bg-panel bg-surface"
         :style="`margin: -${gap + 1}px;`"
         x="0"
@@ -10,7 +11,7 @@
         h="12"
         w="12"
       >
-        <Suspense suspensible>
+        <Suspense>
           <component
             id="bg-widget"
             :is="bgWidget?.component"
@@ -30,7 +31,7 @@
             :x="importedWidget.value.layout.x"
             :y="importedWidget.value.layout.y"
           >
-            <Suspense suspensible>
+            <Suspense>
               <component
                 :key="importedWidget.value.id"
                 :is="importedWidget.value.component"

package/core/client/components/DynamicWebComponent.vue

@@ -34,7 +34,7 @@ const props = /** @type {import("@/types").WebComponentProps} */ (
 const getWebComponent = async () =>
   typeof props.link === "string"
     ? await import(/* @vite-ignore */ props.link)
-    : await props.link();
+    : await props.link?.();
 
 const imported = !customElements.get(props.tagName)
   ? await getWebComponent().catch((e) => {
@@ -46,8 +46,15 @@ const defined = customElements.get(props.tagName);
 
 // if the imported link doesn't define the custom tag provided
 if (!defined && props.constructorProp) {
-  const Constructor = imported[props.constructorProp];
-  customElements.define(props.tagName, Constructor);
+  try {
+    const Constructor = imported[props.constructorProp];
+    customElements.define(props.tagName, Constructor);
+  } catch (e) {
+    console.error(
+      `[eodash] ${props.tagName} is not defined, please add a valid link or constructorProp`,
+    );
+    console.error(e);
+  }
 }
 
 const store = useSTAcStore();

package/core/client/components/Header.vue

@@ -1,6 +1,6 @@
 <template>
   <v-app-bar color="primary">
-    <v-app-bar-title>{{ title }}</v-app-bar-title>
+    <v-app-bar-title class="header">{{ title }}</v-app-bar-title>
     <v-img class="mx-12 logo" :src="eodash.brand?.logo" />
   </v-app-bar>
 </template>

package/core/client/components/MobileLayout.vue

@@ -4,6 +4,7 @@
       <component
         id="bg-widget"
         v-if="bgWidget?.component"
+        :key="bgWidget.id"
         :is="bgWidget.component"
         v-bind="bgWidget.props"
       ></component>

package/core/client/composables/DefineTemplate.js

@@ -47,11 +47,22 @@ const useTemplate = () => {
         }
 
         const templateConfig = eodash.templates[template];
-        [definedTemplate.bgWidget] = useDefineWidgets([
+        const [importedBgWidget] = useDefineWidgets([
           templateConfig.background,
         ]);
+        if (importedBgWidget.value.id !== definedTemplate.bgWidget.value?.id) {
+          definedTemplate.bgWidget.value = importedBgWidget.value;
+        }
+
+        const [importedLoadingWidget] = useDefineWidgets([
+          templateConfig.loading,
+        ]);
 
-        [definedTemplate.loading] = useDefineWidgets([templateConfig.loading]);
+        if (
+          importedLoadingWidget.value.id !== definedTemplate.loading.value?.id
+        ) {
+          definedTemplate.loading.value = importedLoadingWidget.value;
+        }
 
         definedTemplate.importedWidgets = useDefineWidgets(
           templateConfig.widgets,

package/core/client/composables/DefineWidgets.js

@@ -111,11 +111,16 @@ const getWidgetDefinition = (config) => {
   switch (config?.type) {
     case "internal":
       importedWidget.component = defineAsyncComponent({
-        loader:
-          internalWidgets[
+        loader: () => {
+          const widgetName =
             /** @type {import("@/types").InternalComponentWidget} * */ (config)
-              ?.widget.name
-          ],
+              ?.widget.name;
+
+          return (
+            internalWidgets[widgetName]?.() ??
+            Promise.reject(`Widget ${widgetName} not found`)
+          );
+        },
         suspensible: true,
       });
       importedWidget.props = reactive(

package/core/client/composables/EodashMap.js

@@ -106,7 +106,7 @@ const createLayersConfig = async (
     await EodashCollection.getIndicatorLayers(selectedIndicator);
   const geodbLayer = EodashCollection.getGeoDBLayer(eodashCols);
   if (geodbLayer) {
-    dataLayers.layers.push(geodbLayer);
+    dataLayers.layers.unshift(geodbLayer);
   }
   const baseLayers = {
     type: "Group",

package/core/client/eodash.js

@@ -20,6 +20,16 @@ export const eodash = reactive({
   brand: {
     noLayout: true,
     name: "Demo",
+    font: {
+      headers: {
+        family: "Open Sans",
+        link: "https://eox.at/fonts/opensans/opensans.css",
+      },
+      body: {
+        family: "Sintony",
+        link: "https://eox.at/fonts/sintony/sintony.css",
+      },
+    },
     theme: {
       colors: {
         primary: "#002742",
@@ -64,7 +74,7 @@ export const eodash = reactive({
         },
       },
       background: {
-        id: Symbol(),
+        id: "background-map",
         type: "internal",
         widget: {
           name: "EodashMap",
@@ -186,7 +196,7 @@ export const eodash = reactive({
         },
       },
       background: {
-        id: Symbol(),
+        id: "background-map",
         type: "internal",
         widget: {
           name: "EodashMap",
@@ -252,7 +262,7 @@ export const eodash = reactive({
               ? {
                   id: "Datepicker",
                   type: "internal",
-                  layout: { x: 5, y: 8, w: 2, h: 4 },
+                  layout: { x: 5, y: 11, w: 2, h: 1 },
                   title: "Date",
                   widget: {
                     name: "EodashDatePicker",
@@ -315,7 +325,7 @@ export const eodash = reactive({
         },
       },
       background: {
-        id: Symbol(),
+        id: "background-map",
         type: "internal",
         widget: {
           name: "EodashMap",

package/core/client/eodashSTAC/EodashCollection.js

@@ -407,12 +407,16 @@ export class EodashCollection {
         continue;
       }
       const collectionFeatures = generateFeatures(
-        collection.#collectionStac?.links,
+        JSON.parse(JSON.stringify(collection.#collectionStac?.links)),
+        {
+          collection_id: collection.#collectionStac?.id,
+          geoDBID: collection.#collectionStac?.geoDBID,
+          themes: collection.#collectionStac?.themes ?? [],
+        },
       ).features;
+
       if (collectionFeatures.length) {
-        allFeatures.push(
-          generateFeatures(collection.#collectionStac?.links).features,
-        );
+        allFeatures.push(collectionFeatures);
       }
     }
     if (allFeatures.length) {
@@ -430,7 +434,7 @@ export class EodashCollection {
         type: "Vector",
         properties: {
           id: "geodb-collection",
-          title: "GeoDB Collection",
+          title: "Observation Points",
         },
         source: {
           type: "Vector",

package/core/client/eodashSTAC/helpers.js

@@ -3,8 +3,11 @@ import axios from "@/plugins/axios";
 import log from "loglevel";
 import { getStyleVariablesState } from "./triggers.js";
 
-/** @param {import("stac-ts").StacLink[]} [links] */
-export function generateFeatures(links) {
+/**
+ *  @param {import("stac-ts").StacLink[]} [links]
+ *  @param {Record<string,any>} [extraProperties]
+ **/
+export function generateFeatures(links, extraProperties = {}) {
   /**
    * @type {import("geojson").Feature[]}
    */
@@ -20,7 +23,7 @@ export function generateFeatures(links) {
           type: "Point",
           coordinates: [lon, lat],
         },
-        properties: { id: element.id },
+        properties: { ...element, ...extraProperties },
       });
     }
   });

package/core/client/types.ts

@@ -14,7 +14,7 @@ export interface WebComponentProps<T extends ExecutionTime = "compiletime"> {
    *   import maps are not available in runtime config
    *   :::
    */
-  link: T extends "runtime" ? string : string | (() => Promise<unknown>);
+  link?: T extends "runtime" ? string : string | (() => Promise<unknown>);
   /**
    * Exported Constructor, needs to be provided if the web component is not
    * registered in by the [link](#link) provided
@@ -194,7 +194,15 @@ export type StacEndpoint = `${string}/catalog.json`;
 
 /** @group Eodash */
 type ExecutionTime = "runtime" | "compiletime";
-
+type EodashFont = {
+  /**
+   * Link to stylesheet that defines font-face. Could be either a relative
+   * or absolute URL.
+   */
+  link?: string;
+  /** Font family name. */
+  family: string;
+};
 /**
  * Eodash instance API
  *
@@ -212,15 +220,12 @@ export type Eodash<T extends ExecutionTime = "compiletime"> = {
     /** Custom error message to alert the users if something crashes */
     errorMessage?: string;
     /** Fetches the specified font family from the specified `link` property. */
-    font?: {
-      /**
-       * Link to stylesheet that defines font-face. Could be either a relative
-       * or absolute URL.
-       */
-      link: string;
-      /** Font family name. */
-      family: string;
-    };
+    font?:
+      | EodashFont
+      | {
+          body: EodashFont;
+          headers: EodashFont;
+        };
     /** Title that will be shown in the app header */
     name: string;
     /** Brand logo */
@@ -320,8 +325,8 @@ export declare const store: typeof import("@/store").default;
 export * from "./main.js";
 
 export type EodashStyleJson = import("ol/style/webgl.js").WebGLStyle & {
-  variables?: Record<string, any>;
-  legend?: Record<string, any>;
+  variables?: Record<string, string | number | boolean | null | undefined>;
+  legend?: import("@eox/layercontrol/src/components/layer-config.js").EOxLayerControlLayerConfig["layerConfig"]["legend"];
   jsonform?: Record<string, any>;
   tooltip?: { id: string; title?: string; appendix?: string }[];
 };

package/core/client/utils/index.js

@@ -1,43 +1,123 @@
 import log from "loglevel";
 import { collectionsPalette } from "./states";
+import WebFontLoader from "webfontloader";
+
 /**
  * Loads font in the app using `webfontloader`
  *
- * @param {string} [family]
- * @param {string} [link]
- * @param {boolean} [isWebComponent]
- * @returns {Promise<string>} - Font family name
+ * @param {import("@/types").Eodash["brand"]["font"]} fontConfig
+ * @param {boolean} isWebComponent
+ * @returns {Promise<string[]>} - Font family name
  * @see {@link "https://github.com/typekit/webfontloader"}
  */
-export const loadFont = async (
-  family = "",
-  link = "",
-  isWebComponent = false,
-) => {
-  if (family && link) {
-    const WebFontLoader = (await import("webfontloader")).default;
-    WebFontLoader.load({
-      classes: false,
-      custom: {
-        // Use FVD notation to include families https://github.com/typekit/fvd
-        families: [family],
-        // Path to stylesheet that defines font-face
-        urls: [link],
-      },
-      fontactive(familyName, _fvd) {
-        const stylesheet = new CSSStyleSheet();
-        const styles = isWebComponent
-          ? `eo-dash {font-family: ${familyName};}`
-          : `* {font-family: ${familyName};}`;
-        stylesheet.replaceSync(styles);
-        document.adoptedStyleSheets.push(stylesheet);
-      },
-      fontinactive(familyName, _fvd) {
-        throw new Error(`error loading font: ${familyName}`);
-      },
-    });
+export const loadFont = async (fontConfig, isWebComponent) => {
+  if (!fontConfig) {
+    return [];
+  }
+
+  let headerFamily = "",
+    bodyFamily = "",
+    headerLink = "",
+    bodyLink = "";
+  if ("headers" in fontConfig) {
+    headerFamily = fontConfig?.headers?.family;
+    headerLink = fontConfig.headers.link ?? "";
+    bodyFamily = fontConfig?.body?.family;
+    bodyLink = fontConfig.body.link ?? "";
+  } else {
+    headerFamily = fontConfig.family;
+    headerLink = fontConfig.link ?? "";
+    bodyFamily = fontConfig?.family;
+    bodyLink = fontConfig.link ?? "";
+  }
+  const families =
+    headerFamily === bodyFamily ? [headerFamily] : [headerFamily, bodyFamily];
+  const urls = [];
+  if (bodyLink && headerLink) {
+    if (bodyLink !== headerLink) {
+      urls.push(bodyLink);
+      urls.push(headerLink);
+    } else {
+      urls.push(bodyLink);
+    }
   }
-  return family;
+
+  WebFontLoader.load({
+    classes: false,
+    custom: {
+      // Use FVD notation to include families https://github.com/typekit/fvd
+      families,
+      // Path to stylesheet that defines font-face
+      urls,
+    },
+    fontactive(familyName, _fvd) {
+      const stylesheet = new CSSStyleSheet();
+
+      const bodyRule = `
+         ${isWebComponent ? "eo-dash" : `:root`} {
+          font-family: ${bodyFamily};
+          --vc-font-family: ${bodyFamily};
+          }
+           eox-layercontrol,
+           eox-map,
+           eox-jsonform,
+           eox-timecontrol,
+           eox-itemfilter,
+           eox-chart,
+           eox-stacinfo{
+            --eox-body-font-family: ${bodyFamily};
+             font-family: ${bodyFamily}
+            ;
+           }
+            *[class*="text-body"]{
+              font-family: ${bodyFamily}
+            }
+            `;
+
+      const headersRule = `
+           ${
+             isWebComponent
+               ? `
+            eo-dash h1,
+            eo-dash h2,
+            eo-dash h3,
+            eo-dash h4,
+            eo-dash h5,
+            eo-dash *[class*="header"]
+            `
+               : `
+            h1,
+            h2,
+            h3,
+            h4,
+            h5,
+            *[class*="header"]`
+           } {
+           font-family: ${headerFamily} !important;
+         }
+           eox-layercontrol,
+           eox-map,
+           eox-jsonform,
+           eox-timecontrol,
+           eox-itemfilter,
+           eox-chart,
+           eox-stacinfo {
+          --eox-header-font-family: ${headerFamily};
+          `;
+      const isOne = headerFamily && headerFamily === bodyFamily;
+      const styles = isOne
+        ? bodyRule + "\n" + headersRule
+        : familyName == bodyFamily
+          ? bodyRule
+          : headersRule;
+      stylesheet.replaceSync(styles);
+      document?.adoptedStyleSheets?.push(stylesheet);
+    },
+    fontinactive(familyName, _fvd) {
+      throw new Error(`error loading font: ${familyName}`);
+    },
+  });
+  return families;
 };
 
 /**

package/core/client/views/Dashboard.vue

@@ -31,20 +31,17 @@ const props = defineProps({
     default: false,
   },
 });
-const eodash = await useEodashRuntime(props.config);
 
 useURLSearchParametersSync();
 
+const eodash = await useEodashRuntime(props.config);
+
 const theme = useUpdateTheme("dashboardTheme", {
   ...(eodash.brand?.theme ?? {}),
 });
 theme.global.name.value = "dashboardTheme";
 
-await loadFont(
-  eodash.brand?.font?.family,
-  eodash.brand?.font?.link,
-  props.isWebComponent,
-);
+await loadFont(eodash.brand?.font, props.isWebComponent);
 
 const { loadSTAC } = useSTAcStore();
 await loadSTAC();
@@ -88,4 +85,24 @@ div.v-application__wrap {
 eo-dash {
   overflow: hidden;
 }
+/* set eox-elements colors css vars to match the theme */
+eox-layercontrol,
+eox-map,
+eox-drawtools,
+eox-timecontrol,
+eox-jsonform,
+eox-chart,
+eox-stacinfo,
+eox-itemfilter {
+  --primary-color: rgb(var(--v-theme-primary));
+  --eox-primary-color: rgb(var(--v-theme-primary));
+  --eox-secondary-color: rgb(var(--v-theme-secondary));
+  --eox-accent-color: rgb(var(--v-theme-accent));
+  --eox-error-color: rgb(var(--v-theme-error));
+  --eox-info-color: rgb(var(--v-theme-info));
+  --eox-success-color: rgb(var(--v-theme-success));
+  --eox-warning-color: rgb(var(--v-theme-warning));
+  --range-slider-color: rgb(var(--v-theme-primary));
+  --range-slider-track-color: rgb(var(--v-theme-on-primary));
+}
 </style>

package/dist/client/{DashboardLayout-BjUs7mYs.js → DashboardLayout-ByVMURpM.js}

@@ -1,7 +1,7 @@
 import { openBlock, createBlock, withCtx, createElementVNode, unref, normalizeStyle, createElementBlock, Suspense, resolveDynamicComponent, mergeProps, createCommentVNode, Fragment, renderList, Transition } from 'vue';
 import '@eox/layout';
-import { _ as _export_sfc, F as useDefineTemplate } from './asWebComponent-N7ChSAQG.js';
-import { V as VMain } from './VMain-fx1gaM7Y.js';
+import { _ as _export_sfc, F as useDefineTemplate } from './asWebComponent--e4yqM3f.js';
+import { V as VMain } from './VMain-B7G2T3Zv.js';
 
 const _hoisted_1 = ["gap"];
 const _hoisted_2 = ["id", "h", "w", "x", "y"];
@@ -24,7 +24,7 @@ return (_ctx, _cache) => {
       }, [
         (unref(bgWidget)?.component)
           ? (openBlock(), createElementBlock("eox-layout-item", {
-              key: 0,
+              key: unref(bgWidget).id,
               class: "bg-panel bg-surface",
               style: normalizeStyle(`margin: -${unref(gap) + 1}px;`),
               x: "0",
@@ -32,7 +32,7 @@ return (_ctx, _cache) => {
               h: "12",
               w: "12"
             }, [
-              (openBlock(), createBlock(Suspense, { suspensible: "" }, {
+              (openBlock(), createBlock(Suspense, null, {
                 default: withCtx(() => [
                   (openBlock(), createBlock(resolveDynamicComponent(unref(bgWidget)?.component), mergeProps({ id: "bg-widget" }, unref(bgWidget)?.props), null, 16 /* FULL_PROPS */))
                 ]),
@@ -56,7 +56,7 @@ return (_ctx, _cache) => {
                     x: importedWidget.value.layout.x,
                     y: importedWidget.value.layout.y
                   }, [
-                    (openBlock(), createBlock(Suspense, { suspensible: "" }, {
+                    (openBlock(), createBlock(Suspense, null, {
                       default: withCtx(() => [
                         (openBlock(), createBlock(resolveDynamicComponent(importedWidget.value.component), mergeProps({
                           key: importedWidget.value.id,
@@ -79,6 +79,6 @@ return (_ctx, _cache) => {
 }
 
 };
-const DashboardLayout = /*#__PURE__*/_export_sfc(_sfc_main, [['__scopeId',"data-v-ebeeb1d1"]]);
+const DashboardLayout = /*#__PURE__*/_export_sfc(_sfc_main, [['__scopeId',"data-v-7294ae56"]]);
 
 export { DashboardLayout as default };

package/dist/client/{DynamicWebComponent-rIFx5c0f.js → DynamicWebComponent-BRQQ5AXV.js}

@@ -1,5 +1,5 @@
 import { withAsyncContext, ref, onMounted, onUnmounted, openBlock, createElementBlock, createBlock, resolveDynamicComponent, mergeProps } from 'vue';
-import { $ as useSTAcStore } from './asWebComponent-N7ChSAQG.js';
+import { $ as useSTAcStore } from './asWebComponent--e4yqM3f.js';
 
 const _hoisted_1 = { class: "d-flex flex-column fill-height overflow-auto" };
 
@@ -36,7 +36,7 @@ const props = /** @type {import("@/types").WebComponentProps} */ (
 const getWebComponent = async () =>
   typeof props.link === "string"
     ? await import(/* @vite-ignore */ props.link)
-    : await props.link();
+    : await props.link?.();
 
 const imported = !customElements.get(props.tagName)
   ? (
@@ -53,8 +53,15 @@ const defined = customElements.get(props.tagName);
 
 // if the imported link doesn't define the custom tag provided
 if (!defined && props.constructorProp) {
-  const Constructor = imported[props.constructorProp];
-  customElements.define(props.tagName, Constructor);
+  try {
+    const Constructor = imported[props.constructorProp];
+    customElements.define(props.tagName, Constructor);
+  } catch (e) {
+    console.error(
+      `[eodash] ${props.tagName} is not defined, please add a valid link or constructorProp`,
+    );
+    console.error(e);
+  }
 }
 
 const store = useSTAcStore();

package/dist/client/{EodashDatePicker-brJlj1aQ.js → EodashDatePicker-DyLo_JUC.js}

@@ -1,9 +1,9 @@
 import { resolveComponent, render, h, mergeProps, useCssVars, useTemplateRef, customRef, ref, computed, reactive, toRef, watch, onMounted, openBlock, createElementBlock, createVNode, unref, createSlots, withCtx, createElementVNode, withDirectives, createBlock, createCommentVNode, toHandlers } from 'vue';
 import { DatePicker } from 'v-calendar';
-import { E as isObject, Y as consoleError, t as useDisplay, Z as datetime, $ as useSTAcStore, a0 as eodashCollections, a1 as collectionsPalette, a2 as makePanelTransparent, V as VBtn, y as VIcon } from './asWebComponent-N7ChSAQG.js';
+import { E as isObject, Y as consoleError, t as useDisplay, Z as datetime, $ as useSTAcStore, a0 as eodashCollections, a1 as collectionsPalette, a2 as makePanelTransparent, V as VBtn, y as VIcon } from './asWebComponent--e4yqM3f.js';
 import { mdiRayEndArrow, mdiRayStartArrow } from '@mdi/js';
 import log from 'loglevel';
-import { V as VTooltip } from './VTooltip-DKOCofTl.js';
+import { V as VTooltip } from './VTooltip-9810qjB2.js';
 
 // Utilities
 function useDirectiveComponent(component, props) {
@@ -132,7 +132,7 @@ const _sfc_main = {
   setup(__props) {
 
 useCssVars(_ctx => ({
-  "45a34dce": (transform.value)
+  "f4706d8a": (transform.value)
 }));
 
 const { lgAndDown } = useDisplay();

package/dist/client/{EodashItemFilter-C2i4lnM1.js → EodashItemFilter-BR572AaH.js}

@@ -1,5 +1,5 @@
 import { computed, ref, openBlock, createElementBlock, mergeProps, unref, createElementVNode, toDisplayString } from 'vue';
-import { t as useDisplay, $ as useSTAcStore } from './asWebComponent-N7ChSAQG.js';
+import { t as useDisplay, $ as useSTAcStore } from './asWebComponent--e4yqM3f.js';
 import '@eox/itemfilter';
 
 const _hoisted_1 = [".items"];

package/dist/client/{EodashLayerControl-DNQzPQQ4.js → EodashLayerControl-C_mi-Hoo.js}

@@ -3,7 +3,7 @@ import '@eox/layercontrol';
 import '@eox/jsonform';
 import '@eox/timecontrol';
 import 'color-legend-element';
-import { $ as useSTAcStore, a3 as mapCompareEl, a4 as mapEl, a5 as eodashCompareCollections, a0 as eodashCollections, a6 as layerControlFormValue, a7 as getColFromLayer } from './asWebComponent-N7ChSAQG.js';
+import { $ as useSTAcStore, a3 as mapCompareEl, a4 as mapEl, a5 as eodashCompareCollections, a0 as eodashCollections, a6 as layerControlFormValue, a7 as getColFromLayer } from './asWebComponent--e4yqM3f.js';
 import { storeToRefs } from 'pinia';
 
 const _hoisted_1 = { class: "d-flex flex-column fill-height overflow-auto" };

package/dist/client/{EodashLayoutSwitcher-gLe7G8Qn.js → EodashLayoutSwitcher-D4ooLbys.js}

@@ -1,7 +1,7 @@
 import { ref, openBlock, createElementBlock, createVNode, withCtx, mergeProps } from 'vue';
-import { a2 as makePanelTransparent, y as VIcon, al as activeTemplate } from './asWebComponent-N7ChSAQG.js';
+import { a2 as makePanelTransparent, y as VIcon, al as activeTemplate } from './asWebComponent--e4yqM3f.js';
 import { mdiViewDashboard } from '@mdi/js';
-import { V as VTooltip } from './VTooltip-DKOCofTl.js';
+import { V as VTooltip } from './VTooltip-9810qjB2.js';
 
 const _sfc_main = {
   __name: 'EodashLayoutSwitcher',

package/dist/client/{EodashMap-LOzTlvrM.js → EodashMap-CGFv4e85.js}

@@ -1,7 +1,7 @@
 import { onMounted, onUnmounted, watch, nextTick, ref, toRaw, computed, openBlock, createElementBlock, createElementVNode, unref, normalizeStyle } from 'vue';
 import '@eox/map';
 import '@eox/map/src/plugins/advancedLayersAndSources';
-import { a8 as eoxLayersKey, $ as useSTAcStore, a9 as setMapProjFromCol, aa as posIsSetFromUrl, ab as useOnLayersUpdate, ac as EodashCollection, ad as mapPosition, a4 as mapEl, a3 as mapCompareEl, Z as datetime, a0 as eodashCollections, a5 as eodashCompareCollections, a6 as layerControlFormValue } from './asWebComponent-N7ChSAQG.js';
+import { a8 as eoxLayersKey, $ as useSTAcStore, a9 as setMapProjFromCol, aa as posIsSetFromUrl, ab as useOnLayersUpdate, ac as EodashCollection, ad as mapPosition, a4 as mapEl, a3 as mapCompareEl, Z as datetime, a0 as eodashCollections, a5 as eodashCompareCollections, a6 as layerControlFormValue } from './asWebComponent--e4yqM3f.js';
 import { storeToRefs } from 'pinia';
 import log from 'loglevel';
 import { useEventBus } from '@vueuse/core';
@@ -105,7 +105,7 @@ const createLayersConfig = async (
     await EodashCollection.getIndicatorLayers(selectedIndicator);
   const geodbLayer = EodashCollection.getGeoDBLayer(eodashCols);
   if (geodbLayer) {
-    dataLayers.layers.push(geodbLayer);
+    dataLayers.layers.unshift(geodbLayer);
   }
   const baseLayers = {
     type: "Group",

package/dist/client/{EodashMapBtns-UXOupU5J.js → EodashMapBtns-_M7SW7Is.js}

@@ -1,9 +1,9 @@
 import { computed, ref, openBlock, createElementBlock, createBlock, unref, createCommentVNode, createVNode, withCtx } from 'vue';
-import { _ as _export_sfc, t as useDisplay, a2 as makePanelTransparent, V as VBtn, ae as availableMapProjection, af as changeMapProjection, ag as setActiveTemplate } from './asWebComponent-N7ChSAQG.js';
+import { _ as _export_sfc, t as useDisplay, a2 as makePanelTransparent, V as VBtn, ae as availableMapProjection, af as changeMapProjection, ag as setActiveTemplate } from './asWebComponent--e4yqM3f.js';
 import { mdiMapPlus, mdiEarthBox, mdiCompare } from '@mdi/js';
-import ExportState from './ExportState-DVosrSNY.js';
-import _sfc_main$1 from './PopUp-BFcSuX3b.js';
-import _sfc_main$2 from './EodashItemFilter-C2i4lnM1.js';
+import ExportState from './ExportState-DNUSRJSJ.js';
+import _sfc_main$1 from './PopUp-CEmhdNIj.js';
+import _sfc_main$2 from './EodashItemFilter-BR572AaH.js';
 
 const _sfc_main = {
   __name: 'EodashMapBtns',