diff --git a/data/assets/actions/toggle_trail.asset b/data/assets/actions/toggle_trail.asset index d3c5848d6c..1f8153e674 100644 --- a/data/assets/actions/toggle_trail.asset +++ b/data/assets/actions/toggle_trail.asset @@ -103,3 +103,13 @@ asset.onDeinitialize(function() openspace.action.removeAction(show_trail.Identifier) openspace.action.removeAction(hide_trail.Identifier) end) + + +asset.meta = { + Name = "Actions - Toggle current Trails", + Version = "1.0", + Description = [[ Asset providing actions to toggle trails]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset index e1307229d4..a5b5eeb090 100644 --- a/data/assets/customization/globebrowsing.asset +++ b/data/assets/customization/globebrowsing.asset @@ -87,3 +87,14 @@ asset.onInitialize(function () end end end) + + +asset.meta = { + Name = "Customization - GlobeBrowsing", + Version = "1.0", + Description = [[ This asset adds planetary images that can be downloaded separately + and placed in the OpenSpaceData folder]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/customization/gui.asset b/data/assets/customization/gui.asset index e18cd44a7f..6e7d14003f 100644 --- a/data/assets/customization/gui.asset +++ b/data/assets/customization/gui.asset @@ -6,3 +6,13 @@ asset.export("webguiDevelopmentMode", false) -- 2) Clone the repository: https://github.com/OpenSpace/OpenSpace-WebGuiFrontend -- 3) Install nodejs (including npm) -- 4) Within the repository, run `npm install` and `npm start` + + +asset.meta = { + Name = "Customization - User Interface", + Version = "1.0", + Description = [[ This asset is used by developers working on the GUI.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/dashboard/date.asset b/data/assets/dashboard/date.asset index 01ada33be2..886ae15d5b 100644 --- a/data/assets/dashboard/date.asset +++ b/data/assets/dashboard/date.asset @@ -11,3 +11,13 @@ end) asset.onDeinitialize(function() openspace.dashboard.removeDashboardItem(item.Identifier) end) + + +asset.meta = { + Name = "Dashboard - Date", + Version = "1.0", + Description = [[ This asset provides a Date dashboard item.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/dashboard/default_dashboard.asset b/data/assets/dashboard/default_dashboard.asset index 453895ab4e..fcb7c9be8b 100644 --- a/data/assets/dashboard/default_dashboard.asset +++ b/data/assets/dashboard/default_dashboard.asset @@ -4,3 +4,13 @@ asset.require("./distance") asset.require("./framerate") asset.require("./parallelconnection") asset.require("./globelocation") + + +asset.meta = { + Name = "Dashboard - Default Items", + Version = "1.0", + Description = [[ This asset provides the default items for the dashboard.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/dashboard/distance.asset b/data/assets/dashboard/distance.asset index 6316a79948..34548d7359 100644 --- a/data/assets/dashboard/distance.asset +++ b/data/assets/dashboard/distance.asset @@ -11,3 +11,13 @@ end) asset.onDeinitialize(function() openspace.dashboard.removeDashboardItem(item.Identifier) end) + + +asset.meta = { + Name = "Dashboard - Distance", + Version = "1.0", + Description = [[ This asset provides a Distance dashboard item.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/dashboard/framerate.asset b/data/assets/dashboard/framerate.asset index 1c28a17674..d21418b01e 100644 --- a/data/assets/dashboard/framerate.asset +++ b/data/assets/dashboard/framerate.asset @@ -11,3 +11,13 @@ end) asset.onDeinitialize(function() openspace.dashboard.removeDashboardItem(item.Identifier) end) + + +asset.meta = { + Name = "Dashboard - Framerate", + Version = "1.0", + Description = [[ This asset provides a Framerate dashboard item.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/dashboard/globelocation.asset b/data/assets/dashboard/globelocation.asset index 268e2593f7..1bb2743b6c 100644 --- a/data/assets/dashboard/globelocation.asset +++ b/data/assets/dashboard/globelocation.asset @@ -11,3 +11,13 @@ end) asset.onDeinitialize(function() openspace.dashboard.removeDashboardItem(item.Identifier) end) + + +asset.meta = { + Name = "Dashboard - GlobeLocation", + Version = "1.0", + Description = [[ This asset provides a GlobeLocation dashboard item.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/dashboard/parallelconnection.asset b/data/assets/dashboard/parallelconnection.asset index 2ee8bd6307..5321aea85c 100644 --- a/data/assets/dashboard/parallelconnection.asset +++ b/data/assets/dashboard/parallelconnection.asset @@ -11,3 +11,13 @@ end) asset.onDeinitialize(function() openspace.dashboard.removeDashboardItem(item.Identifier) end) + + +asset.meta = { + Name = "Dashboard - ParallelConnection", + Version = "1.0", + Description = [[ This asset provides a ParallelConnection dashboard item.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/dashboard/simulationincrement.asset b/data/assets/dashboard/simulationincrement.asset index 1ced58eed5..ae2caf1b87 100644 --- a/data/assets/dashboard/simulationincrement.asset +++ b/data/assets/dashboard/simulationincrement.asset @@ -11,3 +11,14 @@ end) asset.onDeinitialize(function() openspace.dashboard.removeDashboardItem(item.Identifier) end) + + +asset.meta = { + Name = "Dashboard - Simulation Increment", + Version = "1.0", + Description = [[ This asset provides a dashboard item that shows the simulation + increment, meaning how fast the in-game time progresses relative to the wall-clock.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/dashboard/velocity.asset b/data/assets/dashboard/velocity.asset index 5373ee315c..1c1c1c96b4 100644 --- a/data/assets/dashboard/velocity.asset +++ b/data/assets/dashboard/velocity.asset @@ -12,3 +12,13 @@ end) asset.onDeinitialize(function() openspace.dashboard.removeDashboardItem(item.Identifier) end) + + +asset.meta = { + Name = "Dashboard - Velocity", + Version = "1.0", + Description = [[ This asset provides a dashboard item that shows the camera's velocity]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset index 13cd896ac5..0aded73262 100644 --- a/data/assets/scene/digitaluniverse/2dF.asset +++ b/data/assets/scene/digitaluniverse/2dF.asset @@ -58,10 +58,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "2dF Galaxies", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for the The Two-degree Field (2dF) Survey.]], Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"2dF"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset index e9ca7bdc7b..4bd68a18cc 100644 --- a/data/assets/scene/digitaluniverse/2mass.asset +++ b/data/assets/scene/digitaluniverse/2mass.asset @@ -54,11 +54,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "2MASS Galaxies", - Version = "1.0", + Version = "1.1", Description = [[ Digital Universe asset for the Two Micron All-Sky Survey (2MASS) survey]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"2MASS"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset index 3b61dd0221..d8ab9a511c 100644 --- a/data/assets/scene/digitaluniverse/6dF.asset +++ b/data/assets/scene/digitaluniverse/6dF.asset @@ -56,10 +56,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "6dF Galaxies", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for The Six-degree Field (6dF) Galaxy Survey]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"6dF"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset index c6be3a84c3..359d4332cf 100644 --- a/data/assets/scene/digitaluniverse/abell.asset +++ b/data/assets/scene/digitaluniverse/abell.asset @@ -65,10 +65,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Abell Galaxy Clusters", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for The Abell catalog]], Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Abell"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset index b01cad1fe1..dfe8f77df7 100644 --- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset +++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset @@ -39,12 +39,11 @@ local object = { asset.meta = { Name = "Stars Labels - Alternate", - Version = "1.0", + Version = "1.1", Description = [[Digital Universe asset for alternate start labels]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"StarLabelsAlternate"} + License = "AMNH Digital Universe" } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset index b49e753be1..d780c7ec36 100644 --- a/data/assets/scene/digitaluniverse/backgroundradiation.asset +++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset @@ -130,7 +130,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { asset.meta = { Name = "Background Radiation", - Version = "2.0", + Version = "2.1", Description = [[Various AllSky images for the Milky Way and observable Universe. Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer, Planck, and H Alpha

Data Reference: Planck/ESA and the Planck @@ -138,6 +138,5 @@ asset.meta = { Finkbeiner (Princeton)]], Author = "Brian Abbott (AMNH), OpenSpace Team", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"WMAP", "CBE", "Planck", "HAlpha"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset index 51560008fe..8468b2fabe 100644 --- a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset +++ b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset @@ -137,13 +137,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { asset.meta = { Name = "Multiverse Background Radiation", - Version = "2.0", + Version = "2.1", Description = [[ Non-physical representation of the location of hypothetical cosmic microwave background radiation images how they would be observed from other locations in the universe.
This is not a measured dataset!]], Author = "Brian Abbott (AMNH), OpenSpace Team", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = { "PlanckMultiverse1", "PlanckMultiverse2", - "PlanckMultiverse3", "PlanckMultiverse4" } + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset index 0e8cae16ff..15f1a77b81 100644 --- a/data/assets/scene/digitaluniverse/clusters.asset +++ b/data/assets/scene/digitaluniverse/clusters.asset @@ -45,10 +45,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Galaxy Clusters Labels", - Version = "1.0", + Version = "1.1", Description = [[Digital Universe asset for Galaxy Clusters]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"GalaxyClusterLabels"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset index 8a253de6d9..d443a1d82a 100644 --- a/data/assets/scene/digitaluniverse/constellationbounds.asset +++ b/data/assets/scene/digitaluniverse/constellationbounds.asset @@ -47,11 +47,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Constellation Bounds", - Version = "1.0", + Version = "1.1", Description = [[DU asset providing a Spherical mesh dividing the sky into regions that fit the constellations.]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"ConstellationBounds"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset index f65c00b905..91b77406e6 100644 --- a/data/assets/scene/digitaluniverse/constellations.asset +++ b/data/assets/scene/digitaluniverse/constellations.asset @@ -65,10 +65,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { constellationsExtragalacti asset.meta = { Name = "Constellations", - Version = "1.0", + Version = "1.1", Description = [[Digital Universe asset for constellation lines]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Constellations", "ConstellationsExtragalactic"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset index 8109316997..4293b14338 100644 --- a/data/assets/scene/digitaluniverse/deepsky.asset +++ b/data/assets/scene/digitaluniverse/deepsky.asset @@ -97,10 +97,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { deepSkyPoints, deepSkyImag asset.meta = { Name = "Deep Sky Objects Images", - Version = "1.0", + Version = "1.1", Description = [[Digital Universe asset for Deep Sky Objects and their Images]], Author = "Nate Greenstein, Matt Everhart, Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"DeepSkyObjects", "DeepSkyObjectsImages"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/digitaluniverse.asset b/data/assets/scene/digitaluniverse/digitaluniverse.asset index f4bc5e7465..f0b6bc530a 100644 --- a/data/assets/scene/digitaluniverse/digitaluniverse.asset +++ b/data/assets/scene/digitaluniverse/digitaluniverse.asset @@ -34,3 +34,14 @@ asset.require("./superclusters") asset.require("./supernovaremnants") asset.require("./tully") asset.require("./voids") + + +asset.meta = { + Name = "Digital Universe", + Version = "1.0", + Description = [[This asset is a meta asset, containing all the assets from the AMNH + Digital Universe.]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe" +} diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset index 1a026472e2..262b8ee6ac 100644 --- a/data/assets/scene/digitaluniverse/dwarfs.asset +++ b/data/assets/scene/digitaluniverse/dwarfs.asset @@ -67,10 +67,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Brown Dwarfs", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for Brown Dwarfs]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Dwarfs"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset index 2da69322c6..c8586925b0 100644 --- a/data/assets/scene/digitaluniverse/exoplanets.asset +++ b/data/assets/scene/digitaluniverse/exoplanets.asset @@ -55,10 +55,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Exoplanets", - Version = "1.0", + Version = "1.1", Description = [[Digital Universe asset for Exoplanets]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Exoplanets"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset index e63b2d4579..8d554bd336 100644 --- a/data/assets/scene/digitaluniverse/globularclusters.asset +++ b/data/assets/scene/digitaluniverse/globularclusters.asset @@ -59,7 +59,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Globular Clusters", - Version = "2.0", + Version = "2.1", Description = [[Census: 157 globular clusters. DU Version 2.6. Globular star clusters are gravitationally bound groups of 100,000 to 1 million stars. They are compact, spherical “balls” of stars with very high stellar densities in their centers (stars @@ -73,6 +73,5 @@ asset.meta = { Properties of Galactic Globular Clusters, C. Francis+ (U Cambridge)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"GlobularClusters"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset index 433069b89a..340327a707 100644 --- a/data/assets/scene/digitaluniverse/grids.asset +++ b/data/assets/scene/digitaluniverse/grids.asset @@ -522,7 +522,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { asset.meta = { Name = "Grids", - Version = "2.0", + Version = "2.1", Description = [[Various grids for showing size reference. Included: 10,000 light year grid, 10 light year grid, 20 billion light year grid, 10 million light year grid, 100 light year grid, 100 million light year grid, Ecliptic Coordinate Sphere @@ -532,9 +532,5 @@ asset.meta = { 1,000 light year grid, 1 million light year grid, 1 light year grid]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"RadioSphere", "OortSphere", "EclipticSphere", "EclipticSphereLabels", - "Equatorial", "EquatorialSphereLabels", "GalacticSphere", "GalacticSphereLabels", - "1ldGrid", "1lmGrid", "1lyGrid", "10lyGrid", "100lyGrid", "1klyGrid", "10klyGrid", - "100klyGrid", "1MlyGrid", "10MlyGrid", "100MlyGrid", "20GlyGrid"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset index 62b2eecd3f..46af31e364 100644 --- a/data/assets/scene/digitaluniverse/groups.asset +++ b/data/assets/scene/digitaluniverse/groups.asset @@ -45,10 +45,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Galaxy Group Labels", - Version = "1.0", + Version = "1.1", Author = "Brian Abbott (AMNH)", Description = [[Digital Universe asset for Galaxy Groups]], URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"NearbyGalaxyGroups"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset index d81999a271..0a107a6fe5 100644 --- a/data/assets/scene/digitaluniverse/h2regions.asset +++ b/data/assets/scene/digitaluniverse/h2regions.asset @@ -57,10 +57,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "HII Regions", - Version = "1.0", + Version = "1.1", Description = [[Digital Universe asset for HII Regions]], Author = "Carter Emmart, Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"HIIRegions"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/hdf.asset b/data/assets/scene/digitaluniverse/hdf.asset index f76fac43d7..a6f6bf7f60 100644 --- a/data/assets/scene/digitaluniverse/hdf.asset +++ b/data/assets/scene/digitaluniverse/hdf.asset @@ -52,10 +52,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Hubble Ultra Deep Field", - Version = "1.1", + Version = "1.2", Description = "Hubble Ultra Deep Field galaxy survey", Author = "Frank Summers (STScI), Brian Abbott (AMNH)", - Identifiers = {"HubbleDeepField"}, URL = "http://www.haydenplanetarium.org/universe", License = [[ Copyright (c) American Museum of Natural History. All rights reserved.

diff --git a/data/assets/scene/digitaluniverse/kepler.asset b/data/assets/scene/digitaluniverse/kepler.asset index 9f7e5c4ff5..41ca970084 100644 --- a/data/assets/scene/digitaluniverse/kepler.asset +++ b/data/assets/scene/digitaluniverse/kepler.asset @@ -53,10 +53,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Kepler Planetary Candidates", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for Kepler Planetary Candidates]], Author = "Brian Abbott, Emily Rice, and Jason No (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"KeplerPlanetaryCandidates"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset index d9c8c6212e..0bf926ade8 100644 --- a/data/assets/scene/digitaluniverse/localdwarfs.asset +++ b/data/assets/scene/digitaluniverse/localdwarfs.asset @@ -59,10 +59,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Local Group", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for the Local Goup]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"LocalDwarfGalaxies"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset index 34bf613fee..7c1811f04e 100644 --- a/data/assets/scene/digitaluniverse/milkyway.asset +++ b/data/assets/scene/digitaluniverse/milkyway.asset @@ -52,11 +52,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { plane }) asset.meta = { Name = "MilkyWay Galaxy", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset containt 2D image of the MilkyWay. For extragalactic viewing]], Author = "Brian Abbott, Carter Emmart (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"MilkyWayGalaxyImage"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset index 3e4294b20a..bb8ec3bf37 100644 --- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset +++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset @@ -49,7 +49,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { plane }) asset.meta = { Name = "Milky Way Arms Labels", - Version = "1.0", + Version = "1.1", Description = [[ Image with arm labels for the Milky Way galaxy]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", @@ -72,6 +72,5 @@ asset.meta = { WARRANTY of any kind. We provide the Atlas as is and take no responsibility for any damage resulting from the use of this Atlas. The entire risk as to the quality and performance of this product is with the user.

For more information, - please visit http://www.haydenplanetarium.org/universe]], - Identifiers = {"MilkyWayGalaxyArmLabelsImage"} + please visit http://www.haydenplanetarium.org/universe]] } diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset index 062ca05f62..ef8cc56f98 100644 --- a/data/assets/scene/digitaluniverse/milkyway_label.asset +++ b/data/assets/scene/digitaluniverse/milkyway_label.asset @@ -45,10 +45,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { homeLabel }) asset.meta = { Name = "Home Label", - Version = "1.0", + Version = "1.1", Description = [[Label for the Milky Way titled "Home", sided for the galactic level]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"HomeLabel"} + License = "MIT license" } diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset index 7a5d3c1971..b1a29de48d 100644 --- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset +++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset @@ -43,10 +43,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { sphere }) asset.meta = { Name = "Milky Way Galaxy Sphere", - Version = "2.0", + Version = "2.1", Description = [[All sky image of the Milky Way]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MilkyWay"} + License = "MIT license" } diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset index 3e2ece6db1..0f1df24720 100644 --- a/data/assets/scene/digitaluniverse/obassociations.asset +++ b/data/assets/scene/digitaluniverse/obassociations.asset @@ -61,10 +61,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "OB Associations", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for OB Associations]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"OBAssociations"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset index 057aacb5b8..4f2715987a 100644 --- a/data/assets/scene/digitaluniverse/openclusters.asset +++ b/data/assets/scene/digitaluniverse/openclusters.asset @@ -57,10 +57,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Open Star Clusters", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for Open Star Clusters]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"OpenStarClusters"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset index 23e0eccd09..df39e0831b 100644 --- a/data/assets/scene/digitaluniverse/planetarynebulae.asset +++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset @@ -54,10 +54,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Planetary Nebulae", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for Planetary Nebulae]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"PlanetaryNebulae"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset index 0a53462ce7..d476082a5c 100644 --- a/data/assets/scene/digitaluniverse/pulsars.asset +++ b/data/assets/scene/digitaluniverse/pulsars.asset @@ -58,10 +58,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Pulsars", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for Pulsars.]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Pulsars"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset index 0a50114c2d..4f77fe9188 100644 --- a/data/assets/scene/digitaluniverse/quasars.asset +++ b/data/assets/scene/digitaluniverse/quasars.asset @@ -50,10 +50,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Quasars", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for Quasars.]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Quasars"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset index c855534515..3557c7f370 100644 --- a/data/assets/scene/digitaluniverse/sdss.asset +++ b/data/assets/scene/digitaluniverse/sdss.asset @@ -64,10 +64,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Sloan Digital Sky Survey", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for The Sloan Digital Sky Survey (SDSS).]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"SloanDigitalSkySurvey"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset index eb8f049642..12810d50c5 100644 --- a/data/assets/scene/digitaluniverse/starlabels.asset +++ b/data/assets/scene/digitaluniverse/starlabels.asset @@ -35,10 +35,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Star Labels", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for labels of the stars.]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"StarsLabels"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset index ccded58ce2..d744e6c36c 100644 --- a/data/assets/scene/digitaluniverse/starorbits.asset +++ b/data/assets/scene/digitaluniverse/starorbits.asset @@ -171,14 +171,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { asset.meta = { Name = "Star Orbits", - Version = "1.0", + Version = "1.1", Description = [[Select Star Orbital paths that delineate their trajectory around the Milky Way over 1 billion years into the future. Included: Sun, Barnards, Kapteyns, Lacaille 9352, LSR1826+3014, LSRJ0822+1700, PM_J13420-3415.

Data Reference: Sebastien Lepine (AMNH)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"SunOrbit", "BarnardsOrbit", "KapteynsOrbit", "pM_J13420Orbit", - "LSR1826Orbit", "LSRJ0822Orbit", "lacaille9352Orbit"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset index 27f950183c..f8de02f543 100644 --- a/data/assets/scene/digitaluniverse/stars.asset +++ b/data/assets/scene/digitaluniverse/stars.asset @@ -103,10 +103,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { stars, sunstar }) asset.meta = { Name = "Stars", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for the stars.]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Stars"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset index b183856ae3..28d2c8a33f 100644 --- a/data/assets/scene/digitaluniverse/superclusters.asset +++ b/data/assets/scene/digitaluniverse/superclusters.asset @@ -53,10 +53,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Galaxy Superclusters", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for Galaxy Superclusters.]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"GalaxySuperclusters"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset index 9f5cf72062..11d5b2f6f0 100644 --- a/data/assets/scene/digitaluniverse/supernovaremnants.asset +++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset @@ -53,10 +53,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Supernova Remnants", - Version = "2.0", + Version = "2.1", Description = [[Digital Universe asset for Supernova Remnants.]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"SupernovaRemnants"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset index d36e0a9224..5bb9b0e56d 100644 --- a/data/assets/scene/digitaluniverse/tully.asset +++ b/data/assets/scene/digitaluniverse/tully.asset @@ -115,11 +115,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { tullyPoints, tullyImages } asset.meta = { Name = "Tully Galaxies", - Version = "3.0", + Version = "3.1", Description = [[Digital Universe asset for Tully Galaxies, including point cloud and images.]], Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"TullyGalaxies" , "TullyGalaxiesImages"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset index db1bfba976..e1c8759cdd 100644 --- a/data/assets/scene/digitaluniverse/voids.asset +++ b/data/assets/scene/digitaluniverse/voids.asset @@ -45,10 +45,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Voids", - Version = "2.0", + Version = "2.1", Author = "Brian Abbott (AMNH)", Description = [[Digital Universe asset for Cosmic voids.]], URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"Voids"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset index c036605476..35bc93b27b 100644 --- a/data/assets/scene/milkyway/constellations/constellation_art.asset +++ b/data/assets/scene/milkyway/constellations/constellation_art.asset @@ -65,7 +65,8 @@ local createConstellations = function (baseIdentifier, guiPath, constellationfil Tag = { "ConstellationArtImage", group }, GUI = { Name = name .. " Image", - Path = "/Milky Way/" .. guiPath + Path = "/Milky Way/" .. guiPath, + Description = name .. " Constellation Image" } } table.insert(genConstellations, aconstellation); @@ -137,6 +138,7 @@ local hide_zodiac_art = { asset.export("HideZodiacArt", hide_zodiac_art) local nodes = {} +local assetRef = asset asset.onInitialize(function () local constellationsCSV = images .. "constellation_data.csv" @@ -144,6 +146,7 @@ asset.onInitialize(function () nodes = createConstellations("ConstellationArt", "Constellation Art", constellationsCSV) for _, n in ipairs(nodes) do openspace.addSceneGraphNode(n); + assetRef.registerIdentifierWithMeta(n.Identifier) end openspace.action.registerAction(show_art) @@ -164,7 +167,7 @@ end) asset.meta = { Name = "Constellation Images", - Version = "1.0", + Version = "1.1", Description = "Artistic images depicting the constellations", Author = "James Hedberg", URL = "http://jameshedberg.com", diff --git a/data/assets/scene/milkyway/gaia/apogee.asset b/data/assets/scene/milkyway/gaia/apogee.asset index 5c5eaca933..e9746489b8 100644 --- a/data/assets/scene/milkyway/gaia/apogee.asset +++ b/data/assets/scene/milkyway/gaia/apogee.asset @@ -24,7 +24,7 @@ local textures = asset.syncedResource({ }) local gaia_abundance_apogee = { - Identifier = "Gaia Abundance Apogee", + Identifier = "GaiaAbundanceApogee", Renderable = { Type = "RenderableStars", Enabled = false, @@ -52,8 +52,20 @@ local gaia_abundance_apogee = { } }, GUI = { - Path = "/Milky Way/Gaia" + Path = "/Milky Way/Gaia", + Name = "Gaia Abundance Apogee", + Description = "Data set of stars color coded by metallicity." } } assetHelper.registerSceneGraphNodesAndExport(asset, { gaia_abundance_apogee }) + + +asset.meta = { + Name = "Gaia Abundance Apogee", + Version = "1.0", + Description = [[This asset contains a RenderableStars dataset with metallicity data.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT License" +} diff --git a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset index 9c8bcbf1a0..85f8ae35ee 100644 --- a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset +++ b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset @@ -28,3 +28,14 @@ end) asset.export("GaiaDR2_618M", gaia618DestinationExtracted) asset.export("GaiaFullDataset", gaiaFull) + + +asset.meta = { + Name = "GaiaDR2 Download Stars", + Version = "1.1", + Description = [[This asset contains code to sync gaia subsets from the OpenSpace + servers. Edit this file to choose which subsets to sync. WARNING can use 150GB], + Author = "ESA/Gaia/DPAC", + URL = "https://gea.esac.esa.int/archive/documentation/GDR2/index.html", + License = [[The Gaia data are open and free to use, provided credit is given to 'ESA/Gaia/DPAC'. In general, access to, and use of, ESA's Gaia Archive (hereafter called 'the website') constitutes acceptance of the following general terms and conditions. Neither ESA nor any other party involved in creating, producing, or delivering the website shall be liable for any direct, incidental, consequential, indirect, or punitive damages arising out of user access to, or use of, the website. The website does not guarantee the accuracy of information provided by external sources and accepts no responsibility or liability for any consequences arising from the use of such data.]] +} diff --git a/data/assets/scene/milkyway/gaia/gaiastars.asset b/data/assets/scene/milkyway/gaia/gaiastars.asset index de6a84a71a..e422fb3463 100644 --- a/data/assets/scene/milkyway/gaia/gaiastars.asset +++ b/data/assets/scene/milkyway/gaia/gaiastars.asset @@ -55,8 +55,20 @@ local GaiaStars = { }, GUI = { Name = "Gaia Stars", - Path = "/Milky Way" + Path = "/Milky Way", + Description = "Radial Velocity subset of GaiaDR2." } } assetHelper.registerSceneGraphNodesAndExport(asset, { GaiaStars }) + + +asset.meta = { + Name = "Gaia Stars", + Version = "1.0", + Description = [[This asset contains a subset of GaiaDR2. This subset contains 7.5M stars which have + accurate values for a number of columns. ]], + Author = "ESA/Gaia/DPAC", + URL = "https://gea.esac.esa.int/archive/documentation/GDR2/index.html", + License = [[The Gaia data are open and free to use, provided credit is given to 'ESA/Gaia/DPAC'. In general, access to, and use of, ESA's Gaia Archive (hereafter called 'the website') constitutes acceptance of the following general terms and conditions. Neither ESA nor any other party involved in creating, producing, or delivering the website shall be liable for any direct, incidental, consequential, indirect, or punitive damages arising out of user access to, or use of, the website. The website does not guarantee the accuracy of information provided by external sources and accepts no responsibility or liability for any consequences arising from the use of such data.]] +} diff --git a/data/assets/scene/milkyway/gaia/galah.asset b/data/assets/scene/milkyway/gaia/galah.asset index a311ed25ba..248177489c 100644 --- a/data/assets/scene/milkyway/gaia/galah.asset +++ b/data/assets/scene/milkyway/gaia/galah.asset @@ -24,7 +24,7 @@ local textures = asset.syncedResource({ }) local gaia_abundance_galah = { - Identifier = "Gaia Abundance Galah", + Identifier = "GaiaAbundanceGalah", Renderable = { Type = "RenderableStars", Enabled = false, @@ -52,8 +52,20 @@ local gaia_abundance_galah = { } }, GUI = { - Path = "/Milky Way/Gaia" + Path = "/Milky Way/Gaia", + Name = "Gaia Abundance Galah", + Description = "Data set of stars color coded by metallicity." } } assetHelper.registerSceneGraphNodesAndExport(asset, { gaia_abundance_galah }) + + +asset.meta = { + Name = "Gaia Abundance Galah", + Version = "1.0", + Description = [[This asset contains a RenderableStars dataset with metallicity data.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT License" +} diff --git a/data/assets/scene/milkyway/milkyway/eso.asset b/data/assets/scene/milkyway/milkyway/eso.asset index 556e19a1a8..d3310d0a0d 100644 --- a/data/assets/scene/milkyway/milkyway/eso.asset +++ b/data/assets/scene/milkyway/milkyway/eso.asset @@ -31,8 +31,21 @@ local object = { }, GUI = { Name = "Milky Way (ESO)", - Path = "/Milky Way/Milky Way" + Path = "/Milky Way/Milky Way", + Description = "Milky Way Galaxy image (alternate)" } } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + + +asset.meta = { + Name = "MilkyWay Galaxy (ESO)", + Version = "1.0", + Description = [[This asset contains an alternate to the Digital Universe image for the + Milky Way from ESO.]], + Author = "ESO/S. Brunier", + URL = "https://www.eso.org/public/usa/images/eso0932a/", + License = "Creative Commons Attribution 4.0 International License" +} diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset index af427e384e..c6b9e2b8a1 100644 --- a/data/assets/scene/milkyway/milkyway/volume.asset +++ b/data/assets/scene/milkyway/milkyway/volume.asset @@ -46,7 +46,9 @@ local MilkyWayVolumeGalaxy = { }, GUI = { Path = "/Milky Way", - Name = "Milky Way Volume" + Name = "Milky Way Volume", + Description = [[Volumetric rendering of Milky Way galaxy based on simulation from + NAOJ.]] } } @@ -56,11 +58,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, objects) asset.meta = { Name = "Milky Way Volume", - Version = "1.0", - Description = [[Volumetric rendering of Milky Way galaxy based on simulation from + Version = "1.1", + Description = [[Volumetric rendering of Milky Way galaxy based on simulations from NAOJ.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT License", - Identifiers = {"MilkyWayVolume"} + License = "MIT License" } diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset index e10e6c024a..a30a6b62b4 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset @@ -56,11 +56,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { OrionClusterStars }) asset.meta = { Name = "Orion Nebula Star Cluster", - Version = "1.0", + Version = "1.1", Description = [[ Digital Universe asset for the Orion star cluster. To be used in conjunction with nebula model. Use orionnebula.asset to include both.]], Author = "AMNH Digital Universe", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"OrionClusterStars"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset index f22b31f319..84f47b7415 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset @@ -72,7 +72,6 @@ local OrionNebulaModel = { GUI = { Name = "Orion Nebula Model", Path = "/Milky Way/Orion", - Hidden = true, Description = "Orion Nebula 3D model. See Orion Nebula for description." } } @@ -145,13 +144,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { asset.meta = { Name = "Orion Nebula Model", - Version = "1.0", + Version = "1.1", Description = [[ Digital Universe asset for the Orion nebula 3D model. This asset contains seperate models for the nebula, proplyds and shocks. To be used in conjunction with orion star cluster. Use orionnebula.asset to include both.]], Author = "AMNH Digital Universe", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe", - Identifiers = {"OrionNebulaHolder", "OrionNebulaModel", "OrionNebulaProplydsModel", - "OrionNebulaShocksModel"} + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset b/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset index 014c4bc8c4..e045e3efa3 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset @@ -1,2 +1,13 @@ asset.require("./cluster") asset.require("./nebula") + + +asset.meta = { + Name = "Orion Nebula", + Version = "1.0", + Description = [[This asset is a meta asset, containing all the assets for the Orion + Nebula from the AMNH Digital Universe. This includes a 3D model and a star cluster.]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe" +} diff --git a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset index 7f9c77e7dd..aae811cca0 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset @@ -25,3 +25,14 @@ local NebulaPosition = { } assetHelper.registerSceneGraphNodesAndExport(asset, { NebulaPosition }) + + +asset.meta = { + Name = "Orion Nebula Transforms", + Version = "1.0", + Description = [[This asset contains the position of the Orion Nebula. Generally you + would not include this asset as other assets would include it.]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset index e323d1a5de..4501966b98 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset @@ -66,7 +66,8 @@ local PlutoLabel = { Tag = { "solarsystem_labels" }, GUI = { Name = "Pluto Label", - Path = "/Solar System/Dwarf Planets/Pluto" + Path = "/Solar System/Dwarf Planets/Pluto", + Description = "Label for Pluto, visible at the solarsystem overview zoom level" } } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset index 52363d1bca..27fd55b614 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset @@ -35,6 +35,5 @@ asset.meta = { NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"PlutoBarycentricTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset index 3b8a7a063c..25ea9f28f4 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset @@ -43,8 +43,7 @@ asset.meta = { JPL Horizons.]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/sbdb.cgi?sstr=pluto", - License = "JPL/NASA", - Identifiers = {"PlutoKeplerianTrail"} + License = "JPL/NASA" } diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/carringtonToHEEQRotation.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/carringtonToHEEQRotation.asset index 3335e1a3bf..9fcb6c35c5 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/carringtonToHEEQRotation.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/carringtonToHEEQRotation.asset @@ -14,3 +14,13 @@ local CarringtonLongitudeToHEEQ180Rotation = { } asset.export("CarringtonLongitudeToHEEQ180Rotation", CarringtonLongitudeToHEEQ180Rotation) + + +asset.meta = { + Name = "Carrington Longitude To HEEQ180 Rotation", + Version = "1.0", + Description = [[ Contains a rotation for HEEQ180 to be used by another file]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset index 61262f1621..fdef475903 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset @@ -68,6 +68,5 @@ asset.meta = { Description = [[Volumetric rendering for the bastille day CME event]], Author = "CCMC, OpenSpace team", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", - License = "CC-BY", - Identifier = {"MAS-MHD-Density-bastille-day-2000"} + License = "CC-BY" } diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset index 0d284f051d..0f862dea94 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset @@ -71,6 +71,5 @@ asset.meta = { Description = [[Magnetic fieldlines for the bastille day CME event]], Author = "CCMC, Jonathan Grangien, Matthias Berg", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", - License = "CC-BY", - Identifier = {"MAS-MHD-Fieldlines-bastille-day-2000"} + License = "CC-BY" } diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset index 8ce98c3646..2c80842848 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset @@ -53,6 +53,5 @@ asset.meta = { Description = [[Flux nodes for the bastille day CME event]], Author = "CCMC, Christian Adamsson, Emilie Ho", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", - License = "CC-BY", - Identifier = {"MAS-MHD-FluxNodes-bastille-day-2000"} + License = "CC-BY" } diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset index c08a6a1905..72b34b170b 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset @@ -97,6 +97,5 @@ asset.meta = { Description = [[Cutplanes for the bastille day CME event]], Author = "CCMC, Christian Adamsson, Emilie Ho", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", - License = "CC-BY", - Identifier = {"MeridialCutplane-bastille-day-2000", "EquatorialCutplane-bastille-day-2000"} + License = "CC-BY" } diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset index 47c837e730..4825faa422 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset @@ -57,6 +57,5 @@ asset.meta = { Description = [[Screen space renderable image legend of flux nodes for the bastille day CME event]], Author = "Christian Adamsson, Emilie Ho", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", - License = "MIT", - Identifier = {"LegendFluxNodes-bastille-day-2000"} + License = "MIT" } diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset index 96980132f4..8bfbd17137 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset @@ -35,6 +35,5 @@ asset.meta = { Description = [[Speed of light indicator from sun to earth]], Author = "CCMC, Christian Adamsson, Emilie Ho", URL = "", - License = "MIT", - Identifier = {"TravelSpeedIndicator-2000"} + License = "MIT" } diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset index 8d83f6729d..3a1624a691 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram.asset @@ -17,6 +17,5 @@ asset.meta = { Description = [[Magnetograms of the sun as texture color layers]], Author = "Jonathan Grangien, Matthias Berg", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", - License = "CC-BY", - Identifier = {"Sun"} + License = "CC-BY" } diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset index c6b8df79c5..0ac3bb04d8 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset @@ -58,3 +58,15 @@ asset.onDeinitialize(function () end openspace.action.removeAction(switch_color_layer.Identifier) end) + + +asset.meta = { + Name = "Bastille Day magnetogram textures", + Version = "1.0", + Description = [[ This asset adds multiple magnetogram textures to the Sun. In addition + it provides an action to cycle through the textures. See magnetogram.asset for details + of the textures.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset index 86f48785f6..d441f71598 100644 --- a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset +++ b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset @@ -24,7 +24,9 @@ local C2019Q4BorisovTrail = { }, GUI = { Name = "C/2019 Q4 Borisov Trail", - Path = "/Solar System/Interstellar" + Path = "/Solar System/Interstellar", + Description = [[Trail of C-2019 Q4 Borisov from 2015 JAN 01 00:00:00 + to 2024 JAN 01 00:00:00. Data from JPL Horizons]] } } @@ -39,7 +41,9 @@ local C2019Q4BorisovPosition = { }, GUI = { Name = "C/2019 Q4 Borisov", - Path = "/Solar System/Interstellar" + Path = "/Solar System/Interstellar", + Description = [[Position of C-2019 Q4 Borisov from 2015 JAN 01 00:00:00 + to 2024 JAN 01 00:00:00. Data from JPL Horizons]] } } @@ -48,7 +52,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { C2019Q4BorisovPosition, C2 asset.meta = { Name = "C/2019 Q4 Borisov", - Version = "1.0", + Version = "1.1", Description = [[ This asset contains the trail and position of C-2019 Q4 Borisov from 2015 JAN 01 00:00:00 to 2024 JAN 01 00:00:00. Data from JPL Horizons']], diff --git a/data/assets/scene/solarsystem/interstellar/oumuamua.asset b/data/assets/scene/solarsystem/interstellar/oumuamua.asset index d3a9abc32b..33381536b5 100644 --- a/data/assets/scene/solarsystem/interstellar/oumuamua.asset +++ b/data/assets/scene/solarsystem/interstellar/oumuamua.asset @@ -25,7 +25,9 @@ local OumuamuaTrail = { }, GUI = { Name = "'Oumuamua Trail", - Path = "/Solar System/Interstellar" + Path = "/Solar System/Interstellar", + Description = [[Trail of 'Oumuamua from 2014 JAN 01 00:00:00 to 2023 JAN 01 00:00:00. + Data from JPL Horizons']], } } @@ -40,7 +42,9 @@ local OumuamuaPosition = { }, GUI = { Name = "'Oumuamua", - Path = "/Solar System/Interstellar" + Path = "/Solar System/Interstellar", + Description = [[ Position of 'Oumuamua from 2014 JAN 01 00:00:00 to 2023 JAN 01 + 00:00:00. Data from JPL Horizons']], } } @@ -49,7 +53,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { OumuamuaPosition, Oumuamua asset.meta = { Name = "'Oumuamua", - Version = "1.0", + Version = "1.1", Description = [[ This asset contains the trail and position of 'Oumuamua from 2014 JAN 01 00:00:00 to 2023 JAN 01 00:00:00. Data from JPL Horizons']], Author = "OpenSpace Team", diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset index 9c464b1519..d83c879abe 100644 --- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset @@ -94,10 +94,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) asset.meta = { Name = "Earth Atmosphere", - Version = "1.0", + Version = "1.1", Description = [[ RenderableAtmosphere for Earth.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = { "EarthAtmosphere" } + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset index 3cee780b96..4eca7b3bdc 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth.asset @@ -83,6 +83,5 @@ asset.meta = { Description = [[ Earth is a special planet with special needs ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Earth", "EarthLabel"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset index e4591244db..58cb15bf3d 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset @@ -67,3 +67,13 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { L1, L1Label }) + + +asset.meta = { + Name = "Lagrange point L1", + Version = "1.0", + Description = [[ Lagrange point L1 node and label]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset index bf7eecb072..ff8dd240f4 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset @@ -134,3 +134,14 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { L2SmallLabel, L2Label }) + + +asset.meta = { + Name = "Lagrange point L2", + Version = "1.0", + Description = [[ Lagrange point L2 large and small nodes, sun line, and large and small + labels. ]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset index 3ff07dd9c1..6702d16f61 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset @@ -67,3 +67,13 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { L4, L4Label }) + + +asset.meta = { + Name = "Lagrange point L4", + Version = "1.0", + Description = [[ Lagrange point L4 node and label]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset index 5de0504897..67d973499d 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset @@ -67,3 +67,13 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { L5, L5Label }) + + +asset.meta = { + Name = "Lagrange point L5", + Version = "1.0", + Description = [[ Lagrange point L5 node and label]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset index a995d9ae6d..cff6a21d61 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset @@ -2,3 +2,13 @@ asset.require("scene/solarsystem/planets/earth/lagrange_points/L1") asset.require("scene/solarsystem/planets/earth/lagrange_points/L2") asset.require("scene/solarsystem/planets/earth/lagrange_points/L4") asset.require("scene/solarsystem/planets/earth/lagrange_points/L5") + + +asset.meta = { + Name = "Earth Lagrange Points", + Version = "1.0", + Description = [[ Meta asset to include all the Earth Lagrange points. Includes L1, L2, L4 and L5.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset index 98388e8e7b..d0b0a8983a 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -26,20 +27,15 @@ local layer = { of 12 km. (Description from NASA Worldview)]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)", - Version = "1.0", + Version = "1.1", Description = [[ GIBS hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", - License = "NASA", - Identifiers = {"AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset index 4807d05cd1..01f39083f5 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -31,20 +32,15 @@ local layer = { and the temporal resolution is daily. (Description from NASA Worldview)]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Aqua Modis (Temporal)", - Version = "1.0", + Version = "1.1", Description = [[ GIBS hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", - License = "NASA", - Identifiers = {"Aqua_Modis_Temporal"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset index eb8a17beb1..8dd37ed101 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -8,20 +9,15 @@ local layer = { This map is hosted on the OpenSpace servers in Sweden]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Blue Marble Next Generation (Sweden)", - Version = "1.0", + Version = "1.1", Description = [[ Web loaded full resolution map of Blue Marble Next Generation. This map is hosted on the OpenSpace servers in Sweden]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA", - Identifiers = {"BMNG_Sweden"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset index 28ec33a0b8..19e84e3ded 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -8,20 +9,15 @@ local layer = { This map is hosted on the OpenSpace servers in Utah]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Blue Marble Next Generation (Utah)", - Version = "1.0", + Version = "1.1", Description = [[ Web loaded full resolution map of Blue Marble Next Generation. This map is hosted on the OpenSpace servers in Utah]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA", - Identifiers = {"BMNG_Utah"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset index e7f8695c7f..7a706559b2 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -15,19 +16,14 @@ local layer = { (Description from URL)]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "ESRI Imagery World 2D", - Version = "1.0", + Version = "1.1", Description = [[Older 2D imager map layer for Earth. This layer is hosted by ESRI.]], Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=21b4ba14d9e5472d97afcbb819f7368e", - License = "Esri Master License Agreement", - Identifiers = {"ESRI_Imagery_World_2D"} + License = "Esri Master License Agreement" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset index 374d067466..75dfeab69c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local fallBackLayer = asset.require("./fallbacks/blue_marble").layer @@ -46,20 +47,15 @@ local layer = { Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "ESRI VIIRS Combo", - Version = "1.0", + Version = "1.1", Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]], Author = "OpenSpace Tem", URL = "http://www.openspaceproject.com", - License = "MIT License", - Identifiers = {"ESRI_VIIRS_Combo"} + License = "MIT License" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset index bc3fae5e92..a191ea5377 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -16,19 +17,14 @@ local layer = { ~1:280 scale. (Description from URL)]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "ESRI World Imagery", - Version = "1.0", + Version = "1.1", Description = [[Main web loaded map layer for Earth. This layer is hosted by ESRI.]], Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9", - License = "Esri Master License Agreement", - Identifiers = {"ESRI_World_Imagery"} + License = "Esri Master License Agreement" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset index e1051ce567..b1751b003d 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../../earth").Earth.Identifier local texturesPath = asset.syncedResource({ @@ -19,11 +20,10 @@ asset.export("layer", layer) asset.meta = { Name = "Blue Marble", - Version = "1.0", + Version = "1.1", Description = [[ Fallback layer for earth image if no internet is available. Contains Blue Marble Next Generation ]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA", - Identifiers = {"Blue_Marble"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset index 9bf43d88d2..d9e4f6fd08 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -23,21 +24,16 @@ local layer = { Author = "NASA EOSDIS Global Imagery Browse Services" } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", - Version = "1.0", + Version = "1.1", Description = [[ GIBS hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", - License = "NASA", - Identifiers = {"GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset index 4efb087717..cdf9dbf4a7 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -22,21 +23,16 @@ local layer = { is 1 km, and the temporal resolution is daily.]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", - Version = "1.0", + Version = "1.1", Description = [[ GIBS hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. "eosdis-components/gibs", - License = "NASA", - Identifiers = {"GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset index c4377b380e..d3d806a337 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -22,21 +23,16 @@ local layer = { is 1 km, and the temporal resolution is daily.]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "MODIS Terra Chlorophyll A (Temporal)", - Version = "1.0", + Version = "1.1", Description = [[ GIBS hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", - License = "NASA", - Identifiers = {"MODIS_Terra_Chlorophyll_A_Temporal"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset index fa39b2eff3..ac6f7c850c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -22,21 +23,16 @@ local layer = { is 1 km, and the temporal resolution is daily.]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Terra Modis (Temporal)", - Version = "1.0", + Version = "1.1", Description = [[ GIBS hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. "eosdis-components/gibs", - License = "NASA", - Identifiers = {"Terra_Modis_Temporal"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset index d1bb41c089..cd136e8454 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -22,21 +23,16 @@ local layer = { is 0.25 km, and the temporal resolution is daily.]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "VIIRS SNPP (Temporal)", - Version = "1.0", + Version = "1.1", Description = [[ This layer has the best daily Earth Image. GIBS hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", - License = "NASA", - Identifiers = {"VIIRS_SNPP_Temporal"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset index 8c011649d3..48c53c1afa 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset @@ -17,11 +17,10 @@ asset.export("layer", layer) asset.meta = { Name = "Earth Bluemarble Height", - Version = "1.0", + Version = "1.1", Description = [[ Fallback layer for earth height if no internet is available. Contains Blue Marble Next Generation Topographic]], Author = "NASA", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA", - Identifiers = {"Earth_Bluemarble_Height"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset index 4fa05ae8d5..2344f85561 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset @@ -1,5 +1,5 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier - local fallBackLayer = asset.require("./fallbacks/blue_marble_height").layer local layer = { @@ -15,19 +15,14 @@ local layer = { data from the USGS elsewhere. Vertical units are measured in meters.]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "HeightLayers") asset.meta = { Name = "World Elevation (3D)", - Version = "1.0", + Version = "1.1", Description = [[Main web loaded height layer for Earth. This layer is hosted by ESRI.]], Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=1b48cd3b6276416784fe90a68c580a89", - License = "Esri Master License Agreement", - Identifiers = {"Terrain_tileset"} + License = "Esri Master License Agreement" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset index 2dbb1e8f35..dd4576d0a4 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local fallBackLayer = asset.require("./fallbacks/earth_night_texture").layer @@ -11,19 +12,14 @@ local layer = { in this global view. ]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "NightLayers") asset.meta = { Name = "Earth at Night 2012", - Version = "1.0", + Version = "1.1", Description = [[Main web loaded night layer for Earth. This layer is hosted by GIBS.]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", - License = "NASA", - Identifiers = {"Earth_at_Night_2012"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset index bd3c7f6cfb..08cc2fb4de 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -38,20 +39,15 @@ local layer = { temporal resolution is daily. (Description from NASA Worldview)]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "NightLayers") asset.meta = { Name = "Earth at Night (Temporal)", - Version = "1.0", + Version = "1.1", Description = [[Temporal layer for earth with daily night image. This layer is a GIBS hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "OpenSpace Team", URL = "https://worldview.earthdata.nasa.gov/?l=VIIRS_SNPP_DayNightBand_ENCC", - License = "NASA", - Identifiers = {"Earth_at_Night_Temporal"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset index e2af3ebc65..e4e20aceb4 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset @@ -17,10 +17,9 @@ asset.export("layer", layer) asset.meta = { Name = "Blue Marble Night", - Version = "1.0", + Version = "1.1", Description = [[ Fallback layer for earth night image if no internet is available. ]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA", - Identifiers = {"Earth_Night_Texture"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset index 0d90a261a7..363d3e43d9 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -5,8 +6,14 @@ local layer = { FilePath = asset.localResource("coastlines.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "Overlays") -asset.export("layer", layer) + +asset.meta = { + Name = "Earth Coastlines Layer", + Version = "1.0", + Description = [[ Coastlines layer for Earth globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset index b6fe2f8f86..a307d22795 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -6,8 +7,14 @@ local layer = { FilePath = asset.localResource("reference_features.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "Overlays") -asset.export("layer", layer) + +asset.meta = { + Name = "Earth Reference Features", + Version = "1.0", + Description = [[ Reference Features layer for Earth globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset index 1e6f76b759..57a70110e3 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -6,8 +7,14 @@ local layer = { FilePath = asset.localResource("reference_labels.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "Overlays") -asset.export("layer", layer) + +asset.meta = { + Name = "Earth Reference Labels", + Version = "1.0", + Description = [[ Reference Labels layer for Earth globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset index b208fa7e69..8b3a9de7ce 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local earthAsset = asset.require("../../earth").Earth local globeIdentifier = earthAsset.Identifier @@ -8,8 +9,14 @@ local layer ={ Radii = earthAsset.Renderable.Radii } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "Overlays") -asset.export("layer", layer) + +asset.meta = { + Name = "Earth Size Reference", + Version = "1.0", + Description = [[ Size reference layer for Earth globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset index b19df9addd..4786543c67 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -6,8 +7,14 @@ local layer = { Type = "TileIndexTileLayer" } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "Overlays") -asset.export("layer", layer) + +asset.meta = { + Name = "Earth Tile Indices", + Version = "1.0", + Description = [[ Tile index layer for Earth globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset index 3ce00a16ba..c88892b450 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -6,8 +7,14 @@ local layer = { FilePath = asset.localResource("gebco_sweden.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "WaterMasks") -asset.export("layer", layer) + +asset.meta = { + Name = "Gebco WaterMask Layer (Sweden)", + Version = "1.0", + Description = [[ WaterMask layer for Earth globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset index b1bb493ac3..eef1ac5256 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -5,9 +6,14 @@ local layer = { Identifier = "Gebco_Utah", FilePath = asset.localResource("gebco_utah.wms") } +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "WaterMasks") -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) -end) -asset.export("layer", layer) +asset.meta = { + Name = "Gebco WaterMask Layer (Utah)", + Version = "1.0", + Description = [[ WaterMask layer for Earth globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset index b3568ab86c..a9502edcb8 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../earth").Earth.Identifier local layer = { @@ -6,8 +7,15 @@ local layer = { FilePath = asset.localResource("modis_water_mask.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "WaterMasks") -asset.export("layer", layer) + +asset.meta = { + Name = "MODIS Water Mask", + Version = "1.0", + Description = [[ MODIS Water Mask layer for Earth globe.]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. + "eosdis-components/gibs", + License = "NASA" +} diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset index 757b7eb718..114d1c6ca1 100644 --- a/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset @@ -41,10 +41,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { earthMagnetosphere }) asset.meta = { Name = "Static generic magnetosphere of fieldlines", - Version = "1.0", + Version = "1.1", Description = "Magnetic fieldlines for the bastille day CME event", Author = "CCMC", URL = "", - License = "", - Identifier = {"EarthMagnetosphere"} + License = "CC-BY" } diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset index d39e7abd5d..111b7478f3 100644 --- a/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/transforms_magnetosphere.asset @@ -26,10 +26,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { GSMReferenceFrame }) asset.meta = { Name = "Earth magnetosphere transforms", - Version = "1.0", + Version = "1.1", Description = "Earth transforms: GSMReferenceFrame. Geocentric Solar Magnetospheric", Author = "CCMC", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"GSMReferenceFrame"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/markers.asset b/data/assets/scene/solarsystem/planets/earth/markers.asset index 4625701381..1456d53115 100644 --- a/data/assets/scene/solarsystem/planets/earth/markers.asset +++ b/data/assets/scene/solarsystem/planets/earth/markers.asset @@ -32,10 +32,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { EarthMarker }) asset.meta = { Name = "Earth marker", - Version = "1.0", + Version = "1.1", Description = [[ Earth marker with name, sized for Solar System view]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"EarthMarker"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset index add0650eb8..8508881a65 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset @@ -24,3 +24,13 @@ asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Moon layers", + Version = "1.0", + Description = [[This asset adds the default layers to the Moon globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset index e3c4f63c36..19af6c5006 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { @@ -7,11 +8,22 @@ local layer = { Settings = { Gamma = 1.14, Multiplier = 1.4 - } + }, + Description = [[The Clementine Ultraviolet/Visible (UVVIS) Version 2 mosaic is a + grayscale data set representing the albedo (brightness of the lunar surface) as + measured at the 750 nanometer (nm) wavelength by the UVVIS camera (Lee, et al., 2009). + Resolution of this mosaic is 118 meters per pixel (m).]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Clem Uvvis [Sweden]", + Version = "1.1", + Description = [[Moon Clementine UVVIS Global Mosaic 118m v2 map of the Moon. This map + is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/Clementine/UVVIS/Lunar_Clementine_UVVIS_750nm_Global_Mosaic_118m_v2", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset index 751ca6b5b7..a659343f3d 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { @@ -7,11 +8,23 @@ local layer = { Settings = { Gamma = 1.14, Multiplier = 1.4 - } + }, + Description = [[The Clementine Ultraviolet/Visible (UVVIS) Version 2 mosaic is a + grayscale data set representing the albedo (brightness of the lunar surface) as + measured at the 750 nanometer (nm) wavelength by the UVVIS camera (Lee, et al., 2009). + Resolution of this mosaic is 118 meters per pixel (m).]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + + +asset.meta = { + Name = "Clem Uvvis [Utah]", + Version = "1.1", + Description = [[Moon Clementine UVVIS Global Mosaic 118m v2 map of the Moon. This map + is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/Clementine/UVVIS/Lunar_Clementine_UVVIS_750nm_Global_Mosaic_118m_v2", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset index 7a7329961f..d9b5284ed8 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { @@ -7,11 +8,21 @@ local layer = { Settings = { Gamma = 1.0, Multiplier = 1.23 - } + }, + Description = [[This near-global mosaic was generated using data from the SELenological + and Engineering Explorer (SELENE) “Kaguya” Terrain Camera (TC) instrument. TC source + data originated as map-projected tiles at ~10 meters per pixel (m) spatial resolution.]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Kaguya [Sweden]", + Version = "1.1", + Description = [[Moon SELENE Kaguya TC Global Orthomosaic 474m v2 layer for Moon globe. + This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/Kaguya/TC/Ortho/v02/Lunar_Kaguya_TC_Ortho_Global_64ppd_v02", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset index 89526f0da0..dcc75d872c 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { @@ -7,11 +8,21 @@ local layer = { Settings = { Gamma = 1.0, Multiplier = 1.23 - } + }, + Description = [[This near-global mosaic was generated using data from the SELenological + and Engineering Explorer (SELENE) “Kaguya” Terrain Camera (TC) instrument. TC source + data originated as map-projected tiles at ~10 meters per pixel (m) spatial resolution.]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Kaguya [Utah]", + Version = "1.1", + Description = [[Moon SELENE Kaguya TC Global Orthomosaic 474m v2 layer for Moon globe. + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/Kaguya/TC/Ortho/v02/Lunar_Kaguya_TC_Ortho_Global_64ppd_v02", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset index 628fb8bfbd..9130b8d830 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset @@ -1,13 +1,29 @@ -local globeIdentifier = asset.require("../../moon").Moon.Identifier +local assetHelper = asset.require("util/asset_helper") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "Lola_Clr_Shade_Sweden", - Name = "Lola Color Shade [Sweden]", + Name = "LRO LOLA Color Shaded Relief 388m v4 [Sweden]", + Description = [[This is a colorized shaded-relief of a original polar digital elevation + model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an + instrument on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance + Orbiter (LRO) spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the + Moon at a resolution 100 meters per pixel (m) based on altimetry data acquired through + September, 2011 by the LOLA instrument. The ground tracks were interpolated using the + Generic Mapping Tools programs "surface" and "grdblend". Map values are referred to a + radius of 1,737,400 m.]], FilePath = asset.localResource("lola_clr_shade_sweden.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Lola Color Shade [Sweden]", + Version = "1.1", + Description = [[Moon LRO LOLA Color Shaded Relief 388m v4 layer for Moon globe. This + map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/LMMP/LOLA-derived/Lunar_LRO_LOLA_ClrShade_Global_128ppd_v04", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset index 5fd79d6640..6e57445d38 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset @@ -1,13 +1,29 @@ -local globeIdentifier = asset.require("../../moon").Moon.Identifier +local assetHelper = asset.require("util/asset_helper") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "Lola_Clr_Shade_Utah", - Name = "Lola Color Shade [Utah]", + Name = "LRO LOLA Color Shaded Relief 388m v4 [Utah]", + Description = [[This is a colorized shaded-relief of a original polar digital elevation + model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an + instrument on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance + Orbiter (LRO) spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the + Moon at a resolution 100 meters per pixel (m) based on altimetry data acquired through + September, 2011 by the LOLA instrument. The ground tracks were interpolated using the + Generic Mapping Tools programs "surface" and "grdblend". Map values are referred to a + radius of 1,737,400 m.]], FilePath = asset.localResource("lola_clr_shade_utah.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Lola Color Shade [Utah]", + Version = "1.1", + Description = [[Moon LRO LOLA Color Shaded Relief 388m v4 layer for Moon globe. This + map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/LMMP/LOLA-derived/Lunar_LRO_LOLA_ClrShade_Global_128ppd_v04", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset index 966942a6ee..943d2078bb 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset @@ -1,13 +1,29 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { Identifier = "Lola_Shade_Sweden", Name = "Lola Shade [Sweden]", + Description = [[This is a shaded-relief of a original polar digital elevation model + (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument + on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO) + spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the Moon at a + resolution 100 meters per pixel (m) based on altimetry data acquired through September, + 2011 by the LOLA instrument. The ground tracks were interpolated using the Generic + Mapping Tools programs "surface" and "grdblend". Map values are referred to a radius + of 1,737,400 m.]], FilePath = asset.localResource("lola_shade_sweden.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Lola Shade [Sweden]", + Version = "1.1", + Description = [[Moon LRO LOLA Shaded Relief 237m v4 layer for Moon globe. This + map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/LMMP/LOLA-derived/Lunar_LRO_LOLA_Shade_Global_128ppd_v04", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset index 48770a2e8e..48fc34ee33 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset @@ -1,13 +1,30 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { Identifier = "Lola_Shade_Utah", Name = "Lola Shade [Utah]", + Description = [[This is a shaded-relief of a original polar digital elevation model + (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument + on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO) + spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the Moon at a + resolution 100 meters per pixel (m) based on altimetry data acquired through September, + 2011 by the LOLA instrument. The ground tracks were interpolated using the Generic + Mapping Tools programs "surface" and "grdblend". Map values are referred to a radius + of 1,737,400 m.]], FilePath = asset.localResource("lola_shade_utah.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + + +asset.meta = { + Name = "Lola Shade [Utah]", + Version = "1.1", + Description = [[Moon LRO LOLA Shaded Relief 237m v4 layer for Moon globe. This + map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/LMMP/LOLA-derived/Lunar_LRO_LOLA_Shade_Global_128ppd_v04", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset index 25222c0c59..de9fc22576 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { @@ -7,11 +8,26 @@ local layer = { Settings = { Gamma = 0.52, Multiplier = 0.65 - } + }, + Description = [[The is a blend (or overlay) of the U.S. Geological Survey (USGS) + Clementine Ultraviolet/Visible (UVVIS) V2 mosaic and the original USGS Lunar Orbiter + mosaic. The Clementine 750 nm Version 2 mosaic is a grayscale data set representing the + albedo (brightness of the lunar surface) as measured at the 750 nm wavelength by the + UVVIS camera. The original base map was radiometrically and geometrically controlled, + photometrically modeled global image mosaic compiled using more than 43,000 images + from the 750 nanometer filter observations of the UVVIS (Lee et al., 2009).]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + + +asset.meta = { + Name = "Uvvis Hybrid [Sweden]", + Version = "1.1", + Description = [[Moon Lunar Orbiter - Clementine UVVISv2 Hybrid Mosaic 59m v1 + map of the Moon. This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/Lunar-Orbiter/Lunar_LO_UVVISv2_Hybrid_Mosaic_Global_59m", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset index 84f808d321..c4e6209f34 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { @@ -7,11 +8,25 @@ local layer = { Settings = { Gamma = 0.52, Multiplier = 0.65 - } + }, + Description = [[The is a blend (or overlay) of the U.S. Geological Survey (USGS) + Clementine Ultraviolet/Visible (UVVIS) V2 mosaic and the original USGS Lunar Orbiter + mosaic. The Clementine 750 nm Version 2 mosaic is a grayscale data set representing the + albedo (brightness of the lunar surface) as measured at the 750 nm wavelength by the + UVVIS camera. The original base map was radiometrically and geometrically controlled, + photometrically modeled global image mosaic compiled using more than 43,000 images + from the 750 nanometer filter observations of the UVVIS (Lee et al., 2009).]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Uvvis Hybrid [Utah]", + Version = "1.1", + Description = [[Moon Lunar Orbiter - Clementine UVVISv2 Hybrid Mosaic 59m v1 + map of the Moon. This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/Lunar-Orbiter/Lunar_LO_UVVISv2_Hybrid_Mosaic_Global_59m", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset index 217e580e8f..1eeb976312 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset @@ -1,15 +1,33 @@ -local mapServiceConfigs = asset.localResource("../../map_service_configs/LiU/WAC.wms") +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { Identifier = "WAC_Sweden", Name = "WAC [Sweden]", + Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle + Camera (WAC) aboard the Lunar Reconnaissance Orbiter (LRO) has + allowed the instrument team to create a global mosaic comprised of + over 15,000 images acquired between November 2009 and February 2011. + The WAC maps the whole Moon in one month, however the solar incidence + angle at the equator changes about 28° from the beginning to the end + of the month. To even out the incidence angle variations (generally + angles between 55-75 degrees), this morphology mosaic (at 643 nm), + is comprised of data collected over three periods (1/20/2010 to + 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010). + (Description from URL).]], FilePath = asset.localResource("wac_sweden.wms"), Settings = { Gamma = 0.84 } } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "WAC [Sweden]", + Version = "1.1", + Description = [[Wide Angle Color map of the Moon. This map is hosted on + the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/LRO/LROC_WAC/Lunar_LRO_LROC-WAC_Mosaic_global_100m_June2013", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset index d97d9508cc..faceb4c1c4 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset @@ -1,14 +1,33 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { Identifier = "WAC_Utah", Name = "WAC [Utah]", FilePath = asset.localResource("wac_utah.wms"), - Settings = { Gamma = 0.84 } + Settings = { Gamma = 0.84 }, + Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle + Camera (WAC) aboard the Lunar Reconnaissance Orbiter (LRO) has + allowed the instrument team to create a global mosaic comprised of + over 15,000 images acquired between November 2009 and February 2011. + The WAC maps the whole Moon in one month, however the solar incidence + angle at the equator changes about 28° from the beginning to the end + of the month. To even out the incidence angle variations (generally + angles between 55-75 degrees), this morphology mosaic (at 643 nm), + is comprised of data collected over three periods (1/20/2010 to + 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010). + (Description from URL).]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "WAC [Utah]", + Version = "1.1", + Description = [[Wide Angle Color map of the Moon. This map is hosted on + the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/LRO/LROC_WAC/Lunar_LRO_LROC-WAC_Mosaic_global_100m_June2013", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset index f1c2d9e023..b1de53f376 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { @@ -8,8 +9,15 @@ local layer = { Settings = { Multiplier = 0.5 } } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "HeightLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Lola DEM [Sweden]", + Version = "1.1", + Description = [[Moon LRO LOLA DEM 118m v1 layer for Moon globe. This map is hosted on + the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/LRO/LOLA/Lunar_LRO_LOLA_Global_LDEM_118m_Mar2014", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset index f886538ae3..5e919dbfc9 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { @@ -5,11 +6,24 @@ local layer = { Name = "Lola DEM [Utah]", FilePath = asset.localResource("loladem_utah.wms"), TilePixelSize = 64, - Settings = { Multiplier = 0.5 } + Settings = { Multiplier = 0.5 }, + Description = [[This digital elevation model (DEM) is based on data from the Lunar + Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument on the National + Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO) spacecraft + (Tooley et al., 2010). The created DEM represents more than 6.5 billion measurements + gathered between July 2009 and July 2013, adjusted for consistency in the coordinate + system described below, and then converted to lunar radii (Mazarico et al., 2012).]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "HeightLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Lola DEM [Utah]", + Version = "1.1", + Description = [[Moon LRO LOLA DEM 118m v1 layer for Moon globe. This map is hosted on + the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Moon/LRO/LOLA/Lunar_LRO_LOLA_Global_LDEM_118m_Mar2014", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset index 4ac336a5ab..1c4330c990 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local moonAsset = asset.require("../../moon").Moon local globeIdentifier = moonAsset.Identifier @@ -8,8 +9,14 @@ local layer = { Radii = moonAsset.Renderable.Radii } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "Overlays") -asset.export("layer", layer) + +asset.meta = { + Name = "Moon Size Reference", + Version = "1.0", + Description = [[ Size reference layer for Moon globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index 83fd4e7898..b8faa53340 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -62,10 +62,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Moon }) asset.meta = { Name = "Moon", - Version = "1.0", + Version = "1.1", Description = [[ Moon globe with labels. ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Moon"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset index 6ebdb7020b..6c99fb676b 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset @@ -30,11 +30,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MoonTrail }) asset.meta = { Name = "Moon Trail", - Version = "1.0", + Version = "1.1", Description = [[ Moon Trail - This asset contains the trail of the Moon. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MoonTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset index 9c8f44f122..dd652dab76 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - Amateur Radio", + Version = "1.0", + Description = [[ Satellites asset for Communications - Amateur Radio. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset index f25d5f3b80..ed234a6ebb 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - Experimental", + Version = "1.0", + Description = [[ Satellites asset for Communications - Experimental. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset index c24a94946d..0035ecb47c 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset @@ -3,8 +3,21 @@ local shared = asset.require("util/tle_helper") local group = { Title = "Geostationary", Url = "http://celestrak.com/NORAD/elements/geo.txt", - TrailColor = { 0.9, 0.9, 0.0 } + TrailColor = { 0.9, 0.9, 0.0 }, + Description = [[Satellites that are currently active and in a Geosynchronous orbit, meaning + their orbital period matches Earth's rotation.]] } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - Geostationary", + Version = "1.0", + Description = [[ Satellites asset for Communications - Geostationary. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset index 8e626b9b5f..46aadb0759 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - GlobalStar", + Version = "1.0", + Description = [[ Satellites asset for Communications - GlobalStar. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset index dc7e2b9dd0..d6415beb8b 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - Gorizont", + Version = "1.0", + Description = [[ Satellites asset for Communications - Gorizont. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset index 98f3f7637f..e46b557324 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - Intelsat", + Version = "1.0", + Description = [[ Satellites asset for Communications - Intelsat. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset index 04c2f689b9..80ef41ff4e 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - Iridium", + Version = "1.0", + Description = [[ Satellites asset for Communications - Iridium. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset index 011b5ce518..c6a0ffd014 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - Iridium NEXT", + Version = "1.0", + Description = [[ Satellites asset for Communications - Iridium NEXT. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset index 055fac267f..3b4418dfa5 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - Molniya", + Version = "1.0", + Description = [[ Satellites asset for Communications - Molniya. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset index 2542d87397..3a4a2c9e4b 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - Orbcomm", + Version = "1.0", + Description = [[ Satellites asset for Communications - Orbcomm. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset index 4804523303..22ccee97c4 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - Other comm", + Version = "1.0", + Description = [[ Satellites asset for Communications - Other comm. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset index e42dfa2405..44aa55af46 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - Raduga", + Version = "1.0", + Description = [[ Satellites asset for Communications - Raduga. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset index 141124edaa..6b75d9d9df 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Communications - SES", + Version = "1.0", + Description = [[ Satellites asset for Communications - SES. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset index b9dfbfabb4..312d6aa436 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset @@ -12,3 +12,14 @@ local tle = shared.downloadTLEFile(asset, group.Url, group.Title) local objectNames = {} shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Debris - Indian ASAT test Debris", + Version = "1.0", + Description = [[ Satellites asset for Debris - Indian ASAT test Debris. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset index b4f279913e..9cd5b8f360 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset @@ -12,3 +12,14 @@ local tle = shared.downloadTLEFile(asset, group.Url, group.Title) local objectNames = {} shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Debris - Breeze-M Breakup", + Version = "1.0", + Description = [[ Satellites asset for Debris - Breeze-M Breakup. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/events/38746-Breakup/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset index 6ac65f3a8c..82bd7f5e96 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset @@ -12,3 +12,14 @@ local tle = shared.downloadTLEFile(asset, group.Url, group.Title) local objectNames = {} shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Debris - Fengyun Debris", + Version = "1.0", + Description = [[ Satellites asset for Debris - Fengyun Debris. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset index 6c22666ef4..4eb6178c6f 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset @@ -12,3 +12,14 @@ local tle = shared.downloadTLEFile(asset, group.Url, group.Title) local objectNames = {} shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Debris - Iridium 33 Debris", + Version = "1.0", + Description = [[ Satellites asset for Debris - Iridium 33 Debris. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset index 308bc36881..d051cadcee 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset @@ -12,3 +12,14 @@ local tle = shared.downloadTLEFile(asset, group.Url, group.Title) local objectNames = {} shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Debris - Kosmos 2251 Debris", + Version = "1.0", + Description = [[ Satellites asset for Debris - Kosmos 2251 Debris. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset index 589dba3a29..eb6d9e4520 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset @@ -36,3 +36,13 @@ local volume = { local objects = { volume } assetHelper.registerSceneGraphNodes(asset, objects) + + +asset.meta = { + Name = "Satellites Debris - Volume Cartesian", + Version = "1.0", + Description = [[ Satellites asset for Debris - Volume Cartesian. Example asset.]], + Author = "OpenSpace Team", + URL = "", + License = "MIT" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset index 11402ae123..cdfb0295af 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset @@ -36,3 +36,13 @@ local volume = { local objects = { volume } assetHelper.registerSceneGraphNodes(asset, objects) + + +asset.meta = { + Name = "Satellites Debris - Volume Spherical", + Version = "1.0", + Description = [[ Satellites asset for Debris - Volume Spherical. Example asset.]], + Author = "OpenSpace Team", + URL = "", + License = "MIT" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset index c7678ae032..f7147ecefe 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset @@ -3,8 +3,20 @@ local shared = asset.require("util/tle_helper") local group = { Title = "100 Brightest", Url = "http://www.celestrak.com/NORAD/elements/visual.txt", - TrailColor = { 0.55, 0.25, 0.65 } + TrailColor = { 0.55, 0.25, 0.65 }, + Description = [[The 100 (or so) satellites that will appear brightest when viewed + from Earth.]] } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites 100 Brightest", + Version = "1.0", + Description = [[ Satellites asset for 100 Brightest. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset index ff5a78c181..662fec9cea 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset @@ -8,3 +8,13 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites CubeSat", + Version = "1.0", + Description = [[ Satellites asset for CubeSat. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset index 775eb44ee7..7121f39afb 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset @@ -8,3 +8,13 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Military", + Version = "1.0", + Description = [[ Satellites asset for Military. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset index 1e1d065501..437c0f9440 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset @@ -8,3 +8,13 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Other", + Version = "1.0", + Description = [[ Satellites asset for Other. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset index 2591d504a9..fd389a5a73 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset @@ -8,3 +8,13 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Radar Calibration", + Version = "1.0", + Description = [[ Satellites asset for Radar Calibration. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset index 354454729b..bc22d96f7a 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset @@ -3,8 +3,21 @@ local shared = asset.require("util/tle_helper") local group = { Title = "SpaceStations", Url = "http://celestrak.com/NORAD/elements/stations.txt", - TrailColor = { 0.9, 0.1, 0.0 } + TrailColor = { 0.9, 0.1, 0.0 }, + Description = [[A collection of space stations (including the ISS and China's + Tiangong), along with certain cubesats and satellite constellations from space + agencies.]] } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites SpaceStations", + Version = "1.0", + Description = [[ Satellites asset for SpaceStations. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset index 188ab00641..8485b11e8b 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset @@ -3,8 +3,19 @@ local shared = asset.require("util/tle_helper") local group = { Title = "Last 30 Days", Url = "http://www.celestrak.com/NORAD/elements/tle-new.txt", - TrailColor = { 0.65, 0.25, 0.45 } + TrailColor = { 0.65, 0.25, 0.45 }, + Description = [[All the satellites that have been launched in the last 30 days.]] } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Last 30 Days", + Version = "1.0", + Description = [[ Satellites asset for Last 30 Days. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset index 33e253e6d6..c3cc3b1673 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset @@ -8,3 +8,13 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Navigation Beidou", + Version = "1.0", + Description = [[ Satellites asset for Navigation Beidou. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset index 2348eb8b67..abeae83de4 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset @@ -8,3 +8,13 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Navigation Galileo", + Version = "1.0", + Description = [[ Satellites asset for Navigation Galileo. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset index 3274c7fdcb..9a88c1d826 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset @@ -8,3 +8,13 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Navigation Glosnass", + Version = "1.0", + Description = [[ Satellites asset for Navigation Glosnass. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset index 39b87c733d..8b50de3f46 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset @@ -3,8 +3,20 @@ local shared = asset.require("util/tle_helper") local group = { Title = "GPS", Url = "http://celestrak.com/NORAD/elements/gps-ops.txt", - TrailColor = { 0.9, 0.5, 0.0 } + TrailColor = { 0.9, 0.5, 0.0 }, + Description = [[The GPS satellites that give us our precise locations back here + on Earth.]] } local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Navigation GPS", + Version = "1.0", + Description = [[ Satellites asset for Navigation GPS. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset index 01dcc0b947..2fa939803d 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Navigation Russian LEO Navigation", + Version = "1.0", + Description = [[ Satellites asset for Navigation Russian LEO Navigation. + Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset index 4a3bd8f81a..53dca435c2 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Navigation Navy Navigation Satellite System", + Version = "1.0", + Description = [[ Satellites asset for Navigation Navy Navigation Satellite System. + Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset index 5e30251ea3..266fd5de9a 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Navigation Satellite Based Augmentation System", + Version = "1.0", + Description = [[ Satellites asset for Navigation Satellite Based Augmentation System. + Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset index acb2faf5e5..0e85684c8d 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset @@ -1 +1,12 @@ asset.require("./satellites_interesting") + + +asset.meta = { + Name = "Satellites", + Version = "1.0", + Description = [[ Default Earth Satellites. This file is the same as + satellites_interesting.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset index 0850296deb..f07a6fbcd6 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset @@ -8,3 +8,13 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Science Education", + Version = "1.0", + Description = [[ Satellites asset for Science Education. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset index b0d22df911..80d6cab0f1 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset @@ -8,3 +8,13 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Science Engineering", + Version = "1.0", + Description = [[ Satellites asset for Science Engineering. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset index e1999224d8..231604f951 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset @@ -8,3 +8,13 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Science Geodect", + Version = "1.0", + Description = [[ Satellites asset for Science Geodect. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset index 6a18f6f1ad..2b65c770a1 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Science Space & Earth Science", + Version = "1.0", + Description = [[ Satellites asset for Science Space & Earth Science. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset index e1fb6435cc..b515339277 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Weather - ARGOS", + Version = "1.0", + Description = [[ Satellites asset for Weather - ARGOS. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset index 804614312a..6d05a89140 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Weather - Disaster Monitoring", + Version = "1.0", + Description = [[ Satellites asset for Weather - Disaster Monitoring. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset index 379c6e246f..5e9c7c2f96 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Weather - Earth Resources", + Version = "1.0", + Description = [[ Satellites asset for Weather - Earth Resources. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset index c4feefd1e8..cb464c8999 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Weather - GOES", + Version = "1.0", + Description = [[ Satellites asset for Weather - GOES. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset index b3d5f0e3a8..be73a4e12d 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Weather - NOAA", + Version = "1.0", + Description = [[ Satellites asset for Weather - NOAA. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset index 6053428283..d777d6f803 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Weather - Planet", + Version = "1.0", + Description = [[ Satellites asset for Weather - Planet. Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset index 0e6fbaf55f..b9063795aa 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Weather - Search & Rescue (SARSAT)", + Version = "1.0", + Description = [[ Satellites asset for Weather - Search & Rescue (SARSAT). Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset index 55c152ca80..95ba2c97ac 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Weather - Spire", + Version = "1.0", + Description = [[ Satellites asset for Weather - Search & Rescue (SARSAT). Data from + Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset index ec5303c5e9..a126d89160 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset @@ -8,3 +8,14 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Weather - Tracking and Data Relay Satellite System (TDRSS)", + Version = "1.0", + Description = [[ Satellites asset for Weather - Tracking and Data Relay Satellite + System (TDRSS). Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset index 1c9afa8c8c..7c4f1aa854 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset @@ -8,3 +8,13 @@ local group = { local tle = shared.downloadTLEFile(asset, group.Url, group.Title) shared.registerSatelliteGroupObjects(asset, group, tle, true) + + +asset.meta = { + Name = "Satellites Weather - Weather", + Version = "1.0", + Description = [[ Satellites asset for Weather - Weather. Data from Celestrak]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/NORAD/elements/", + License = "Celestrak" +} diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset index 444dd149a7..d684284d1f 100644 --- a/data/assets/scene/solarsystem/planets/earth/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/trail.asset @@ -30,11 +30,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { EarthTrail }) asset.meta = { Name = "Earth Trail", - Version = "1.0", + Version = "1.1", Description = [[ Trail of Earth as observed by the Sun. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"EarthTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/earth/transforms.asset b/data/assets/scene/solarsystem/planets/earth/transforms.asset index f784b7aa15..eb1ee37c7a 100644 --- a/data/assets/scene/solarsystem/planets/earth/transforms.asset +++ b/data/assets/scene/solarsystem/planets/earth/transforms.asset @@ -83,11 +83,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { asset.meta = { Name = "Earth Transforms", - Version = "1.0", + Version = "1.1", Description = [[ Earth transforms: Earth Barycenter, Earth Center, Earth Inertial, Earth IAU. A scene graph node is created for each transform.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"EarthBarycenter", "EarthCenter", "EarthInertial", "EarthIAU"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset index 1a070de460..6bc4c93f6e 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset @@ -58,10 +58,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Callisto }) asset.meta = { Name = "Callisto", - Version = "1.0", + Version = "1.1", Description = [[ Callisto globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Callisto"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset index e8645189be..1f6e0584ef 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../callisto").Callisto.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "callisto_os.tif", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset index fcca4c1af0..7d17801f1b 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset @@ -32,11 +32,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { CallistoTrail }) asset.meta = { Name = "Callisto Trail", - Version = "1.0", + Version = "1.1", Description = [[ Trail of Callisto as observed by the Jupiter. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"CallistoTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset index aef595b55b..247b6cb4d8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset @@ -57,10 +57,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Europa }) asset.meta = { Name = "Mimas", - Version = "1.0", + Version = "1.1", Description = [[ Europa globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Europa"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset index 9b4ff9e14b..296af219df 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../europa").Europa.Identifier local texturesPath = asset.syncedResource({ @@ -13,11 +14,7 @@ local layer = { Enabled = true } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset index 7a4ce49342..b3592f52ec 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../europa").Europa.Identifier local texturesPath = asset.syncedResource({ @@ -14,16 +15,12 @@ local layer = { BlendMode = "Color" } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Voyager Global Mosaic", - Version = "1.0", + Version = "1.1", Description = [[ Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map base of Europa utilizes the best image quality and moderate resolution coverage supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2. @@ -36,7 +33,6 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Europa/Voyager-Galileo/" .. "Europa_Voyager_GalileoSSI_global_mosaic_500m", - License = "NASA/PDS", - Identifiers = {"Voyager_Global_Mosaic_Local"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset index 42c935b191..a047ecac9c 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../europa").Europa.Identifier local layer = { @@ -7,16 +8,12 @@ local layer = { BlendMode = "Color", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Voyager Global Mosaic", - Version = "1.0", + Version = "1.1", Description = [[ Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map base of Europa utilizes the best image quality and moderate resolution coverage supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2. @@ -29,6 +26,5 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Europa/Voyager-Galileo/" .. "Europa_Voyager_GalileoSSI_global_mosaic_500m", - License = "NASA/PDS", - Identifiers = {"Voyager_Global_Mosaic"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset index 3bb96d5e41..685f24f487 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset @@ -3,8 +3,6 @@ local assetHelper = asset.require("util/asset_helper") asset.require("spice/base") local kernel = asset.require("../kernels").jup310 - - local EuropaTrail = { Identifier = "EuropaTrail", Parent = transforms.JupiterBarycenter.Identifier, @@ -32,11 +30,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { EuropaTrail }) asset.meta = { Name = "Europa Trail", - Version = "1.0", + Version = "1.1", Description = [[ Trail of Europa as observed by the Jupiter. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"EuropaTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset index 43ef9e2098..ee10014899 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset @@ -57,10 +57,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Ganymede }) asset.meta = { Name = "Ganymede", - Version = "1.0", + Version = "1.1", Description = [[ Ganymede globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Ganymede"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset index 1fcee46112..f4ddb60451 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../ganymede").Ganymede.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "ganymede.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset index 46f091bf79..4695298d2c 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset @@ -32,11 +32,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { GanymedeTrail }) asset.meta = { Name = "Ganymede Trail", - Version = "1.0", + Version = "1.1", Description = [[ Trail of Ganymede as observed by the Jupiter. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"GanymedeTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset index f1db4cf69d..2e3509120e 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset @@ -57,10 +57,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Io }) asset.meta = { Name = "Io", - Version = "1.0", + Version = "1.1", Description = [[ Io globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Io"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset index 9b1cc66f0b..5bfd45cb40 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../io").Io.Identifier local texturesPath = asset.syncedResource({ @@ -12,12 +13,7 @@ local layer = { FilePath = texturesPath .. "io.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) - +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Io Texutre", diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset index f61e88f68d..3759fca849 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset @@ -32,11 +32,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { IoTrail }) asset.meta = { Name = "Io Trail", - Version = "1.0", + Version = "1.1", Description = [[ Trail of Io as observed by the Jupiter. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"IoTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset index 9e273566d7..96a16eb448 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset @@ -66,10 +66,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Jupiter, JupiterLabel }) asset.meta = { Name = "Jupiter", - Version = "1.0", + Version = "1.1", Description = [[ Jupiter globe, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Jupiter", "JupiterLabel"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset index f66313ab79..6b8fb7e113 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../jupiter").Jupiter.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "jupiter_os.tif", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/trail.asset index d55a414ebd..5f33376a70 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail.asset @@ -30,11 +30,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrail }) asset.meta = { Name = "Jupiter Trail", - Version = "1.0", + Version = "1.1", Description = [[ Trail of Jupiter as observed by the Sun. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"JupiterTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset index 59ff6ab042..d825fef9ca 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset @@ -30,13 +30,12 @@ local JupiterTrailEarth = { asset.meta = { Name = "Jupiter Trail from Earth", - Version = "1.0", + Version = "1.1", Description = [[ Trail of Jupiter as observed by the Earth. Data from NASA SPICE (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"JupiterTrailEarth"} + License = "MIT license" } assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset index e340a579ed..ead9f1d4d1 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset @@ -26,10 +26,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterBarycenter }) asset.meta = { Name = "Jupiter Transforms", - Version = "1.0", + Version = "1.1", Description = [[ Jupiter Barycenter transform ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"JupiterBarycenter"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset index b1832cc1c4..e4c3cdf51e 100644 --- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset @@ -58,10 +58,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) asset.meta = { Name = "Mars Atmosphere", - Version = "1.0", + Version = "1.1", Description = [[ RenderableAtmosphere for Mars.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MarsAtmosphere"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset index f717ff56d6..e94b0dc281 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -26,20 +27,15 @@ local layer = { to prevent misinterpretation. (Description from URL)]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "CTX Blended beta01", - Version = "1.0", + Version = "1.1", Description = [[New blended CTX map for Mars from CalTech Murray lab. This map is hosted by ESRI.]], Author = "Caltech Murray Lab", URL = "http://murray-lab.caltech.edu/CTX/", - License = "Esri Master License Agreement", - Identifiers = {"CTX_blended_01"} + License = "Esri Master License Agreement" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset index 0b09b46e38..84c5cd128a 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -7,8 +8,15 @@ local layer = { BlendMode = "Color" } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "CTX Mosaic [Sweden]", + Version = "1.0", + Description = [[ CTX Mosaic layer for Mars globe. This layer is served from the + OpenSpace servers in Sweden.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset index f6022d1923..bd9cc5d14a 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -7,8 +8,15 @@ local layer = { BlendMode = "Color" } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "CTX Mosaic [Utah]", + Version = "1.0", + Description = [[ CTX Mosaic layer for Mars globe. This layer is served from the + OpenSpace servers in Utah.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset index 57082d1987..7a652a60b2 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -22,20 +23,15 @@ local layer = { 10 bit range. (Description from URL)]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "HiRISE", - Version = "1.0", + Version = "1.1", Description = [[Updated HiRISE layer for Mars with raw unselected imagery. This map is hosted by ESRI.]], Author = "esri_astro", URL = "https://www.arcgis.com/home/item.html?id=c1c4c750a2154842ae523c984cc14fa5", - License = "Esri Master License Agreement", - Identifiers = {"HiRISE-PSP"} + License = "Esri Master License Agreement" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset index 93ab1d7cef..e542011109 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -19,22 +20,17 @@ local layer = { model (DTM) was available as of 2018.]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "HiRISE Local Set", - Version = "1.0", + Version = "1.1", Description = [[HiRISE layer for images with corresponding DEMs. This map is hosted by ESRI.]], Author = "USGS", URL = "https://www.uahirise.org", - License = "Esri Master License Agreement", - Identifiers = {"HiRISE-LS"} + License = "Esri Master License Agreement" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset index 45bfc84439..b5240a9749 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local texturesPath = asset.syncedResource({ @@ -14,11 +15,7 @@ local layer = { Description = [[ Default jpg texture for Mars]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset index 8767bd034f..f5aee8b1f5 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local fallbackLayer = asset.require("./fallbacks/mars_texture").layer @@ -17,20 +18,15 @@ local layer = { https://www.jpl.nasa.gov/spaceimages/details.php?id=PIA03467.]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "MOC WA Color [Sweden]", - Version = "1.0", + Version = "1.1", Description = [[Main color map layer for Mars. This map is hosted on the OpenSpace server in Sweden.]], Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", - License = "NASA/PDS", - Identifiers = {"MOLA_HRSC_Sweden"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset index 5e74c9ed0e..8b6a5b623d 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local fallbackLayer = asset.require("./fallbacks/mars_texture").layer @@ -17,20 +18,15 @@ local layer = { https://www.jpl.nasa.gov/spaceimages/details.php?id=PIA03467]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "MOC WA Color [Utah]", - Version = "1.0", + Version = "1.1", Description = [[Main color map layer for Mars. This map is hosted on the OpenSpace server in Utah.]], Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", - License = "NASA/PDS", - Identifiers = {"MOC_WA_Color_Utah"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset index db37cdebb3..59ed620783 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -10,20 +11,15 @@ local layer = { https://astrogeology.usgs.gov/search/map/Mars/Topography/HRSC_MOLA_Blend/Mars_HRSC_MOLA_BlendDEM_Global_200mp_v2]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "MOLA HRSC [Sweden]", - Version = "1.0", + Version = "1.1", Description = [[ Colorzied elevation data for Mars. This map is hosted on the OpenSpace server in Sweden.]], Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", - License = "NASA/PDS", - Identifiers = {"MOLA_HRSC_Sweden"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset index 01dab90621..e604370a82 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -10,20 +11,15 @@ local layer = { https://astrogeology.usgs.gov/search/map/Mars/Topography/HRSC_MOLA_Blend/Mars_HRSC_MOLA_BlendDEM_Global_200mp_v2]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "MOLA HRSC [Utah]", - Version = "1.0", + Version = "1.1", Description = [[ Colorzied elevation data for Mars. This map is hosted on the OpenSpace server in Sweden.]], Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", - License = "NASA/PDS", - Identifiers = {"MOLA_HRSC_Sweden"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset index 7deafc1110..2b8d33eb22 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -20,21 +21,16 @@ local layer = { is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL).]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "MOLA Pseudo Color [Sweden]", - Version = "1.0", + Version = "1.1", Description = [[ Colorzied elevation data for Mars (with shading). This map is hosted on the OpenSpace server in Sweden.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_ClrShade_merge_global_463m", - License = "NASA/PDS", - Identifiers = {"MOLA_Pseudo_Color_Sweden"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset index ab593d9443..f830667cfd 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -20,21 +21,16 @@ local layer = { is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL)]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "MOLA Pseudo Color [Utah]", - Version = "1.0", + Version = "1.1", Description = [[ Colorzied elevation data for Mars (with shading). This map is hosted on the OpenSpace server in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_ClrShade_merge_global_463m", - License = "NASA/PDS", - Identifiers = {"MOLA_Pseudo_Color_Utah"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset index ebcfce5448..3e97aceacf 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -17,21 +18,16 @@ local layer = { (Description from URL).]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Themis IR Day [Sweden]", - Version = "1.0", + Version = "1.1", Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server in Sweden.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", - License = "NASA/PDS", - Identifiers = {"Themis_IR_Day_Sweden"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset index bbaf877c53..d6613bf751 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -17,21 +18,16 @@ local layer = { (Description from URL).]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Themis IR Day [Utah]", - Version = "1.0", + Version = "1.1", Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", - License = "NASA/PDS", - Identifiers = {"Themis_IR_Day_Utah"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset index 39588692e9..902f80356f 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -18,21 +19,16 @@ local layer = { URL).]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Themis IR Night [Sweden]", - Version = "1.0", + Version = "1.1", Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace server in Sweden.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", - License = "NASA/PDS", - Identifiers = {"Themis_IR_Night_Sweden"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset index 03988bdb6c..d4f006f242 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -18,21 +19,16 @@ local layer = { URL).]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Themis IR Night [Utah]", - Version = "1.0", + Version = "1.1", Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace server in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", - License = "NASA/PDS", - Identifiers = {"Themis_IR_Night_Utah"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset index 2fb79b5b3e..eef15b6151 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -25,21 +26,16 @@ local layer = { references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 ]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Viking MDIM [Sweden]", - Version = "1.0", + Version = "1.1", Description = [[ Alternate image layer for Mars. This map is hosted on the OpenSpace server in Sweden.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. "Mars_Viking_MDIM21_ClrMosaic_global_232m", - License = "NASA/PDS", - Identifiers = {"Viking_MDIM_Sweden"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset index 03055f155a..b5e140f023 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -25,21 +26,16 @@ local layer = { references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 ]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Viking MDIM [Utah]", - Version = "1.0", + Version = "1.1", Description = [[ Alternate image layer for Mars. This map is hosted on the OpenSpace server in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. "Mars_Viking_MDIM21_ClrMosaic_global_232m", - License = "NASA/PDS", - Identifiers = {"Viking_MDIM_Utah"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset index c7dd7454bd..be6cf0bba1 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -11,24 +12,19 @@ local layer = { Express spacecraft). The average accuracy is ~100 meters in horizontal position and the elevation uncertainty is at least ±3 m. This tiled elevation layer, hosted by Esri, is made available using - lossless LERC compression.(Description from URL).]], + lossless LERC compression. (Description from URL).]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "HeightLayers") asset.meta = { Name = "Mars HRSC MOLA Blended DEM Global 200m v2", - Version = "1.0", + Version = "1.1", Description = [[ESRI Hosted ars HRSC MOLA Blended DEM.]], Author = "esri_astro", URL = "https://www.arcgis.com/home/item.html?id=225adad86379474ebc3d51a74573c99b", - License = "Esri Master License Agreement", - Identifiers = {"MDEM200M"} + License = "Esri Master License Agreement" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset index 0843e9f4c6..d50847052d 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -17,22 +18,17 @@ local layer = { DEM where available as of 2018.]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "HeightLayers") asset.meta = { Name = "HiRISE Local Set DEM", - Version = "1.0", + Version = "1.1", Description = [[HiRISE DEM layer for corresponding Local Set imager. This map is hosted by ESRI.]], Author = "USGS", URL = "https://www.uahirise.org", - License = "Esri Master License Agreement", - Identifiers = {"HiRISE-LS-DEM"} + License = "Esri Master License Agreement" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset index 5a68e92b57..bfa5dc2ff0 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -21,21 +22,16 @@ local layer = { URL). Data Reference: (See URL).]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "HeightLayers") asset.meta = { Name = "Mola Elevation [Sweden]", - Version = "1.0", + Version = "1.1", Author = "USGS", Description = [[ Global elevation layer for Mars. This layer is hosted on the OpenSpace server in Sweden.]], URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_DEM_mosaic_global_463m", - License = "NASA/PDS", - Identifiers = {"Mola_Europe"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset index e37d69d644..92febe410a 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -21,21 +22,16 @@ local layer = { URL). Data Reference: (See URL).]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "HeightLayers") asset.meta = { Name = "Mola Elevation [Utah]", - Version = "1.0", + Version = "1.1", Description = [[ Global elevation layer for Mars. This layer is hosted on the OpenSpace server in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_DEM_mosaic_global_463m", - License = "NASA/PDS", - Identifiers = {"Mola_Utah"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset index 3136ceea89..68425c008b 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mars").Mars.Identifier local layer = { @@ -5,8 +6,13 @@ local layer = { Type = "TileIndexTileLayer" } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "Overlays") -asset.export("layer", layer) +asset.meta = { + Name = "Mars Indices", + Version = "1.0", + Description = [[ This asset supplies a tile index layer for the Mars globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset index fe6c339349..925f7c3a3b 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local marsAsset = asset.require("../../mars").Mars local globeIdentifier = marsAsset.Identifier @@ -8,8 +9,14 @@ local layer ={ Radii = marsAsset.Renderable.Radii } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "Overlays") -asset.export("layer", layer) + +asset.meta = { + Name = "Mars Size Reference", + Version = "1.0", + Description = [[ This asset supplies a size reference layer for the Mars globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 135de2b5ca..51e5562411 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -86,10 +86,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Mars, MarsLabel }) asset.meta = { Name = "Mars", - Version = "1.0", + Version = "1.1", Description = [[ Mars globe, and main globe label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Mars", "MarsLabel"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset index 14e2b7f7bb..8d594bd4f3 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset @@ -66,10 +66,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Deimos, DeimosTrail }) asset.meta = { Name = "Deimos", - Version = "1.0", + Version = "1.1", Description = [[ RenderableGlobe and Trail for Deimos.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Deimos", "DeimosTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset index 97ab860099..6000230b40 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../deimos").Deimos.Identifier local layer = { @@ -11,18 +12,13 @@ local layer = { released 26 October 2001. (Description from URL)]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Deimos Global Mosaic [USGS]", - Version = "1.0", + Version = "1.1", Author = "Philip Stooke/NASA", URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html", - License = "NASA/PDS", - Identifiers = {'Deimos_Global_Mosaic_USGS'} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset index 446c188279..2ebc0b4be7 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../phobos").Phobos.Identifier local layer = { @@ -8,18 +9,13 @@ local layer = { Description = [[ Viking-base Phobos shaded relief created by USGS.]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Phobos Global Shaded Relief [USGS]", - Version = "1.0", + Version = "1.1", Author = "USGS/NASA", URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html", - License = "NASA/PDS", - Identifiers = {'Phobos_Global_Shaded_Relief_USGS'} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset index 4b8aad75d5..9a11f40d27 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset @@ -66,10 +66,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Phobos, PhobosTrail }) asset.meta = { Name = "Phobos", - Version = "1.0", + Version = "1.1", Description = [[ RenderableGlobe and Trail for Phobos.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Phobos", "PhobosTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset index bda74c054b..b7085cb3e1 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail.asset @@ -32,10 +32,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MarsTrail }) asset.meta = { Name = "Mars Trail", - Version = "1.0", + Version = "1.1", Description = [[ Main Mars trail from SPICE.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MarsTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset index d96759605b..eecb83ba28 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset @@ -34,11 +34,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MarsTrailEarth }) asset.meta = { Name = "Mars Trail from Earth", - Version = "1.0", + Version = "1.1", Description = [[ Trail of Mars, parented to Earth with Earth as the SPICE observer. Data from NASA SPICE (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MarsTrailEarth"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset index 1e3ff966f5..b8128ea5da 100644 --- a/data/assets/scene/solarsystem/planets/mars/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset @@ -25,10 +25,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MarsBarycenter }) asset.meta = { Name = "Mars Transforms", - Version = "1.0", + Version = "1.1", Description = [[ Transform with position for Mars.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MarsBarycenter"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset index 4191fa531b..a94894efa6 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local texturesPath = asset.syncedResource({ @@ -14,8 +15,14 @@ local layer = { BlendMode = "Multiply", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Mercury Aluminium Abundance", + Version = "1.0", + Description = [[ Aluminium Abundance layer for Mercury globe]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset index 132c104cc7..8af4e18616 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local texturesPath = asset.syncedResource({ @@ -14,8 +15,15 @@ local layer = { BlendMode = "Multiply", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + + +asset.meta = { + Name = "Mercury Calcium Abundance", + Version = "1.0", + Description = [[ Calcium Abundance layer for Mercury globe]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset index 20762ae4a4..f38888ad3a 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local texturesPath = asset.syncedResource({ @@ -14,8 +15,15 @@ local layer = { BlendMode = "Multiply", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + + +asset.meta = { + Name = "Mercury Iron Abundance", + Version = "1.0", + Description = [[ Iron Abundance layer for Mercury globe]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset index 412364df0d..4c4bc729a3 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -5,10 +6,25 @@ local layer = { Name = "Messenger BDR [Sweden]", FilePath = asset.localResource("messenger_bdr_sweden.wms"), TilePixelSize = 360, + Description = [[The Map Projected Basemap RDR (BDR) data set consists of a global + monochrome map of reflectance at a resolution of 256 pixels per degree (~166 m/p). + This edition, version 1, was released May 6, 2016 to the Planetary Data System (PDS) + MESSENGER archive. It is compiled using NAC or WAC 750-nm images from any campaign that + best fit the intended illumination geometry or low emission angle and incidence angle + near 74 degrees. It is controlled and projected onto a global digital elevation model. It uses + a Kasseleinin-Shkuratov photometric model, whose parameters are the same for any given + wavelength band across all MESSENGER end-of-mission map data products.]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Messenger BDR [Sweden]", + Version = "1.0", + Description = [[ Mercury MESSENGER MDIS Global Basemap BDR 166m layer for Mercury globe. + This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_Basemap_BDR_Mosaic_Global_166m", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset index b81431684e..23e5581a8d 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset @@ -1,14 +1,30 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_BDR_Utah", Name = "Messenger BDR [Utah]", FilePath = asset.localResource("messenger_bdr_utah.wms"), - TilePixelSize = 360 + TilePixelSize = 360, + Description = [[The Map Projected Basemap RDR (BDR) data set consists of a global + monochrome map of reflectance at a resolution of 256 pixels per degree (~166 m/p). + This edition, version 1, was released May 6, 2016 to the Planetary Data System (PDS) + MESSENGER archive. It is compiled using NAC or WAC 750-nm images from any campaign that + best fit the intended illumination geometry or low emission angle and incidence angle + near 74 degrees. It is controlled and projected onto a global digital elevation model. It uses + a Kasseleinin-Shkuratov photometric model, whose parameters are the same for any given + wavelength band across all MESSENGER end-of-mission map data products.]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Messenger BDR [Utah]", + Version = "1.0", + Description = [[ Mercury MESSENGER MDIS Global Basemap BDR 166m layer for Mercury globe. + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_Basemap_BDR_Mosaic_Global_166m", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset index fe1a646b64..b28bdf861c 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,16 @@ local layer = { FilePath = asset.localResource("messenger_hie_sweden.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") + + +asset.meta = { + Name = "Messenger HIE [Sweden]", + Version = "1.0", + Description = [[ Mercury HIE layer for Mercury globe. + This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "", + License = "NASA/PDS" +} -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset index a126f50f99..2c134783d1 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,15 @@ local layer = { FilePath = asset.localResource("messenger_hie_utah.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Messenger HIE [Utah]", + Version = "1.0", + Description = [[ Mercury HIE layer for Mercury globe. + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset index 95b7d143d2..a97c5780e9 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,17 @@ local layer = { FilePath = asset.localResource("messenger_hiw_sweden.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") + + +asset.meta = { + Name = "Messenger HIW [Sweden]", + Version = "1.0", + Description = [[ Messenger HIW layer for Mercury globe. + This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "", + License = "NASA/PDS" +} + -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset index 84ba23aeaf..0c7f7e2284 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,16 @@ local layer = { FilePath = asset.localResource("messenger_hiw_utah.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") + + +asset.meta = { + Name = "Messenger HIW [Utah]", + Version = "1.0", + Description = [[ Messenger HIW layer for Mercury globe. + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "", + License = "NASA/PDS" +} -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset index cbf10715c6..597dd6ec21 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,16 @@ local layer = { FilePath = asset.localResource("messenger_loi_sweden.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") + + +asset.meta = { + Name = "Messenger LOI [Sweden]", + Version = "1.0", + Description = [[ Mercury LOI layer for Mercury globe. + This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_Basemap_LOI_Mosaic_Global_166m", + License = "NASA/PDS" +} -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset index 53f551ea2c..3644a798b8 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,16 @@ local layer = { FilePath = asset.localResource("messenger_loi_utah.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") + + +asset.meta = { + Name = "Messenger LOI [Utah]", + Version = "1.0", + Description = [[ Mercury LOI layer for Mercury globe. + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_Basemap_LOI_Mosaic_Global_166m", + License = "NASA/PDS" +} -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset index 14c98c20d0..57f827e4c1 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset @@ -1,13 +1,31 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_MDIS_Sweden", Name = "Messenger MDIS [Sweden]", - FilePath = asset.localResource("messenger_mdis_sweden.wms") + FilePath = asset.localResource("messenger_mdis_sweden.wms"), + Description = [[This May 2013 basemap is a combination of the following mosaics; (1) + The 2013-05-10 version of the monochrome global mosaic, made from Applied Coherent + Technology (ACT) Corporation tiles, (2) An average north polar mosaic from 90N to 82.5N, + composed of images from many campaigns, made by C. Ernst, and (3) An average south + polar mosaic from 90S to 85S, composed of images from the south polar monitoring + campaign from the primary mission, made by N. Chabot. To fill minor areas of missing + data, the 2013-05-10 version of the high-incidence global mosaic was underlain. This + monochrome mosaic is composed of Mercury Dual Imaging System (MDIS) Narrow Angle + Camera (NAC) images and Wide Angle Camers (WAC) images acquired in the filter centered + at 750 nm. The resolution of this mosaic is 250 meters per pixel (m).]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Messenger MDIS [Sweden]", + Version = "1.0", + Description = [[ Messenger MDIS layer for Mercury globe. + This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_mosaic_global_250m_2013", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset index 2a5bc1361c..5d371b7404 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset @@ -1,13 +1,33 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_MDIS_Utah", Name = "Messenger MDIS [Utah]", - FilePath = asset.localResource("messenger_mdis_utah.wms") + FilePath = asset.localResource("messenger_mdis_utah.wms"), + Description = [[This May 2013 basemap is a combination of the following mosaics; (1) + The 2013-05-10 version of the monochrome global mosaic, made from Applied Coherent + Technology (ACT) Corporation tiles, (2) An average north polar mosaic from 90N to 82.5N, + composed of images from many campaigns, made by C. Ernst, and (3) An average south + polar mosaic from 90S to 85S, composed of images from the south polar monitoring + campaign from the primary mission, made by N. Chabot. To fill minor areas of missing + data, the 2013-05-10 version of the high-incidence global mosaic was underlain. This + monochrome mosaic is composed of Mercury Dual Imaging System (MDIS) Narrow Angle + Camera (NAC) images and Wide Angle Camers (WAC) images acquired in the filter centered + at 750 nm. The resolution of this mosaic is 250 meters per pixel (m).]] +} + +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") + + +asset.meta = { + Name = "Messenger MDIS [Utah]", + Version = "1.0", + Description = [[ Messenger MDIS layer for Mercury globe. + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_mosaic_global_250m_2013", + License = "NASA/PDS" } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset index df0e160a02..7f10000c10 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,16 @@ local layer = { FilePath = asset.localResource("messenger_mdr_utah.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") + + +asset.meta = { + Name = "Messenger MDR [Utah]", + Version = "1.0", + Description = [[ Mercury MDR layer for Mercury globe. + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "", + License = "NASA/PDS" +} -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset index f164a293bd..5239fad7df 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,15 @@ local layer = { FilePath = asset.localResource("messenger_mosaic2_sweden.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Messenger Mosaic2 [Sweden]", + Version = "1.0", + Description = [[ Mercury Messenger Mosaic2 layer for Mercury globe. + This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset index 047670cf8f..3d225e53bc 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,15 @@ local layer = { FilePath = asset.localResource("messenger_mosaic2_utah.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Messenger Mosaic2 [Utah]", + Version = "1.0", + Description = [[ Mercury Messenger Mosaic2 layer for Mercury globe. + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset index a2d20199b3..1f2e414c40 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,15 @@ local layer = { FilePath = asset.localResource("messenger_mosaic_sweden.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Messenger Mosaic [Sweden]", + Version = "1.0", + Description = [[ Mercury Messenger Mosaic layer for Mercury globe. + This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset index 8bc5644755..5f8758bce5 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,15 @@ local layer = { FilePath = asset.localResource("messenger_mosaic_utah.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Messenger Mosaic [Utah]", + Version = "1.0", + Description = [[ Mercury Messenger Mosaic layer for Mercury globe. + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset index 4aab95aa3f..30e8be0dbd 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -6,8 +7,16 @@ local layer = { FilePath = asset.localResource("messenger_mp3_utah.wms") } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") + + +asset.meta = { + Name = "Messenger MP3 [Utah]", + Version = "1.0", + Description = [[ Mercury Messenger MP3 layer for Mercury globe. + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "", + License = "NASA/PDS" +} -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset index f66e07b49c..a22ea995ae 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -11,8 +12,15 @@ local layer = { BlendMode = "Multiply", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Messenger SHADE [Sweden]", + Version = "1.0", + Description = [[ Mercury SHADE layer for Mercury globe. + This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mercury/Topography/MESSENGER/Mercury_Messenger_USGS_ClrShade_Global_2km", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset index ee62abad1f..99e21a3451 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local layer = { @@ -11,8 +12,15 @@ local layer = { BlendMode = "Multiply", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Messenger SHADE [Utah]", + Version = "1.0", + Description = [[ Mercury Messenger SHADE layer for Mercury globe. + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mercury/Topography/MESSENGER/Mercury_Messenger_USGS_ClrShade_Global_2km", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset index 138e1017b3..bd22e1514b 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local texturesPath = asset.syncedResource({ @@ -18,8 +19,14 @@ local layer = { BlendMode = "Multiply", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Mercury Magnesium Abundance", + Version = "1.0", + Description = [[ Magnesium Abundance layer for Mercury globe]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset index b910263ee5..2a7c66ac60 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mercury").Mercury.Identifier local texturesPath = asset.syncedResource({ @@ -14,8 +15,14 @@ local layer = { BlendMode = "Multiply", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Mercury Silicon Abundance", + Version = "1.0", + Description = [[ Silicon Abundance layer for Mercury globe]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset index 9ecd31f795..635571cea4 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset @@ -77,10 +77,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Mercury, MercuryLabel }) asset.meta = { Name = "Mercury", - Version = "1.0", + Version = "1.1", Description = [[ Mercury globe with labels, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Mercury" , "MercuryLabel"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset index 410e93a92a..b5c560fcaa 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset @@ -31,11 +31,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryTrail }) asset.meta = { Name = "Mercury Trail", - Version = "1.0", + Version = "1.1", Description = [[ Main trail for Mercury. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MercuryTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset index 1eb4e8c0a4..c92515b06b 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset @@ -34,11 +34,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryTrailEarth }) asset.meta = { Name = "Mercury Trail from Earth", - Version = "1.0", + Version = "1.1", Description = [[ Alternate trail of Mercury, as observed by the Earth rather then the Sun.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MercuryTrailEarth"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset index db4f045299..61606eeb68 100644 --- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset @@ -25,10 +25,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryBarycenter }) asset.meta = { Name = "Mercury Transforms", - Version = "1.0", + Version = "1.1", Description = [[ Mercury Barycenter transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MercuryBarycenter"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset index 86a3625998..c066e907ae 100644 --- a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset +++ b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../neptune").Neptune.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "neptune.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset index 8f5e758e56..584e67489b 100644 --- a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset @@ -1,3 +1,14 @@ asset.require("./inner_moons") asset.require("./irregular_prograde_moons") asset.require("./irregular_retrograde_moons") + + +asset.meta = { + Name = "Neptune Minor Moons", + Version = "1.0", + Description = [[ Meta asset containing 3 moon groups: inner_moons, + irregular_prograde_moons, and irregular_retrograde_moons]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset index e8702e04e7..e4d1691a91 100644 --- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset +++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset @@ -58,10 +58,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Neptune, NeptuneLabel }) asset.meta = { Name = "Neptune", - Version = "1.0", + Version = "1.1", Description = [[ Neptune globe, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Neptune"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset index 579a87ff9d..e1434267b0 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset @@ -42,10 +42,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneTrail }) asset.meta = { Name = "Neptune Trail", - Version = "1.0", + Version = "1.1", Description = [[ Main trail of Neptune. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"NeptuneTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset index 6bd470acf5..1d373108ee 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset @@ -34,11 +34,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneTrailEarth }) asset.meta = { Name = "Neptune Trail from Earth", - Version = "1.0", + Version = "1.1", Description = [[ Alternate trail of Neptune, as observed by the Earth rather then the Sun.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"NeptuneTrailEarth"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset index fdb81080ad..d638cca596 100644 --- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset +++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset @@ -25,10 +25,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneBarycenter }) asset.meta = { Name = "Neptune Transforms", - Version = "1.0", + Version = "1.1", Description = [[ Neptune Barycenter transform ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"NeptuneBarycenter"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/neptune/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton.asset index cbeba17776..9554dab706 100644 --- a/data/assets/scene/solarsystem/planets/neptune/triton.asset +++ b/data/assets/scene/solarsystem/planets/neptune/triton.asset @@ -31,11 +31,10 @@ assetHelper.registerSceneGraphNodesAndExport( asset.meta = { Name = "Triton", - Version = "1.0", + Version = "1.1", Description = [[ Procedural Globe asset containing Neptune's moon: Triton. A blank globe and SPICE trail are generated for the moon.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Triton"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset index 891a48d36c..459648fd37 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../dione").Dione.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "dione.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index 48fbce8a6d..560d6d0e1e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -57,10 +57,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Enceladus }) asset.meta = { Name = "Enceladus", - Version = "1.0", + Version = "1.1", Description = [[ Enceladus globe with labels and map layers]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Enceladus"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset index b28f512525..b3c5f6e599 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../enceladus").Enceladus.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "enceladus.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset index 59bdc0c776..608becb171 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../enceladus").Enceladus.Identifier local layer = { @@ -12,11 +13,7 @@ local layer = { than 120 degrees. (Description from URL).]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { @@ -27,6 +24,5 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Enceladus/Cassini/" .. "Enceladus_Cassini_ISS_Global_Mosaic_100m_HPF", - License = "NASA/PDS", - Identifiers = {"Global_Mosaic_100m_HPF"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset index eb70ea00ea..7c6314a470 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset @@ -32,10 +32,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { EnceladusTrail }) asset.meta = { Name = "Enceladus Trail", - Version = "1.0", + Version = "1.1", Description = [[ Trail for Enceladus. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"EnceladusTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index 7a1d445e7e..ec96ea15ef 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -56,10 +56,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Hyperion }) asset.meta = { Name = "Hyperion", - Version = "1.0", + Version = "1.1", Description = [[ Hyperion globe with labels]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Hyperion"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset index f6e01eeba9..21afd8b8c4 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset @@ -31,11 +31,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { HyperionTrail }) asset.meta = { Name = "Hyperion Trail", - Version = "1.0", + Version = "1.1", Description = [[ Trail of Saturn's moon Hyperion as observed by Saturn. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"HyperionTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset index d00aef94cd..5ed38f75c4 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../iapetus").Iapetus.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "iapetus.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset index 011dbcd41f..15ef5d0b40 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset @@ -32,10 +32,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { IapetusTrail }) asset.meta = { Name = "Iapetus Trail", - Version = "1.0", + Version = "1.1", Description = [[Main trail for Iapetus. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"IapetusTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset index 11c2f39bf9..40e4b12dd4 100644 --- a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../saturn").Saturn.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "saturn.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset index bef66be274..05f561f735 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../mimas").Mimas.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "mimas.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index 4a4948f555..18f4919b9c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -57,10 +57,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Mimas }) asset.meta = { Name = "Mimas", - Version = "1.0", + Version = "1.1", Description = [[ Mimas globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Mimas"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset index 29da5054d7..e5ea363a87 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset @@ -32,10 +32,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MimasTrail }) asset.meta = { Name = "Mimas Trail", - Version = "1.0", + Version = "1.1", Description = [[ Main trail for Mimas. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"MimasTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset index a75b2eeee6..eb0ae0c6b5 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../rhea").Rhea.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "rhea.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset index 666a9a161e..ea99d2503a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset +++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset @@ -86,10 +86,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Saturn, SaturnLabel }) asset.meta = { Name = "Saturn", - Version = "1.0", + Version = "1.1", Description = [[ Saturn globe, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Saturn", "SaturnLabel"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset index c7fbe1969c..069d872c01 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../tethys").Tethys.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "tethys.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset b/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset index 1c186daa01..64839e715c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset @@ -49,10 +49,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) asset.meta = { Name = "Titan Atmosphere", - Version = "1.0", + Version = "1.1", Description = [[ RenderableAtmosphere for Titan.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = { "TitanAtmosphere" } + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset index 91e0c5a587..06455475ff 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../titan").Titan.Identifier local texturesPath = asset.syncedResource({ @@ -21,20 +22,15 @@ local layer = { is created at some point in the future. (Description from URL)]] } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Cassini ISS Global Mosaic", - Version = "1.0", + Version = "1.1", Description = [[ Cassini global image layer for Titan]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Titan/Cassini/Global-Mosaic/" .. "Titan_ISS_P19658_Mosaic_Global_4km", - License = "NASA/PDS", - Identifiers = {"Cassini_ISS_Global_Mosaic_4km_Local"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset index b04e2c974a..1637278b98 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../titan").Titan.Identifier local layer = { @@ -14,21 +15,16 @@ local layer = { is created at some point in the future. (Description from URL)]], } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { Name = "Cassini ISS Global Mosaic", - Version = "1.0", + Version = "1.1", Description = [[ Cassini global image layer for Titan. This layer is hosted on the OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Titan/Cassini/Global-Mosaic/" .. "Titan_ISS_P19658_Mosaic_Global_4km", - License = "NASA/PDS", - Identifiers = {"Cassini_ISS_Global_Mosaic_4km_LiU"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset index b407affe83..c885d17521 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset @@ -47,7 +47,7 @@ local Titan = { Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, GUI = { Name = "Titan", - Path = "/Solar System/Planets/Saturn/Moons", + Path = "/Solar System/Planets/Saturn/Moons/Titan", Description = [[Largest moon of Saturn.]] } } @@ -57,10 +57,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Titan }) asset.meta = { Name = "Titan", - Version = "1.0", + Version = "1.2", Description = [[ Titan globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Titan"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset index 7b4c0177b8..3213b4c1ce 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset @@ -22,7 +22,7 @@ local TitanTrail = { Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, GUI = { Name = "Titan Trail", - Path = "/Solar System/Planets/Saturn/Moons", + Path = "/Solar System/Planets/Saturn/Moons/Titan", Description = [[ Trail of Saturn's moon Titan as observed by Saturn.]], } } @@ -32,10 +32,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { TitanTrail }) asset.meta = { Name = "Titan Trail", - Version = "1.0", + Version = "1.2", Description = [[ Main trail for Titan. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"TitanTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset index 5dcb752284..f94030d01b 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset @@ -30,10 +30,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnTrail }) asset.meta = { Name = "Saturn Trail", - Version = "1.0", + Version = "1.1", Description = [[ Main trail of Saturn. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SaturnTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset index def9f62137..bab0f19dfd 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset @@ -31,13 +31,12 @@ local SaturnTrailEarth = { asset.meta = { Name = "Saturn Trail from Earth", - Version = "1.0", + Version = "1.1", Description = [[ Alternate trail of Saturn, as observed by the Earth rather then the Sun. Data from NASA SPICE (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SaturnTrailEarth"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset index 4c1a939748..61c299bb64 100644 --- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset +++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset @@ -25,10 +25,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnBarycenter }) asset.meta = { Name = "Saturn Transforms", - Version = "1.0", + Version = "1.1", Description = [[ Saturn Barycenter transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SaturnBarycenter"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset index 7efd9eb3cd..c36af0f937 100644 --- a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset +++ b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../uranus").Uranus.Identifier local texturesPath = asset.syncedResource({ @@ -12,11 +13,7 @@ local layer = { FilePath = texturesPath .. "uranus.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset index 6c21fde33f..442b92134c 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset @@ -30,10 +30,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrail }) asset.meta = { Name = "Uranus Trail", - Version = "1.0", + Version = "1.1", Description = [[ Main trail of Uranus. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"UranusTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset index 60eed096e0..f80b061dac 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset @@ -34,11 +34,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrailEarth }) asset.meta = { Name = "Uranus Trail from Earth", - Version = "1.0", + Version = "1.1", Description = [[ Alternate trail of Uranus, as observed by the Earth rather then the Sun. Data from NASA SPICE (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"UranusTrailEarth"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/transforms.asset b/data/assets/scene/solarsystem/planets/uranus/transforms.asset index 0cdd92f642..4ac93c9378 100644 --- a/data/assets/scene/solarsystem/planets/uranus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/uranus/transforms.asset @@ -27,10 +27,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { UranusBarycenter }) asset.meta = { Name = "Uranus Transforms", - Version = "1.0", + Version = "1.1", Description = [[ Uranus Barycenter transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"UranusBarycenter"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset index 6e065fd4e2..59b9da5079 100644 --- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset +++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset @@ -58,10 +58,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Uranus, UranusLabel }) asset.meta = { Name = "Uranus", - Version = "1.0", + Version = "1.1", Description = [[ Uranus globe, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Uranus" , "UranusLabel"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset index 4e6f7515fe..044ba1eed9 100644 --- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset @@ -57,10 +57,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) asset.meta = { Name = "Venus Atmosphere", - Version = "1.0", + Version = "1.1", Description = [[ Atmosphere of Venus.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusAtmosphere"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/venus/default_layers.asset b/data/assets/scene/solarsystem/planets/venus/default_layers.asset index cd7a8e653b..26f07e266c 100644 --- a/data/assets/scene/solarsystem/planets/venus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/venus/default_layers.asset @@ -15,7 +15,7 @@ end) asset.meta = { Name = "Default Venus Layers", - Version = "1.0", + Version = "1.1", Description = [[ Default Venus layers are: Venus Magellan Mosaic and Venus Magellan DEM]], Author = "OpenSpace Team", diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset index df2ad89162..96baf091ef 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require('util/asset_helper') local globeIdentifier = asset.require("../../venus").Venus.Identifier local layer = { @@ -26,11 +27,7 @@ local layer = { } } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { @@ -41,6 +38,5 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/" .. "Venus_Magellan_LeftLook_mosaic_global_75m", - License = "NASA/PDS", - Identifiers = {"Magellan_Mosaic_Utah"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset index 8aee32e12e..c3548e169e 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../venus").Venus.Identifier local texturesPath = asset.syncedResource({ @@ -16,8 +17,14 @@ local layer = { } } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") -asset.export("layer", layer) + +asset.meta = { + Name = "Venus Texture", + Version = "1.0", + Description = [[ This asset supplies a default texture for Venus.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset index c1475af736..4bfb93d606 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset @@ -1,3 +1,4 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../venus").Venus.Identifier local layer = { @@ -21,11 +22,7 @@ local layer = { } } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "HeightLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset index db8a8f09b5..7e68e7c109 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail.asset @@ -32,11 +32,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { VenusTrail }) asset.meta = { Name = "Venus Trail", - Version = "1.0", + Version = "1.1", Description = [[ Trail of Venus as observed by the Sun. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset index 62133e5af9..4b39aca93b 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset @@ -33,11 +33,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { VenusTrailEarth }) asset.meta = { Name = "Venus Trail from Earth", - Version = "1.0", + Version = "1.1", Description = [[ Trail of Venus as observed by the Earth. Data from NASA SPICE (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusTrailEarth"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset index 9620f615e0..06b8411be8 100644 --- a/data/assets/scene/solarsystem/planets/venus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset @@ -25,10 +25,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { VenusBarycenter }) asset.meta = { Name = "Venus Transforms", - Version = "1.0", + Version = "1.1", Description = [[ Spice translation for Venus Barycenter ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"VenusBarycenter"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index 1a3acd055b..065c55aa72 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -83,10 +83,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Venus, VenusLabel }) asset.meta = { Name = "Venus", - Version = "1.0", + Version = "1.1", Description = [[ Venus globe with labels, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Venus", "VenusLabel"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset index ff4e89334c..117cef10a7 100644 --- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset @@ -17,13 +17,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Amor Asteroids", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining the Amor group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws."]], - Identifiers = {"sssb_sssb_data_amor_asteroid"} + Foreign Copyright Laws."]] } diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset index 667bfb0d30..69f724f1e9 100644 --- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset @@ -17,13 +17,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Apollo Asteroids", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining the Apollo group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_apollo_asteroid"} + Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/astraea.asset b/data/assets/scene/solarsystem/sssb/astraea.asset index 87ed46a177..5260ba9751 100644 --- a/data/assets/scene/solarsystem/sssb/astraea.asset +++ b/data/assets/scene/solarsystem/sssb/astraea.asset @@ -49,7 +49,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { AstraeaPosition, AstraeaTr asset.meta = { Name = "5 Astraea", - Version = "1.0", + Version = "1.1", Description = [[ This asset contains the trail and position of 5 Astraea from 2014 JAN 01 00:00:00 to 2023 JAN 01 00:00:00. Data from JPL Horizons']], diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset index 63c1f2dc2d..f630f9db89 100644 --- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset @@ -18,13 +18,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Aten Asteroids", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining the Aten group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_aten_asteroid"} + Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset index b16b13266a..4bd96d7920 100644 --- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset @@ -18,13 +18,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Atira Asteroids", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining the Atira group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws."]], - Identifiers = {"sssb_sssb_data_atira_asteroid"} + Foreign Copyright Laws."]] } diff --git a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset index 49c06b661f..dd7eac1d29 100644 --- a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset +++ b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset @@ -53,11 +53,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { asset.meta = { Name = "C/2019 Y4 Atlas", - Version = "1.0", + Version = "1.1", Description = [[ This asset contains the trail and position of C/2019 Y4 Atlas from 1950 JAN 01 00:00:00 to 2100 JAN 01 00:00:00. Data from JPL Horizons]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = "NASA", - Identifiers = {"C2019Y4AtlasPosition", "C2019Y4AtlasTrail"} + License = "NASA" } diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset index 1fd58d3029..6a0a69d7f9 100644 --- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset @@ -18,13 +18,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Centaur Asteroids", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining the Centaur group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_centaur_asteroid"} + Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset index c5fa1d6cd6..a4d21d94e6 100644 --- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset @@ -18,13 +18,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Chiron-Type Comets", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining the Chiron-Type group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_chiron-type_comet"} + Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset index 2dfea14d39..c630aabe45 100644 --- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset @@ -18,13 +18,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Encke-Type Comets", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining the Encke-Type group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_encke-type_comet"} + Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset index bf3cd4537f..30280e780d 100644 --- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset @@ -17,13 +17,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Halley-Type Comets", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining the Halley-Type group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_halley-type_comet"} + Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset index d07fa4ab13..e0ee99a43b 100644 --- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset @@ -18,13 +18,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Inner Main Asteroid Belt", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining the Inner Main Asteroid Belt group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_inner_main_belt_asteroid"} + Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset index 82ed1f5901..e0f4ab7b6a 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset @@ -18,13 +18,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Jupiter Family Comets", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining Jupiter-family group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_jupiter-family_comet"} + Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset index 6e3e344b6b..a07b9393fe 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset @@ -18,13 +18,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Jupiter Trojan Asteroids", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining Jupiter Trojan group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_jupiter_trojan_asteroid"} + Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset index 77ca6d32be..9da8b7231c 100644 --- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset @@ -19,13 +19,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Main Asteroid Belt", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining Main Asteroid Belt group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_main_belt_asteroid"} + Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset index 5be63fdf52..22ad96e678 100644 --- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset @@ -18,13 +18,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Mars-Crossing Asteroids", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons containing Mars-Crossing group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_mars-crossing_asteroid"} + Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset index 0c3b16a9c4..d4f6171e14 100644 --- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset @@ -23,13 +23,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Outer Main Asteroid Belt", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining Outer Main Asteroid Belt group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. - and Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_outer_main_belt_asteroid"} + and Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset index e80295a478..c6455f624b 100644 --- a/data/assets/scene/solarsystem/sssb/pha.asset +++ b/data/assets/scene/solarsystem/sssb/pha.asset @@ -22,7 +22,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Potentially-Hazardous Asteroids", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining Potentially Hazardous group. ]], Author = [[JPL Small-Body Database hosted by California Institute of @@ -30,6 +30,5 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws.]], - Identifiers = {"sssb_sssb_data_pha"} + under the U.S. and Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/sssb_shared.asset b/data/assets/scene/solarsystem/sssb/sssb_shared.asset index c8770fb413..732b70c745 100644 --- a/data/assets/scene/solarsystem/sssb/sssb_shared.asset +++ b/data/assets/scene/solarsystem/sssb/sssb_shared.asset @@ -38,3 +38,13 @@ end asset.export("downloadSssbDatabaseFile", downloadSssbDatabaseFile) asset.export("createSssbGroupObject", createSssbGroupObject) + + +asset.meta = { + Name = "SSSB shared", + Version = "1.0", + Description = [[ UTILITY ASSET; This asset is for builders and coders.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/sssb/swifttuttle.asset b/data/assets/scene/solarsystem/sssb/swifttuttle.asset index bcad498a16..faacae7ff5 100644 --- a/data/assets/scene/solarsystem/sssb/swifttuttle.asset +++ b/data/assets/scene/solarsystem/sssb/swifttuttle.asset @@ -50,13 +50,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { asset.meta = { Name = "Swift Tuttle", - Version = "1.0", + Version = "1.1", Description = [[ Position and Trail of Swift Tuttle from 1879 JUN 27 to 1879 JUN 27. Data from JPL Horizons]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", License = [[ JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws."]], - Identifiers = {"SwiftTuttlePosition", "SwiftTuttleTrail"} + under the U.S. and Foreign Copyright Laws."]] } diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset index fc1e71735a..b687e2e370 100644 --- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset +++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset @@ -51,13 +51,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { TeslaPosition, TeslaRoadst asset.meta = { Name = "Tesla Roadster", - Version = "1.0", + Version = "1.1", Description = [[ Position and Trail of Tesla Roadster from 2018 FEB 8 to 2022 FEB 7 00:00:00. Data from JPL Horizons.]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", License = [[ JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws.]], - Identifiers = {"TeslaPosition", "TeslaRoadsterTrail"} + under the U.S. and Foreign Copyright Laws.]] } diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset index 312c4ee154..a6501a3804 100644 --- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset @@ -24,7 +24,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Trans-Neptunian Asteroids", - Version = "1.0", + Version = "1.1", Description = [[ RenderableSmallBody asset with data from from JPL Horizons contiaining Trans-Neptunian group. ]], Author = [[JPL Small-Body Database hosted by California Institute of @@ -32,6 +32,5 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[ JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws."]], - Identifiers = {"sssb_sssb_data_transneptunian_object_asteroid"} + under the U.S. and Foreign Copyright Laws."]] } diff --git a/data/assets/scene/solarsystem/sun.asset b/data/assets/scene/solarsystem/sun.asset index 0b1286c347..e7ace91216 100644 --- a/data/assets/scene/solarsystem/sun.asset +++ b/data/assets/scene/solarsystem/sun.asset @@ -1,2 +1,13 @@ asset.require("./sun/sun") asset.require("./sun/glare") + + +asset.meta = { + Name = "Sun", + Version = "1.0", + Description = [[ Meta asset for the Sun in our solar system. Contains the Sun globe and + Sun glare texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/sun/EUV_layer.asset b/data/assets/scene/solarsystem/sun/EUV_layer.asset index 7a7e617a41..8547184539 100644 --- a/data/assets/scene/solarsystem/sun/EUV_layer.asset +++ b/data/assets/scene/solarsystem/sun/EUV_layer.asset @@ -47,11 +47,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { EUVLayer }) asset.meta = { Name = "Predictive Science Inc. EUV texture sequence Bastille Days", - Version = "1.0", + Version = "1.1", Description = [[Texture sequence of an extreme ultraviolet (EUV) simulation during, the CME]], Author = "CCMC, OpenSpace team", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", - License = "CC-BY", - Identifier = {"EUV-Layer-bastille-day-2000"} + License = "CC-BY" } diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset index ee3697c1aa..b9b078b86b 100644 --- a/data/assets/scene/solarsystem/sun/glare.asset +++ b/data/assets/scene/solarsystem/sun/glare.asset @@ -35,10 +35,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { SunGlare }) asset.meta = { Name = "Sun Glare", - Version = "1.0", + Version = "1.1", Description = [[ Image plane with sun glare effect.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SunGlare"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/sun/habitablezone.asset b/data/assets/scene/solarsystem/sun/habitablezone.asset index 6726c3667c..399e0da791 100644 --- a/data/assets/scene/solarsystem/sun/habitablezone.asset +++ b/data/assets/scene/solarsystem/sun/habitablezone.asset @@ -25,11 +25,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { HabitableZone }) asset.meta = { Name = "Sun Habitable Zone", - Version = "1.0", + Version = "1.1", Description = [[ The habitable zone around our sun, computed using formula and coefficients by Kopparapu et al. (2015) https://arxiv.org/abs/1404.5292]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SunHabitableZone"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset index 2ce7e12487..2795fffe17 100644 --- a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset +++ b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset @@ -1,6 +1,6 @@ +local assetHelper = asset.require("util/asset_helper") local globeIdentifier = asset.require("../../sun").Sun.Identifier - local texturesPath = asset.syncedResource({ Type = "HttpSynchronization", Name = "Sun textures", @@ -13,11 +13,7 @@ local layer = { FilePath = texturesPath .. "sun.jpg", } -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) +assetHelper.registerLayerAndExport(asset, layer, globeIdentifier, "ColorLayers") asset.meta = { diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset index 877fad9992..ebc87eba3b 100644 --- a/data/assets/scene/solarsystem/sun/marker.asset +++ b/data/assets/scene/solarsystem/sun/marker.asset @@ -34,10 +34,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { SunMarker }) asset.meta = { Name = "Sun marker", - Version = "1.0", - Description = [[ Marker for the sun, with a stick and label.]], + Version = "1.1", + Description = [[ Marker for the Sun, with a stick and label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SunMarker"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset index de53d4aa1b..03d54392c7 100644 --- a/data/assets/scene/solarsystem/sun/sun.asset +++ b/data/assets/scene/solarsystem/sun/sun.asset @@ -50,10 +50,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Sun, SunLabel }) asset.meta = { Name = "Sun", - Version = "1.0", + Version = "1.1", Description = [[ The Sun and label]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Sun" , "SunLabel"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset index 952b9e8515..309b5ba255 100644 --- a/data/assets/scene/solarsystem/sun/transforms.asset +++ b/data/assets/scene/solarsystem/sun/transforms.asset @@ -90,11 +90,10 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { SolarSystemBarycenter, Sun asset.meta = { Name = "Sun Transforms", - Version = "1.0", + Version = "1.1", Description = [[ Sun transforms: Solar System Barycenter, SUN IAU and SUN J2000]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"SolarSystemBarycenter", "SunIAU", "SunECLIPJ2000"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset b/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset index 9478e20141..53301daf7e 100644 --- a/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset +++ b/data/assets/scene/solarsystem/sun/transforms_heliosphere.asset @@ -30,10 +30,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { HEEQ180ReferenceFrame }) asset.meta = { Name = "Sun Transform, HEEQ180", - Version = "1.0", + Version = "1.1", Description = "Sun transform: HEEQ180", Author = "CCMC", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"HEEQ180ReferenceFrame"} + License = "MIT license" } diff --git a/data/assets/util/asset_helper.asset b/data/assets/util/asset_helper.asset index 51fc00b2e8..1910de8a1f 100644 --- a/data/assets/util/asset_helper.asset +++ b/data/assets/util/asset_helper.asset @@ -32,11 +32,12 @@ local registerSceneGraphNodes = function (sceneAsset, nodes, override) sceneAsset.onInitialize(function () for i, node in ipairs(nodes) do openspace.addSceneGraphNode(node) + sceneAsset.registerIdentifierWithMeta(node.Identifier); end end) sceneAsset.onDeinitialize(function () for i = #nodes, 1, -1 do - node = nodes[i] + local node = nodes[i] openspace.removeSceneGraphNode(node.Identifier) end end) @@ -82,37 +83,26 @@ local registerDashboardItems = function (dashboardAsset, items) end local registerSceneGraphNodesAndExport = function (sceneAsset, nodes, override) - override = override or false - if not override then - if tableLength(nodes) == 0 then - openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning.") - return - end - end - - for i, node in ipairs(nodes) do - if not node.Identifier then - openspace.printError("Could not load asset as Identifier was missing") - end - end - - sceneAsset.onInitialize(function () - for i, node in ipairs(nodes) do - openspace.addSceneGraphNode(node) - end - end) - sceneAsset.onDeinitialize(function () - for i = #nodes, 1, -1 do - local node = nodes[i] - openspace.removeSceneGraphNode(node.Identifier) - end - end) + registerSceneGraphNodes(sceneAsset, nodes, override) for i, node in ipairs(nodes) do sceneAsset.export(node.Identifier, node) end end +local registerLayerAndExport = function (sceneAsset, layer, globeIdentifier, layerGroup) + sceneAsset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, layerGroup, layer) + sceneAsset.registerIdentifierWithMeta(layer.Identifier) + end) + + sceneAsset.onDeinitialize(function () + openspace.globebrowsing.deleteLayer(globeIdentifier, layerGroup, layer) + end) + + sceneAsset.export("layer", layer) +end + local requireAll = function (sceneAsset, directory) function string.ends(String,End) return End == "" or string.sub(String,-string.len(End))==End @@ -178,6 +168,7 @@ end asset.export("registerSceneGraphNodes", registerSceneGraphNodes) asset.export("registerSceneGraphNodesAndExport", registerSceneGraphNodesAndExport) +asset.export("registerLayerAndExport", registerLayerAndExport) asset.export("registerScreenSpaceRenderables", registerScreenSpaceRenderables) asset.export("registerSpiceKernels", registerSpiceKernels) asset.export("registerDashboardItems", registerDashboardItems) diff --git a/data/assets/util/tle_helper.asset b/data/assets/util/tle_helper.asset index 089d040ddb..acd0155517 100644 --- a/data/assets/util/tle_helper.asset +++ b/data/assets/util/tle_helper.asset @@ -91,7 +91,9 @@ function satellites(title, file, color, group) }, Tag = { "earth_satellites" }, GUI = { - Path = "/Solar System/Planets/Earth/Satellites" + Name = group.Title, + Path = "/Solar System/Planets/Earth/Satellites", + Description = group.Description } } end diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset index 203b14ea9d..b3866fcce2 100644 --- a/data/assets/util/webgui.asset +++ b/data/assets/util/webgui.asset @@ -3,7 +3,7 @@ asset.require("./static_server") local guiCustomization = asset.require("customization/gui") -- Select which commit hashes to use for the frontend and backend -local frontendHash = "7e513ba86b0bb989b72f22712ebf0bb5a626ba06" +local frontendHash = "32980412faef0773cb7ebaa78ad0db1444f244cc" local dataProvider = "data.openspaceproject.com/files/webgui" local frontend = asset.syncedResource({ diff --git a/include/openspace/scene/asset.h b/include/openspace/scene/asset.h index 22af5c2cad..1b96ce95ae 100644 --- a/include/openspace/scene/asset.h +++ b/include/openspace/scene/asset.h @@ -117,6 +117,13 @@ public: */ void setSynchronizationStateRejected(); + + /** + * Register a SceneGraphNodeIdentifier with the asset + * (used to associate Nodes with asset meta) + */ + void addIdentifier(std::string identifier); + /** * If the asset has not yet been loaded, this function loads the asset and returns the * success state. If the loading succeeded, the Asset transitions into the \c Loaded diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp index 0998b40f1a..a90ddbafe6 100644 --- a/src/scene/asset.cpp +++ b/src/scene/asset.cpp @@ -205,6 +205,12 @@ void Asset::startSynchronizations() { } } +void Asset::addIdentifier(std::string identifier) { + if (_metaInformation.has_value()) { + _metaInformation->identifiers.push_back(std::move(identifier)); + } +} + void Asset::load(Asset* parent) { if (!isLoaded()) { const bool loaded = _manager.loadAsset(this, parent); diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp index d3cee96134..ddbe19a775 100644 --- a/src/scene/assetmanager.cpp +++ b/src/scene/assetmanager.cpp @@ -410,6 +410,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) { // | |- require // | |- exists // | |- export + // | |- registerIdentifierWithMeta // | |- onInitialize // | |- onDeinitialize // | |- directory @@ -622,6 +623,27 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) { ); lua_setfield(*_luaState, assetTableIndex, "export"); + // Register registerIdentifierWithMeta function to add meta at runtime + // registerIdentifierWithMeta(string identifier) + ghoul::lua::push(*_luaState, this, asset); + lua_pushcclosure( + *_luaState, + [](lua_State* L) { + ZoneScoped + + Asset* asset = ghoul::lua::userData(L, 2); + ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::registerIdentifierWithMeta"); + + std::string identifier = luaL_checkstring(L, 1); + asset->addIdentifier(identifier); + + lua_settop(L, 0); + return 0; + }, + 2 + ); + lua_setfield(*_luaState, assetTableIndex, "registerIdentifierWithMeta"); + // Register onInitialize function to be called upon asset initialization // void onInitialize(function initializationFunction) ghoul::lua::push(*_luaState, this, asset); diff --git a/src/util/resourcesynchronization.cpp b/src/util/resourcesynchronization.cpp index 367b9781fa..b92ec9a241 100644 --- a/src/util/resourcesynchronization.cpp +++ b/src/util/resourcesynchronization.cpp @@ -63,7 +63,6 @@ std::unique_ptr ResourceSynchronization::createFromDict auto factory = FactoryManager::ref().factory(); ghoul_assert(factory, "ResourceSynchronization factory did not exist"); ResourceSynchronization* sync = factory->create(p.type, dictionary); - sync->_identifier = p.identifier; sync->_name = p.name; return std::unique_ptr(sync); }