Skip to content

Commit

Permalink
Update Feature Branch #464 (#550)
Browse files Browse the repository at this point in the history
* Fix click on vectortile

* Fix missing Missions/mission path on tile layers

* #465 Disable Globe more thoroughly when off (#466)

* #467 GENERATE_SOURCEMAP ENV (#468)

* #469 Fix Tool Drag Handle Remains on Screen (#470)

* #471 Additional Body Metadata for Draw Webhooks (#472)

* #471 Webhook fields 1

* #471 Additional Body Metadata for Draw Webhooks

* #471 Add raw_file_description

* #474 ShadeTool - Fix Entity height calculation (#475)

* #474 ShadeTool- Fix Entity height calculation

* #474 Remove comment of bad calculation line

* #473 MeasureTool and IdentifierTool Layer Vars (#476)

* #473 Layer Specific IdentifierTool vars 1

* #473 MeasureTool and IdentifierTool Layer Vars

* #477 DrawTool - Filter state management (#478)

* #479 Remove restriction on Layer names (#480)

* #479 Remove Layer Name restrictions

* #479 Remove console.log

* #481 ShadeTool Touchups (#482)

* #481 ShadeTool Touchups

* #481 Fix docs

* #483 MeasureTool Fix nodata issue (#484)

* Minor ShadeTool Fixes - hide point and regen at med res

* Check for empty time configs in TimeControl

* #489 DrawTool - Move (#490)

* #489 Draggable DrawTool Features part 1

* #489 DrawTool - Move 2

* #494 Dropdown in the topbar for a selected feature’s properties links (#495)

* #485 Rover Image Overlay Improvements (#486)

* #485 Rover Image Overlay Improvments

* #485 Prevent reload/updates to layers through the mmgisAPI if one is already taking place

* #485 Support initialOpacity for imageOverlays w/ docs

* Remove dev consolelog

* #485 Rover Improvement fixes

* #485 Image overlay chache works (but is offset badly now)

* #485 Fix image_overlay updateVectorLayer flickering

* #485 Fix layerObj ref

* #496 Support Symbols in DrawTool Folders and Tags (#497)

* #491 panorama angle of view wonky near poles (#499)

* #492 updateVectorLayer calls causes flat panorama view to revert to wrapped panorama view (#501)

* Fix time replacement in IdentifierTool

* #500 getFiles if deeplinked to draw tool (#502)

* Update docker installation docs

* Fix typo in docs

* mmgisAPI.appendLineString returns false if layer was in a blocking state

* Touch up, move extraneous DrawTool destory

* If Globe Panel disabled, do not even run empty animate loop

* Bug: Deeplinked DrawTool layers are now immediately clickable

* Bug: Webhooks identify symbols in draw tags

* Minor bug fixes - missing deeplink layer error gone, search bar recenters and can force makelayer

* #505 Dynamic Vector Layers (#506)

* #505 Dynamic Vector Layer querying 1

* #505 Time queries, reselect improvement, download extent or full

* #505 Dynamic vector layers

* #504 ShadeTool Improvements and Multi-missionize (#507)

* #504 ShadeTool - User settable AzElRange

* #504 SPICE kernel scheduled downloads

* #504 update shadetool css

* #504 Update docs for SPICE conf

* #505 [Bug]: Support dynamicExtentMoveThresholf for non-geodatasets

* #508 Upgrade Dockerfile to Node.JS v20+ (#509)

* #508 Upgrade to NodeJS v20.11.1

* #508 Update Dockerfile 2, update nupmy

* Geodatasets to use spatial index, also DB_POOL envs

* #510 Temporal Geodatasets (#511)

* #510 Temporal Geodatasets

* #510 Fix new doc page path

* #270 Fix nested header expansion (#512)

* #498 LayersTool - Prevent toggle of loading layer (#513)

