From 8bd22d02635482f40b7a5c94e75a0811a673ea69 Mon Sep 17 00:00:00 2001
From: Tariq Soliman <Tariq.K.Soliman@jpl.nasa.gov>
Date: Mon, 13 Nov 2023 17:36:59 -0800
Subject: [PATCH] Improve KML Export Styles

---
 src/essence/Basics/Formulae_/Formulae_.js | 65 ++++++++++++++++-------
 src/essence/Tools/Layers/LayersTool.js    | 13 +++--
 2 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/src/essence/Basics/Formulae_/Formulae_.js b/src/essence/Basics/Formulae_/Formulae_.js
index 7a2820e9..9171472f 100644
--- a/src/essence/Basics/Formulae_/Formulae_.js
+++ b/src/essence/Basics/Formulae_/Formulae_.js
@@ -1452,27 +1452,56 @@ var Formulae_ = {
         return string
     },
     // https://github.com/mapbox/simplestyle-spec
-    geoJSONForceSimpleStyleSpec(geojson, stringifyPropertyObjects) {
+    geoJSONForceSimpleStyleSpec(
+        geojson,
+        stringifyPropertyObjects,
+        defaultStyle,
+        useKeyAsName
+    ) {
+        const defStyle = defaultStyle
+            ? JSON.parse(JSON.stringify(defaultStyle))
+            : {}
+
         const g = JSON.parse(JSON.stringify(geojson))
         g.features.forEach((f) => {
-            if (f.properties.style) {
-                // style.color -> stroke
-                if (f.properties.style.color != null)
-                    f.properties['stroke'] = f.properties.style.color
-                // style.opacity -> stroke-opacity
-                if (f.properties.style.opacity != null)
-                    f.properties['stroke-opacity'] = f.properties.style.opacity
-                // style.weight -> stroke-width
-                if (f.properties.style.weight != null)
-                    f.properties['stroke-width'] = f.properties.style.weight
-                // style.fillColor -> fill
-                if (f.properties.style.fillColor != null)
-                    f.properties['fill'] = f.properties.style.fillColor
-                // style.fillOpacity -> fill-opacity
-                if (f.properties.style.fillOpacity != null)
-                    f.properties['fill-opacity'] =
-                        f.properties.style.fillOpacity
+            let pstyle = f.properties.style || {}
+
+            if (useKeyAsName && f.properties[useKeyAsName] != null) {
+                if (typeof f.properties[useKeyAsName] === 'number')
+                    f.properties[useKeyAsName] = `${f.properties[useKeyAsName]}`
             }
+
+            if (f.geometry.type.toLowerCase() === 'point') {
+                if (pstyle.fillColor != null)
+                    f.properties['marker-color'] = pstyle.fillColor
+                else if (defStyle.fillColor != null)
+                    f.properties['marker-color'] = defStyle.fillColor
+            }
+            // style.color -> stroke
+            if (pstyle.color != null) f.properties['stroke'] = pstyle.color
+            else if (defStyle.color != null)
+                f.properties['stroke'] = defStyle.color
+            // style.opacity -> stroke-opacity
+            if (pstyle.opacity != null)
+                f.properties['stroke-opacity'] = pstyle.opacity
+            if (defStyle.opacity != null)
+                f.properties['stroke-opacity'] = defStyle.opacity
+            // style.weight -> stroke-width
+            if (pstyle.weight != null)
+                f.properties['stroke-width'] = pstyle.weight
+            if (defStyle.weight != null)
+                f.properties['stroke-width'] = defStyle.weight
+            // style.fillColor -> fill
+            if (pstyle.fillColor != null)
+                f.properties['fill'] = pstyle.fillColor
+            if (defStyle.fillColor != null)
+                f.properties['fill'] = defStyle.fillColor
+            // style.fillOpacity -> fill-opacity
+            if (pstyle.fillOpacity != null)
+                f.properties['fill-opacity'] = pstyle.fillOpacity
+            if (defStyle.fillOpacity != null)
+                f.properties['fill-opacity'] = defStyle.fillOpacity
+
             if (stringifyPropertyObjects)
                 Object.keys(f.properties).forEach((p) => {
                     const val = f.properties[p]
diff --git a/src/essence/Tools/Layers/LayersTool.js b/src/essence/Tools/Layers/LayersTool.js
index add95288..56047ed3 100644
--- a/src/essence/Tools/Layers/LayersTool.js
+++ b/src/essence/Tools/Layers/LayersTool.js
@@ -796,16 +796,19 @@ function interfaceWithMMGIS(fromInit) {
                 break
             case 'kml':
                 const kml = tokml(
-                    F_.geoJSONForceSimpleStyleSpec(geojson, true),
+                    F_.geoJSONForceSimpleStyleSpec(
+                        geojson,
+                        true,
+                        L_.layers.data[layerUUID]?.style,
+                        layerData.useKeyAsName
+                    ),
                     {
-                        name: layerData.useKeyAsName || null,
-                        description: 'description',
+                        name: layerData.useKeyAsName || false,
+                        description: 'Generated by MMGIS',
                         timestamp:
                             layerData.time?.enabled === true
                                 ? layerData.time.endProp || null
                                 : null,
-                        documentName: filename,
-                        documentDescription: 'Generated by MMGIS',
                         simplestyle: true,
                     }
                 )