@vcmap/ui 6.2.2 → 6.3.0-rc.1

package/src/vcsUiApp.js

@@ -11,6 +11,7 @@ import {
   VcsEvent,
   Viewpoint,
   volatileModuleId,
+  WMSLayer,
 } from '@vcmap/core';
 import { getLogger as getLoggerByName } from '@vcsuite/logger';
 import { deserializePlugin, serializePlugin } from './pluginHelper.js';
@@ -36,7 +37,12 @@ import FeatureInfo, {
   featureInfoClassRegistry,
 } from './featureInfo/featureInfo.js';
 import UiConfig from './uiConfig.js';
-import { createEmptyState, getStateFromURL } from './state.js';
+import {
+  createEmptyState,
+  getStateFromURL,
+  parseWMSStyle,
+  writeWMSStyleForLayer,
+} from './state.js';
 import { version } from '../package.json';
 import Search from './search/search.js';
 import Notifier from './notifier/notifier.js';
@@ -557,9 +563,17 @@ class VcsUiApp extends VcsApp {
    */
   async getState(forUrl) {
     const state = createEmptyState();
-    state.moduleIds = this.modules
-      .filter(({ _id }) => _id !== defaultDynamicModuleId)
-      .map(({ _id }) => _id);
+    const nonDynamicModules = this.modules.filter(
+      ({ _id }) => _id !== defaultDynamicModuleId,
+    );
+
+    if (nonDynamicModules.some((m) => !m.config._id)) {
+      getLogger().warning(
+        'Some modules you are creating are missing a stable _id property. This may lead to issues while restoring application state.',
+      );
+    }
+
+    state.moduleIds = nonDynamicModules.map(({ _id }) => _id);
 
     state.activeMap = this.maps.activeMap.name;
     const viewpoint = await this.maps.activeMap.getViewpoint();
@@ -591,6 +605,12 @@ class VcsUiApp extends VcsApp {
           l.style[moduleIdSymbol] !== volatileModuleId
         ) {
           layerState.styleName = l.style.name;
+        } else if (l instanceof WMSLayer) {
+          const module = this.getModuleById(l[moduleIdSymbol]);
+          const styleName = writeWMSStyleForLayer(l, module?.config);
+          if (styleName) {
+            layerState.styleName = styleName;
+          }
         }
         return layerState;
       });
@@ -642,6 +662,11 @@ class VcsUiApp extends VcsApp {
    */
   async _parseModule(module) {
     const { config } = module;
+    if (!config._id) {
+      getLogger().warning(
+        'A module is missing a stable _id property. This may lead to issues while restoring application state.',
+      );
+    }
     if (Array.isArray(config.plugins)) {
       await this._plugins.parseItems(config.plugins, module._id);
     }
@@ -667,7 +692,7 @@ class VcsUiApp extends VcsApp {
         if (layer) {
           if (layerState.active) {
             layer.activate().catch((e) => {
-              getLogger().warn(
+              getLogger().warning(
                 'Failed to activate cached app state. layer failed: ',
                 layer.name,
               );
@@ -677,12 +702,21 @@ class VcsUiApp extends VcsApp {
             layer.deactivate();
           }
 
-          if (
-            layerState.styleName &&
-            this.styles.hasKey(layerState.styleName) &&
-            layer.setStyle
-          ) {
-            layer.setStyle(this.styles.getByKey(layerState.styleName));
+          if (layerState.styleName) {
+            if (this.styles.hasKey(layerState.styleName) && layer.setStyle) {
+              layer.setStyle(this.styles.getByKey(layerState.styleName));
+            } else if (layer instanceof WMSLayer) {
+              const { layers, styles } = parseWMSStyle(layerState.styleName);
+              if (styles) {
+                layer.parameters.STYLES = styles;
+              }
+              layer.setLayers(layers || layer.getLayers()).catch((err) => {
+                getLogger().warning(
+                  `Failed to set WMS layers ${layers} on layer ${layer.name}`,
+                  err,
+                );
+              });
+            }
           }
         }
       });