* Bump 2.11 (#515)

* Docs - Time Tiles - Clarify tagging

* Fix css misaligned panel arrows due to browser update

* Bugfix: Send options to WMS layers (#517)

* Bugfix: Send options to WMS layers

* remove console.log

* Bugfix: TimeUI zoom - use wheel instead of mousewheel event for ff

* Bugfix: Catch errors in api/shorten/expand

* #519 fix mmgisAPI.setTime start (#520)

* #518 time={starttime} in a WMS URL is filled with endtime (#522)

* ts-518 Inject time tile params better

* #518 Stop wms layer options for override wms parameters

* Bugfix: LayersTool - Fix collapse all headers

* #523 Chronice fix second loss (#524)

* Info.go

* #270 Fix nested header expansion - quickfix

* Fix Chronice overflow, update spice-kernel-conf-example and fix TimeUI startInPointMode

* #525 Make dynamicExtent requery timeEnabled aware. (#526)

* #525 Make dynamicExtent requery timeEnabled aware.

* #525 Make dynamicExtent requery controlled aware.

* #527 Bugfix: Vector layers with headings/bearings do not toggle on/off based on zoom cutoffs (#528)

* #529 Viewshed set initial target and observer heights, also doc improvements (#530)

* #531 Viewshed in-app docs (#532)

* #531 partial

* #531 Viewshed in-app docs

* gdal2customtiles.py remove downscale for dem tiles

* #533 Allow adding relative seconds to initial times (#534)

* #533 Allow adding relative seconds to initial times

* #533 Make sure not to overwrite config time value for initialend

* #535 dynamicExtent vector layer and filtering issues (#536)

* Spelling fixes

* #452 Updated Identifier tool to be a separated floating tool

- Need to test different UI combinations with other separated tools
- We may possibly want an option to make the tool not be separated to
maintain compatibility

* Fixed Identifier tool bug when using old config with non-separated tool

Bug was causing other tools to not open. This makes it backwards
compatible.

* JS-API - setTime: add customtimes

* Fix docs typo

* Allow Identifier and Legend tools to be on different sides if specified

* Bug fix - MeasureTool without dem config variable set

* DrawTool - include Created and Modified time part in file info

* Fix no data dynamicExtent responses

* Remove minor debug field

* #544 Fix setTime currentTime timezone, default layer time objects (#548)

---------

Co-authored-by: Joe Roberts <joe.t.roberts@jpl.nasa.gov>
Co-authored-by: Joe T. Roberts <5315956+jtroberts@users.noreply.github.com>
  • Loading branch information
3 people committed Jun 11, 2024
1 parent 7f2fa74 commit c0c09f3
Show file tree
Hide file tree
Showing 6 changed files with 264 additions and 140 deletions.
13 changes: 11 additions & 2 deletions API/Backend/Geodatasets/models/geodatasets.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ function makeNewGeodatasetTable(
allowNull: true,
defaultValue: {},
},
start_time: {
type: Sequelize.BIGINT,
allowNull: true,
},
end_time: {
type: Sequelize.BIGINT,
allowNull: true,
},
geometry_type: {
type: Sequelize.STRING,
unique: false,
Expand Down Expand Up @@ -115,6 +123,7 @@ function makeNewGeodatasetTable(
`CREATE INDEX IF NOT EXISTS ${result.dataValues.table}_geom_idx on ${result.dataValues.table} USING gist (geom);`
)
.then(() => {

if (startProp != null || endProp != null) {
sequelize
.query(
Expand Down Expand Up @@ -157,6 +166,7 @@ function makeNewGeodatasetTable(

return null;
}

})
.catch((err) => {
logger(
Expand Down Expand Up @@ -189,8 +199,7 @@ function makeNewGeodatasetTable(
sequelize
.query("SELECT MAX(id) FROM geodatasets")
.then(([results]) => {
let newTable =
"g" + (parseInt(results[0].max) + 1) + "_geodatasets";
let newTable = "g" + (parseInt(results[0].max) + 1) + "_geodatasets";

Geodatasets.create({
name: name,
Expand Down
1 change: 1 addition & 0 deletions API/Backend/Geodatasets/routes/geodatasets.js
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@ router.delete("/remove/:name", function (req, res, next) {
sequelize
.query(`DROP TABLE IF EXISTS ${result.dataValues.table};`)
.then(() => {

Geodatasets.destroy({ where: { name: req.params.name } })
.then(() => {
logger(
Expand Down
9 changes: 6 additions & 3 deletions src/essence/Ancillary/TimeUI.js
Original file line number Diff line number Diff line change
Expand Up @@ -1067,9 +1067,12 @@ const TimeUI = {
dontRemoveOffset,
ignoreDontChange
) {
const timestamp =
typeof ISOString === 'string' ? Date.parse(ISOString) : ISOString
TimeUI._timeSliderTimestamp = timestamp
if (typeof ISOString === 'string') {
TimeUI._timeSliderTimestamp = TimeUI.addOffset(ISOString)
} else {
TimeUI._timeSliderTimestamp = ISOString
}

if (TimeUI.play) {
const date = new Date(TimeUI._timeSliderTimestamp)
const offsetNowDate = new Date(
Expand Down
1 change: 1 addition & 0 deletions src/essence/Basics/Layers_/LayerConstructors.js
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,7 @@ const uncertaintyEllipses = (geojson, layerObj, leafletLayerObject) => {
let clampedUncertaintyOptions
let leafletLayerObjectUncertaintyEllipse


if (
uncertaintyVar &&
(uncertaintyVar.enabled === true || uncertaintyVar.enabled == null)
Expand Down
5 changes: 5 additions & 0 deletions src/essence/Basics/Layers_/Layers_.js
Original file line number Diff line number Diff line change
Expand Up @@ -3400,6 +3400,11 @@ function parseConfig(configData, urlOnLayers) {
})(d[i].name)
)
}

// Set disabled time object if missing
if (d[i].time == null) {
d[i].time = { enabled: false }
}
}

//Create parsed layers data
Expand Down
Loading

0 comments on commit c0c09f3

Please sign in to comment.