From 9a8fe35e38d0692f5a002332f495f6231c158ab7 Mon Sep 17 00:00:00 2001 From: Lovisa Hassler Date: Fri, 11 Jan 2019 11:23:36 -0500 Subject: [PATCH 1/3] renamed chandraxray to chandra --- data/assets/scene/solarsystem/dsn/spacecrafts.asset | 6 +++--- .../chandraxray.asset => chandra/chandra.asset} | 10 +++++----- .../scene/solarsystem/dsn/spacecraftslabels.asset | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) rename data/assets/scene/solarsystem/dsn/spacecrafts/{chandraxray/chandraxray.asset => chandra/chandra.asset} (73%) diff --git a/data/assets/scene/solarsystem/dsn/spacecrafts.asset b/data/assets/scene/solarsystem/dsn/spacecrafts.asset index de97fb11fd..987a74d464 100644 --- a/data/assets/scene/solarsystem/dsn/spacecrafts.asset +++ b/data/assets/scene/solarsystem/dsn/spacecrafts.asset @@ -6,7 +6,7 @@ local Voyager2Asset = asset.require('scene/solarsystem/missions/voyager2/voyager -- added specifically for dsn visualization local CassiniAsset = asset.require('scene/solarsystem/dsn/spacecrafts/cassini/cassini') -local ChandraXrayAsset = asset.require('scene/solarsystem/dsn/spacecrafts/chandraxray/chandraxray') +local ChandraAsset = asset.require('scene/solarsystem/dsn/spacecrafts/chandra/chandra') local DawnAsset = asset.require('scene/solarsystem/dsn/spacecrafts/dawn/dawn') local GaiaAsset = asset.require('scene/solarsystem/dsn/spacecrafts/gaia/gaia') local GenesisAsset = asset.require('scene/solarsystem/dsn/spacecrafts/genesis/genesis') @@ -44,7 +44,7 @@ local signalDataIdMap = { GTL = GeotailAsset.spacecraftID, HYB2 = Hayabusa2Asset.spacecraftID, ICE = IceAsset.spacecraftID, - CHDR = ChandraXrayAsset.spacecraftID, + CHDR = ChandraAsset.spacecraftID, DAWN = DawnAsset.spacecraftID, JNO = JunoAsset.spacecraftID, KEPL = KeplerAsset.spacecraftID, @@ -73,7 +73,7 @@ local signalDataIdMap = { asset.export("signalDataIdMap", signalDataIdMap) asset.export("CassiniAsset", CassiniAsset) -asset.export("ChandraXrayAsset", ChandraXrayAsset) +asset.export("ChandraAsset", ChandraAsset) asset.export("DawnAsset", DawnAsset) asset.export("GaiaAsset", GaiaAsset) asset.export("GenesisAsset", GenesisAsset) diff --git a/data/assets/scene/solarsystem/dsn/spacecrafts/chandraxray/chandraxray.asset b/data/assets/scene/solarsystem/dsn/spacecrafts/chandra/chandra.asset similarity index 73% rename from data/assets/scene/solarsystem/dsn/spacecrafts/chandraxray/chandraxray.asset rename to data/assets/scene/solarsystem/dsn/spacecrafts/chandra/chandra.asset index 02c2bec964..212d9c20aa 100644 --- a/data/assets/scene/solarsystem/dsn/spacecrafts/chandraxray/chandraxray.asset +++ b/data/assets/scene/solarsystem/dsn/spacecrafts/chandra/chandra.asset @@ -7,9 +7,9 @@ local models = asset.syncedResource({ Identifier = "dsn_stations", Version = 1 }) -local spacecraftID = "ChandraXray"; +local spacecraftID = "Chandra"; -local ChandraXray = { +local Chandra = { Identifier = spacecraftID, Transform = { Translation = { @@ -21,9 +21,9 @@ local ChandraXray = { }, GUI = { - Name = "ChandraXray", - Path = "/Solar System/Missions/ChandraXray" + Name = "Chandra", + Path = "/Solar System/Missions/Chandra" } } asset.export("spacecraftID", spacecraftID) -assetHelper.registerSceneGraphNodesAndExport(asset, {ChandraXray}) \ No newline at end of file +assetHelper.registerSceneGraphNodesAndExport(asset, {Chandra}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset b/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset index c0e712ccb2..ffaea1e2df 100644 --- a/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset +++ b/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset @@ -13,9 +13,9 @@ local CassiniLabel = { }, ObjectIdentifier = spacecrafts.CassiniAsset.spacecraftID } -local ChandraXrayLabel = { - LabelText = ".Chandra Xray", - ObjectIdentifier = spacecrafts.ChandraXrayAsset.spacecraftID +local ChandraLabel = { + LabelText = ".Chandra", + ObjectIdentifier = spacecrafts.ChandraAsset.spacecraftID } local DawnLabel = { LabelText = ".Dawn", @@ -217,7 +217,7 @@ local labelMapInnerSpace = { local labelMapNearEarth = { Label1 = GaiaLabel, - Label2 = ChandraXrayLabel, + Label2 = ChandraLabel, label3 = ThemisBLabel, label4 = ThemisCLabel, label5 = WindLabel, From 670c71a05d820b4090eafe5f8340dec0f584e418 Mon Sep 17 00:00:00 2001 From: Lovisa Hassler Date: Fri, 11 Jan 2019 11:59:50 -0500 Subject: [PATCH 2/3] renamed the mars cube one sats --- .../scene/solarsystem/dsn/spacecrafts.asset | 12 ++++++------ .../marscubesata.asset => marcoa/marcoa.asset} | 11 ++++++----- .../marscubesatb.asset => marcob/marcob.asset} | 11 ++++++----- .../solarsystem/dsn/spacecraftslabels.asset | 16 ++++++++-------- 4 files changed, 26 insertions(+), 24 deletions(-) rename data/assets/scene/solarsystem/dsn/spacecrafts/{marscubesata/marscubesata.asset => marcoa/marcoa.asset} (73%) rename data/assets/scene/solarsystem/dsn/spacecrafts/{marscubesatb/marscubesatb.asset => marcob/marcob.asset} (73%) diff --git a/data/assets/scene/solarsystem/dsn/spacecrafts.asset b/data/assets/scene/solarsystem/dsn/spacecrafts.asset index 987a74d464..7bab6960da 100644 --- a/data/assets/scene/solarsystem/dsn/spacecrafts.asset +++ b/data/assets/scene/solarsystem/dsn/spacecrafts.asset @@ -15,8 +15,8 @@ local Hayabusa2Asset = asset.require('scene/solarsystem/dsn/spacecrafts/hayabusa local IceAsset = asset.require('scene/solarsystem/dsn/spacecrafts/ice/ice') local JunoAsset = asset.require('scene/solarsystem/dsn/spacecrafts/juno/juno') local KeplerAsset = asset.require('scene/solarsystem/dsn/spacecrafts/kepler/kepler') -local MarsCubeSatAAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marscubesata/marscubesata') -local MarsCubeSatBAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marscubesatb/marscubesatb') +local MarCOAAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marcoa/marcoa') +local MarCOBAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marcob/marcob') local MarsRecOrbAsset = asset.require('scene/solarsystem/dsn/spacecrafts/mro/mro') local MarsOdysseyAsset = asset.require('scene/solarsystem/dsn/spacecrafts/marsodyssey/marsodyssey') local MessengerAsset = asset.require('scene/solarsystem/dsn/spacecrafts/messenger/messenger') @@ -48,8 +48,8 @@ local signalDataIdMap = { DAWN = DawnAsset.spacecraftID, JNO = JunoAsset.spacecraftID, KEPL = KeplerAsset.spacecraftID, - MCOA = MarsCubeSatAAsset.spacecraftID, - MCOB = MarsCubeSatBAsset.spacecraftID, + MCOA = MarCOAAsset.spacecraftID, + MCOB = MarCOBAsset.spacecraftID, MRE1 = OpportunityAsset.spacecraftID, MRO = MarsRecOrbAsset.spacecraftID, MOM = MomAsset.spacecraftID, @@ -82,8 +82,8 @@ asset.export("Hayabusa2Asset", Hayabusa2Asset) asset.export("IceAsset", IceAsset) asset.export("JunoAsset", JunoAsset) asset.export("KeplerAsset", KeplerAsset) -asset.export("MarsCubeSatAAsset", MarsCubeSatAAsset) -asset.export("MarsCubeSatBAsset", MarsCubeSatBAsset) +asset.export("MarCOAAsset", MarCOAAsset) +asset.export("MarCOBAsset", MarCOBAsset) asset.export("MarsRecOrbAsset", MarsRecOrbAsset) asset.export("MarsOdysseyAsset", MarsOdysseyAsset) asset.export("MessengerAsset", MessengerAsset) diff --git a/data/assets/scene/solarsystem/dsn/spacecrafts/marscubesata/marscubesata.asset b/data/assets/scene/solarsystem/dsn/spacecrafts/marcoa/marcoa.asset similarity index 73% rename from data/assets/scene/solarsystem/dsn/spacecrafts/marscubesata/marscubesata.asset rename to data/assets/scene/solarsystem/dsn/spacecrafts/marcoa/marcoa.asset index a8e4fccf36..92e821d151 100644 --- a/data/assets/scene/solarsystem/dsn/spacecrafts/marscubesata/marscubesata.asset +++ b/data/assets/scene/solarsystem/dsn/spacecrafts/marcoa/marcoa.asset @@ -1,3 +1,4 @@ +-- Mars Cube One A local assetHelper = asset.require('util/asset_helper') local dataFolder = openspace.absPath("${SYNC}/http/dsn_data/1/positioning/MCOA") @@ -7,9 +8,9 @@ local models = asset.syncedResource({ Identifier = "dsn_stations", Version = 1 }) -local spacecraftID = "MarsCubeSatA"; +local spacecraftID = "MarCO A"; -local MarsCubeSatA = { +local MarCOA = { Identifier = spacecraftID, Transform = { Translation = { @@ -21,9 +22,9 @@ local MarsCubeSatA = { }, GUI = { - Name = "Mars Cubesat A", - Path = "/Solar System/Missions/MarsCubeSatA" + Name = "MarCO A", + Path = "/Solar System/Missions/MarCO A" } } asset.export("spacecraftID", spacecraftID) -assetHelper.registerSceneGraphNodesAndExport(asset, {MarsCubeSatA}) \ No newline at end of file +assetHelper.registerSceneGraphNodesAndExport(asset, {MarCOA}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dsn/spacecrafts/marscubesatb/marscubesatb.asset b/data/assets/scene/solarsystem/dsn/spacecrafts/marcob/marcob.asset similarity index 73% rename from data/assets/scene/solarsystem/dsn/spacecrafts/marscubesatb/marscubesatb.asset rename to data/assets/scene/solarsystem/dsn/spacecrafts/marcob/marcob.asset index 0c0efa35ff..bfdf8a2044 100644 --- a/data/assets/scene/solarsystem/dsn/spacecrafts/marscubesatb/marscubesatb.asset +++ b/data/assets/scene/solarsystem/dsn/spacecrafts/marcob/marcob.asset @@ -1,3 +1,4 @@ +-- Mars Cube One B local assetHelper = asset.require('util/asset_helper') local dataFolder = openspace.absPath("${SYNC}/http/dsn_data/1/positioning/MCOB") @@ -7,9 +8,9 @@ local models = asset.syncedResource({ Identifier = "dsn_stations", Version = 1 }) -local spacecraftID = "MarsCubeSatB"; +local spacecraftID = "MarCO B"; -local MarsCubeSatB = { +local MarCOB = { Identifier = spacecraftID, Transform = { Translation = { @@ -21,9 +22,9 @@ local MarsCubeSatB = { }, GUI = { - Name = "Mars Cubesat B", - Path = "/Solar System/Missions/MarsCubeSatB" + Name = "MarCO B", + Path = "/Solar System/Missions/MarCO B" } } asset.export("spacecraftID", spacecraftID) -assetHelper.registerSceneGraphNodesAndExport(asset, {MarsCubeSatB}) \ No newline at end of file +assetHelper.registerSceneGraphNodesAndExport(asset, {MarCOB}) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset b/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset index ffaea1e2df..7467b2c498 100644 --- a/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset +++ b/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset @@ -69,21 +69,21 @@ local KeplerLabel = { LabelText = ".Kepler", ObjectIdentifier = spacecrafts.KeplerAsset.spacecraftID } -local MarsCubeSatALabel = { - LabelText = ".MCO A", +local MarCOALabel = { + LabelText = ".MarCO A", TimeFrame = { Start = "2018-125T12:00:00", End = "2018-365T19:00:00" }, - ObjectIdentifier = spacecrafts.MarsCubeSatAAsset.spacecraftID + ObjectIdentifier = spacecrafts.MarCOAAsset.spacecraftID } -local MarsCubeSatBLabel = { - LabelText = ".MCO B", +local MarCOBLabel = { + LabelText = ".MarCO B", TimeFrame = { Start = "2018-125T12:00:00", End = "2018-365T19:00:00" }, - ObjectIdentifier = spacecrafts.MarsCubeSatBAsset.spacecraftID + ObjectIdentifier = spacecrafts.MarCOBAsset.spacecraftID } local MarsRecOrbLabel = { LabelText = ".Mars Recon Orbiter", @@ -210,8 +210,8 @@ local labelMapInnerSpace = { label8 = GenesisLabel, label9 = Hayabusa2Label, label10 = MessengerLabel, - label12 = MarsCubeSatALabel, - label13 = MarsCubeSatBLabel + label12 = MarCOALabel, + label13 = MarCOBLabel } From 439184311635fb413ab79c99f56b7019c4e3cefe Mon Sep 17 00:00:00 2001 From: Lovisa Hassler Date: Fri, 11 Jan 2019 12:20:05 -0500 Subject: [PATCH 3/3] abbreviations in capital letters --- data/assets/scene/solarsystem/dsn/spacecraftslabels.asset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset b/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset index 7467b2c498..158950302d 100644 --- a/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset +++ b/data/assets/scene/solarsystem/dsn/spacecraftslabels.asset @@ -114,7 +114,7 @@ local OpportunityLabel = { ObjectIdentifier = spacecrafts.OpportunityAsset.spacecraftID } local SohoLabel = { - LabelText = ".Soho", + LabelText = ".SOHO", ObjectIdentifier = spacecrafts.SohoAsset.spacecraftID } local SpitzerLabel = { @@ -135,7 +135,7 @@ local StereoBLabel = { } --Transit exoplanet Survey Satellite local TessLabel = { - LabelText = ".Tess", + LabelText = ".TESS", TimeFrame = { Start = "2018-108T23:00:00", End = "2019-001T01:00:00"