Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NASA-AMMOS/MMGIS
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.12.0
Choose a base ref
...
head repository: NASA-AMMOS/MMGIS
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: MMGIS-2.12.0
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 1, 2024

  1. Copy the full SHA
    dd8c5a1 View commit details
Showing with 17 additions and 14 deletions.
  1. +16 −14 src/essence/Tools/Identifier/IdentifierTool.js
  2. +1 −0 src/essence/Tools/Measure/MeasureTool.js
30 changes: 16 additions & 14 deletions src/essence/Tools/Identifier/IdentifierTool.js
Original file line number Diff line number Diff line change
@@ -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')
1 change: 1 addition & 0 deletions src/essence/Tools/Measure/MeasureTool.js
Original file line number Diff line number Diff line change
@@ -673,6 +673,7 @@ let MeasureTool = {
MeasureTool.data = []
MeasureTool.lastData = []
MeasureTool.datasetMapping = []
MeasureTool.uniformData = []
distDisplayUnit = 'meters'
steps = 100