Merge pull request #2 from steps39/develop

Small updates post V1

Author: steps39

SedimentDataExplorer.html

@@ -595,7 +595,7 @@
     <div id="everything" style="display: none;"></div>
 
     <header>
-        <h1>Sediment Data Explorer <small style="font-weight: normal; opacity: 0.8;">v1.20250928</small></h1>
+        <h1>Sediment Data Explorer <small style="font-weight: normal; opacity: 0.8;">v1.20251020</small></h1>
         <div class="header-actions">
             <button onclick="updateChart()">(Re)Plot Chart</button>
             <button onclick="exportCharts()" class="secondary">Export Chart</button>
@@ -701,6 +701,7 @@ <h1>Sediment Data Explorer <small style="font-weight: normal; opacity: 0.8;">v1.
                 <button onclick="openDatasetLabels()">Enter Dataset Labels</button>
                 <button onclick="openSampleLabels()">Enter Sample Labels</button>
                 <button onclick="openChartModifiersModal()">Chart Modifiers</button>
+                <button onclick="openMapModifiersModal()">Map Modifiers</button>
                 <hr>
                 <div class="input-group">
                     <label for="primary-sorting-select">Primary Sort:</label>
@@ -871,6 +872,13 @@ <h2>Chart Modifiers</h2>
             <div class="modal-footer"><button onclick="closeChartModifiersModal()" class="secondary">Close</button></div>
         </div>
     </div>
+    <div id="mapModifiersModal" class="modal">
+        <div class="modal-content">
+            <h2>Map Modifiers</h2>
+            <label for="markerScaling">Marker Scaling Factor:</label><input type="number" id="markerScaling" placeholder="2">
+            <div class="modal-footer"><button onclick="closeMapModifiersModal()" class="secondary">Close</button></div>
+        </div>
+    </div>
     <div id="additionalChartsModal" class="modal">
         <div class="modal-content">
             <h2>Additional Chart Options</h2>
@@ -924,6 +932,7 @@ <h2>Select Radar Plot for Map Popups</h2>
     <script src="os-transform.js"></script>
     <script src="sdeDataUtilities.js"></script>
     <script src="sdeDredgeData.js"></script>
+    <script src="sdeStandards.js"></script>
     <script src="SedimentDataExplorer.js"></script>
     <script src="sdeCalcs4Charts.js"></script>
     <script src="sdeCharts.js"></script>
@@ -1174,6 +1183,11 @@ <h2>Select Radar Plot for Map Popups</h2>
         function closeAdditionalInfoModal() { document.getElementById('additionalInfoModal').style.display = 'none'; }
         function openChartModifiersModal() { document.getElementById('chartModifiersModal').style.display = 'block'; }
         function closeChartModifiersModal() { document.getElementById('chartModifiersModal').style.display = 'none'; }
+        function openMapModifiersModal() { document.getElementById('mapModifiersModal').style.display = 'block'; }
+        function closeMapModifiersModal() { 
+            document.getElementById('mapModifiersModal').style.display = 'none';
+            markerScaling = parseFloat(document.getElementById('markerScaling').value) || 2;
+         }
         function openAdditionalChartsModal() { document.getElementById('additionalChartsModal').style.display = 'block'; }
         function closeAdditionalChartsModal() { document.getElementById('additionalChartsModal').style.display = 'none'; }
         function openPcaOptionsModal() { document.getElementById('pcaOptionsModal').style.display = 'block'; }

SedimentDataExplorer.js

@@ -2,6 +2,8 @@
     let radarPlot = "None";
     let resuspensionSize = 0;
     let kmlLayers = {};
+    let chosenStandard = 'Cefas Action Levels';
+//    let chosenStandard = "Candian Quality Guidelines";
 //		import {parse, stringify, toJSON, fromJSON} from 'flatted';
     const autocolors = window['chartjs-plugin-autocolors'];
     Chart.register(autocolors);
