Geodatasets support nested _source

Author: tariqksoliman

API/Backend/Geodatasets/routes/geodatasets.js

@@ -109,9 +109,14 @@ function get(reqtype, req, res, next) {
             properties = `jsonb_build_object(
             ${_source
               .map((v, i) => {
-                if (["feature_id", "group_id"].indexOf(v) === -1)
-                  return `:prop_${i}, properties->:prop_${i}`;
-                else return "";
+                if (["feature_id", "group_id"].indexOf(v) === -1) {
+                  let toReturn = `:prop_${i}, properties`;
+                  const vSplit = v.split(".");
+                  vSplit.forEach((vs, idx) => {
+                    toReturn += ` -> :prop_${i}_${idx}`;
+                  });
+                  return toReturn;
+                } else return "";
               })
               .filter(Boolean)
               .join(",")} 
@@ -222,6 +227,10 @@ function get(reqtype, req, res, next) {
 
           if (Array.isArray(_source)) {
             _source.forEach((v, i) => {
+              const vSplit = v.split(".");
+              vSplit.forEach((vs, idx) => {
+                replacements[`prop_${i}_${idx}`] = vs;
+              });
               replacements[`prop_${i}`] = v;
             });
           }
@@ -300,6 +309,14 @@ function get(reqtype, req, res, next) {
                       result.dataValues.feature_id_field != null
                         ? results[i].feature_id
                         : results[i].id;
+
+                  _source.forEach((s) => {
+                    if (s && s.split(".").length > 1) {
+                      const savedValue = feature.properties[s];
+                      delete feature.properties[s];
+                      Utils.setIn2(feature.properties, s, savedValue, true);
+                    }
+                  });
                 }
                 feature.geometry = JSON.parse(results[i].st_asgeojson);
                 geojson.features.push(feature);

API/utils.js

@@ -37,8 +37,11 @@ const Utils = {
     }
     return index;
   },
+  isNumeric: function (value) {
+    return /^\d+$/.test(value);
+  },
   setIn: function (obj, keyArray, value, splice, assumeLayerHierarchy) {
-    if (keyArray == null || keyArray === []) return false;
+    if (keyArray == null || keyArray.length === 0) return false;
     if (typeof keyArray === "string") keyArray = keyArray.split(".");
     let object = obj;
     for (let i = 0; i < keyArray.length - 1; i++) {
@@ -60,6 +63,34 @@ const Utils = {
     else object[keyArray[keyArray.length - 1]] = value;
     return true;
   },
+  setIn2: function (obj, keyArray, value, force) {
+    if (keyArray == null || keyArray.length === 0) return null;
+    if (typeof keyArray === "string") keyArray = keyArray.split(".");
+    let object = obj;
+    for (let i = 0; i < keyArray.length - 1; i++) {
+      if (force) {
+        // If string but setting a number index at the end of keyArray, turn into array
+        if (i === keyArray.length - 2) {
+          if (
+            Utils.isNumeric(keyArray[i + 1]) &&
+            !Array.isArray(object[keyArray[i]])
+          )
+            object[keyArray[i]] = Array(object[keyArray[i]]);
+        }
+        if (!object.hasOwnProperty(keyArray[i])) {
+          object[keyArray[i]] =
+            i === keyArray.length - 2 && Utils.isNumeric(keyArray[i + 1])
+              ? []
+              : {};
+        }
+        object = object[keyArray[i]];
+      } else {
+        if (object.hasOwnProperty(keyArray[i])) object = object[keyArray[i]];
+        else return null;
+      }
+    }
+    object[keyArray[keyArray.length - 1]] = value;
+  },
   traverseLayers: function (layers, onLayer) {
     let removedUUIDs = [];
     depthTraversal(layers, 0, []);

src/essence/Basics/Layers_/Layers_.js

@@ -2085,13 +2085,20 @@ const L_ = {
     },
     // Returns any array of all the "fromProp"-like configuration fields for a layer
     getDynamicProps(layerData) {
-        const dynamicProps = []
+        let dynamicProps = []
         if (layerData?.style) {
             Object.keys(layerData.style).forEach((key) => {
                 if (key.endsWith('Prop'))
                     dynamicProps.push(layerData.style[key])
             })
         }
+        if (layerData?.variables?.useKeyAsName) {
+            dynamicProps = dynamicProps.concat(
+                typeof layerData.variables.useKeyAsName === 'string'
+                    ? [layerData.variables.useKeyAsName]
+                    : layerData.variables.useKeyAsName
+            )
+        }
         return dynamicProps
     },
     /**
@@ -3301,7 +3308,10 @@ const L_ = {
                     propertyNames = [propertyNames]
                 propertyValues = Array(propertyNames.length).fill(null)
                 propertyNames.forEach((propertyName, idx) => {
-                    if (feature.properties.hasOwnProperty(propertyName)) {
+                    if (
+                        feature.properties.hasOwnProperty(propertyName) ||
+                        l.getFeaturePropertiesOnClick === true
+                    ) {
                         propertyValues[idx] = F_.getIn(
                             feature.properties,
                             propertyName