Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ The structure of these meta-configuration is as follows:
"description": "",
"type": "dropdown",
"width": 2,
"options": ["ll", "en", "cproj", "sproj", "rxy", "site"]
"options": ["ll", "ll_r", "en", "cproj", "sproj", "rxy", "site"]
},

{
Expand Down
2 changes: 1 addition & 1 deletion configure/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "configure",
"version": "4.2.29-20260320",
"version": "4.2.30-20260323",
"homepage": "./configure/build",
"private": true,
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions configure/src/metaconfigs/tab-coordinates-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@
{
"field": "coordinates.coordmain",
"name": "Main Coordinate Type",
"description": "Sets which coordinates are shown by default in the bottom-right of the map.\n\t<strong>• LL</strong>: Longitude, Latitude\n\t<strong>• EN</strong>: Easting, Northing\n\t<strong>• CPROJ</strong>: Custom Projected (uses Projection tab)\n\t<strong>• SPROJ</strong>: Secondary Projected\n\t<strong>• RXY</strong>: Relative X, Y, (Z) in meters\n\t<strong>• SITE</strong>: Local Level Y, X, -Z",
"description": "Sets which coordinates are shown by default in the bottom-right of the map.\n\t<strong>• LL</strong>: Longitude, Latitude\n\t<strong>• LL_R</strong>: Latitude, Longitude\n\t<strong>• EN</strong>: Easting, Northing\n\t<strong>• CPROJ</strong>: Custom Projected (uses Projection tab)\n\t<strong>• SPROJ</strong>: Secondary Projected\n\t<strong>• RXY</strong>: Relative X, Y, (Z) in meters\n\t<strong>• SITE</strong>: Local Level Y, X, -Z",
"type": "dropdown",
"width": 4,
"options": ["ll", "en", "cproj", "sproj", "rxy", "site"]
"options": ["ll", "ll_r", "en", "cproj", "sproj", "rxy", "site"]
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mmgis",
"version": "4.2.29-20260320",
"version": "4.2.30-20260323",
"description": "A web-based mapping and localization solution for science operation on planetary missions.",
"homepage": "build",
"repository": {
Expand Down
34 changes: 34 additions & 0 deletions src/essence/Ancillary/Coordinates.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ const Coordinates = {
available: true,
coordOffset: [0, 0],
},
ll_r: {
ancillaryTitle: 'lat/lon',
names: ['Latitude', 'Longitude', 'Elevation'],
units: ['°', '°', 'm'],
precision: [8, 8, 3],
available: true,
coordOffset: [0, 0],
},
en: {
ancillaryTitle: 'east/north',
names: ['Easting', 'Northing', 'Elevation'],
Expand Down Expand Up @@ -186,6 +194,22 @@ const Coordinates = {
L_.configData.coordinates.coordlatoffset || 0
)

// ll_r
if (
L_.configData.coordinates.coordlatoffset != null &&
!isNaN(L_.configData.coordinates.coordlatoffset)
)
Coordinates.states.ll_r.coordOffset[0] = parseFloat(
L_.configData.coordinates.coordlatoffset || 0
)
if (
L_.configData.coordinates.coordlngoffset != null &&
!isNaN(L_.configData.coordinates.coordlngoffset)
)
Coordinates.states.ll_r.coordOffset[1] = parseFloat(
L_.configData.coordinates.coordlngoffset || 0
)

// en
if (L_.configData.coordinates.coorden)
Coordinates.states.en.available = true
Expand Down Expand Up @@ -435,6 +459,12 @@ const Coordinates = {
if (Coordinates.elevation != null)
newCoords[2] = Coordinates.elevation
break
case 'll_r':
newCoords[0] = lat + currentState.coordOffset[0]
newCoords[1] = lng + currentState.coordOffset[1]
if (Coordinates.elevation != null)
newCoords[2] = Coordinates.elevation
break
case 'en':
newCoords[0] =
lng *
Expand Down Expand Up @@ -730,6 +760,10 @@ function pickLngLatGo() {
finalLng = valA - currentState.coordOffset[0]
finalLat = valB - currentState.coordOffset[1]
break
case 'll_r':
finalLat = valA - currentState.coordOffset[0]
finalLng = valB - currentState.coordOffset[1]
break
case 'en': //01 easting northing
const valALng =
((valA - currentState.coordENOffset[0]) * (180 / Math.PI)) /
Expand Down
Loading