@@ -261,6 +263,17 @@ for (i = 1; i < dataSheetNames.length; i++) {
         ccontainer.appendChild(label);
     });
 
+/*standards = {};
+
+        document.addEventListener('DOMContentLoaded', async () => {
+            const dataUrl = 'https://northeastfc.uk/Supporting/quality_standards.sdes';
+            const parsedData = await readQualityStandards(dataUrl);
+            const outputElement = document.getElementById('output');
+            standards = parsedData;
+        });*/
+
+    completeStandards();
+
     importData();
 
     function parseDates(dateString) {
@@ -1360,10 +1373,10 @@ let missingTotalSolids = true;
                      const applicant = df[14][4];
                     const applicationNumber = df[15][4];
                     const applicationTitle = df[16][4];*/
-        for (i = 16; 19; i++) {
+        for (i = 16; i<19; i++) {
             dateRow = i;
-            //console.log('df[dateRow][2]',dateRow,df[dateRow][2]);                
-            if (df[dateRow][2].includes('Date sampled:')) {
+//console.log('df[dateRow][2]',sheetName,i,dateRow,df[dateRow][2],df);                
+            if (df[dateRow][2]?.includes('Date sampled:')) {
                 break;
             }
             dateRow = 0;

sdeDataUtilities.js

@@ -1,3 +1,98 @@
+function Version1deepMerge(a, b) {
+  // Handle null/undefined cases
+  if (a == null) return b;
+  if (b == null) return a;
+  
+  // If either value is not an object, b takes precedence
+  if (typeof a !== 'object' || typeof b !== 'object') {
+    return b;
+  }
+  
+  // Handle arrays - concatenate them
+  if (Array.isArray(a) && Array.isArray(b)) {
+    return [...a, ...b];
+  }
+  
+  // If one is array and other is object, prefer the object
+  if (Array.isArray(a) !== Array.isArray(b)) {
+    return Array.isArray(b) ? b : a;
+  }
+  
+  // Merge objects
+  const result = { ...a };
+  
+  for (const key in b) {
+    if (b.hasOwnProperty(key)) {
+      if (key in result) {
+        // Recursively merge nested objects
+        result[key] = deepMerge(result[key], b[key]);
+      } else {
+        // Add new property from b
+        result[key] = b[key];
+      }
+    }
+  }
+  
+  return result;
+}
+
+function deepMerge(...objects) {
+  // Filter out null/undefined objects
+  const validObjects = objects.filter(obj => obj != null);
+  
+  if (validObjects.length === 0) return {};
+  if (validObjects.length === 1) return validObjects[0];
+  
+  return validObjects.reduce((result, current) => {
+    return mergeTwo(result, current);
+  }, {});
+}
+
+function mergeTwo(a, b) {
+  // Handle null/undefined cases
+  if (a == null) return b;
+  if (b == null) return a;
+  
+  // If either value is not an object, b takes precedence
+  if (typeof a !== 'object' || typeof b !== 'object') {
+    return b;
+  }
+  
+  // Handle arrays - concatenate them
+  if (Array.isArray(a) && Array.isArray(b)) {
+    return [...a, ...b];
+  }
+  
+  // If one is array and other is object, prefer the object
+  if (Array.isArray(a) !== Array.isArray(b)) {
+    return Array.isArray(b) ? b : a;
+  }
+  
+  // Merge objects - create new object to avoid mutation
+  const result = {};
+  
+  // Get all keys from both objects
+  const allKeys = new Set([...Object.keys(a), ...Object.keys(b)]);
+  
+  for (const key of allKeys) {
+    const hasA = key in a;
+    const hasB = key in b;
+    
+    if (hasA && hasB) {
+      // Both have the key - recursively merge
+      result[key] = mergeTwo(a[key], b[key]);
+    } else if (hasA) {
+      // Only a has the key
+      result[key] = a[key];
+    } else {
+      // Only b has the key
+      result[key] = b[key];
+    }
+  }
+  
+  return result;
+}
+
 function isSingleValue(item) {
   return (
     item !== null &&