From c185ec7ebf822df01385da3b2a40ce85d3d639f7 Mon Sep 17 00:00:00 2001 From: tariqksoliman Date: Tue, 19 Dec 2023 16:09:30 -0800 Subject: [PATCH 1/2] #479 Remove Layer Name restrictions --- API/Backend/Config/validate.js | 16 ---------------- src/essence/Basics/Layers_/LayerConstructors.js | 3 ++- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/API/Backend/Config/validate.js b/API/Backend/Config/validate.js index d1d11ffd..d9ad4d78 100644 --- a/API/Backend/Config/validate.js +++ b/API/Backend/Config/validate.js @@ -116,24 +116,8 @@ const isValidLayerName = (name) => { errs.push( err("Found a layer with name: undefined", ["layers[layer].name"]) ); - if (!validCSSName(name)) - errs.push( - err( - `Layer: '${name}' must not be empty, a non-string, contain symbols or begin with numbers.`, - ["layers[layer].name"] - ) - ); return errs; - - function validCSSName(name) { - if (name == null || typeof name !== "string") return false; - - const match = name.match(/[_A-Z ]+[_A-Z0-9- ]+/gi); - if (match && match[0].length === name.length) return true; - - return false; - } }; const isValidUrl = (layer) => { diff --git a/src/essence/Basics/Layers_/LayerConstructors.js b/src/essence/Basics/Layers_/LayerConstructors.js index 396225c9..946b36d6 100644 --- a/src/essence/Basics/Layers_/LayerConstructors.js +++ b/src/essence/Basics/Layers_/LayerConstructors.js @@ -65,7 +65,8 @@ export const constructVectorLayer = ( } if (feature.properties.hasOwnProperty('style')) { - let className = layerObj.style.className + let className = layerObj.uuid + console.log(layerObj.style.className, className) let layerName = layerObj.style.layerName layerObj.style = Object.assign({}, layerObj.style) layerObj.style = { From 922ff9bdf81410180f6e2adf701881411c8ef8d9 Mon Sep 17 00:00:00 2001 From: tariqksoliman Date: Tue, 19 Dec 2023 16:15:17 -0800 Subject: [PATCH 2/2] #479 Remove console.log --- src/essence/Basics/Layers_/LayerConstructors.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/essence/Basics/Layers_/LayerConstructors.js b/src/essence/Basics/Layers_/LayerConstructors.js index 946b36d6..dd9756ed 100644 --- a/src/essence/Basics/Layers_/LayerConstructors.js +++ b/src/essence/Basics/Layers_/LayerConstructors.js @@ -66,7 +66,6 @@ export const constructVectorLayer = ( if (feature.properties.hasOwnProperty('style')) { let className = layerObj.uuid - console.log(layerObj.style.className, className) let layerName = layerObj.style.layerName layerObj.style = Object.assign({}, layerObj.style) layerObj.style = {