Fix IdTool breaking MeasureTool

NASA-AMMOS · Aug 1, 2024 · dd8c5a1 · dd8c5a1
1 parent 138c59f
commit dd8c5a1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/essence/Tools/Identifier/IdentifierTool.js b/src/essence/Tools/Identifier/IdentifierTool.js
@@ -59,8 +59,8 @@ var IdentifierTool = {
         }
     },
     make: function (targetId) {
-        this.MMWebGISInterface = new interfaceWithMMWebGIS()
         this.targetId = targetId
+        this.MMWebGISInterface = new interfaceWithMMWebGIS()
         this.activeLayerNames = []
 
         L_.subscribeOnLayerToggle('IdentifierTool', () => {
@@ -467,7 +467,8 @@ var IdentifierTool = {
                 var decPlacesBefore = decSplit[0] ? decSplit[0].length : 0
                 var decPlacesAfter = decSplit[1] ? decSplit[1].length : 0
                 if (decPlacesBefore <= 5) {
-                    if (scalefactor != undefined) v = v * parseFloat(scalefactor)
+                    if (scalefactor != undefined)
+                        v = v * parseFloat(scalefactor)
                     if (sigfigs != undefined) v = v.toFixed(sigfigs)
                 }
                 v = parseFloat(v)
@@ -485,18 +486,19 @@ function interfaceWithMMWebGIS() {
     this.separateFromMMWebGIS = function () {
         separateFromMMWebGIS()
     }
-
-    //MMWebGIS should always have a div with id 'tools'
-    var tools = d3.select('#tools')
-    //Clear it
-    tools.selectAll('*').remove()
-    //Add a semantic container
-    tools = tools
-        .append('div')
-        .attr('class', 'center aligned ui padded grid')
-        .style('height', '100%')
-    //Add the markup to tools or do it manually
-    //tools.html( markup );
+    if (IdentifierTool.targetId !== 'toolContentSeparated_Identifier') {
+        //MMWebGIS should always have a div with id 'tools'
+        var tools = d3.select('#tools')
+        //Clear it
+        tools.selectAll('*').remove()
+        //Add a semantic container
+        tools = tools
+            .append('div')
+            .attr('class', 'center aligned ui padded grid')
+            .style('height', '100%')
+        //Add the markup to tools or do it manually
+        //tools.html( markup );
+    }
 
     //Add event functions and whatnot
     var previousCursor = d3.select('#map').style('cursor')

diff --git a/src/essence/Tools/Measure/MeasureTool.js b/src/essence/Tools/Measure/MeasureTool.js
@@ -673,6 +673,7 @@ let MeasureTool = {
         MeasureTool.data = []
         MeasureTool.lastData = []
         MeasureTool.datasetMapping = []
+        MeasureTool.uniformData = []
         distDisplayUnit = 'meters'
         steps = 100