mapp.layer.styleParser() method

.github/workflows/unit_tests.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
           node-version: '18'
 

README.md

@@ -1,7 +1,7 @@
 **v4.8.6**
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-![example workflow](https://github.com/GEOLYTIX/xyz/actions/workflows/unit_tests.yml/badge.svg)
+![Codi Unit Tests](https://github.com/GEOLYTIX/xyz/actions/workflows/unit_tests.yml/badge.svg)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=GEOLYTIX_xyz&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=GEOLYTIX_xyz)
 
 **Open source presentation, controller, domain and service layers for cloud native spatial data and application interfaces.**

lib/layer/_layer.mjs

@@ -1,23 +1,45 @@
 /**
 ## mapp.layer{}
-The module export methods to decorate layer objects.
-
+This module exports methods to decorate layer objects.
 @module /layer
-*/
+ */
 
-import decorate from './decorate.mjs'
+import decorate from './decorate.mjs';
 import formats from './format/_format.mjs';
-import fade from './fade.mjs'
+import fade from './fade.mjs';
 import changeEnd from './changeEnd.mjs'
-import featureHover from './featureHover.mjs'
-import featureFilter from './featureFilter.mjs'
-import * as featureFormats from './featureFormats.mjs'
-import * as featureFields from './featureFields.mjs'
-import Style from './Style.mjs'
-import categorized from './themes/categorized.mjs'
-import distributed from './themes/distributed.mjs'
-import graduated from './themes/graduated.mjs'
+import featureHover from './featureHover.mjs';
+import featureFilter from './featureFilter.mjs';
+import * as featureFormats from './featureFormats.mjs';
+import * as featureFields from './featureFields.mjs';
+import featureStyle from './featureStyle.mjs';
+import styleParser from './styleParser.mjs';
+const Style = layer => {
+  console.warn(`The mapp.layer.Style() method has been superseeded by the mapp.layer.featureStyle() method.`)
+  return featureStyle(layer)
+}
+import basic from './themes/basic.mjs';
+import categorized from './themes/categorized.mjs';
+import distributed from './themes/distributed.mjs';
+import graduated from './themes/graduated.mjs';
 
+/**
+@function layer
+@property {function} decorate - A function to decorate layer objects.
+@property {function} changeEnd - A function to add the changeEnd event.
+@property {Object} formats - An object containing layer format modules.
+@property {Object} featureFormats - An object containing feature format modules.
+@property {Object} featureFields - An object containing feature field modules.
+@property {function} featureHover - A function to handle feature hover interactions.
+@property {function} featureFilter - A function to filter features.
+@property {function} featureStyle - A function to style features.
+@property {function} fade - A function to apply fade effects to layers.
+@property {function} styleParser - A function to parse layer styles.
+@property {Object} themes - An object containing theme modules.
+@property {function} themes.categorized - A function to apply a categorized theme to features.
+@property {function} themes.distributed - A function to apply a distributed theme to features.
+@property {function} themes.graduated - A function to apply a graduated theme to features.
+ */
 export default {
   decorate,
   changeEnd,
@@ -26,11 +48,14 @@ export default {
   featureFields,
   featureHover,
   featureFilter,
+  featureStyle,
   fade,
+  styleParser,
   Style,
   themes: {
+    basic,
     categorized,
     distributed,
     graduated
   }
-}
+};

lib/layer/decorate.mjs

@@ -124,61 +124,6 @@ export default async function decorate(layer) {
   // Set layer opacity from style.
   layer.L.setOpacity(layer.style?.opacity || 1);
 
-  // Handle deprecated layer.style.hover and layer.style.hovers.
-  if (layer.style?.hovers && layer.style?.hover) {
-    console.warn(`Layer: ${layer.key}, cannot use both layer.style.hover and layer.style.hovers. Layer.style.hover has been deleted.`);
-    delete layer.style.hover;
-  }
-
-  // Handle deprecated layer.style.label and layer.style.labels.
-  if (layer.style?.labels && layer.style?.label) {
-    console.warn(`Layer: ${layer.key}, cannot use both layer.style.label and layer.style.labels. Layer.style.label has been deleted.`);
-    delete layer.style.label;
-  }
-
-  // Handle multiple themes in layer style.
-  if (layer.style?.themes) {
-    Object.keys(layer.style.themes).forEach(key => {
-      layer.style.themes[key].title ??= key;
-      if (layer.style.themes[key].skip) delete layer.style.themes[key];
-    });
-    layer.style.theme = typeof layer.style.theme === 'object'
-      ? layer.style.theme
-      : layer.style.themes[layer.style.theme || Object.keys(layer.style.themes)[0]];
-  }
-
-  // Handle setLabel and labels in layer style.
-  if (layer.style?.theme?.setLabel && layer.style?.labels) {
-    layer.style.label = layer.style.labels[layer.style.theme.setLabel];
-  }
-
-  // Handle deprecated layer.hover configuration.
-  if (layer.hover) {
-    console.warn(`Layer: ${layer.key}, layer.hover{} should be defined within layer.style{}.`);
-    layer.style.hover = layer.hover;
-    delete layer.hover;
-  }
-
-  // Handle setHover and hovers in layer style.
-  if (layer.style?.theme?.setHover && layer.style?.hovers) {
-    layer.style.hover = layer.style.hovers[layer.style.theme.setHover];
-  }
-
-  // Handle multiple hovers in layer style.
-  if (layer.style?.hovers) {
-    layer.style.hover = typeof layer.style.hover === 'object' ? layer.style.hover : layer.style.hovers[layer.style.hover || Object.keys(layer.style.hovers)[0]];
-  }
-
-  // Set default featureHover method if not provided.
-  if (layer.style?.hover) {
-    layer.style.hover.method ??= mapp.layer.featureHover;
-  }
-
-  // Handle multiple labels in layer style.
-  if (layer.style?.labels) {
-    layer.style.label = typeof layer.style.label === 'object' ? layer.style.label : layer.style.labels[layer.style.label || Object.keys(layer.style.labels)[0]];
-  }
-
   // Call layer and/or plugin methods.
   Object.keys(layer).forEach((key) => {
     typeof mapp.layer[key] === 'function' && mapp.layer[key]?.(layer);

lib/layer/featureFields.mjs

@@ -35,7 +35,7 @@ featureFields.process(layer) will process the fields required for a theme and re
 export function process(layer) {
 
   // Check if the distribution method is defined in the distribution object.
-  if (Object.hasOwnProperty(distribution, layer.style?.theme?.distribution)) {
+  if (Object.hasOwn(distribution, layer.style?.theme?.distribution)) {
 
     // Call the corresponding distribution function.
     distribution[layer.style.theme.distribution](layer);
@@ -71,7 +71,7 @@ The cat values will be updated to represented the natural breaks before the laye
 function jenks(layer) {
   let theme = layer.style.theme;
 
-  let n = Math.min(layer.featureFields[theme.field].values.length, theme.cat_arr.length);
+  let n = Math.min(layer.featureFields[theme.field].values.length, theme.categories.length);
 
   // Parse array values as float.
   layer.featureFields[theme.field].values = layer.featureFields[theme.field].values.map(parseFloat);
@@ -82,7 +82,7 @@ function jenks(layer) {
 
   let val;
 
-  theme.cat_arr.forEach((cat, i) => {
+  theme.categories.forEach((cat, i) => {
     val = val === layer.featureFields[theme.field].jenks[i] ? undefined : layer.featureFields[theme.field].jenks[i];
     cat.value = val;
   });