From cc7c0092a3dec61e3ff72bf13a362787852d8635 Mon Sep 17 00:00:00 2001 From: Micah Acinapura Date: Wed, 28 Oct 2020 09:25:34 -0400 Subject: [PATCH] Feature/meta identifier list (#1357) Updating asset.meta.identifiers to be dictionary/list instead of string --- data/assets/scene/digitaluniverse/2dF.asset | 2 +- data/assets/scene/digitaluniverse/2mass.asset | 2 +- data/assets/scene/digitaluniverse/6dF.asset | 2 +- data/assets/scene/digitaluniverse/abell.asset | 2 +- .../digitaluniverse/alternatestarlabels.asset | 2 +- .../digitaluniverse/backgroundradiation.asset | 4 +-- .../scene/digitaluniverse/clusters.asset | 2 +- .../digitaluniverse/constellationbounds.asset | 2 +- .../digitaluniverse/constellations.asset | 2 +- .../scene/digitaluniverse/deepsky.asset | 2 +- .../assets/scene/digitaluniverse/dwarfs.asset | 2 +- .../scene/digitaluniverse/exoplanets.asset | 2 +- .../digitaluniverse/globularclusters.asset | 2 +- data/assets/scene/digitaluniverse/grids.asset | 8 ++--- .../assets/scene/digitaluniverse/groups.asset | 2 +- .../scene/digitaluniverse/h2regions.asset | 2 +- .../assets/scene/digitaluniverse/kepler.asset | 2 +- .../scene/digitaluniverse/localdwarfs.asset | 2 +- .../scene/digitaluniverse/milkyway.asset | 2 +- .../digitaluniverse/milkyway_arm_labels.asset | 2 +- .../digitaluniverse/milkyway_label.asset | 2 +- .../digitaluniverse/milkyway_sphere.asset | 2 +- .../digitaluniverse/obassociations.asset | 2 +- .../scene/digitaluniverse/openclusters.asset | 2 +- .../digitaluniverse/planetarynebulae.asset | 2 +- .../scene/digitaluniverse/pulsars.asset | 2 +- .../scene/digitaluniverse/quasars.asset | 2 +- data/assets/scene/digitaluniverse/sdss.asset | 2 +- .../scene/digitaluniverse/starlabels.asset | 2 +- .../scene/digitaluniverse/starorbits.asset | 4 +-- data/assets/scene/digitaluniverse/stars.asset | 2 +- .../scene/digitaluniverse/superclusters.asset | 2 +- .../digitaluniverse/supernovaremnants.asset | 2 +- data/assets/scene/digitaluniverse/tully.asset | 2 +- data/assets/scene/digitaluniverse/voids.asset | 2 +- .../scene/milkyway/milkyway/volume.asset | 2 +- .../objects/orionnebula/cluster.asset | 2 +- .../milkyway/objects/orionnebula/nebula.asset | 4 +-- .../planets/earth/atmosphere.asset | 2 +- .../solarsystem/planets/earth/earth.asset | 2 +- ...om_w1_sea_ice_concentration_temporal.asset | 2 +- .../colorlayers/aqua_modis_temporal.asset | 2 +- .../layers/colorlayers/bmng_sweden.asset | 2 +- .../earth/layers/colorlayers/bmng_utah.asset | 2 +- .../colorlayers/esri_imagery_world_2D.asset | 2 +- .../layers/colorlayers/esri_viirs_combo.asset | 2 +- .../colorlayers/esri_world_imagery.asset | 2 +- .../colorlayers/fallbacks/blue_marble.asset | 2 +- ...sst_sea_surface_temperature_temporal.asset | 2 +- ...mur_sea_surface_temperature_temporal.asset | 2 +- .../modis_terra_chlorophyll_a_temporal.asset | 2 +- .../colorlayers/terra_modis_temporal.asset | 2 +- .../colorlayers/viirs_snpp_temporal.asset | 2 +- .../fallbacks/blue_marble_height.asset | 2 +- .../layers/heightlayers/terrain_tileset.asset | 2 +- .../nightlayers/earth_at_night_2012.asset | 2 +- .../nightlayers/earth_at_night_temporal.asset | 2 +- .../fallbacks/earth_night_texture.asset | 2 +- .../solarsystem/planets/earth/markers.asset | 2 +- .../solarsystem/planets/earth/moon/moon.asset | 2 +- .../planets/earth/moon/trail.asset | 2 +- .../solarsystem/planets/earth/trail.asset | 2 +- .../planets/earth/transforms.asset | 2 +- .../planets/jupiter/callisto/callisto.asset | 2 +- .../planets/jupiter/callisto/trail.asset | 2 +- .../planets/jupiter/europa/europa.asset | 2 +- .../colorlayers/voyager_global_mosaic.asset | 2 +- .../planets/jupiter/europa/trail.asset | 2 +- .../planets/jupiter/ganymede/ganymede.asset | 2 +- .../planets/jupiter/ganymede/trail.asset | 2 +- .../solarsystem/planets/jupiter/io/io.asset | 2 +- .../planets/jupiter/io/trail.asset | 2 +- .../solarsystem/planets/jupiter/jupiter.asset | 2 +- .../solarsystem/planets/jupiter/trail.asset | 2 +- .../planets/jupiter/trail_earth.asset | 2 +- .../planets/jupiter/transforms.asset | 2 +- .../solarsystem/planets/mars/atmosphere.asset | 2 +- .../mars/layers/colorlayers/HiRISE.asset | 2 +- .../layers/colorlayers/ctx_blended_01.asset | 2 +- .../mars/layers/colorlayers/hirisels.asset | 2 +- .../layers/colorlayers/moc_wa_color_liu.asset | 2 +- .../colorlayers/moc_wa_color_utah.asset | 2 +- .../layers/colorlayers/mola_hrsc_sweden.asset | 2 +- .../layers/colorlayers/mola_hrsc_utah.asset | 2 +- .../mola_pseudo_color_sweden.asset | 2 +- .../colorlayers/mola_pseudo_color_utah.asset | 2 +- .../colorlayers/themis_ir_day_sweden.asset | 2 +- .../colorlayers/themis_ir_day_utah.asset | 2 +- .../colorlayers/themis_ir_night_sweden.asset | 2 +- .../colorlayers/themis_ir_night_utah.asset | 2 +- .../colorlayers/viking_mdim_sweden.asset | 2 +- .../layers/colorlayers/viking_mdim_utah.asset | 2 +- .../mars/layers/heightlayers/hirisels.asset | 2 +- .../layers/heightlayers/mola_europe.asset | 2 +- .../mars/layers/heightlayers/mola_utah.asset | 2 +- .../scene/solarsystem/planets/mars/mars.asset | 2 +- .../planets/mars/moons/deimos.asset | 2 +- .../planets/mars/moons/phobos.asset | 2 +- .../solarsystem/planets/mars/trail.asset | 2 +- .../planets/mars/trail_earth.asset | 2 +- .../solarsystem/planets/mars/transforms.asset | 2 +- .../solarsystem/planets/mercury/mercury.asset | 2 +- .../solarsystem/planets/mercury/trail.asset | 2 +- .../planets/mercury/trail_earth.asset | 2 +- .../planets/mercury/transforms.asset | 2 +- .../solarsystem/planets/neptune/neptune.asset | 2 +- .../solarsystem/planets/neptune/trail.asset | 2 +- .../planets/neptune/trail_earth.asset | 2 +- .../planets/neptune/transforms.asset | 2 +- .../solarsystem/planets/neptune/triton.asset | 2 +- .../planets/saturn/enceladus/enceladus.asset | 2 +- .../colorlayers/global_mosaic_100m_hpf.asset | 2 +- .../planets/saturn/enceladus/trail.asset | 2 +- .../planets/saturn/hyperion/hyperion.asset | 2 +- .../planets/saturn/hyperion/trail.asset | 2 +- .../planets/saturn/iapetus/iapetus.asset | 2 +- .../planets/saturn/iapetus/trail.asset | 2 +- .../planets/saturn/mimas/mimas.asset | 2 +- .../planets/saturn/mimas/trail.asset | 2 +- .../solarsystem/planets/saturn/saturn.asset | 3 +- .../cassini_iss_global_mosaic_4km_liu.asset | 2 +- .../planets/saturn/titan/titan.asset | 2 +- .../planets/saturn/titan/trail.asset | 2 +- .../solarsystem/planets/saturn/trail.asset | 2 +- .../planets/saturn/trail_earth.asset | 2 +- .../planets/saturn/transforms.asset | 2 +- .../solarsystem/planets/uranus/trail.asset | 2 +- .../planets/uranus/trail_earth.asset | 2 +- .../solarsystem/planets/uranus/uranus.asset | 2 +- .../planets/venus/atmosphere.asset | 2 +- .../colorlayers/magellan_mosaic_utah.asset | 2 +- .../venus/layers/heightlayers/magellan.asset | 2 +- .../solarsystem/planets/venus/trail.asset | 2 +- .../planets/venus/trail_earth.asset | 2 +- .../planets/venus/transforms.asset | 2 +- .../solarsystem/planets/venus/venus.asset | 2 +- .../solarsystem/sssb/amor_asteroid.asset | 2 +- .../solarsystem/sssb/apollo_asteroid.asset | 2 +- .../solarsystem/sssb/aten_asteroid.asset | 2 +- .../solarsystem/sssb/atira_asteroid.asset | 2 +- .../scene/solarsystem/sssb/c2019y4atlas.asset | 2 +- .../solarsystem/sssb/centaur_asteroid.asset | 2 +- .../solarsystem/sssb/chiron-type_comet.asset | 2 +- .../solarsystem/sssb/encke-type_comet.asset | 2 +- .../solarsystem/sssb/halley-type_comet.asset | 2 +- .../sssb/inner_main_belt_asteroid.asset | 2 +- .../sssb/jupiter-family_comet.asset | 2 +- .../sssb/jupiter_trojan_asteroid.asset | 2 +- .../solarsystem/sssb/main_belt_asteroid.asset | 2 +- .../sssb/mars-crossing_asteroid.asset | 2 +- .../sssb/outer_main_belt_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/pha.asset | 2 +- .../scene/solarsystem/sssb/swifttuttle.asset | 2 +- .../solarsystem/sssb/tesla_roadster.asset | 2 +- .../sssb/transneptunian_object_asteroid.asset | 2 +- data/assets/scene/solarsystem/sun/glare.asset | 2 +- .../assets/scene/solarsystem/sun/marker.asset | 2 +- data/assets/scene/solarsystem/sun/sun.asset | 2 +- .../scene/solarsystem/sun/transforms.asset | 2 +- data/assets/util/webgui.asset | 2 +- data/profiles/mars.profile | 6 ++-- .../documentation/documentationgenerator.h | 10 ++++++ include/openspace/scene/asset.h | 2 +- src/documentation/documentationgenerator.cpp | 36 +++++++++++++++++++ src/scene/assetloader.cpp | 9 ++++- 165 files changed, 225 insertions(+), 171 deletions(-) diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset index bf848bcde3..0e8c025a53 100644 --- a/data/assets/scene/digitaluniverse/2dF.asset +++ b/data/assets/scene/digitaluniverse/2dF.asset @@ -64,5 +64,5 @@ asset.meta = { Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "2dF" + Identifiers = {"2dF"} } diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset index f852f3a707..d2a0b53a42 100644 --- a/data/assets/scene/digitaluniverse/2mass.asset +++ b/data/assets/scene/digitaluniverse/2mass.asset @@ -60,5 +60,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "2MASS" + Identifiers = {"2MASS"} } diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset index 5ae38458bb..a77c03fd11 100644 --- a/data/assets/scene/digitaluniverse/6dF.asset +++ b/data/assets/scene/digitaluniverse/6dF.asset @@ -61,5 +61,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "6dF" + Identifiers = {"6dF"} } diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset index 2f19ff5ff8..a40bf8e1f9 100644 --- a/data/assets/scene/digitaluniverse/abell.asset +++ b/data/assets/scene/digitaluniverse/abell.asset @@ -70,5 +70,5 @@ asset.meta = { Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "Abell" + Identifiers = {"Abell"} } diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset index 7adb9ca9b9..2ba0ff4eb9 100644 --- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset +++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset @@ -44,7 +44,7 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "StarLabelsAlternate" + Identifiers = {"StarLabelsAlternate"} } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset index a59f4d9374..1a7e4d7d44 100644 --- a/data/assets/scene/digitaluniverse/backgroundradiation.asset +++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset @@ -260,6 +260,6 @@ asset.meta = { Author = "Brian Abbott (AMNH), OpenSpace Team", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "WMAP,CBE,Planck,PlanckMultiverse1,PlanckMultiverse2" .. - "PlanckMultiverse3,PlanckMultiverse4,HAlpha" + Identifiers = {"WMAP", "CBE", "Planck", "PlanckMultiverse1", "PlanckMultiverse2", + "PlanckMultiverse3", "PlanckMultiverse4", "HAlpha"} } diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset index 7525c55978..e4f0121334 100644 --- a/data/assets/scene/digitaluniverse/clusters.asset +++ b/data/assets/scene/digitaluniverse/clusters.asset @@ -50,5 +50,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "GalaxyClusterLabels" + Identifiers = {"GalaxyClusterLabels"} } diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset index 6c64402132..6da4fce20b 100644 --- a/data/assets/scene/digitaluniverse/constellationbounds.asset +++ b/data/assets/scene/digitaluniverse/constellationbounds.asset @@ -53,5 +53,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "ConstellationBounds" + Identifiers = {"ConstellationBounds"} } diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset index 93a522bbe9..52add17d18 100644 --- a/data/assets/scene/digitaluniverse/constellations.asset +++ b/data/assets/scene/digitaluniverse/constellations.asset @@ -72,5 +72,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "Constellations,ConstellationsExtragalactic" + Identifiers = {"Constellations", "ConstellationsExtragalactic"} } diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset index 00b3f1f180..8d858cc663 100644 --- a/data/assets/scene/digitaluniverse/deepsky.asset +++ b/data/assets/scene/digitaluniverse/deepsky.asset @@ -105,6 +105,6 @@ asset.meta = { 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" + Identifiers = {"DeepSkyObjects", "DeepSkyObjectsImages"} } diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset index 2135911fe8..1efccea999 100644 --- a/data/assets/scene/digitaluniverse/dwarfs.asset +++ b/data/assets/scene/digitaluniverse/dwarfs.asset @@ -72,5 +72,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "Dwarfs" + Identifiers = {"Dwarfs"} } diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset index 81ea3477ca..027f5de52e 100644 --- a/data/assets/scene/digitaluniverse/exoplanets.asset +++ b/data/assets/scene/digitaluniverse/exoplanets.asset @@ -61,5 +61,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "Exoplanets" + Identifiers = {"Exoplanets"} } diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset index 9b0f95ebb3..ea516aac13 100644 --- a/data/assets/scene/digitaluniverse/globularclusters.asset +++ b/data/assets/scene/digitaluniverse/globularclusters.asset @@ -75,5 +75,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "GlobularClusters" + Identifiers = {"GlobularClusters"} } diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset index 31483f3243..2699247df4 100644 --- a/data/assets/scene/digitaluniverse/grids.asset +++ b/data/assets/scene/digitaluniverse/grids.asset @@ -548,8 +548,8 @@ asset.meta = { 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" + Identifiers = {"RadioSphere", "OortSphere", "EclipticSphere", "EclipticSphereLabels", + "Equatorial", "EquatorialSphereLabels", "GalacticSphere", "GalacticSphereLabels", + "1ldGrid", "1lmGrid", "1lyGrid", "10lyGrid", "100lyGrid", "1klyGrid" "10klyGrid", + "100klyGrid", "1MlyGrid", "10MlyGrid", "100MlyGrid", "20GlyGrid"} } diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset index 1f324cef43..5d9586e3ce 100644 --- a/data/assets/scene/digitaluniverse/groups.asset +++ b/data/assets/scene/digitaluniverse/groups.asset @@ -50,5 +50,5 @@ asset.meta = { Description = [[Digital Universe asset for Galaxy Groups]], URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "NearbyGalaxyGroups" + Identifiers = {"NearbyGalaxyGroups"} } diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset index a54f40fe2f..470c5e7146 100644 --- a/data/assets/scene/digitaluniverse/h2regions.asset +++ b/data/assets/scene/digitaluniverse/h2regions.asset @@ -63,5 +63,5 @@ asset.meta = { Author = "Carter Emmart, Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "HIIRegions" + Identifiers = {"HIIRegions"} } diff --git a/data/assets/scene/digitaluniverse/kepler.asset b/data/assets/scene/digitaluniverse/kepler.asset index 8480f925a1..212071b5fe 100644 --- a/data/assets/scene/digitaluniverse/kepler.asset +++ b/data/assets/scene/digitaluniverse/kepler.asset @@ -58,5 +58,5 @@ asset.meta = { 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" + Identifiers = {"KeplerPlanetaryCandidates"} } diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset index 41fb19c836..034d27a491 100644 --- a/data/assets/scene/digitaluniverse/localdwarfs.asset +++ b/data/assets/scene/digitaluniverse/localdwarfs.asset @@ -64,5 +64,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "LocalDwarfGalaxies" + Identifiers = {"LocalDwarfGalaxies"} } diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset index 058a333f2c..168fbf61ad 100644 --- a/data/assets/scene/digitaluniverse/milkyway.asset +++ b/data/assets/scene/digitaluniverse/milkyway.asset @@ -44,5 +44,5 @@ asset.meta = { Author = "Brian Abbott, Carter Emmart (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "MilkyWayGalaxyImage" + Identifiers = {"MilkyWayGalaxyImage"} } diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset index c973b8bb9d..8228de7a36 100644 --- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset +++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset @@ -59,5 +59,5 @@ asset.meta = { 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" + Identifiers = {"MilkyWayGalaxyArmLabelsImage"} } diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset index aca337344c..f2e2046717 100644 --- a/data/assets/scene/digitaluniverse/milkyway_label.asset +++ b/data/assets/scene/digitaluniverse/milkyway_label.asset @@ -53,5 +53,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "HomeLabel" + Identifiers = {"HomeLabel"} } diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset index 28b14ded2a..e3843e8faa 100644 --- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset +++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset @@ -48,5 +48,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "MilkyWay" + Identifiers = {"MilkyWay"} } diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset index 93d0c4d316..e357d498e9 100644 --- a/data/assets/scene/digitaluniverse/obassociations.asset +++ b/data/assets/scene/digitaluniverse/obassociations.asset @@ -67,5 +67,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "OBAssociations" + Identifiers = {"OBAssociations"} } diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset index 4da9e44a02..1a40b4834b 100644 --- a/data/assets/scene/digitaluniverse/openclusters.asset +++ b/data/assets/scene/digitaluniverse/openclusters.asset @@ -63,5 +63,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "OpenStarClusters" + Identifiers = {"OpenStarClusters"} } diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset index 3c56a24762..7415c85657 100644 --- a/data/assets/scene/digitaluniverse/planetarynebulae.asset +++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset @@ -60,5 +60,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "PlanetaryNebulae" + Identifiers = {"PlanetaryNebulae"} } diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset index 8b572b9391..ad2bd6a438 100644 --- a/data/assets/scene/digitaluniverse/pulsars.asset +++ b/data/assets/scene/digitaluniverse/pulsars.asset @@ -64,5 +64,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "Pulsars" + Identifiers = {"Pulsars"} } diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset index c1363977d8..cf880b62fa 100644 --- a/data/assets/scene/digitaluniverse/quasars.asset +++ b/data/assets/scene/digitaluniverse/quasars.asset @@ -58,5 +58,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "Quasars" + Identifiers = {"Quasars"} } diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset index aea7142560..b0bc956351 100644 --- a/data/assets/scene/digitaluniverse/sdss.asset +++ b/data/assets/scene/digitaluniverse/sdss.asset @@ -73,5 +73,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "SloanDigitalSkySurvey" + Identifiers = {"SloanDigitalSkySurvey"} } diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset index 62fda28888..5b68512e81 100644 --- a/data/assets/scene/digitaluniverse/starlabels.asset +++ b/data/assets/scene/digitaluniverse/starlabels.asset @@ -42,5 +42,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "StarsLabels" + Identifiers = {"StarsLabels"} } diff --git a/data/assets/scene/digitaluniverse/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset index fad2c66b5e..46e4ec8018 100644 --- a/data/assets/scene/digitaluniverse/starorbits.asset +++ b/data/assets/scene/digitaluniverse/starorbits.asset @@ -187,6 +187,6 @@ asset.meta = { 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" + Identifiers = {"SunOrbit", "BarnardsOrbit", "KapteynsOrbit", "pM_J13420Orbit", + "LSR1826Orbit", "LSRJ0822Orbit", "lacaille9352Orbit"} } diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset index 3978780626..7328d0fae4 100644 --- a/data/assets/scene/digitaluniverse/stars.asset +++ b/data/assets/scene/digitaluniverse/stars.asset @@ -86,5 +86,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "Stars" + Identifiers = {"Stars"} } diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset index 9e2f74d287..c5c688640d 100644 --- a/data/assets/scene/digitaluniverse/superclusters.asset +++ b/data/assets/scene/digitaluniverse/superclusters.asset @@ -58,5 +58,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "GalaxySuperclusters" + Identifiers = {"GalaxySuperclusters"} } diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset index 29b0f6bc3e..d3b19093a3 100644 --- a/data/assets/scene/digitaluniverse/supernovaremnants.asset +++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset @@ -59,5 +59,5 @@ asset.meta = { Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "SupernovaRemnants" + Identifiers = {"SupernovaRemnants"} } diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset index 31cc4cb3ab..2bc40a8ac4 100644 --- a/data/assets/scene/digitaluniverse/tully.asset +++ b/data/assets/scene/digitaluniverse/tully.asset @@ -124,5 +124,5 @@ asset.meta = { 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" + Identifiers = {"TullyGalaxies" , "TullyGalaxiesImages"} } diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset index 8156708b9e..dbc7eac25a 100644 --- a/data/assets/scene/digitaluniverse/voids.asset +++ b/data/assets/scene/digitaluniverse/voids.asset @@ -50,5 +50,5 @@ asset.meta = { Description = [[Digital Universe asset for Cosmic voids.]], URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "Voids" + Identifiers = {"Voids"} } diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset index 4f87af5456..aaf3aa3fec 100644 --- a/data/assets/scene/milkyway/milkyway/volume.asset +++ b/data/assets/scene/milkyway/milkyway/volume.asset @@ -62,5 +62,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT License", - Identifiers = "MilkyWayVolume" + Identifiers = {"MilkyWayVolume"} } diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset index d2c3ff1727..910aca0673 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset @@ -49,5 +49,5 @@ cluster distribution. ]], Author = "AMNH Digital Universe", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "OrionClusterStars" + Identifiers = {"OrionClusterStars"} } diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset index 0eaf64e257..dc99a09a4f 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset @@ -155,6 +155,6 @@ and the bow shocks are part of the outward rush of material. ]], Author = "AMNH Digital Universe", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", - Identifiers = "OrionNebulaModel,OrionNebulaModel,OrionNebulaProplydsModel,".. - "OrionNebulaShocksModel" + Identifiers = {"OrionNebulaModel", "OrionNebulaModel", "OrionNebulaProplydsModel", + "OrionNebulaShocksModel"} } diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset index c46df1f9b4..9bb7b5cadd 100644 --- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset @@ -111,5 +111,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "EarthAtmosphere" + Identifiers = {"EarthAtmosphere"} } diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset index 73d63828c9..476414303f 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth.asset @@ -91,5 +91,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Earth,EarthLabel" + Identifiers = {"Earth", "EarthLabel"} } 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 cbca713bac..d4c110e9fc 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 @@ -35,5 +35,5 @@ asset.meta = { 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" + Identifiers = {"AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal"} } 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 503d014e93..fa0b103440 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 @@ -40,5 +40,5 @@ asset.meta = { 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" + Identifiers = {"Aqua_Modis_Temporal"} } 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 64314513ab..ad786b1301 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 @@ -24,5 +24,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", - Identifiers = "BMNG_Sweden" + Identifiers = {"BMNG_Sweden"} } 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 7f115b2db3..fca8d5e4c5 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 @@ -24,5 +24,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", - Identifiers = "BMNG_Utah" + Identifiers = {"BMNG_Utah"} } 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 cfd621fbae..284eebb05c 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 @@ -30,5 +30,5 @@ asset.meta = { Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=21b4ba14d9e5472d97afcbb819f7368e", License = "Esri Master License Agreement", - Identifiers = "ESRI_Imagery_World_2D" + Identifiers = {"ESRI_Imagery_World_2D"} } 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 10522fae95..5ced647f2f 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 @@ -56,5 +56,5 @@ asset.meta = { Author = "OpenSpace Tem", URL = "http://www.openspaceproject.com", License = "MIT License", - Identifiers = "ESRI_VIIRS_Combo" + Identifiers = {"ESRI_VIIRS_Combo"} } 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 7f9e511ee7..f583a8e8bb 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 @@ -31,5 +31,5 @@ asset.meta = { Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9", License = "Esri Master License Agreement", - Identifiers = "ESRI_World_Imagery" + Identifiers = {"ESRI_World_Imagery"} } 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 59cbafb1cc..548f57c33c 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 @@ -19,5 +19,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", - Identifiers = "Blue_Marble" + Identifiers = {"Blue_Marble"} } 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 0e4d577f5e..eaf1a5b5ea 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 @@ -34,5 +34,5 @@ asset.meta = { URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", License = "NASA", - Identifiers = "GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal" + Identifiers = {"GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal"} } 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 c1e0ba9f84..0371007fd9 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 @@ -32,5 +32,5 @@ asset.meta = { URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. "eosdis-components/gibs", License = "NASA", - Identifiers = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal" + Identifiers = {"GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal"} } 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 32cea1a7e7..64d5ddfabe 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 @@ -32,5 +32,5 @@ asset.meta = { URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", License = "NASA", - Identifiers = "MODIS_Terra_Chlorophyll_A_Temporal" + Identifiers = {"MODIS_Terra_Chlorophyll_A_Temporal"} } 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 b114f114b6..de489171d6 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 @@ -32,5 +32,5 @@ asset.meta = { URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. "eosdis-components/gibs", License = "NASA", - Identifiers = "Terra_Modis_Temporal" + Identifiers = {"Terra_Modis_Temporal"} } 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 1a8982274f..4730e990a7 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 @@ -32,5 +32,5 @@ asset.meta = { URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", License = "NASA", - Identifiers = "VIIRS_SNPP_Temporal" + Identifiers = {"VIIRS_SNPP_Temporal"} } 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 c896d37583..6cfd7a680e 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 @@ -18,5 +18,5 @@ asset.meta = { Author = "NASA", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", - Identifiers = "Earth_Bluemarble_Height" + Identifiers = {"Earth_Bluemarble_Height"} } 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 19c40c9b84..ad574bb9b2 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 @@ -31,5 +31,5 @@ asset.meta = { Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=1b48cd3b6276416784fe90a68c580a89", License = "Esri Master License Agreement", - Identifiers = "Terrain_tileset" + Identifiers = {"Terrain_tileset"} } 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 659125449e..103ae90770 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 @@ -26,5 +26,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", License = "NASA", - Identifiers = "Earth_at_Night_2012" + Identifiers = {"Earth_at_Night_2012"} } 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 8effe06be3..6b126d25b7 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 @@ -47,5 +47,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://worldview.earthdata.nasa.gov/?l=VIIRS_SNPP_DayNightBand_ENCC", License = "NASA", - Identifiers = "Earth_at_Night_Temporal" + Identifiers = {"Earth_at_Night_Temporal"} } 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 38b8a630fe..25d092b60d 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,5 +17,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", - Identifiers = "Earth_Night_Texture" + Identifiers = {"Earth_Night_Texture"} } diff --git a/data/assets/scene/solarsystem/planets/earth/markers.asset b/data/assets/scene/solarsystem/planets/earth/markers.asset index 29e0dd8f73..d6acac5b23 100644 --- a/data/assets/scene/solarsystem/planets/earth/markers.asset +++ b/data/assets/scene/solarsystem/planets/earth/markers.asset @@ -32,5 +32,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "EarthMarker" + Identifiers = {"EarthMarker"} } diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index b3daa4d330..c6079124a9 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -67,5 +67,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Moon" + Identifiers = {"Moon"} } diff --git a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset index e1e17c44dc..d60140bda5 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset @@ -36,5 +36,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "MoonTrail" + Identifiers = {"MoonTrail"} } diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset index f750fa6103..87dc7806fa 100644 --- a/data/assets/scene/solarsystem/planets/earth/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/trail.asset @@ -36,5 +36,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "EarthTrail" + Identifiers = {"EarthTrail"} } diff --git a/data/assets/scene/solarsystem/planets/earth/transforms.asset b/data/assets/scene/solarsystem/planets/earth/transforms.asset index 067bce9c88..a5b066b7fc 100644 --- a/data/assets/scene/solarsystem/planets/earth/transforms.asset +++ b/data/assets/scene/solarsystem/planets/earth/transforms.asset @@ -89,5 +89,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "EarthBarycenter,EarthCenter,EarthInertial,EarthIAU" + Identifiers = {"EarthBarycenter", "EarthCenter", "EarthInertial", "EarthIAU"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset index 254e335c2e..09c2888303 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset @@ -60,5 +60,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Callisto" + Identifiers = {"Callisto"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset index 8a6b20b932..847ae5e43e 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset @@ -38,5 +38,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "CallistoTrail" + Identifiers = {"CallistoTrail"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset index 866fe6d973..6be8e60814 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset @@ -60,5 +60,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Europa" + Identifiers = {"Europa"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset index 30de152eb3..6438fe1b5b 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset @@ -31,5 +31,5 @@ asset.meta = { URL = "https://astrogeology.usgs.gov/search/map/Europa/Voyager-Galileo/" .. "Europa_Voyager_GalileoSSI_global_mosaic_500m", License = "NASA/PDS", - Identifiers = "Voyager_Global_Mosaic" + Identifiers = {"Voyager_Global_Mosaic"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset index b046be6929..7ed601c78a 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset @@ -38,5 +38,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "EuropaTrail" + Identifiers = {"EuropaTrail"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset index 265bd4b4fa..c93b359f3e 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset @@ -60,5 +60,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Ganymede" + Identifiers = {"Ganymede"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset index ffd26252e8..e0b7a0eefd 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset @@ -38,5 +38,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "GanymedeTrail" + Identifiers = {"GanymedeTrail"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset index 43f6786cc6..e64cbfe431 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset @@ -60,5 +60,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Io" + Identifiers = {"Io"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset index 9752f31aa7..b05d0b488e 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset @@ -38,5 +38,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "IoTrail" + Identifiers = {"IoTrail"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset index 824c99a8c9..520a72d840 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset @@ -56,5 +56,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Jupiter,JupiterLabel" + Identifiers = {"Jupiter", "JupiterLabel"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/trail.asset index 7d3afaaebd..5e8830cbc7 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail.asset @@ -36,5 +36,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "JupiterTrail" + Identifiers = {"JupiterTrail"} } diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset index 3abeef018a..64c2d7798f 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset @@ -36,7 +36,7 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "VenusTrailEarth" + Identifiers = {"VenusTrailEarth"} } 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 dde80c565a..e4795f3afc 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset @@ -31,5 +31,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "JupiterBarycenter" + Identifiers = {"JupiterBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset index 06b1d7a1c8..9f45e9804b 100644 --- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset @@ -74,5 +74,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "MarsAtmosphere" + Identifiers = {"MarsAtmosphere"} } 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 3e67eea5eb..716e504cca 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset @@ -38,5 +38,5 @@ asset.meta = { Author = "esri_astro", URL = "https://www.arcgis.com/home/item.html?id=c1c4c750a2154842ae523c984cc14fa5", License = "Esri Master License Agreement", - Identifiers = "HiRISE-PSP" + Identifiers = {"HiRISE-PSP"} } 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 f6ae50ead9..2ced7b9bcb 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 @@ -42,5 +42,5 @@ asset.meta = { Author = "Caltech Murray Lab", URL = "http://murray-lab.caltech.edu/CTX/", License = "Esri Master License Agreement", - Identifiers = "CTX_blended_01" + Identifiers = {"CTX_blended_01"} } 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 216cb86b5c..1ce80e2d49 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset @@ -35,7 +35,7 @@ asset.meta = { Author = "USGS", URL = "https://www.uahirise.org", License = "Esri Master License Agreement", - Identifiers = "HiRISE-LS" + Identifiers = {"HiRISE-LS"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset index e9f44a9537..f55aa9264b 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset @@ -33,5 +33,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", License = "NASA/PDS", - Identifiers = "MOLA_HRSC_Sweden" + Identifiers = {"MOLA_HRSC_Sweden"} } 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 54a3dab794..36f5f9778e 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 @@ -33,5 +33,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", License = "NASA/PDS", - Identifiers = "MOC_WA_Color_Utah" + Identifiers = {"MOC_WA_Color_Utah"} } 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 a5862618ff..07bd5a83f4 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 @@ -26,5 +26,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", License = "NASA/PDS", - Identifiers = "MOLA_HRSC_Sweden" + Identifiers = {"MOLA_HRSC_Sweden"} } 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 87a1e1cf94..8a65c5510f 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 @@ -26,5 +26,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", License = "NASA/PDS", - Identifiers = "MOLA_HRSC_Sweden" + Identifiers = {"MOLA_HRSC_Sweden"} } 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 73920dac15..5420bbcad2 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 @@ -37,5 +37,5 @@ asset.meta = { 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" + Identifiers = {"MOLA_Pseudo_Color_Sweden"} } 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 3844cc5f09..4057051c9b 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 @@ -37,5 +37,5 @@ asset.meta = { 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" + Identifiers = {"MOLA_Pseudo_Color_Utah"} } 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 5a8b2847e7..cb18e6a17f 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 @@ -34,5 +34,5 @@ asset.meta = { 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" + Identifiers = {"Themis_IR_Day_Sweden"} } 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 0226af185d..1063556825 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 @@ -34,5 +34,5 @@ asset.meta = { 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" + Identifiers = {"Themis_IR_Day_Utah"} } 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 fab55ffd4a..04977ad8a2 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 @@ -35,5 +35,5 @@ asset.meta = { 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" + Identifiers = {"Themis_IR_Night_Sweden"} } 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 fdb5cc593e..c6dd7fca7c 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 @@ -35,5 +35,5 @@ asset.meta = { 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" + Identifiers = {"Themis_IR_Night_Utah"} } 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 e43878ff1f..e0fd344b2f 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 @@ -42,5 +42,5 @@ asset.meta = { URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. "Mars_Viking_MDIM21_ClrMosaic_global_232m", License = "NASA/PDS", - Identifiers = "Viking_MDIM_Sweden" + Identifiers = {"Viking_MDIM_Sweden"} } 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 550069100e..5cf52c5fc1 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 @@ -42,5 +42,5 @@ asset.meta = { URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. "Mars_Viking_MDIM21_ClrMosaic_global_232m", License = "NASA/PDS", - Identifiers = "Viking_MDIM_Utah" + Identifiers = {"Viking_MDIM_Utah"} } 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 41ab3634d0..0fa9c56943 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset @@ -33,7 +33,7 @@ asset.meta = { Author = "USGS", URL = "https://www.uahirise.org", License = "Esri Master License Agreement", - Identifiers = "HiRISE-LS-DEM" + Identifiers = {"HiRISE-LS-DEM"} } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset index a46993113c..0be40ea886 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset @@ -38,5 +38,5 @@ asset.meta = { URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_DEM_mosaic_global_463m", License = "NASA/PDS", - Identifiers = "Mola_Europe" + Identifiers = {"Mola_Europe"} } 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 c433db084a..e934a7c26d 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 @@ -38,5 +38,5 @@ asset.meta = { URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_DEM_mosaic_global_463m", License = "NASA/PDS", - Identifiers = "Mola_Utah" + Identifiers = {"Mola_Utah"} } diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 97d7a0d453..8bdd08008d 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -85,5 +85,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Mars,MarsLabel" + Identifiers = {"Mars", "MarsLabel"} } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset index 621d9252f0..b200cef599 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset @@ -67,5 +67,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Deimos,DeimosTrail" + Identifiers = {"Deimos", "DeimosTrail"} } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset index cbd9353046..99bcf87cc6 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset @@ -67,5 +67,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Phobos,PhobosTrail" + Identifiers = {"Phobos", "PhobosTrail"} } diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset index 04c64c8b92..a92011e04e 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail.asset @@ -37,5 +37,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "MarsTrail" + Identifiers = {"MarsTrail"} } diff --git a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset index e24f49a1fe..4565a8d6a7 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset @@ -40,5 +40,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "MarsTrailEarth" + Identifiers = {"MarsTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset index e499f1204e..a7d410d5c1 100644 --- a/data/assets/scene/solarsystem/planets/mars/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset @@ -30,5 +30,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "MarsBarycenter" + Identifiers = {"MarsBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset index a2d8f3e0e2..c2a9ca1584 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset @@ -76,5 +76,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Mercury,MercuryLabel" + Identifiers = {"Mercury" , "MercuryLabel"} } diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset index f73d6417e2..c13026c14b 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset @@ -37,5 +37,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "MercuryTrail" + Identifiers = {"MercuryTrail"} } diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset index 979e9a6abd..6f9c702a2a 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset @@ -40,5 +40,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "MercuryTrailEarth" + Identifiers = {"MercuryTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset index 1e4f43bbe3..8cb25558bf 100644 --- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset @@ -30,5 +30,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "MercuryBarycenter" + Identifiers = {"MercuryBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset index a4fc70ae9a..5a3fa3df6b 100644 --- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset +++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset @@ -59,5 +59,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Neptune" + Identifiers = {"Neptune"} } diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset index 7faf40750a..cc0a2d7eb4 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset @@ -47,5 +47,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "NeptuneTrail" + Identifiers = {"NeptuneTrail"} } diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset index 1fd86c1337..9757c78023 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset @@ -40,5 +40,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "VenusTrailEarth" + Identifiers = {"VenusTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset index 19a99b6b61..be9a959e1a 100644 --- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset +++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset @@ -30,5 +30,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "NeptuneBarycenter" + Identifiers = {"NeptuneBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/neptune/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton.asset index 9aba0c9518..3b796b74ad 100644 --- a/data/assets/scene/solarsystem/planets/neptune/triton.asset +++ b/data/assets/scene/solarsystem/planets/neptune/triton.asset @@ -37,5 +37,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Triton" + Identifiers = {"Triton"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index 9285f80cd1..bb66e85ba2 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -60,5 +60,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Enceladus" + Identifiers = {"Enceladus"} } 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 cbb634c0fa..d8a3e6dc5d 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 @@ -29,5 +29,5 @@ asset.meta = { URL = "https://astrogeology.usgs.gov/search/map/Enceladus/Cassini/" .. "Enceladus_Cassini_ISS_Global_Mosaic_100m_HPF", License = "NASA/PDS", - Identifiers = "Global_Mosaic_100m_HPF" + Identifiers = {"Global_Mosaic_100m_HPF"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset index 647228d2e1..df92c063be 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset @@ -37,5 +37,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "EnceladusTrail" + Identifiers = {"EnceladusTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index 3103501c3e..14dcdd94e2 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -59,5 +59,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Hyperion" + Identifiers = {"Hyperion"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset index bf16f431d2..42ef03180e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset @@ -37,5 +37,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "HyperionTrail" + Identifiers = {"HyperionTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index 63132da3ad..ec01d7b69a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -60,5 +60,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Iapetus" + Identifiers = {"Iapetus"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset index c8c089970b..21e5681294 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset @@ -37,5 +37,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "IapetusTrail" + Identifiers = {"IapetusTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index e56c74a28d..1ba8d19d3f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -60,5 +60,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Mimas" + Identifiers = {"Mimas"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset index 32355adc85..9777b2c2f6 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset @@ -37,5 +37,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "MimasTrail" + Identifiers = {"MimasTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset index d6bb4c47f2..8cfb39f883 100644 --- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset +++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset @@ -69,5 +69,6 @@ asset.meta = { Description = [[ Saturn globe, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = {"Saturn", "SaturnLabel"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset index 93aed7e860..e59abc51d2 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset @@ -31,5 +31,5 @@ asset.meta = { 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" + Identifiers = {"Cassini_ISS_Global_Mosaic_4km_LiU"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset index e60c2042eb..dd947f3214 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset @@ -60,5 +60,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Titan" + Identifiers = {"Titan"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset index 64176c0c3e..642a32b306 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset @@ -37,5 +37,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "TitanTrail" + Identifiers = {"TitanTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset index 05d35198cd..5f11ff9c71 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset @@ -35,5 +35,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "SaturnTrail" + Identifiers = {"SaturnTrail"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset index cae480d1b4..d62a830e25 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset @@ -37,7 +37,7 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "VenusTrailEarth" + Identifiers = {"VenusTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset index 0edc4e247c..486b23469b 100644 --- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset +++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset @@ -30,5 +30,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "SaturnBarycenter" + Identifiers = {"SaturnBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset index d1101204bf..d853a80c7c 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset @@ -35,5 +35,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "UranusTrail" + Identifiers = {"UranusTrail"} } diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset index 2390b5cb48..0b98567560 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset @@ -40,5 +40,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "VenusTrailEarth" + Identifiers = {"VenusTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset index fd8a081fa6..be3566e994 100644 --- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset +++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset @@ -59,5 +59,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Uranus,UranusLabel" + Identifiers = {"Uranus" , "UranusLabel"} } diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset index ca97a2cbd7..5742ade4a8 100644 --- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset @@ -71,5 +71,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "VenusAtmosphere" + Identifiers = {"VenusAtmosphere"} } 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 c54eca68d3..867ca8b10e 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 @@ -43,5 +43,5 @@ asset.meta = { URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/" .. "Venus_Magellan_LeftLook_mosaic_global_75m", License = "NASA/PDS", - Identifiers = "Magellan_Mosaic_Utah" + Identifiers = {"Magellan_Mosaic_Utah"} } diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset index 8ffd0677b1..95bf17d62a 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset @@ -38,5 +38,5 @@ asset.meta = { URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/RadarProperties" .. "/Venus_Magellan_Topography_Global_4641m_v02", License = "NASA/PDS", - Identifiers = "Magellan" + Identifiers = {"Magellan"} } diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset index e683a11ee7..6172f6b66c 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail.asset @@ -38,5 +38,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "VenusTrail" + Identifiers = {"VenusTrail"} } diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset index a9cc3633d9..a96a8990db 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset @@ -39,5 +39,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "VenusTrailEarth" + Identifiers = {"VenusTrailEarth"} } diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset index 1f84882347..83349ef680 100644 --- a/data/assets/scene/solarsystem/planets/venus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset @@ -30,5 +30,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "VenusBarycenter" + Identifiers = {"VenusBarycenter"} } diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index 0b2871f033..0f4c1cbe9f 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -82,5 +82,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Venus,VenusLabel" + Identifiers = {"Venus", "VenusLabel"} } diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset index bf980397b7..de5fa442e5 100644 --- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset @@ -25,5 +25,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_amor_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset index ba7fe9c9e6..67c043019a 100644 --- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset @@ -25,5 +25,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_apollo_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset index cba5c40e93..c522abe149 100644 --- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset @@ -26,5 +26,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_aten_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset index bc7cd92e66..b06b0850de 100644 --- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset @@ -26,5 +26,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_atira_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset index 2ad536f7fb..912db8d30b 100644 --- a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset +++ b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset @@ -59,5 +59,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", License = "NASA", - Identifiers = "C2019Y4AtlasPosition,C2019Y4AtlasTrail" + Identifiers = {"C2019Y4AtlasPosition", "C2019Y4AtlasTrail"} } diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset index ab7d80067d..baa3d5469f 100644 --- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset @@ -26,5 +26,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_centaur_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset index dd1aa61d3a..81f1523ac6 100644 --- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset @@ -26,5 +26,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_chiron-type_comet"} } diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset index b3516e4e91..c3af524bb2 100644 --- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset @@ -26,5 +26,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_encke-type_comet"} } diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset index cfbe090cbe..ebc84f9e0d 100644 --- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset @@ -25,5 +25,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_halley-type_comet"} } 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 c28f479795..bd63087c9b 100644 --- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset @@ -26,5 +26,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_inner_main_belt_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset index a2bbe595ff..ecbf215d8e 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset @@ -26,5 +26,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_jupiter-family_comet"} } diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset index f272d92e68..6663cd38a2 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset @@ -26,5 +26,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_jupiter_trojan_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset index 4535fb686b..580b7b5fbb 100644 --- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset @@ -27,5 +27,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_main_belt_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset index 7da4f37d64..dd3252f7c2 100644 --- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset @@ -26,5 +26,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_mars-crossing_asteroid"} } 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 f98a8db61b..e792b3d556 100644 --- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset @@ -31,5 +31,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_outer_main_belt_asteroid"} } diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset index fec3d582b9..514396b4b2 100644 --- a/data/assets/scene/solarsystem/sssb/pha.asset +++ b/data/assets/scene/solarsystem/sssb/pha.asset @@ -31,5 +31,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_pha"} } diff --git a/data/assets/scene/solarsystem/sssb/swifttuttle.asset b/data/assets/scene/solarsystem/sssb/swifttuttle.asset index 142f26b84e..971c822bb2 100644 --- a/data/assets/scene/solarsystem/sssb/swifttuttle.asset +++ b/data/assets/scene/solarsystem/sssb/swifttuttle.asset @@ -58,5 +58,5 @@ asset.meta = { 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" + Identifiers = {"SwiftTuttlePosition", "SwiftTuttleTrail"} } diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset index caa5f90f2c..105a489659 100644 --- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset +++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset @@ -59,5 +59,5 @@ asset.meta = { 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" + Identifiers = {"TeslaPosition", "TeslaRoadsterTrail"} } diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset index d458ca2591..50a9dc8959 100644 --- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset @@ -34,5 +34,5 @@ asset.meta = { 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" + Identifiers = {"sssb_sssb_data_transneptunian_object_asteroid"} } diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset index 4f2aa4e267..3d817fe120 100644 --- a/data/assets/scene/solarsystem/sun/glare.asset +++ b/data/assets/scene/solarsystem/sun/glare.asset @@ -42,5 +42,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "SunGlare" + Identifiers = {"SunGlare"} } diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset index 191ee0073c..f392f82ad9 100644 --- a/data/assets/scene/solarsystem/sun/marker.asset +++ b/data/assets/scene/solarsystem/sun/marker.asset @@ -34,5 +34,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "SunMarker" + Identifiers = {"SunMarker"} } diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset index be58afe588..36569f6092 100644 --- a/data/assets/scene/solarsystem/sun/sun.asset +++ b/data/assets/scene/solarsystem/sun/sun.asset @@ -59,5 +59,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "Sun,SunLabel" + Identifiers = {"Sun" , "SunLabel"} } diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset index e05b46acf4..fe661015d9 100644 --- a/data/assets/scene/solarsystem/sun/transforms.asset +++ b/data/assets/scene/solarsystem/sun/transforms.asset @@ -78,5 +78,5 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = "SolarSystemBarycenter,SunIAU,SunECLIPJ2000" + Identifiers = {"SolarSystemBarycenter", "SunIAU", "SunECLIPJ2000"} } diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset index f72e690643..66fddec5ad 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 = "5d9b8d52e43260c71f641e73e44e4c90bc9f5d6a" +local frontendHash = "da6b14e4f2f40a8e6340de3251839ff09970b005" local dataProvider = "data.openspaceproject.com/files/webgui" local frontend = asset.syncedResource({ diff --git a/data/profiles/mars.profile b/data/profiles/mars.profile index 44b0fb44bd..56d2dd82a6 100644 --- a/data/profiles/mars.profile +++ b/data/profiles/mars.profile @@ -39,7 +39,7 @@ "is_local": false, "key": "I", "name": "Setup scene for insight EDL", - "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -469.300000);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', -470.800006);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', true);openspace.time.setPause(true);openspace.time.setTime('2018 NOV 26 19:39:03.68');openspace.navigation.setNavigationState({Anchor = 'Insight',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});" + "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -469.300000);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISE-LS-DEM.Settings.Offset', -470.800006);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISE-LS.Enabled', true);openspace.time.setPause(true);openspace.time.setTime('2018 NOV 26 19:39:03.68');openspace.navigation.setNavigationState({Anchor = 'Insight',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});" }, { "documentation": "Disable Mars layer settings used for insight EDL", @@ -47,7 +47,7 @@ "is_local": false, "key": "SHIFT+I", "name": "Unset Insight Landing", - "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', 0);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', 0);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', false);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', false);" + "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', 0);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISE-LS-DEM.Settings.Offset', 0);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISE-LS-DEM.Enabled', false);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISE-LS.Enabled', false);" }, { "documentation": "Sets time and layers for Perseverance landing", @@ -55,7 +55,7 @@ "is_local": false, "key": "P", "name": "Setup and Goto Perseverance", - "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1677.088867);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', -1677.088867);openspace.time.setPause(true);openspace.time.setTime('2021 FEB 18 20:32:16');openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISELS.Enabled', true);openspace.navigation.setNavigationState({Anchor = 'Perseverance',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});" + "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1677.088867);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISE-LS-DEM.Settings.Offset', -1677.088867);openspace.time.setPause(true);openspace.time.setTime('2021 FEB 18 20:32:16');openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISE-LS.Enabled', true);openspace.navigation.setNavigationState({Anchor = 'Perseverance',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});" } ], "mark_nodes": [ diff --git a/include/openspace/documentation/documentationgenerator.h b/include/openspace/documentation/documentationgenerator.h index 41c3f21508..8b5a165880 100644 --- a/include/openspace/documentation/documentationgenerator.h +++ b/include/openspace/documentation/documentationgenerator.h @@ -102,6 +102,16 @@ private: */ std::string escapedJson(const std::string& text); + +/** + * This function takes a \p list of text and escapes all necessary characters () that JSON + * does not want in its strings. + * \param text The list text that is to be escaped + * \return The same text will all required characteres escaped + */ +std::string escapedJson(const std::vector& list); + + } // namespace openspace #endif // __OPENSPACE_CORE___DOCUMENTATIONGENERATOR___H__ diff --git a/include/openspace/scene/asset.h b/include/openspace/scene/asset.h index 9b08c84e40..7fd8afd13f 100644 --- a/include/openspace/scene/asset.h +++ b/include/openspace/scene/asset.h @@ -56,7 +56,7 @@ public: std::string author; std::string url; std::string license; - std::string identifiers; + std::vector identifiers; }; /** diff --git a/src/documentation/documentationgenerator.cpp b/src/documentation/documentationgenerator.cpp index 384c46ab96..b81cd02bd1 100644 --- a/src/documentation/documentationgenerator.cpp +++ b/src/documentation/documentationgenerator.cpp @@ -58,6 +58,42 @@ std::string DocumentationGenerator::jsonName() { return _jsonName; } +std::string escapedJson(const std::vector& list) { + std::string jsonString; + jsonString += "["; + for (const std::string& text : list) { + jsonString += "\\\""; + for (const char& c : text) { + switch (c) { + case '\t': + jsonString += "\\t"; // Replace tab with \t. + break; + case '"': + jsonString += "\\\""; // Replace " with \". + break; + case '\\': + jsonString += "\\\\"; // Replace \ with \\. + break; + case '\n': + jsonString += "\\\\n"; // Replace newline with \n. + break; + case '\r': + jsonString += "\\r"; // Replace carriage return with \r. + break; + default: + jsonString += c; + } + } + jsonString += "\\\","; + } + if (jsonString.length() > 1) { + jsonString.pop_back(); + } + jsonString += "]"; + + return jsonString; +} + std::string escapedJson(const std::string& text) { std::string jsonString; for (const char& c : text) { diff --git a/src/scene/assetloader.cpp b/src/scene/assetloader.cpp index 828a3faf99..06804dbf08 100644 --- a/src/scene/assetloader.cpp +++ b/src/scene/assetloader.cpp @@ -305,7 +305,14 @@ bool AssetLoader::loadAsset(Asset* asset) { metaDict.getValue(MetaInformationAuthor, meta.author); metaDict.getValue(MetaInformationURL, meta.url); metaDict.getValue(MetaInformationLicense, meta.license); - metaDict.getValue(MetaInformationIdentifiers, meta.identifiers); + if (metaDict.hasKey(MetaInformationIdentifiers)) { + ghoul::Dictionary iddict = metaDict.value(MetaInformationIdentifiers); + for (int i = 1; i <= iddict.size(); ++i) { + std::string key = std::to_string(i); + std::string identifier = iddict.value(key); + meta.identifiers.push_back(identifier); + } + } asset->setMetaInformation(std::move(meta)); } }