diff --git a/README.md b/README.md index dbc1982b63..9be01673e1 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ ![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/collection.jpg) # Background -OpenSpace started as a collaboration between Sweden's [Linköping University](https://scivis.github.io) (LiU) and the [American Museum of Natural History](https://www.amnh.org) (AMNH). Development of the software began several years ago through a close collaboration with NASA Goddard's [Community Coordinated Modeling Center](https://ccmc.gsfc.nasa.gov) (CCMC) to model space weather forecasting and continued with visualizations of NASA's New Horizons mission to Pluto and ESA's Rosetta mission to 67P/Churyumov–Gerasimenko. This promising set of preliminary work provided a foundation for continued funding from NASA, the Swedish eScience Research Centre, and the Knut and Alice Wallenberg foundation, which has extended the collaboration to include the University of Utah's [Scientific Computing and Imaging](https://www.sci.utah.edu) (SCI) Institute, [New York University](https://www.nyu.edu)'s Tandon School of Engineering, multiple informal science institutions across the world, and multiple, international vendors. +OpenSpace started as a collaboration between Sweden's [Linköping University](https://scivis.github.io) (LiU) and the [American Museum of Natural History](https://www.amnh.org) (AMNH). Development of the software began several years ago through a close collaboration with NASA Goddard's [Community Coordinated Modeling Center](https://ccmc.gsfc.nasa.gov) (CCMC) to model space weather forecasting and continued with visualizations of NASA's New Horizons mission to Pluto and ESA's Rosetta mission to 67P/Churyumov-Gerasimenko. This promising set of preliminary work provided a foundation for continued funding from NASA, the Swedish eScience Research Centre, and the Knut and Alice Wallenberg foundation, which has extended the collaboration to include the University of Utah's [Scientific Computing and Imaging](https://www.sci.utah.edu) (SCI) Institute, [New York University](https://www.nyu.edu)'s Tandon School of Engineering, multiple informal science institutions across the world, and multiple, international vendors. ![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/presentation.jpg) diff --git a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp index 6e620a6959..4e7fdfb890 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp @@ -373,7 +373,7 @@ void ActionDialog::createKeyboardWidgets(QGridLayout* layout) { "it is defined in an asset included in this profile, you can enter the " "identifier of that action manually here to associate a key with it. If the " "identifer does not exist, an error will be logged when trying to bind the key " - "at startup." + "at startup" ); _keybindingWidgets.actionText->setEnabled(false); layout->addWidget(_keybindingWidgets.actionText, 13, 2); @@ -557,7 +557,7 @@ void ActionDialog::actionSaved() { this, "Duplicate identifier", "The chosen identifier was already used in another action. Identifiers " - "have to be unique. Please choose a different identfier." + "have to be unique. Please choose a different identfier" ); return; } diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp index a44c0beadc..f1b14d65cd 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp @@ -158,7 +158,7 @@ AssetsDialog::AssetsDialog(QWidget* parent, openspace::Profile* profile, _assetTree->setToolTip( "Expand arrow entries to browse assets in this OpenSpace installation. " "Enable checkbox to include an asset. Those assets highlighted in red are " - "present in the profile but do not exist in this OpenSpace installation." + "present in the profile but do not exist in this OpenSpace installation" ); _assetTree->setAlternatingRowColors(true); _assetTree->setModel(&_assetTreeModel); diff --git a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp index 8fbc6ef5d6..d10250b064 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp @@ -986,7 +986,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) { appendLog(msg, HorizonsDialog::LogLevel::Error); msg = fmt::format( - "Try to use '@{}' as observer to search for possible matches.", + "Try to use '@{}' as observer to search for possible matches", _observerName ); appendLog(msg, HorizonsDialog::LogLevel::Info); @@ -998,7 +998,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) { case HorizonsResultCode::ErrorObserverTargetSame: { std::string msg = fmt::format( "The observer '{}' and target '{}' are the same. Please use another " - "observer for the current target.", _observerName, _targetName + "observer for the current target", _observerName, _targetName ); appendLog(msg, HorizonsDialog::LogLevel::Error); styleLabel(_targetLabel, IsDirty::Yes); @@ -1011,7 +1011,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) { std::string msg = fmt::format( "There is not enough data to compute the state of target '{}' in " "relation to the observer '{}' for the time range '{}' to '{}'. Try to " - "use another observer for the current target or another time range.", + "use another observer for the current target or another time range", _targetName, _observerName, _startTime, _endTime ); appendLog(msg, HorizonsDialog::LogLevel::Error); @@ -1028,7 +1028,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) { msg = fmt::format( "Did not find what you were looking for? Use '@{}' as observer to search " - "for alternatives.", _observerName + "for alternatives", _observerName ); appendLog(msg, HorizonsDialog::LogLevel::Info); styleLabel(_centerLabel, IsDirty::Yes); @@ -1104,8 +1104,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsResultCode& result) { appendLog(msg, HorizonsDialog::LogLevel::Error); msg = fmt::format( - "Try to use '{}*' as target to search for possible matches.", - _targetName + "Try to use '{}*' as target to search for possible matches", _targetName ); appendLog(msg, HorizonsDialog::LogLevel::Info); styleLabel(_targetLabel, IsDirty::Yes); diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp index 8e7aed430e..e3f4a9f982 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp @@ -41,7 +41,7 @@ OrientationDialog::OrientationDialog(sgct::quat& orientation, QWidget* parent) { QString pitchTip = "Pitch or elevation: negative numbers tilt the camera " "downwards; positive numbers tilt upwards.\nThe allowed range is [-90, 90]. " - "Internally, this corresponds to the x value in the quaternion."; + "Internally, this corresponds to the x value in the quaternion"; QLabel* labelPitch = new QLabel("Pitch"); labelPitch->setToolTip(pitchTip); @@ -58,7 +58,7 @@ OrientationDialog::OrientationDialog(sgct::quat& orientation, QWidget* parent) { QString rollTip = "Roll or bank: negative numbers rotate the camera counter-" "clockwise; positive numbers clockwise.\nThe allowed range is [-180, 180]. " - "Internally, this corresponds to the z value in the quaternion."; + "Internally, this corresponds to the z value in the quaternion"; QLabel* labelRoll = new QLabel("Roll"); labelRoll->setToolTip(rollTip); @@ -75,7 +75,7 @@ OrientationDialog::OrientationDialog(sgct::quat& orientation, QWidget* parent) { QString yawTip = "Yaw, heading, or azimuth: negative numbers pan the camera " "to the left; positive numbers pan to the\nright. The allowed range is " - "[-360, 360]. Internally, this corresponds to the y value in the quaternion."; + "[-360, 360]. Internally, this corresponds to the y value in the quaternion"; QLabel* labelYaw = new QLabel; labelYaw ->setText("Yaw"); diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp index da5de7b8aa..2f5eae4166 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp @@ -147,19 +147,19 @@ void SgctEdit::createWidgets(const std::vector& monitorSizes) { layout->addWidget(bottomBorder); _cancelButton = new QPushButton("Cancel"); - _cancelButton->setToolTip("Cancel changes."); + _cancelButton->setToolTip("Cancel changes"); _cancelButton->setFocusPolicy(Qt::NoFocus); connect(_cancelButton, &QPushButton::released, this, &SgctEdit::reject); layoutButtonBox->addWidget(_cancelButton); _saveButton = new QPushButton("Save As"); - _saveButton->setToolTip("Save configuration changes."); + _saveButton->setToolTip("Save configuration changes"); _saveButton->setFocusPolicy(Qt::NoFocus); connect(_saveButton, &QPushButton::released, this, &SgctEdit::save); layoutButtonBox->addWidget(_saveButton); _applyButton = new QPushButton("Apply Without Saving"); - _applyButton->setToolTip("Apply configuration changes without saving to file."); + _applyButton->setToolTip("Apply configuration changes without saving to file"); _applyButton->setFocusPolicy(Qt::NoFocus); connect(_applyButton, &QPushButton::released, this, &SgctEdit::apply); layoutButtonBox->addWidget(_applyButton); diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp index 3d7938cc19..27c9cf99ff 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp @@ -118,7 +118,7 @@ void WindowControl::createWidgets(const QColor& windowColor) { ))); layout->addWidget(_windowNumber, 0, 0, 1, 8, Qt::AlignCenter); { - QString tip = "The name for the window (displayed in title bar)."; + QString tip = "The name for the window (displayed in title bar)"; QLabel* labelName = new QLabel("Name"); labelName->setToolTip(tip); @@ -128,7 +128,7 @@ void WindowControl::createWidgets(const QColor& windowColor) { _windowName->setToolTip(tip); layout->addWidget(_windowName, 1, 1, 1, 7); } - QString tip = "The monitor where this window is located."; + QString tip = "The monitor where this window is located"; _monitor = new QComboBox; _monitor->addItems(monitorNames(_monitorResolutions)); @@ -207,7 +207,7 @@ void WindowControl::createWidgets(const QColor& windowColor) { QLabel* offset = new QLabel("Offset"); offset->setToolTip( "The x,y location of the window's upper left corner from monitor's " - "upper-left corner origin (pixels)." + "upper-left corner origin (pixels)" ); offset->setFixedWidth(55); layout->addWidget(offset, 4, 0); @@ -420,7 +420,7 @@ QWidget* WindowControl::createFisheyeWidget() { "This projection provides a rendering in a format that is suitable for " "planetariums and other immersive environments. A field-of-view of 180 degrees " "is presented as a circular image in the center of the screen. For this " - "projection a square window is suggested, but not necessary." + "projection a square window is suggested, but not necessary" ); info->setObjectName("info"); info->setWordWrap(true); @@ -465,7 +465,7 @@ QWidget* WindowControl::createSphericalMirrorWidget() { "This projection is rendering a image suite for use with a spherical mirror " "projection as described by Paul Bourke (http://paulbourke.net/dome/mirrordome/) " "and which is a low-cost yet effective way to provide content for a sphericalal " - "display surface using a regular projector." + "display surface using a regular projector" ); info->setObjectName("info"); info->setWordWrap(true); @@ -503,7 +503,7 @@ QWidget* WindowControl::createCylindricalWidget() { "This projection type provides a cylindrical rendering that covers 360 degrees " "around the camera, which can be useful in immersive environments that are not " "spherical, but where, for example, all walls of a room are covered with " - "projectors." + "projectors" ); info->setObjectName("info"); info->setWordWrap(true); @@ -556,7 +556,7 @@ QWidget* WindowControl::createEquirectangularWidget() { "This projection provides the rendering as an image in equirectangular " "projection, which is a common display type for 360 surround video. When " "uploading a video in equirectangular projection to YouTube, for example, it " - "will use it as a 360 video." + "will use it as a 360 video" ); info->setObjectName("info"); info->setWordWrap(true); diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 620c2965ac..63574a78cb 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 620c2965ac97cb0a28dc66677179dbc33b5ea4bf +Subproject commit 63574a78cbcd29845bb30cff95fbc2f57b43e3b5 diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp index 7a40a18655..95065776ac 100644 --- a/apps/OpenSpace/main.cpp +++ b/apps/OpenSpace/main.cpp @@ -1083,7 +1083,7 @@ int main(int argc, char* argv[]) { commandlineArguments.configurationName, "--file", "-f", "Provides the path to the OpenSpace configuration file. Only the '${TEMPORARY}' " "path token is available and any other path has to be specified relative to the " - "current working directory." + "current working directory" )); parser.addCommand(std::make_unique>( @@ -1094,7 +1094,7 @@ int main(int argc, char* argv[]) { "configuration file without editing the file on disk, for example in a " "planetarium environment. Please not that the Lua script must not contain any - " "or they will be interpreted as a new command. Similar, in Bash, ${...} will be " - "evaluated before it is passed to OpenSpace." + "evaluated before it is passed to OpenSpace" )); // setCommandLine returns a reference to the vector that will be filled later diff --git a/apps/Sync/main.cpp b/apps/Sync/main.cpp index 00fd95d430..255c587ee0 100644 --- a/apps/Sync/main.cpp +++ b/apps/Sync/main.cpp @@ -68,7 +68,7 @@ int main(int, char**) { progressBar.print(static_cast(progress * 100.f)); }); } - std::cout << "Done synchronizing." << std::endl; + std::cout << "Done synchronizing" << std::endl; return 0; }; diff --git a/apps/TaskRunner/main.cpp b/apps/TaskRunner/main.cpp index 58f88076ee..194b52e4de 100644 --- a/apps/TaskRunner/main.cpp +++ b/apps/TaskRunner/main.cpp @@ -87,7 +87,7 @@ void performTasks(const std::string& path) { }; task.perform(onProgress); } - std::cout << "Done performing tasks." << std::endl; + std::cout << "Done performing tasks" << std::endl; } int main(int argc, char** argv) { diff --git a/data/assets/actions/system/undo_event_fades.asset b/data/assets/actions/system/undo_event_fades.asset index 6038938a99..ed8249386c 100644 --- a/data/assets/actions/system/undo_event_fades.asset +++ b/data/assets/actions/system/undo_event_fades.asset @@ -4,7 +4,8 @@ local undo_event_fade = { Command = [[ openspace.setPropertyValue("Scene.*.Renderable.Fade", 1.0, 0.5); ]], - Documentation = [[Sets the 'Fade' value of all renderables to 1. This internval values is managed by events.]], + Documentation = [[Sets the 'Fade' value of all renderables to 1. This internval values + is managed by events]], GuiPath = "/System/Rendering", IsLocal = true } @@ -22,7 +23,7 @@ end) asset.meta = { Name = "Actions - Undo All Event Fading", Version = "1.0", - Description = [[ Asset providing debug ability to undo all event fading.]], + Description = "Asset providing debug ability to undo all event fading", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/actions/trails/toggle_trail.asset b/data/assets/actions/trails/toggle_trail.asset index 14fe57433c..5f9f6c6c15 100644 --- a/data/assets/actions/trails/toggle_trail.asset +++ b/data/assets/actions/trails/toggle_trail.asset @@ -40,7 +40,7 @@ local toggle_trail = { ]], Documentation = [[Toggles the visibility of the associated trail of a scene graph node. This action takes optional arguments to 1) determine which trail to hide (as the - 'Node') and 2) the transition direction (as 'After' and 'Before').]], + 'Node') and 2) the transition direction (as 'After' and 'Before')]], GuiPath = "/Trails", IsLocal = true } @@ -112,7 +112,7 @@ end) asset.meta = { Name = "Actions - Toggle current Trails", Version = "1.0", - Description = [[ Asset providing actions to toggle trails]], + Description = "Asset providing actions to toggle trails", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset index 2037110afa..1e74a9cb64 100644 --- a/data/assets/customization/globebrowsing.asset +++ b/data/assets/customization/globebrowsing.asset @@ -107,7 +107,7 @@ end) asset.meta = { Name = "Customization - GlobeBrowsing", Version = "1.0", - Description = [[ This asset adds planetary images that can be downloaded separately + Description = [[This asset adds planetary images that can be downloaded separately and placed in the OpenSpaceData folder]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/customization/gui.asset b/data/assets/customization/gui.asset index 6e7d14003f..af95612cc4 100644 --- a/data/assets/customization/gui.asset +++ b/data/assets/customization/gui.asset @@ -11,7 +11,7 @@ asset.export("webguiDevelopmentMode", false) asset.meta = { Name = "Customization - User Interface", Version = "1.0", - Description = [[ This asset is used by developers working on the GUI.]], + Description = "This asset is used by developers working on the GUI", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/dashboard/date.asset b/data/assets/dashboard/date.asset index 111e8125fb..0ee8886c57 100644 --- a/data/assets/dashboard/date.asset +++ b/data/assets/dashboard/date.asset @@ -18,7 +18,7 @@ asset.export(item) asset.meta = { Name = "Dashboard - Date", Version = "1.0", - Description = [[ This asset provides a Date dashboard item.]], + Description = "This asset provides a Date dashboard item", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/dashboard/default_dashboard.asset b/data/assets/dashboard/default_dashboard.asset index fcb7c9be8b..2a75c5d06a 100644 --- a/data/assets/dashboard/default_dashboard.asset +++ b/data/assets/dashboard/default_dashboard.asset @@ -9,7 +9,7 @@ asset.require("./globelocation") asset.meta = { Name = "Dashboard - Default Items", Version = "1.0", - Description = [[ This asset provides the default items for the dashboard.]], + Description = "This asset provides the default items for the dashboard", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/dashboard/distance.asset b/data/assets/dashboard/distance.asset index e10cb5a54e..fd31c01a04 100644 --- a/data/assets/dashboard/distance.asset +++ b/data/assets/dashboard/distance.asset @@ -18,7 +18,7 @@ asset.export(item) asset.meta = { Name = "Dashboard - Distance", Version = "1.0", - Description = [[ This asset provides a Distance dashboard item.]], + Description = "This asset provides a Distance dashboard item", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/dashboard/framerate.asset b/data/assets/dashboard/framerate.asset index 47b6b3b71b..ff04db4e98 100644 --- a/data/assets/dashboard/framerate.asset +++ b/data/assets/dashboard/framerate.asset @@ -18,7 +18,7 @@ asset.export(item) asset.meta = { Name = "Dashboard - Framerate", Version = "1.0", - Description = [[ This asset provides a Framerate dashboard item.]], + Description = "This asset provides a Framerate dashboard item", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/dashboard/globelocation.asset b/data/assets/dashboard/globelocation.asset index 8fd743b7f9..1442218e4c 100644 --- a/data/assets/dashboard/globelocation.asset +++ b/data/assets/dashboard/globelocation.asset @@ -18,7 +18,7 @@ asset.export(item) asset.meta = { Name = "Dashboard - GlobeLocation", Version = "1.0", - Description = [[ This asset provides a GlobeLocation dashboard item.]], + Description = "This asset provides a GlobeLocation dashboard item", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/dashboard/parallelconnection.asset b/data/assets/dashboard/parallelconnection.asset index 29f932fc8b..81ac9f7221 100644 --- a/data/assets/dashboard/parallelconnection.asset +++ b/data/assets/dashboard/parallelconnection.asset @@ -18,7 +18,7 @@ asset.export(item) asset.meta = { Name = "Dashboard - ParallelConnection", Version = "1.0", - Description = [[ This asset provides a ParallelConnection dashboard item.]], + Description = "This asset provides a ParallelConnection dashboard item", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/dashboard/simulationincrement.asset b/data/assets/dashboard/simulationincrement.asset index 0e72bcbf22..392b828b41 100644 --- a/data/assets/dashboard/simulationincrement.asset +++ b/data/assets/dashboard/simulationincrement.asset @@ -18,8 +18,8 @@ asset.export(item) asset.meta = { Name = "Dashboard - Simulation Increment", Version = "1.0", - Description = [[ This asset provides a dashboard item that shows the simulation - increment, meaning how fast the in-game time progresses relative to the wall-clock.]], + Description = [[This asset provides a dashboard item that shows the simulation + increment, meaning how fast the in-game time progresses relative to the wall-clock]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/dashboard/velocity.asset b/data/assets/dashboard/velocity.asset index 1fc95087c9..57d4ebfbfd 100644 --- a/data/assets/dashboard/velocity.asset +++ b/data/assets/dashboard/velocity.asset @@ -19,7 +19,7 @@ asset.export(item) asset.meta = { Name = "Dashboard - Velocity", Version = "1.0", - Description = [[ This asset provides a dashboard item that shows the camera's velocity]], + Description = "This asset provides a dashboard item that shows the camera's velocity", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/events/toggle_sun.asset b/data/assets/events/toggle_sun.asset index 79ddb31176..8d727273ec 100644 --- a/data/assets/events/toggle_sun.asset +++ b/data/assets/events/toggle_sun.asset @@ -21,7 +21,7 @@ local toggle_sun = { ]], Documentation = [[Toggles the visibility of the Sun glare and the Sun globe when the camera is approaching either so that from far away the Sun Glare is rendered and when - close up, the globe is rendered instead.]], + close up, the globe is rendered instead]], GuiPath = "/Solar System/Sun", IsLocal = false } @@ -58,7 +58,7 @@ end) asset.meta = { Name = "Actions - Toggle current Trails", Version = "1.0", - Description = [[ Asset providing actions to toggle trails]], + Description = "Asset providing actions to toggle trails", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/examples/statemachine.asset b/data/assets/examples/statemachine.asset index 3cf24c42b7..adb2740172 100644 --- a/data/assets/examples/statemachine.asset +++ b/data/assets/examples/statemachine.asset @@ -24,8 +24,8 @@ local states = { }, { Identifier = "Earth", - Enter = "openspace.setPropertyValueSingle("Scene.EarthLabel.Renderable.Enabled", true)", - Exit = "openspace.setPropertyValueSingle("Scene.EarthLabel.Renderable.Enabled", false)" + Enter = 'openspace.setPropertyValueSingle("Scene.EarthLabel.Renderable.Enabled", true)', + Exit = 'openspace.setPropertyValueSingle("Scene.EarthLabel.Renderable.Enabled", false)' }, { Identifier = "Moon" diff --git a/data/assets/examples/temperature_land_highres.asset b/data/assets/examples/temperature_land_highres.asset index 09963967df..b3b67fff8d 100644 --- a/data/assets/examples/temperature_land_highres.asset +++ b/data/assets/examples/temperature_land_highres.asset @@ -23,7 +23,7 @@ local layer_prototype = { }, Interpolation = true, Colormap = path .. "rainbow.png", - Description = [[ Temporal coverage: 01 Jan 1981 - 31 Dec 2020.]] + Description = "Temporal coverage: 01 Jan 1981 - 31 Dec 2020" } local layer_folder = { @@ -37,7 +37,7 @@ local layer_folder = { }, Interpolation = true, Colormap = path .. "rainbow.png", - Description = [[ Temporal coverage: 01 Jan 1981 - 31 Dec 2020.]] + Description = "Temporal coverage: 01 Jan 1981 - 31 Dec 2020" } asset.onInitialize(function() @@ -55,7 +55,7 @@ asset.export("layer", layer_prototype) asset.meta = { Name = "Climate Earth Layers", Version = "1.0", - Description = [[ ERA5 data ]], + Description = "ERA5 data", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/modules/exoplanets/default_settings.asset b/data/assets/modules/exoplanets/default_settings.asset index e9784f81b6..88a5c2f448 100644 --- a/data/assets/modules/exoplanets/default_settings.asset +++ b/data/assets/modules/exoplanets/default_settings.asset @@ -9,7 +9,7 @@ end) asset.meta = { Name = "Exoplanet Default Settings", Version = "1.0", - Description = [[ Some default settings related to the exoplanet module ]], + Description = "Some default settings related to the exoplanet module", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/modules/exoplanets/exoplanets_data.asset b/data/assets/modules/exoplanets/exoplanets_data.asset index 197e23cb87..ecf3d4bd1f 100644 --- a/data/assets/modules/exoplanets/exoplanets_data.asset +++ b/data/assets/modules/exoplanets/exoplanets_data.asset @@ -31,7 +31,7 @@ asset.export("DataPath", DataPath) asset.meta = { Name = "Exoplanet Data", Version = "3.0", - Description = [[ The data that is used for the exoplanet systems. The data has been + Description = [[The data that is used for the exoplanet systems. The data has been derived from the 'Planetary Systems Composite Data' dataset from the NASA Exoplanet Archive]], Author = "OpenSpace Team", diff --git a/data/assets/modules/exoplanets/exoplanets_textures.asset b/data/assets/modules/exoplanets/exoplanets_textures.asset index 0c14a5727f..1a89f3b168 100644 --- a/data/assets/modules/exoplanets/exoplanets_textures.asset +++ b/data/assets/modules/exoplanets/exoplanets_textures.asset @@ -58,7 +58,7 @@ asset.export("TexturesPath", TexturesPath) asset.meta = { Name = "Exoplanet Textures", Version = "2.0", - Description = [[ Adds all textures that are required for the exoplanet system + Description = [[Adds all textures that are required for the exoplanet system visualizations]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/modules/skybrowser/default_settings.asset b/data/assets/modules/skybrowser/default_settings.asset index 6bb497667e..cd17650430 100644 --- a/data/assets/modules/skybrowser/default_settings.asset +++ b/data/assets/modules/skybrowser/default_settings.asset @@ -7,7 +7,7 @@ end) asset.meta = { Name = "SkyBrowser Module Default Settings", Version = "1.0", - Description = [[ Some default settings related to the SkyBrowser module ]], + Description = "Some default settings related to the SkyBrowser module", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/modules/skybrowser/hoverCircle.asset b/data/assets/modules/skybrowser/hoverCircle.asset index e526773b22..0618873b49 100644 --- a/data/assets/modules/skybrowser/hoverCircle.asset +++ b/data/assets/modules/skybrowser/hoverCircle.asset @@ -23,7 +23,7 @@ local circle = { Name = "Hover Circle", Description = [[A circular marker that shows the position on the night sky of the object hovered in the sky browser UI. The circle will hide/show up - dynamically, depending on the interaction with the items in the UI. ]], + dynamically, depending on the interaction with the items in the UI]], Path = "/SkyBrowser" } } @@ -43,7 +43,7 @@ asset.meta = { Name = "SkyBrowser Hover Circle", Version = "1.0", Description = [[Includes a circular marker that shows the position on the night sky - of the object hovered in the sky browser UI. ]], + of the object hovered in the sky browser UI]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset index bbd601d532..5cf19a4096 100644 --- a/data/assets/scene/digitaluniverse/2dF.asset +++ b/data/assets/scene/digitaluniverse/2dF.asset @@ -65,7 +65,7 @@ asset.export(object) asset.meta = { Name = "2dF Galaxies", Version = "2.1", - Description = [[Digital Universe asset for the The Two-degree Field (2dF) Survey.]], + Description = "Digital Universe asset for the The Two-degree Field (2dF) Survey", Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset index a28e1a21c6..c03d84df55 100644 --- a/data/assets/scene/digitaluniverse/2mass.asset +++ b/data/assets/scene/digitaluniverse/2mass.asset @@ -34,7 +34,7 @@ local object = { GUI = { Name = "2MASS Galaxies", Path = "/Universe/Galaxies", - Description = [[ The Two Micron All-Sky Survey (2MASS) is an infrared survey of the + Description = [[The Two Micron All-Sky Survey (2MASS) is an infrared survey of the sky published in 2003. Because it is looking in the infrared, and this is a composite of the 2MASS point-source catalog, most of the light from this survey is starlight. In visible light, clouds of gas and dust obscure our view. However, in infrared, the @@ -60,8 +60,7 @@ asset.export(object) asset.meta = { Name = "2MASS Galaxies", Version = "1.1", - Description = [[ Digital Universe asset for the Two Micron All-Sky Survey (2MASS) - survey]], + Description = "Digital Universe asset for the Two Micron All-Sky Survey (2MASS) survey", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset index 3d84f0f4d1..8d6d0fb0a9 100644 --- a/data/assets/scene/digitaluniverse/6dF.asset +++ b/data/assets/scene/digitaluniverse/6dF.asset @@ -62,7 +62,7 @@ asset.export(object) asset.meta = { Name = "6dF Galaxies", Version = "2.1", - Description = [[Digital Universe asset for The Six-degree Field (6dF) Galaxy Survey]], + Description = "Digital Universe asset for The Six-degree Field (6dF) Galaxy Survey", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset index c218cf6620..d9339aa103 100644 --- a/data/assets/scene/digitaluniverse/abell.asset +++ b/data/assets/scene/digitaluniverse/abell.asset @@ -42,7 +42,7 @@ local object = { Path = "/Universe/Galaxies", Description = [[Census 2,246 galaxies. DU Version 1.4.
The Abell catalog includes all the nearby, and not so nearby, galaxy clusters. The northern - hemisphere survey, published in 1958, was compiled by George Abell (1927–1983) + hemisphere survey, published in 1958, was compiled by George Abell (1927-1983) from the Palomar Sky Survey plates. A subsequent southern hemisphere catalog was published posthumously in 1989. Further analysis by Brent Tully determined their distance and three-dimensional distribution. Each point in this data set @@ -71,7 +71,7 @@ asset.export(object) asset.meta = { Name = "Abell Galaxy Clusters", Version = "2.1", - Description = [[Digital Universe asset for The Abell catalog]], + Description = "Digital Universe asset for The Abell catalog", Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset index a72d00012e..a97cd3cbee 100644 --- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset +++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset @@ -48,7 +48,7 @@ asset.export(object) asset.meta = { Name = "Stars Labels - Alternate", Version = "1.1", - Description = [[Digital Universe asset for alternate start labels]], + Description = "Digital Universe asset for alternate start labels", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset index 5a2cf75244..2e377c4175 100644 --- a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset +++ b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset @@ -150,9 +150,9 @@ asset.export(multiverse_planck_4) asset.meta = { Name = "Multiverse Background Radiation", Version = "2.1", - Description = [[ Non-physical representation of the location of hypothetical - cosmic microwave background radiation images how they would be observed from other - locations in the universe.
This is not a measured dataset!]], + Description = [[Non-physical representation of the location of hypothetical cosmic + microwave background radiation images how they would be observed from other locations + in the universe.
This is not a measured dataset]], Author = "Brian Abbott (AMNH), OpenSpace Team", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset index 6945184d6d..1d97d63e72 100644 --- a/data/assets/scene/digitaluniverse/clusters.asset +++ b/data/assets/scene/digitaluniverse/clusters.asset @@ -51,7 +51,7 @@ asset.export(object) asset.meta = { Name = "Galaxy Clusters Labels", Version = "1.1", - Description = [[Digital Universe asset for Galaxy Clusters]], + Description = "Digital Universe asset for Galaxy Clusters", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset index 94dad6b98c..c53f0bead2 100644 --- a/data/assets/scene/digitaluniverse/constellationbounds.asset +++ b/data/assets/scene/digitaluniverse/constellationbounds.asset @@ -34,7 +34,7 @@ local object = { Name = "Constellation Bounds", Path = "/Milky Way/Constellations", Description = [[A Spherical mesh dividing the sky into regions that fit the - constellations.]], + constellations]], } } @@ -54,7 +54,7 @@ asset.meta = { Name = "Constellation Bounds", Version = "1.1", Description = [[DU asset providing a Spherical mesh dividing the sky into regions that - fit the constellations.]], + fit the constellations]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset index f17e4602c8..9bd8d72f18 100644 --- a/data/assets/scene/digitaluniverse/constellations.asset +++ b/data/assets/scene/digitaluniverse/constellations.asset @@ -74,7 +74,7 @@ asset.export(constellations) asset.meta = { Name = "Constellations", Version = "1.1", - Description = [[Digital Universe asset for constellation lines]], + Description = "Digital Universe asset for constellation lines", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset index 98abecfa7f..eee9f485f8 100644 --- a/data/assets/scene/digitaluniverse/deepsky.asset +++ b/data/assets/scene/digitaluniverse/deepsky.asset @@ -47,7 +47,7 @@ local deepSkyPoints = { GUI = { Name = "Deep Sky Objects Points", Path = "/Universe/Galaxies", - Description = [[Point cloud and labels for Deep Sky Objects]] + Description = "Point cloud and labels for Deep Sky Objects" } } @@ -108,7 +108,7 @@ asset.export(deepSkyImages) asset.meta = { Name = "Deep Sky Objects Images", Version = "1.1", - Description = [[Digital Universe asset for Deep Sky Objects and their Images]], + Description = "Digital Universe asset for Deep Sky Objects and their Images", Author = "Nate Greenstein, Matt Everhart, Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/digitaluniverse.asset b/data/assets/scene/digitaluniverse/digitaluniverse.asset index f0b6bc530a..0506ccf4f5 100644 --- a/data/assets/scene/digitaluniverse/digitaluniverse.asset +++ b/data/assets/scene/digitaluniverse/digitaluniverse.asset @@ -40,7 +40,7 @@ asset.meta = { Name = "Digital Universe", Version = "1.0", Description = [[This asset is a meta asset, containing all the assets from the AMNH - Digital Universe.]], + Digital Universe]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset index b2903447d5..64aa5d74bf 100644 --- a/data/assets/scene/digitaluniverse/dwarfs.asset +++ b/data/assets/scene/digitaluniverse/dwarfs.asset @@ -73,7 +73,7 @@ asset.export(object) asset.meta = { Name = "Brown Dwarfs", Version = "2.1", - Description = [[Digital Universe asset for Brown Dwarfs]], + Description = "Digital Universe asset for Brown Dwarfs", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset index f144c2f4bd..60539b3fac 100644 --- a/data/assets/scene/digitaluniverse/exoplanets.asset +++ b/data/assets/scene/digitaluniverse/exoplanets.asset @@ -61,7 +61,7 @@ asset.export(object) asset.meta = { Name = "Exoplanets", Version = "1.1", - Description = [[Digital Universe asset for Exoplanets]], + Description = "Digital Universe asset for Exoplanets", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset index 0c0fe1259a..30f0bb75b4 100644 --- a/data/assets/scene/digitaluniverse/globularclusters.asset +++ b/data/assets/scene/digitaluniverse/globularclusters.asset @@ -36,7 +36,7 @@ local object = { Path = "/Milky Way", Description = [[Census: 157 globular clusters. DU Version 2.6.
Globular star clusters are gravitationally bound groups of 100,000 to 1 million stars. They - are compact, spherical “balls” of stars with very high stellar densities in + are compact, spherical "balls" of stars with very high stellar densities in their centers (stars near their center are within a light year of one another). These clusters are typically 30 to 100 light years in diameter. If Earth were located inside one of these clusters, our sky would be lit by an @@ -67,7 +67,7 @@ asset.meta = { Version = "2.1", Description = [[Census: 157 globular clusters. DU Version 2.6. Globular star clusters are gravitationally bound groups of 100,000 to 1 million stars. They are compact, - spherical “balls” of stars with very high stellar densities in their centers (stars + spherical "balls" of stars with very high stellar densities in their centers (stars near their center are within a light year of one another). These clusters are typically 30 to 100 light years in diameter. If Earth were located inside one of these clusters, our sky would be lit by an abundance of stars brighter than the Sun. The diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset index bd41977d09..e3a8904197 100644 --- a/data/assets/scene/digitaluniverse/groups.asset +++ b/data/assets/scene/digitaluniverse/groups.asset @@ -52,7 +52,7 @@ asset.meta = { Name = "Galaxy Group Labels", Version = "1.1", Author = "Brian Abbott (AMNH)", - Description = [[Digital Universe asset for Galaxy Groups]], + Description = "Digital Universe asset for Galaxy Groups", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset index 033bc25d14..480d0aaa3b 100644 --- a/data/assets/scene/digitaluniverse/h2regions.asset +++ b/data/assets/scene/digitaluniverse/h2regions.asset @@ -20,7 +20,7 @@ local object = { Color = { 0.0, 0.5, 1.0 }, Opacity = 0.70, File = speck .. "h2.speck", - Texture = textures .."point4.png", + Texture = textures .. "point4.png", PolygonSides = 6, LabelFile = speck .. "h2.label", Unit = "pc", @@ -63,7 +63,7 @@ asset.export(object) asset.meta = { Name = "HII Regions", Version = "1.1", - Description = [[Digital Universe asset for HII Regions]], + Description = "Digital Universe asset for HII Regions", Author = "Carter Emmart, Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/kepler.asset b/data/assets/scene/digitaluniverse/kepler.asset index 3e744c0ea7..5c2309c985 100644 --- a/data/assets/scene/digitaluniverse/kepler.asset +++ b/data/assets/scene/digitaluniverse/kepler.asset @@ -59,7 +59,7 @@ asset.export(object) asset.meta = { Name = "Kepler Planetary Candidates", Version = "2.1", - Description = [[Digital Universe asset for Kepler Planetary Candidates]], + Description = "Digital Universe asset for Kepler Planetary Candidates", Author = "Brian Abbott, Emily Rice, and Jason No (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset index a8a515032f..9322874697 100644 --- a/data/assets/scene/digitaluniverse/localdwarfs.asset +++ b/data/assets/scene/digitaluniverse/localdwarfs.asset @@ -65,7 +65,7 @@ asset.export(object) asset.meta = { Name = "Local Group", Version = "2.1", - Description = [[Digital Universe asset for the Local Goup]], + Description = "Digital Universe asset for the Local Goup", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset index 77a27c60c5..36daaf41c4 100644 --- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset +++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset @@ -32,7 +32,7 @@ local plane = { GUI = { Name = "Milky Way Arms Labels", Path = "/Universe/Galaxies", - Description = [[ Census: 1 image. DU Version: 1.2. This image contains labels for + Description = [[Census: 1 image. DU Version: 1.2. This image contains labels for the Milky Way's spiral arms. We label them in this manner ("hard coding" the labels into an image rather than having native labels) so that they can retain their size, shape, and location as they overlay the galaxy. (Description from @@ -55,10 +55,10 @@ asset.export(plane) asset.meta = { Name = "Milky Way Arms Labels", Version = "1.1", - Description = [[ Image with arm labels for the Milky Way galaxy]], + Description = "Image with arm labels for the Milky Way galaxy", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = [[ Copyright © American Museum of Natural History. All rights reserved. + License = [[Copyright © American Museum of Natural History. All rights reserved.

Downloading the Atlas: AMNH offers the Atlas free of charge via our website, http://www.haydenplanetarium.org/. The User is free to download and/or duplicate verbatim copies of the Atlas provided this license and copyright diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset index f58709f484..ae32435c2b 100644 --- a/data/assets/scene/digitaluniverse/milkyway_label.asset +++ b/data/assets/scene/digitaluniverse/milkyway_label.asset @@ -32,7 +32,7 @@ local homeLabel = { GUI = { Name = "Home Label", Path = "/Universe/Galaxies", - Description = [[Label for the Milky Way titled "Home", sided for the galactic level]], + Description = "Label for the Milky Way titled 'Home', sided for the galactic level", } } @@ -51,7 +51,7 @@ asset.export(homeLabel) asset.meta = { Name = "Home Label", Version = "1.1", - Description = [[Label for the Milky Way titled "Home", sided for the galactic level]], + Description = "Label for the Milky Way titled 'Home', sided for the galactic level", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset index a3b094106c..5e900f12ab 100644 --- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset +++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset @@ -50,7 +50,7 @@ asset.export(sphere) asset.meta = { Name = "Milky Way Galaxy Sphere", Version = "2.1", - Description = [[All sky image of the Milky Way]], + Description = "All sky image of the Milky Way", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset index 23844471ef..74e439360d 100644 --- a/data/assets/scene/digitaluniverse/obassociations.asset +++ b/data/assets/scene/digitaluniverse/obassociations.asset @@ -67,7 +67,7 @@ asset.export(object) asset.meta = { Name = "OB Associations", Version = "2.1", - Description = [[Digital Universe asset for OB Associations]], + Description = "Digital Universe asset for OB Associations", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset index 5478007c81..1a809e5836 100644 --- a/data/assets/scene/digitaluniverse/openclusters.asset +++ b/data/assets/scene/digitaluniverse/openclusters.asset @@ -63,7 +63,7 @@ asset.export(object) asset.meta = { Name = "Open Star Clusters", Version = "2.1", - Description = [[Digital Universe asset for Open Star Clusters]], + Description = "Digital Universe asset for Open Star Clusters", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset index 64416512c0..937a33043f 100644 --- a/data/assets/scene/digitaluniverse/planetarynebulae.asset +++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset @@ -60,7 +60,7 @@ asset.export(object) asset.meta = { Name = "Planetary Nebulae", Version = "2.1", - Description = [[Digital Universe asset for Planetary Nebulae]], + Description = "Digital Universe asset for Planetary Nebulae", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset index 64f0cd36c3..91f08b8a74 100644 --- a/data/assets/scene/digitaluniverse/pulsars.asset +++ b/data/assets/scene/digitaluniverse/pulsars.asset @@ -64,7 +64,7 @@ asset.export(object) asset.meta = { Name = "Pulsars", Version = "2.1", - Description = [[Digital Universe asset for Pulsars.]], + Description = "Digital Universe asset for Pulsars", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset index 4f6df72263..6a9b575edf 100644 --- a/data/assets/scene/digitaluniverse/quasars.asset +++ b/data/assets/scene/digitaluniverse/quasars.asset @@ -67,7 +67,7 @@ asset.export(object) asset.meta = { Name = "Quasars", Version = "2.1", - Description = [[Digital Universe asset for Quasars.]], + Description = "Digital Universe asset for Quasars", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset index f03c9d81e6..2f1af244ea 100644 --- a/data/assets/scene/digitaluniverse/sdss.asset +++ b/data/assets/scene/digitaluniverse/sdss.asset @@ -70,7 +70,7 @@ asset.export(object) asset.meta = { Name = "Sloan Digital Sky Survey", Version = "2.1", - Description = [[Digital Universe asset for The Sloan Digital Sky Survey (SDSS).]], + Description = "Digital Universe asset for The Sloan Digital Sky Survey (SDSS)", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset index d3c1c4cced..b4efcfe6ea 100644 --- a/data/assets/scene/digitaluniverse/starlabels.asset +++ b/data/assets/scene/digitaluniverse/starlabels.asset @@ -22,7 +22,7 @@ local object = { GUI = { Name = "Stars Labels", Path = "/Milky Way/Stars", - Description = [[Labels for stars in the Milky Way. See 'Stars' for more info.]], + Description = "Labels for stars in the Milky Way. See 'Stars' for more info", } } @@ -41,7 +41,7 @@ asset.export(object) asset.meta = { Name = "Star Labels", Version = "2.1", - Description = [[Digital Universe asset for labels of the stars.]], + Description = "Digital Universe asset for labels of the stars", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset index e5748af0a9..958499cd3c 100644 --- a/data/assets/scene/digitaluniverse/starorbits.asset +++ b/data/assets/scene/digitaluniverse/starorbits.asset @@ -26,7 +26,7 @@ local sunOrbit = { GUI = { Name = "Sun Orbit", Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of the Sun around the Milky Way"]] + Description = "Orbits of the Sun around the Milky Way" } } @@ -48,7 +48,7 @@ local barnardsOrbit = { GUI = { Name = "Barnards Orbit", Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of Barnard's Star around the Milky Way"]] + Description = "Orbits of Barnard's Star around the Milky Way" } } @@ -70,7 +70,7 @@ local kapteynsOrbit = { GUI = { Name = "Kapteyns Orbit", Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of Kapteyn's Star around the Milky Way"]] + Description = "Orbits of Kapteyn's Star around the Milky Way" } } @@ -92,7 +92,7 @@ local lacaille9352Orbit = { GUI = { Name = "Lacaille 9352 Orbit", Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of Lacaille9352 around the Milky Way"]] + Description = "Orbits of Lacaille9352 around the Milky Way" } } @@ -114,7 +114,7 @@ local lSR1826Orbit = { GUI = { Name = "LSR1826+3014 Orbit", Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of LSR1826+3014 around the Milky Way"]] + Description = "Orbits of LSR1826+3014 around the Milky Way" } } @@ -136,7 +136,7 @@ local lSRJ0822Orbit = { GUI = { Name = "LSRJ0822+1700 Orbit", Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of LSRJ0822+1700 around the Milky Way"]] + Description = "Orbits of LSRJ0822+1700 around the Milky Way" } } @@ -158,7 +158,7 @@ local pM_J13420Orbit = { GUI = { Name = "PM_J13420-3415 Orbit", Path = "/Milky Way/Stars/Stars Orbits", - Description = [["Orbits of PM_J13420-3415 around the Milky Way"]] + Description = "Orbits of PM_J13420-3415 around the Milky Way" } } diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset index de84d9a1d6..069e59b0ab 100644 --- a/data/assets/scene/digitaluniverse/stars.asset +++ b/data/assets/scene/digitaluniverse/stars.asset @@ -114,7 +114,7 @@ asset.export(sunstar) asset.meta = { Name = "Stars", Version = "2.1", - Description = [[Digital Universe asset for the stars.]], + Description = "Digital Universe asset for the stars", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset index bcf9dca7cc..cd7a4a649e 100644 --- a/data/assets/scene/digitaluniverse/superclusters.asset +++ b/data/assets/scene/digitaluniverse/superclusters.asset @@ -59,7 +59,7 @@ asset.export(object) asset.meta = { Name = "Galaxy Superclusters", Version = "2.1", - Description = [[Digital Universe asset for Galaxy Superclusters.]], + Description = "Digital Universe asset for Galaxy Superclusters", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset index cf15dbacfb..0f3fefa885 100644 --- a/data/assets/scene/digitaluniverse/supernovaremnants.asset +++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset @@ -59,7 +59,7 @@ asset.export(object) asset.meta = { Name = "Supernova Remnants", Version = "2.1", - Description = [[Digital Universe asset for Supernova Remnants.]], + Description = "Digital Universe asset for Supernova Remnants", Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset index abe1dc2918..cb488b17ff 100644 --- a/data/assets/scene/digitaluniverse/tully.asset +++ b/data/assets/scene/digitaluniverse/tully.asset @@ -98,7 +98,7 @@ local tullyImages = { come from The Galaxy Catalog. A handful of nearby galaxies are represented by their actual images, which come mostly from the National Optical Astronomy Observatory (NOAO). Each of these images has been altered from its original state. - These images were taken from Earth on some of the world’s largest telescopes, so + These images were taken from Earth on some of the world's largest telescopes, so foreground stars from our own Galaxy appear in each image. We are representing galaxies in extragalactic space, so we have removed the stars from each image. (Description from URL)

Data Reference: Tully Galaxy Catalog: Brent Tully @@ -125,7 +125,7 @@ asset.meta = { Name = "Tully Galaxies", Version = "3.1", Description = [[Digital Universe asset for Tully Galaxies, including point cloud and - images.]], + images]], Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset index c7d85f257c..02c0b964c9 100644 --- a/data/assets/scene/digitaluniverse/voids.asset +++ b/data/assets/scene/digitaluniverse/voids.asset @@ -23,7 +23,7 @@ local object = { GUI = { Name = "Voids", Path = "/Universe/Galaxies", - Description = [[ Census: 24 cosmic voids. DU Version 1.2.
Cosmic voids are + Description = [[Census: 24 cosmic voids. DU Version 1.2.
Cosmic voids are vast, empty spaces where there are either no galaxies, or very few galaxies. They are associated with cold spots in the cosmic microwave background (CMB) light, the earliest picture we have of the universe (see page 58). Those cold @@ -52,7 +52,7 @@ asset.meta = { Name = "Voids", Version = "2.1", Author = "Brian Abbott (AMNH)", - Description = [[Digital Universe asset for Cosmic voids.]], + Description = "Digital Universe asset for Cosmic voids", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" } diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset index 9e7b2e38e5..d96754f498 100644 --- a/data/assets/scene/milkyway/constellations/constellation_art.asset +++ b/data/assets/scene/milkyway/constellations/constellation_art.asset @@ -150,6 +150,8 @@ asset.onInitialize(function () openspace.action.registerAction(show_art) openspace.action.registerAction(hide_art) openspace.action.registerAction(disable_art) + openspace.action.registerAction(show_zodiac_art) + openspace.action.registerAction(hide_zodiac_art) end) asset.onDeinitialize(function () @@ -157,9 +159,11 @@ asset.onDeinitialize(function () openspace.removeSceneGraphNode(n.Identifier); end - openspace.action.removeAction(show_art) - openspace.action.removeAction(hide_art) + openspace.action.removeAction(hide_zodiac_art) + openspace.action.removeAction(show_zodiac_art) openspace.action.removeAction(disable_art) + openspace.action.removeAction(hide_art) + openspace.action.removeAction(show_art) end) for _, n in ipairs(nodes) do diff --git a/data/assets/scene/milkyway/gaia/apogee.asset b/data/assets/scene/milkyway/gaia/apogee.asset index 8685674ca9..abc8c1cb7f 100644 --- a/data/assets/scene/milkyway/gaia/apogee.asset +++ b/data/assets/scene/milkyway/gaia/apogee.asset @@ -51,7 +51,7 @@ local gaia_abundance_apogee = { GUI = { Path = "/Milky Way/Gaia", Name = "Gaia Abundance Apogee", - Description = "Data set of stars color coded by metallicity." + Description = "Data set of stars color coded by metallicity" } } @@ -70,7 +70,7 @@ asset.export(gaia_abundance_apogee) asset.meta = { Name = "Gaia Abundance Apogee", Version = "1.0", - Description = [[This asset contains a RenderableStars dataset with metallicity data.]], + Description = "This asset contains a RenderableStars dataset with metallicity data", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT License" diff --git a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset index 85f8ae35ee..b83394f81e 100644 --- a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset +++ b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset @@ -7,7 +7,7 @@ local gaia618Destination = asset.syncedResource({ Identifier = "gaia_stars_618M_octree", Version = 1 }) -local gaia618DestinationExtracted = gaia618Destination + "data"; +local gaia618DestinationExtracted = gaia618Destination .. "data"; -- Download the full DR2 dataset with 24 values per star (preprocessed with theReadFitsTask (gaia_read.task) into 8 binary files). -- From these files new subsets can be created with the ConstructOctreeTask (gaia_octree.task). @@ -34,8 +34,16 @@ asset.meta = { Name = "GaiaDR2 Download Stars", Version = "1.1", Description = [[This asset contains code to sync gaia subsets from the OpenSpace - servers. Edit this file to choose which subsets to sync. WARNING can use 150GB], + servers. Edit this file to choose which subsets to sync. WARNING can use 150GB]], Author = "ESA/Gaia/DPAC", URL = "https://gea.esac.esa.int/archive/documentation/GDR2/index.html", - License = [[The Gaia data are open and free to use, provided credit is given to 'ESA/Gaia/DPAC'. In general, access to, and use of, ESA's Gaia Archive (hereafter called 'the website') constitutes acceptance of the following general terms and conditions. Neither ESA nor any other party involved in creating, producing, or delivering the website shall be liable for any direct, incidental, consequential, indirect, or punitive damages arising out of user access to, or use of, the website. The website does not guarantee the accuracy of information provided by external sources and accepts no responsibility or liability for any consequences arising from the use of such data.]] + License = [[The Gaia data are open and free to use, provided credit is given to + 'ESA/Gaia/DPAC'. In general, access to, and use of, ESA's Gaia Archive (hereafter + called 'the website') constitutes acceptance of the following general terms and + conditions. Neither ESA nor any other party involved in creating, producing, or + delivering the website shall be liable for any direct, incidental, consequential, + indirect, or punitive damages arising out of user access to, or use of, the website. + The website does not guarantee the accuracy of information provided by external + sources and accepts no responsibility or liability for any consequences arising from + the use of such data]] } diff --git a/data/assets/scene/milkyway/gaia/gaiastars.asset b/data/assets/scene/milkyway/gaia/gaiastars.asset index 8ee150b4f9..7ed47dc838 100644 --- a/data/assets/scene/milkyway/gaia/gaiastars.asset +++ b/data/assets/scene/milkyway/gaia/gaiastars.asset @@ -58,7 +58,7 @@ local GaiaStars = { GUI = { Name = "Gaia Stars", Path = "/Milky Way", - Description = "Radial Velocity subset of GaiaDR2." + Description = "Radial Velocity subset of GaiaDR2" } } @@ -78,8 +78,16 @@ asset.meta = { Name = "Gaia Stars", Version = "1.0", Description = [[This asset contains a subset of GaiaDR2. This subset contains 7.5M stars which have - accurate values for a number of columns. ]], + accurate values for a number of columns]], Author = "ESA/Gaia/DPAC", URL = "https://gea.esac.esa.int/archive/documentation/GDR2/index.html", - License = [[The Gaia data are open and free to use, provided credit is given to 'ESA/Gaia/DPAC'. In general, access to, and use of, ESA's Gaia Archive (hereafter called 'the website') constitutes acceptance of the following general terms and conditions. Neither ESA nor any other party involved in creating, producing, or delivering the website shall be liable for any direct, incidental, consequential, indirect, or punitive damages arising out of user access to, or use of, the website. The website does not guarantee the accuracy of information provided by external sources and accepts no responsibility or liability for any consequences arising from the use of such data.]] + License = [[The Gaia data are open and free to use, provided credit is given to + 'ESA/Gaia/DPAC'. In general, access to, and use of, ESA's Gaia Archive (hereafter + called 'the website') constitutes acceptance of the following general terms and + conditions. Neither ESA nor any other party involved in creating, producing, or + delivering the website shall be liable for any direct, incidental, consequential, + indirect, or punitive damages arising out of user access to, or use of, the website. + The website does not guarantee the accuracy of information provided by external + sources and accepts no responsibility or liability for any consequences arising from + the use of such data]] } diff --git a/data/assets/scene/milkyway/gaia/galah.asset b/data/assets/scene/milkyway/gaia/galah.asset index 06d6e68129..8fa9fecdea 100644 --- a/data/assets/scene/milkyway/gaia/galah.asset +++ b/data/assets/scene/milkyway/gaia/galah.asset @@ -51,7 +51,7 @@ local gaia_abundance_galah = { GUI = { Path = "/Milky Way/Gaia", Name = "Gaia Abundance Galah", - Description = "Data set of stars color coded by metallicity." + Description = "Data set of stars color coded by metallicity" } } @@ -70,7 +70,7 @@ asset.export(gaia_abundance_galah) asset.meta = { Name = "Gaia Abundance Galah", Version = "1.0", - Description = [[This asset contains a RenderableStars dataset with metallicity data.]], + Description = "This asset contains a RenderableStars dataset with metallicity data", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT License" diff --git a/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset b/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset index 0adb898d5a..2cd17759ab 100644 --- a/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset +++ b/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset @@ -9,8 +9,7 @@ asset.export("TexturesPath", TexturesPath) asset.meta = { Name = "Habitable Zone Textures", Version = "1.0", - Description = [[ Default textures that can be used for the habitable zone - rendering]], + Description = "Default textures that can be used for the habitable zone rendering", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/milkyway/milkyway/eso.asset b/data/assets/scene/milkyway/milkyway/eso.asset index 08df1d3e9e..0599938a3a 100644 --- a/data/assets/scene/milkyway/milkyway/eso.asset +++ b/data/assets/scene/milkyway/milkyway/eso.asset @@ -49,7 +49,7 @@ asset.meta = { Name = "MilkyWay Galaxy (ESO)", Version = "1.0", Description = [[This asset contains an alternate to the Digital Universe image for the - Milky Way from ESO.]], + Milky Way from ESO]], Author = "ESO/S. Brunier", URL = "https://www.eso.org/public/usa/images/eso0932a/", License = "Creative Commons Attribution 4.0 International License" diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset index f18095b080..52a6602a30 100644 --- a/data/assets/scene/milkyway/milkyway/volume.asset +++ b/data/assets/scene/milkyway/milkyway/volume.asset @@ -46,8 +46,7 @@ local MilkyWayVolumeGalaxy = { GUI = { Path = "/Milky Way", Name = "Milky Way Volume", - Description = [[Volumetric rendering of Milky Way galaxy based on simulation from - NAOJ.]] + Description = "Volumetric rendering of Milky Way galaxy based on simulation from NAOJ" } } @@ -66,8 +65,7 @@ asset.export(MilkyWayVolumeGalaxy) asset.meta = { Name = "Milky Way Volume", Version = "1.1", - Description = [[Volumetric rendering of Milky Way galaxy based on simulations from - NAOJ.]], + Description = "Volumetric rendering of Milky Way galaxy based on simulations from NAOJ", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT License" diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset index 283fe5b2fd..7ffdd40758 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset @@ -34,7 +34,7 @@ local OrionClusterStars = { GUI = { Name = "Orion Nebula Star Cluster", Path = "/Milky Way/Orion", - Description = [[ In order to have an accurate depiction of the Orion nebula, we + Description = [[In order to have an accurate depiction of the Orion nebula, we need to include the star cluster that was birthed from it. We turned to a study of the cluster's stellar population by Lynne Hillenbrand, who was working at the University of California, Berkeley at the time. The catalog from her paper contains more than 1500 @@ -46,7 +46,7 @@ local OrionClusterStars = { placed each star along a line of sight through this imaginary sphere centered on the cluster. In this sense, these data are observed data and the view from Earth is accurate. But the distance of each star has been derived from this educated-guess approach for the - cluster distribution. ]] + cluster distribution]] } } @@ -65,8 +65,8 @@ asset.export(OrionClusterStars) asset.meta = { Name = "Orion Nebula Star Cluster", Version = "1.1", - Description = [[ Digital Universe asset for the Orion star cluster. To be used in - conjunction with nebula model. Use orionnebula.asset to include both.]], + Description = [[Digital Universe asset for the Orion star cluster. To be used in + conjunction with nebula model. Use orionnebula.asset to include both]], Author = "AMNH Digital Universe", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset index 87d64e3bb8..293d4dca4a 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset @@ -28,7 +28,7 @@ local NebulaHolder = { GUI = { Name = "Orion Nebula", Path = "/Milky Way/Orion", - Description = [[ In the Digital Universe model of the Orion Nebula, we depict the + Description = [[In the Digital Universe model of the Orion Nebula, we depict the ionization front effectively as a terrain, with a flat Hubble image of the nebula mapped on the undulating surface. In reality, the ionization front has a slight thickness to it - about a third of a light year - but is quite thin compared to the overall size of @@ -40,7 +40,7 @@ local NebulaHolder = { nebulas center. These enormous structures are bow shocks that delineate the region where highspeed winds from the central star slow from supersonic to subsonic speeds. You can think of an HII region as a sort of tremendous explosion, taking place over millennia, - and the bow shocks are part of the outward rush of material. ]] + and the bow shocks are part of the outward rush of material]] } } @@ -75,7 +75,7 @@ local OrionNebulaModel = { GUI = { Name = "Orion Nebula Model", Path = "/Milky Way/Orion", - Description = "Orion Nebula 3D model. See Orion Nebula for description." + Description = "Orion Nebula 3D model. See Orion Nebula for description" } } @@ -111,7 +111,7 @@ local OrionNebulaShocksModel = { Name = "Orion Nebula Shocks", Path = "/Milky Way/Orion", Hidden = false, - Description = "Orion Nebula Shocks 3D model. See Orion Nebula for description." + Description = "Orion Nebula Shocks 3D model. See Orion Nebula for description" } } @@ -147,7 +147,7 @@ local OrionNebulaProplydsModel = { Name = "Orion Nebula Proplyds", Path = "/Milky Way/Orion", Hidden = false, - Description = "Orion Nebula Proplyds 3D model. See Orion Nebula for description." + Description = "Orion Nebula Proplyds 3D model. See Orion Nebula for description" } } @@ -175,9 +175,9 @@ asset.export(OrionNebulaProplydsModel) asset.meta = { Name = "Orion Nebula Model", Version = "1.1", - Description = [[ Digital Universe asset for the Orion nebula 3D model. This asset + Description = [[Digital Universe asset for the Orion nebula 3D model. This asset contains seperate models for the nebula, proplyds and shocks. To be used in - conjunction with orion star cluster. Use orionnebula.asset to include both.]], + conjunction with orion star cluster. Use orionnebula.asset to include both]], Author = "AMNH Digital Universe", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset b/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset index e045e3efa3..2cef73fce1 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/orionnebula.asset @@ -6,7 +6,7 @@ asset.meta = { Name = "Orion Nebula", Version = "1.0", Description = [[This asset is a meta asset, containing all the assets for the Orion - Nebula from the AMNH Digital Universe. This includes a 3D model and a star cluster.]], + Nebula from the AMNH Digital Universe. This includes a 3D model and a star cluster]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset index e66deb40db..1f6f25ad2d 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset @@ -39,7 +39,7 @@ asset.meta = { Name = "Orion Nebula Transforms", Version = "1.0", Description = [[This asset contains the position of the Orion Nebula. Generally you - would not include this asset as other assets would include it.]], + would not include this asset as other assets would include it]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset index 3bf85ec695..91ea8d781c 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset @@ -65,7 +65,7 @@ asset.export(Charon) asset.meta = { Name = "Charon", Version = "1.0", - Description = [[ Charon globe with labels.]], + Description = "Charon globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset index a968585271..909163cf61 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset @@ -43,7 +43,7 @@ asset.export(CharonTrailBarycentric) asset.meta = { Name = "Charon Barycentric Trail", Version = "1.0", - Description = [[ Trail of Charon as observed by Pluto Barycenter. Data from + Description = [[Trail of Charon as observed by Pluto Barycenter. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset index 4a914f423d..834a56b932 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset @@ -11,7 +11,7 @@ end) asset.meta = { Name = "Default Charon Layers", Version = "1.0", - Description = [[ Default Charon layers are: Black & White USGS]], + Description = "Default Charon layers are: Black & White USGS", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset index 5215db8749..1e8c0c80ae 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset @@ -20,13 +20,13 @@ asset.export("layer", layer) asset.meta = { Name = "Charon Black & White [USGS]", Version = "1.0", - Description = [[ Charon New Horizons LORRI MVIC Global Mosaic 300m v1. This detailed, - high-quality global mosaic of Pluto’s largest moon, Charon, was assembled from nearly + Description = [[Charon New Horizons LORRI MVIC Global Mosaic 300m v1. This detailed, + high-quality global mosaic of Pluto's largest moon, Charon, was assembled from nearly all of the highest-resolution images obtained by the Long-Range Reconnaissance Imager (LORRI) and the Multispectral Visible Imaging Camera (MVIC) on New Horizons. The - mosaic is the most detailed and comprehensive global view yet of Charon’s surface + mosaic is the most detailed and comprehensive global view yet of Charon's surface using New Horizons data. Standing out on Charon is an enormous trough at least 350 - kilometers long, and reaching 14 kilometers deep –more than seven times as deep as the + kilometers long, and reaching 14 kilometers deep more than seven times as deep as the Grand Canyon. This mosaic is available in equirectangular projection at an equatorial pixel scale of 300 meters per pixel (m). (Description from URL)]], Author = "USGS", diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset index a32acd6d1b..f9df048d67 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset @@ -11,8 +11,8 @@ end) asset.meta = { Name = "Default Pluto Layers", Version = "1.0", - Description = [[ Default Pluto layers are: Black & White USGS]], + Description = "Default Pluto layers are: Black & White USGS", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset index 69e1716b00..370754239b 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset @@ -17,7 +17,7 @@ asset.export("PlutoKernels", PlutoKernels) asset.meta = { Name = "Pluto Spice Kernels", Version = "1.0", - Description = [[ Generic SPICE kernels for Pluto.]], + Description = "Generic SPICE kernels for Pluto", Author = "OpenSpace Team", URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", License = "NASA" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset index da5b929028..c516aed627 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset @@ -20,7 +20,7 @@ asset.export("layer", layer) asset.meta = { Name = "Pluto Black & White [USGS]", Version = "1.0", - Description = [[ This detailed, high-quality global mosaic of Pluto was assembled from + Description = [[This detailed, high-quality global mosaic of Pluto was assembled from nearly all of the highest-resolution images obtained by the Long-Range Reconnaissance Imager (LORRI) and the Multispectral Visible Imaging Camera (MVIC) on New Horizons.The mosaic is the most detailed and comprehensive global view yet diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset index 9198141277..8eb2810076 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset @@ -70,8 +70,8 @@ asset.export(HydraTrail) asset.meta = { Name = "Hydra", Version = "1.0", - Description = [[ Globe and trail for Pluto's moon Hydra. Data from - NASA Spice (see base spice asset)]], + Description = [[Globe and trail for Pluto's moon Hydra. Data from NASA Spice (see base + spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset index f683b9585a..f169d62ddb 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset @@ -69,8 +69,8 @@ asset.export(KerberosTrail) asset.meta = { Name = "Kerberos", Version = "1.0", - Description = [[ Globe and trail for Pluto's moon Kerberos. Data from - NASA Spice (see base spice asset)]], + Description = [[Globe and trail for Pluto's moon Kerberos. Data from NASA Spice (see + base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset index 6135bf34b7..474ea25bb8 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset @@ -69,8 +69,8 @@ asset.export(NixTrail) asset.meta = { Name = "Nix", Version = "1.0", - Description = [[ Globe and trail for Pluto's moon Nix. Data from - NASA Spice (see base spice asset)]], + Description = [[Globe and trail for Pluto's moon Nix. Data from NASA Spice (see base + spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset index 4e9963e062..2f0e120c65 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset @@ -68,8 +68,8 @@ asset.export(StyxTrail) asset.meta = { Name = "Styx", Version = "1.0", - Description = [[ Globe and trail for Pluto's moon Styx. Data from - NASA Spice (see base spice asset)]], + Description = [[Globe and trail for Pluto's moon Styx. Data from NASA Spice (see base + spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset index e99138aec2..a40164704d 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset @@ -88,7 +88,7 @@ asset.export(PlutoLabel) asset.meta = { Name = "Pluto", Version = "1.0", - Description = [[ Pluto globe, and main planet label.]], + Description = "Pluto globe, and main planet label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset index cb2d53bb7f..0ac4ffef77 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset @@ -20,7 +20,7 @@ local PlutoTrailBarycentric = { GUI = { Name = "Pluto Barycentric Trail", Path = "/Solar System/Dwarf Planets/Pluto", - Description = [[Orbit of Pluto around it's Barycenter.]] + Description = "Orbit of Pluto around it's Barycenter" } } @@ -39,8 +39,8 @@ asset.export(PlutoTrailBarycentric) asset.meta = { Name = "Pluto Barycentric Trail", Version = "1.0", - Description = [[ Trail of Pluto as observed by it's Barrycenter. Data from - NASA Spice (see base spice asset)]], + Description = [[Trail of Pluto as observed by it's Barrycenter. Data from NASA Spice + (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset index 151b01b629..fecee05b0f 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset @@ -29,7 +29,7 @@ local PlutoKeplerianTrail = { GUI = { Name = "Pluto Keplerian Trail", Path = "/Solar System/Dwarf Planets/Pluto", - Description = "Keplerian trail of Pluto. Contains full orbit." + Description = "Keplerian trail of Pluto. Contains full orbit" } } @@ -48,8 +48,8 @@ asset.export(PlutoKeplerianTrail) asset.meta = { Name = "Pluto Keplerian Trail", Version = "1.0", - Description = [[ Full Keplerian trail of Pluto as observed by the Sun. Data from - JPL Horizons.]], + Description = [[Full Keplerian trail of Pluto as observed by the Sun. Data from + JPL Horizons]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/sbdb.cgi?sstr=pluto", License = "JPL/NASA" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset index 3a34b5a336..871a4fe603 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset @@ -13,7 +13,7 @@ asset.require("./minor/styx") asset.meta = { Name = "Pluto System", Version = "1.0", - Description = [[ Meta asset for the Pluto system, containing : Pluto, Pluto Trail, + Description = [[Meta asset for the Pluto system, containing : Pluto, Pluto Trail, Charon, Charon Trail, Hydra, Kerberos, Nix, and Styx]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset index cf52ef3310..ae8381c9c0 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset @@ -23,8 +23,8 @@ local PlutoBarycenterTrail = { GUI = { Name = "Pluto Barycenter Trail", Path = "/Solar System/Dwarf Planets/Pluto", - Description = [[Precise trail of Pluto from NASA SPICE data. Not - containing full orbit.]] + Description = [[Precise trail of Pluto from NASA SPICE data. Not containing full + orbit]] } } @@ -43,8 +43,8 @@ asset.export(PlutoBarycenterTrail) asset.meta = { Name = "Pluto Barycenter Trail", Version = "1.0", - Description = [[ Trail of Pluto Barycenter as observed by the Sun. Data from - NASA Spice (see base spice asset)]], + Description = [[Trail of Pluto Barycenter as observed by the Sun. Data from NASA Spice + (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset index 2fb6e88c21..171107d94c 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset @@ -36,7 +36,7 @@ asset.export(PlutoBarycenter) asset.meta = { Name = "Pluto Transforms", Version = "1.0", - Description = [[ Pluto Barycenter transform]], + Description = "Pluto Barycenter transform", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset index f66f9aeaac..b472140ac4 100644 --- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset +++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset @@ -16,7 +16,7 @@ local fieldlineData = asset.syncedResource({ }) local loop = { - Documentation = "Sets time to start of data, sets higher delta time and loops back from start, when at end of data.", + Documentation = "Sets time to start of data, sets higher delta time and loops back from start, when at end of data", GuiPath = "2012July", Identifier = "2012july.loop_batsrus", IsLocal = false, diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/carringtonToHEEQRotation.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/carringtonToHEEQRotation.asset index 9fcb6c35c5..2821a9469e 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/carringtonToHEEQRotation.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/carringtonToHEEQRotation.asset @@ -19,7 +19,7 @@ asset.export("CarringtonLongitudeToHEEQ180Rotation", CarringtonLongitudeToHEEQ18 asset.meta = { Name = "Carrington Longitude To HEEQ180 Rotation", Version = "1.0", - Description = [[ Contains a rotation for HEEQ180 to be used by another file]], + Description = "Contains a rotation for HEEQ180 to be used by another file", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset index c1f4f75211..c958d7ec8e 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset @@ -73,7 +73,7 @@ asset.export(densityVolume) asset.meta = { Name = "Predictive Science Inc. Volume Rendering Bastille Day", Version = "1.0", - Description = [[Volumetric rendering for the bastille day CME event]], + Description = "Volumetric rendering for the bastille day CME event", Author = "CCMC, OpenSpace team", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", License = "CC-BY" diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset index 231cbc4bb0..7541ff97e7 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset @@ -71,7 +71,7 @@ asset.export(fieldlines) asset.meta = { Name = "Predictive Science Inc. Fieldlines Bastille Day", Version = "1.0", - Description = [[Magnetic fieldlines for the bastille day CME event]], + Description = "Magnetic fieldlines for the bastille day CME event", Author = "CCMC, Jonathan Grangien, Matthias Berg", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", License = "CC-BY" diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset index a70cc0e4d7..a679c7f529 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset @@ -57,7 +57,7 @@ asset.export(fluxNodes) asset.meta = { Name = "Predictive Science Inc. Flux nodes Bastille Day", Version = "1.0", - Description = [[Flux nodes for the bastille day CME event]], + Description = "Flux nodes for the bastille day CME event", Author = "CCMC, Christian Adamsson, Emilie Ho", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", License = "CC-BY" diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset index 3a0290ec63..b789e0eec8 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset @@ -107,7 +107,7 @@ asset.export(MeridialCutplane) asset.meta = { Name = "Predictive Science Inc. Cutplanes Bastille Days", Version = "1.0", - Description = [[Cutplanes for the bastille day CME event]], + Description = "Cutplanes for the bastille day CME event", Author = "CCMC, Christian Adamsson, Emilie Ho", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", License = "CC-BY" diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset index 753ac1bebb..edcdbc6c88 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset @@ -53,7 +53,8 @@ end) asset.meta = { Name = "Predictive Science Inc. Flux nodes legend for Bastille Days", Version = "1.0", - Description = [[Screen space renderable image legend of flux nodes for the bastille day CME event]], + Description = [[Screen space renderable image legend of flux nodes for the bastille day + CME event]], Author = "Christian Adamsson, Emilie Ho", URL = "https://dx.doi.org/10.3847/1538-4357/aab36d", License = "MIT" diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset index 5a22526b6a..2830ff1952 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset @@ -43,7 +43,7 @@ asset.export(travelSpeedIndicator) asset.meta = { Name = "Light travel from sun to earth", Version = "1.0", - Description = [[Speed of light indicator from sun to earth]], + Description = "Speed of light indicator from sun to earth", Author = "CCMC, Christian Adamsson, Emilie Ho", URL = "", License = "MIT" diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset index 57af19002f..9b5ae913b4 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset @@ -60,9 +60,9 @@ end) asset.meta = { Name = "Bastille Day magnetogram textures", Version = "1.0", - Description = [[ This asset adds multiple magnetogram textures to the Sun. In addition + Description = [[This asset adds multiple magnetogram textures to the Sun. In addition it provides an action to cycle through the textures. See magnetogram.asset for details - of the textures.]], + of the textures]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset index 1e14e735fe..e40eb40aa2 100644 --- a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset +++ b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset @@ -69,12 +69,11 @@ asset.export(C2019Q4BorisovTrail) asset.meta = { Name = "C/2019 Q4 Borisov", Version = "1.2", - Description = [[ This asset contains the trail - and position of C-2019 Q4 Borisov from 2015 JAN 01 00:00:00 - to 2050 JAN 01 00:00:00. Data from JPL Horizons]], + Description = [[This asset contains the trail and position of C-2019 Q4 Borisov from + 2015 JAN 01 00:00:00 to 2050 JAN 01 00:00:00. Data from JPL Horizons]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = [[ JPL-authored documents are sponsored by NASA under Contract - NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws."]] + 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]] } diff --git a/data/assets/scene/solarsystem/interstellar/oumuamua.asset b/data/assets/scene/solarsystem/interstellar/oumuamua.asset index 1855f09a4f..93f5811802 100644 --- a/data/assets/scene/solarsystem/interstellar/oumuamua.asset +++ b/data/assets/scene/solarsystem/interstellar/oumuamua.asset @@ -31,7 +31,7 @@ local OumuamuaTrail = { Name = "'Oumuamua Trail", Path = "/Solar System/Interstellar", Description = [[Trail of 'Oumuamua from 2014 JAN 01 00:00:00 to 2050 JAN 01 00:00:00. - Data from JPL Horizons']], + Data from JPL Horizons]], } } @@ -47,8 +47,8 @@ local OumuamuaPosition = { GUI = { Name = "'Oumuamua", Path = "/Solar System/Interstellar", - Description = [[ Position of 'Oumuamua from 2014 JAN 01 00:00:00 to 2050 JAN 01 - 00:00:00. Data from JPL Horizons']], + Description = [[Position of 'Oumuamua from 2014 JAN 01 00:00:00 to 2050 JAN 01 + 00:00:00. Data from JPL Horizons]], } } @@ -70,7 +70,7 @@ asset.export(OumuamuaTrail) asset.meta = { Name = "'Oumuamua", Version = "1.2", - Description = [[ This asset contains the trail and position of 'Oumuamua from 2014 + Description = [[This asset contains the trail and position of 'Oumuamua from 2014 JAN 01 00:00:00 to 2050 JAN 01 00:00:00. Data from JPL Horizons]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", diff --git a/data/assets/scene/solarsystem/missions/gaia/trail.asset b/data/assets/scene/solarsystem/missions/gaia/trail.asset index c03e231df1..e70473e731 100644 --- a/data/assets/scene/solarsystem/missions/gaia/trail.asset +++ b/data/assets/scene/solarsystem/missions/gaia/trail.asset @@ -79,7 +79,7 @@ asset.export(GaiaTrailEclip) asset.meta = { Name = "Gaia Trail", Version = "1.0", - Description = [[ This asset contains the trail of Gaia around both Earth and the Sun. + Description = [[This asset contains the trail of Gaia around both Earth and the Sun. Data from JPL Horizons from 2013 DEC 19 09:55:27 to 2026 SEP 14 21:15:27]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", diff --git a/data/assets/scene/solarsystem/missions/gaia/transforms.asset b/data/assets/scene/solarsystem/missions/gaia/transforms.asset index c699bce2af..410ac239dc 100644 --- a/data/assets/scene/solarsystem/missions/gaia/transforms.asset +++ b/data/assets/scene/solarsystem/missions/gaia/transforms.asset @@ -45,8 +45,8 @@ asset.export(GaiaPosition) asset.meta = { Name = "Gaia Transform", Version = "1.0", - Description = [[ This asset contains the position of Gaia from 2013 - DEC 19 09:55:27 to 2026 SEP 14 21:15:27. Data from JPL Horizons]], + Description = [[This asset contains the position of Gaia from 2013 DEC 19 09:55:27 to + 2026 SEP 14 21:15:27. Data from JPL Horizons]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", License = "NASA" diff --git a/data/assets/scene/solarsystem/missions/insight/shortcuts.asset b/data/assets/scene/solarsystem/missions/insight/shortcuts.asset index 0ff2f6217f..a310541b24 100644 --- a/data/assets/scene/solarsystem/missions/insight/shortcuts.asset +++ b/data/assets/scene/solarsystem/missions/insight/shortcuts.asset @@ -55,14 +55,14 @@ local Shortcuts = { Local = false }, { - Command = [[openspace.navigation.setNavigationState(]] .. insightNavigationState .. [[);]], + Command = "openspace.navigation.setNavigationState(" .. insightNavigationState .. ");", Documentation = "Change the camera state for the start of Insight EDL", Name = "Insight EDL NavigationState", GuiPath = "/Missions/Insight", Local = false }, { - Command = [[openspace.time.setPause(true);openspace.time.setTime("]] .. InsightEntryTime .. [[");]], + Command = 'openspace.time.setPause(true);openspace.time.setTime("' .. InsightEntryTime .. '");', Documentation = "Change the time for the start of Insight EDL", Name = "Insight EDL Time", GuiPath = "/Missions/Insight", diff --git a/data/assets/scene/solarsystem/missions/juice/fov/gala.asset b/data/assets/scene/solarsystem/missions/juice/fov/gala.asset index 564e5ed61a..30e57b5552 100644 --- a/data/assets/scene/solarsystem/missions/juice/fov/gala.asset +++ b/data/assets/scene/solarsystem/missions/juice/fov/gala.asset @@ -27,7 +27,7 @@ local Gala = { GUI = { Name = "Gala FOV", Path = "/Solar System/Missions/Juice/Instruments", - Description = "The field-of-view for the Ganymede Laster Altimeter (GALA) instrument." + Description = "The field-of-view for the Ganymede Laster Altimeter (GALA) instrument" } } diff --git a/data/assets/scene/solarsystem/missions/juice/fov/rime.asset b/data/assets/scene/solarsystem/missions/juice/fov/rime.asset index 58fa281f24..db17959464 100644 --- a/data/assets/scene/solarsystem/missions/juice/fov/rime.asset +++ b/data/assets/scene/solarsystem/missions/juice/fov/rime.asset @@ -28,7 +28,7 @@ local RimeBase = { GUI = { Name = "Rime Base FOV", Path = "/Solar System/Missions/Juice/Instruments", - Description = "The location of the base for the RIME instrument onboard Juice." + Description = "The location of the base for the RIME instrument onboard Juice" } } @@ -58,7 +58,7 @@ local Rime = { GUI = { Name = "Rime FOV", Path = "/Solar System/Missions/Juice/Instruments", - Description = "The location of the RIME instrument onboard Juice." + Description = "The location of the RIME instrument onboard Juice" } } diff --git a/data/assets/scene/solarsystem/missions/juice/fov/swi.asset b/data/assets/scene/solarsystem/missions/juice/fov/swi.asset index c940a950cc..9780c9c6c8 100644 --- a/data/assets/scene/solarsystem/missions/juice/fov/swi.asset +++ b/data/assets/scene/solarsystem/missions/juice/fov/swi.asset @@ -63,7 +63,7 @@ local SwiFull = { GUI = { Name = "SWI Full FOV", Path = "/Solar System/Missions/Juice/Instruments", - Description = "The field-of-view for the full SWI instrument onboard Juice." + Description = "The field-of-view for the full SWI instrument onboard Juice" } } diff --git a/data/assets/scene/solarsystem/missions/juice/plane.asset b/data/assets/scene/solarsystem/missions/juice/plane.asset index ddbeddd612..019a3835b3 100644 --- a/data/assets/scene/solarsystem/missions/juice/plane.asset +++ b/data/assets/scene/solarsystem/missions/juice/plane.asset @@ -76,7 +76,7 @@ local xy_utot = { Name = "Ganymede XY Plane U_tot", Path = "/Solar System/Missions/Juice/Plane", Description = [[A cut plane in Ganymede's XY plane showing the X, Y, and Z components - of the magnetic field mapped to the RGB components.]] + of the magnetic field mapped to the RGB components]] } } @@ -217,7 +217,7 @@ local xz_utot = { Name = "Ganymede XZ Plane U_tot", Path = "/Solar System/Missions/Juice/Plane", Description = [[A cut plane in Ganymede's XZ plane showing the X, Y, and Z components - of the magnetic field mapped to the RGB components.]] + of the magnetic field mapped to the RGB components]] } } diff --git a/data/assets/scene/solarsystem/missions/jwst/jwst.asset b/data/assets/scene/solarsystem/missions/jwst/jwst.asset index 3a297ff227..7e15b87ad1 100644 --- a/data/assets/scene/solarsystem/missions/jwst/jwst.asset +++ b/data/assets/scene/solarsystem/missions/jwst/jwst.asset @@ -222,6 +222,5 @@ asset.meta = { ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"JWSTBand", "JWSTModel", "JWSTFov", "JWSTLabel"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/missions/jwst/toggle_trail.asset b/data/assets/scene/solarsystem/missions/jwst/toggle_trail.asset index 986480d0a7..9f8d42dc16 100644 --- a/data/assets/scene/solarsystem/missions/jwst/toggle_trail.asset +++ b/data/assets/scene/solarsystem/missions/jwst/toggle_trail.asset @@ -51,7 +51,7 @@ local toggle_trail = { Documentation = [[Toggles the visibility of the JWST trail with an approaching/exiting event. This action takes optional arguments to 1) determine which node is currently in focus and only hide JWST trail if it is in focus (as the - 'Node') and 2) the transition direction (as 'Approaching' or 'Exiting').]], + 'Node') and 2) the transition direction (as 'Approaching' or 'Exiting')]], GuiPath = "/JWST/Events", IsLocal = true } diff --git a/data/assets/scene/solarsystem/missions/jwst/trail.asset b/data/assets/scene/solarsystem/missions/jwst/trail.asset index d5ca41c838..de82f7f10a 100644 --- a/data/assets/scene/solarsystem/missions/jwst/trail.asset +++ b/data/assets/scene/solarsystem/missions/jwst/trail.asset @@ -171,6 +171,5 @@ asset.meta = { ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"JWSTTrailLaunch", "JWSTTrailOrbit", "JWSTSunTrail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/missions/jwst/transforms.asset b/data/assets/scene/solarsystem/missions/jwst/transforms.asset index 4746895a0f..22c9384366 100644 --- a/data/assets/scene/solarsystem/missions/jwst/transforms.asset +++ b/data/assets/scene/solarsystem/missions/jwst/transforms.asset @@ -118,6 +118,5 @@ asset.meta = { ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"JWSTPosition", "JWSTRotation"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset b/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset index 8159a8da8e..2dc85b22a4 100644 --- a/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset +++ b/data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset @@ -61,14 +61,14 @@ local Shortcuts = { Local = false }, { - Command = [[openspace.time.setPause(true);openspace.time.setTime("]] .. PerseveranceLaunchTime .. [[");]], + Command = 'openspace.time.setPause(true);openspace.time.setTime("' .. PerseveranceLaunchTime .. '");', Documentation = "Change the time for Perseverance launch", Name = "Perseverance launch time", GuiPath = "/Missions/Perseverance", Local = false }, { - Command = [[openspace.time.setPause(true);openspace.time.setTime("]] .. PerseveranceLandingTime .. [[");]], + Command = 'openspace.time.setPause(true);openspace.time.setTime("' .. PerseveranceLandingTime .. '");', Documentation = "Change the time for when Perseverance has landed", Name = "Perseverance landed time", GuiPath = "/Missions/Perseverance", diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset index 16ddc5bbba..b3c11dab39 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset @@ -28,7 +28,7 @@ local Pioneer10 = { GUI = { Name = "Pioneer 10 Spacecraft", Path = "/Solar System/Missions/Pioneer", - Description = [[Pioneer 10 Spacecraft. Positioned by SPICE data.]] + Description = "Pioneer 10 Spacecraft. Positioned by SPICE data" } } @@ -76,10 +76,9 @@ asset.export(Pioneer10Trail) asset.meta = { Name = "Pioneer 10", Version = "1.0", - Description = [[ Pioneer 10 Model and Trail. Driven by SPICE data for high accuracy - from March 3rd, 1972 to January 2nd, 1990.]], + Description = [[Pioneer 10 Model and Trail. Driven by SPICE data for high accuracy from + March 3rd, 1972 to January 2nd, 1990]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Pioneer_10", "Pioneer_10Trail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset index 66a42455f0..b04d3471be 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset @@ -31,7 +31,7 @@ local Pioneer11 = { GUI = { Name = "Pioneer 11 Spacecraft", Path = "/Solar System/Missions/Pioneer", - Description = [[Pioneer 11 Spacecraft. Positioned by SPICE data.]] + Description = "Pioneer 11 Spacecraft. Positioned by SPICE data" } } @@ -57,7 +57,7 @@ local Pioneer11Trail = { Name = "Pioneer 11 Trail (SPICE)", Path = "/Solar System/Missions/Pioneer", Description = [[Pioneer 11 Trail, spanning April 6th, 1973 to January 2nd, 1990. - Data from SPICE.]] + Data from SPICE]] } } @@ -79,10 +79,9 @@ asset.export(Pioneer11Trail) asset.meta = { Name = "Pioneer 11", Version = "1.0", - Description = [[ Pioneer 11 Model and Trail. Driven by SPICE data for high accuracy - from April 6th, 1973 to January 2nd, 1990.]], + Description = [[Pioneer 11 Model and Trail. Driven by SPICE data for high accuracy from + April 6th, 1973 to January 2nd, 1990]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Pioneer_11", "Pioneer_11Trail"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset index 7a2d34f884..a2989a2b90 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset @@ -25,8 +25,8 @@ asset.export("PioneerModel", ModelRenderable) asset.meta = { Name = "Pioneer Model", Version = "1.0", - Description = [[ Pioneer model asset. Used by both pioneer 10 and pioneer 11 asset. - Untextured version of model from NASA 3D resources.]], + Description = [[Pioneer model asset. Used by both pioneer 10 and pioneer 11 asset. + Untextured version of model from NASA 3D resources]], Author = "NASA", URL = "https://nasa3d.arc.nasa.gov/detail/eoss-pioneer", License = "NASA" diff --git a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset index af9714a0e3..f4ede21e72 100644 --- a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset +++ b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset @@ -39,8 +39,8 @@ local voyager1 = { GUI = { Name = "Voyager 1 Trail", Path = "/Solar System/Missions/Voyager", - Description = [[Voyager 1 Trail, spanning September 6th, 1977 to January 1st, - 2030. Data from JPL Horizons.]] + Description = [[Voyager 1 Trail, spanning September 6th, 1977 to January 1st, 2030. + Data from JPL Horizons]] } } @@ -70,7 +70,7 @@ local voyager2 = { Name = "Voyager 2 Trail", Path = "/Solar System/Missions/Voyager", Description = [[Voyager 2 Trail, spanning August 21st, 1977 to January 1st, 2030. - Data from JPL Horizons.]] + Data from JPL Horizons]] } } @@ -100,7 +100,7 @@ local pioneer10 = { Name = "Pioneer 10 Trail", Path = "/Solar System/Missions/Pioneer", Description = [[Pioneer 10 Trail, spanning March 4th, 1972 to January 1st, 2030. - Data from JPL Horizons.]] + Data from JPL Horizons]] } } @@ -130,7 +130,7 @@ local pioneer11 ={ Name = "Pioneer 11 Trail", Path = "/Solar System/Missions/Pioneer", Description = [[Pioneer 11 Trail, spanning April 7th, 1973 to January 1st, 2030. - Data from JPL Horizons.]] + Data from JPL Horizons]] } } @@ -158,11 +158,10 @@ asset.export(pioneer11) asset.meta = { Name = "Pioneer and Voyager Trails", Version = "1.1", - Description = [[ Pioneer 10, Pioneer 11, Voyager 1 and Voyager 2 trails. Driven by JPL - Horizons data for better performance then spice but lower resolution. Data is from - shortly after mission launches until January 1st, 2030.]], + Description = [[Pioneer 10, Pioneer 11, Voyager 1 and Voyager 2 trails. Driven by JPL + Horizons data for better performance then spice but lower resolution. Data is from + shortly after mission launches until January 1st, 2030]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Pioneer10", "Pioneer11", "Voyager1", "Voyager2"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/default_layers.asset b/data/assets/scene/solarsystem/planets/default_layers.asset index 1e4565ec20..883705ecdb 100644 --- a/data/assets/scene/solarsystem/planets/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/default_layers.asset @@ -31,7 +31,7 @@ asset.require("./venus/default_layers") asset.meta = { Name = "Default Solar System Layers", Version = "1.0", - Description = [[ Adds default layers for all planets. Remove this asset and include + Description = [[Adds default layers for all planets. Remove this asset and include individual layers for planets to customize planet layers]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset index 4fa2ed9f1e..3d9de9330c 100644 --- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset @@ -84,7 +84,7 @@ local Atmosphere = { GUI = { Name = "Earth Atmosphere", Path = "/Solar System/Planets/Earth", - Description = [[ Atmosphere of Earth.]] + Description = "Atmosphere of Earth" } } @@ -103,7 +103,7 @@ asset.export(Atmosphere) asset.meta = { Name = "Earth Atmosphere", Version = "1.1", - Description = [[ RenderableAtmosphere for Earth.]], + Description = "RenderableAtmosphere for Earth", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/default_layers.asset index 39c24d7688..9356b1dd33 100644 --- a/data/assets/scene/solarsystem/planets/earth/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/earth/default_layers.asset @@ -51,13 +51,13 @@ end) asset.meta = { Name = "Default Earth Layers", Version = "1.0", - Description = [[ Default Earth layers are: ESRI VIIRS Combo, ESRI World Imagery, VIIRS + Description = [[Default Earth layers are: ESRI VIIRS Combo, ESRI World Imagery, VIIRS SNPP (Temporal), Aqua Modis (Temporal), Terra Modis (Temporal), BMNG, AMSR2 GCOM W1 Sea Ice Concentration (Temporal), MODIS Terra Chlorophyll A (Temporal), GHRSST, L4 G1SST Sea Surface Temperature (Temporal), GHRSST L4 MUR Sea Surface Temperature (Temporal), World Elevation (3D), Earth at Night 2012, Coastlines, Reference Features, Reference Labels, Tile Indicies, Size Reference, Gebco, and Modis Water - Mask.]], + Mask]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset index 737f7a3b02..dfa2afafc9 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth.asset @@ -91,7 +91,7 @@ asset.export(EarthLabel) asset.meta = { Name = "Earth", Version = "1.0", - Description = [[ Earth is a special planet with special needs ]], + Description = "Earth is a special planet with special needs", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset index 3f63961275..a5b400333f 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset @@ -93,7 +93,7 @@ asset.export(L1Label) asset.meta = { Name = "Lagrange point L1", Version = "1.0", - Description = [[ Lagrange point L1 node and label]], + Description = "Lagrange point L1 node and label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset index 38c29e809b..db02b15b11 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset @@ -158,8 +158,8 @@ end asset.meta = { Name = "Lagrange point L2", Version = "1.0", - Description = [[ Lagrange point L2 large and small nodes, sun line, and large and small - labels. ]], + Description = [[Lagrange point L2 large and small nodes, sun line, and large and small + labels]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset index 4d86d8259c..4a9d81f8fa 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset @@ -93,7 +93,7 @@ asset.export(L4Label) asset.meta = { Name = "Lagrange point L4", Version = "1.0", - Description = [[ Lagrange point L4 node and label]], + Description = "Lagrange point L4 node and label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset index e49cc30bd1..69e3bb4f5e 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset @@ -93,7 +93,7 @@ asset.export(L5Label) asset.meta = { Name = "Lagrange point L5", Version = "1.0", - Description = [[ Lagrange point L5 node and label]], + Description = "Lagrange point L5 node and label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset index b64c1639b3..efaabf274c 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset @@ -7,7 +7,8 @@ asset.require("./L5") asset.meta = { Name = "Earth Lagrange Points", Version = "1.0", - Description = [[ Meta asset to include all the Earth Lagrange points. Includes L1, L2, L4 and L5.]], + Description = [[Meta asset to include all the Earth Lagrange points. Includes L1, L2, L4 + and L5]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset index 91385be077..2c9e1067c6 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 @@ -18,12 +18,12 @@ local layer = { "png" ) }, - Description = [[ Temporal coverage: 02 July 2012 - Present. The Advanced Microwave - Scanning Radiometer-E/Advanced Microwave Scanning Radiometer-2 (AMSR-E/AMSR2) - unified "Sea Ice Concentration (12 km)" layer displays the percent of sea ice - concentration in the polar regions as a daily composite of the AMSR2 1:30 a.m. - ascending and 1:30 p.m. descending half-orbit passes, at a spatial resolution - of 12 km. (Description from NASA Worldview)]] + Description = [[Temporal coverage: 02 July 2012 - Present. The Advanced Microwave + Scanning Radiometer-E/Advanced Microwave Scanning Radiometer-2 (AMSR-E/AMSR2) unified + "Sea Ice Concentration (12 km)" layer displays the percent of sea ice concentration in + the polar regions as a daily composite of the AMSR2 1:30 a.m. ascending and 1:30 p.m. + descending half-orbit passes, at a spatial resolution of 12 km. (Description from NASA + Worldview)]] } asset.onInitialize(function() @@ -41,8 +41,7 @@ asset.export("layer", layer) asset.meta = { Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)", Version = "1.1", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], + Description = "GIBS hosted layer", Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset index e29b98f735..1c64fcc6be 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 @@ -18,7 +18,7 @@ local layer = { "jpg" ) }, - Description = [[ Temporal coverage: 03 July 2002 - Present. True Color: Red = Band 1, + Description = [[Temporal coverage: 03 July 2002 - Present. True Color: Red = Band 1, Green = Band 4, Blue = Band 3. These images are called true-color or natural color because this combination of wavelengths is similar to what the human eye would see. The images are natural-looking images of land surface, oceanic and atmospheric @@ -46,8 +46,7 @@ asset.export("layer", layer) asset.meta = { Name = "Aqua Modis (Temporal)", Version = "1.1", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], + Description = "GIBS hosted layer", Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset index 1c592e753d..0fb70eb6a2 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble.asset @@ -11,7 +11,7 @@ local layer = { Identifier = "Blue_Marble", Name = "Blue Marble", FilePath = texturesPath .. "earth_bluemarble.jpg", - Description = [[ Earth image from Blue Marble Next Generation ]], + Description = "Earth image from Blue Marble Next Generation", } @@ -29,8 +29,8 @@ asset.export("layer", layer) asset.meta = { Name = "Blue Marble", Version = "1.1", - Description = [[ Fallback layer for earth image if no internet is available. Contains - Blue Marble Next Generation ]], + Description = [[Fallback layer for earth image if no internet is available. Contains + Blue Marble Next Generation]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA" 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 6e83e007aa..9f7c61a53b 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 @@ -4,8 +4,8 @@ local layer = { Identifier = "BMNG_Sweden", Name = "BMNG [Sweden]", FilePath = asset.localResource("bmng_sweden.wms"), - Description = [[ Web loaded full resolution map of Blue Marble Next Generation. - This map is hosted on the OpenSpace servers in Sweden]], + Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map + is hosted on the OpenSpace servers in Sweden]], } asset.onInitialize(function() @@ -23,8 +23,8 @@ asset.export("layer", layer) asset.meta = { Name = "Blue Marble Next Generation (Sweden)", Version = "1.1", - Description = [[ Web loaded full resolution map of Blue Marble Next Generation. - This map is hosted on the OpenSpace servers in Sweden]], + Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map + is hosted on the OpenSpace servers in Sweden]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA" 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 1c56eea33a..d60f57e50e 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 @@ -4,8 +4,8 @@ local layer = { Identifier = "BMNG_Utah", Name = "BMNG [Utah]", FilePath = asset.localResource("bmng_utah.wms"), - Description = [[ Web loaded full resolution map of Blue Marble Next Generation. - This map is hosted on the OpenSpace servers in Utah]], + Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map + is hosted on the OpenSpace servers in Utah]], } asset.onInitialize(function() @@ -23,8 +23,8 @@ asset.export("layer", layer) asset.meta = { Name = "Blue Marble Next Generation (Utah)", Version = "1.1", - Description = [[ Web loaded full resolution map of Blue Marble Next Generation. - This map is hosted on the OpenSpace servers in Utah]], + Description = [[Web loaded full resolution map of Blue Marble Next Generation. This map + is hosted on the OpenSpace servers in Utah]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA" 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 d9b0535964..d5bb65cc30 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,7 +30,7 @@ asset.export("layer", layer) asset.meta = { Name = "ESRI Imagery World 2D", Version = "1.1", - Description = [[Older 2D imager map layer for Earth. This layer is hosted by ESRI.]], + Description = "Older 2D imager map layer for Earth. This layer is hosted by ESRI", Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=21b4ba14d9e5472d97afcbb819f7368e", License = "Esri Master License Agreement" 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 366b716326..64eefa390c 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,7 +31,7 @@ asset.export("layer", layer) asset.meta = { Name = "ESRI World Imagery", Version = "1.1", - Description = [[Main web loaded map layer for Earth. This layer is hosted by ESRI.]], + Description = "Main web loaded map layer for Earth. This layer is hosted by ESRI", Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9", License = "Esri Master License Agreement" 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 09327fd249..807bba28df 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 @@ -18,8 +18,8 @@ local layer = { "png" ) }, - Description = [[ Temporal coverage: 21 June 2010 - 08 December 2019. The imagery - resolution is 1 km, and the temporal resolution is daily.]], + Description = [[Temporal coverage: 21 June 2010 - 08 December 2019. The imagery + resolution is 1 km, and the temporal resolution is daily]], Author = "NASA EOSDIS Global Imagery Browse Services" } @@ -38,10 +38,8 @@ asset.export("layer", layer) asset.meta = { Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", Version = "1.1", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], + Description = "GIBS hosted layer", Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. - "eosdis-components/gibs", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset index 7379b12da1..4e4a945d08 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 @@ -18,8 +18,8 @@ local layer = { "png" ) }, - Description = [[ Temporal coverage: 01 June 2002 - Present. The imagery resolution - is 1 km, and the temporal resolution is daily.]] + Description = [[Temporal coverage: 01 June 2002 - Present. The imagery resolution + is 1 km, and the temporal resolution is daily]] } asset.onInitialize(function() @@ -37,10 +37,8 @@ asset.export("layer", layer) asset.meta = { Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", Version = "1.1", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], + Description = "GIBS hosted layer", Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. - "eosdis-components/gibs", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset index 5df5ecb4a6..a14faeb554 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 @@ -18,8 +18,8 @@ local layer = { "png" ) }, - Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution - is 1 km, and the temporal resolution is daily.]] + Description = [[Temporal coverage: 02 July 2013 - Present. The imagery resolution + is 1 km, and the temporal resolution is daily]] } asset.onInitialize(function() @@ -37,10 +37,8 @@ asset.export("layer", layer) asset.meta = { Name = "MODIS Terra Chlorophyll A (Temporal)", Version = "1.1", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], + Description = "GIBS hosted layer", Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. - "eosdis-components/gibs", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset index 7b114f69c0..ce1396f244 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 @@ -18,8 +18,8 @@ local layer = { "jpg" ) }, - Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution - is 1 km, and the temporal resolution is daily.]] + Description = [[Temporal coverage: 02 July 2013 - Present. The imagery resolution + is 1 km, and the temporal resolution is daily]] } asset.onInitialize(function() @@ -37,10 +37,8 @@ asset.export("layer", layer) asset.meta = { Name = "Terra Modis (Temporal)", Version = "1.1", - Description = [[ GIBS hosted layer created with - openspace.globebrowsing.createTemporalGibsGdalXml ]], + Description = "GIBS hosted layer", Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. - "eosdis-components/gibs", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset index 8b2b070e3c..266fb5cdeb 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_noaa20_temporal.asset @@ -18,8 +18,8 @@ local layer = { "jpg" ) }, - Description = [[ Temporal coverage: 11 November 2015 - Present. The imagery resolution - is 0.25 km, and the temporal resolution is daily.]] + Description = [[Temporal coverage: 11 November 2015 - Present. The imagery resolution + is 0.25 km, and the temporal resolution is daily]] } asset.onInitialize(function() @@ -37,10 +37,9 @@ asset.export("layer", layer) asset.meta = { Name = "VIIRS NOAA20 (Temporal)", Version = "1.1", - Description = [[ This layer has the best daily Earth Image. GIBS hosted layer created - with openspace.globebrowsing.createTemporalGibsGdalXml ]], + Description = "This layer has the best daily Earth Image", Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. - "eosdis-components/gibs", + URL = + "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset index 10a7ee86cf..3e38895250 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 @@ -18,8 +18,8 @@ local layer = { "jpg" ) }, - Description = [[ Temporal coverage: 11 November 2015 - Present. The imagery resolution - is 0.25 km, and the temporal resolution is daily.]] + Description = [[Temporal coverage: 11 November 2015 - Present. The imagery resolution + is 0.25 km, and the temporal resolution is daily]] } asset.onInitialize(function() @@ -37,10 +37,9 @@ asset.export("layer", layer) asset.meta = { Name = "VIIRS SNPP (Temporal)", Version = "1.1", - Description = [[ This layer has the best daily Earth Image. GIBS hosted layer created - with openspace.globebrowsing.createTemporalGibsGdalXml ]], + Description = "This layer has the best daily Earth Image", Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. - "eosdis-components/gibs", + URL = + "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", License = "NASA" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset index 5902c342b2..08a0886791 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height.asset @@ -11,7 +11,7 @@ local layer = { Name = "Earth Bluemarble Height", Identifier = "Earth_Bluemarble_Height", FilePath = texturesPath .. "earth_bluemarble_height.jpg", - Description = [[ Topographic layer from Blue Marble Next Generation]] + Description = "Topographic layer from Blue Marble Next Generation" } asset.onInitialize(function() @@ -28,7 +28,7 @@ asset.export("layer", layer) asset.meta = { Name = "Earth Bluemarble Height", Version = "1.1", - Description = [[ Fallback layer for earth height if no internet is available. Contains + Description = [[Fallback layer for earth height if no internet is available. Contains Blue Marble Next Generation Topographic]], Author = "NASA", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", 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 1d8c46718b..d5b1ad1091 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 @@ -9,7 +9,7 @@ local layer = { per pixel resolution for the world. The elevation data includes 90m Shuttle Radar Topography Mission (SRTM) elevation data from NASA and National Geospatial-Intelligence Agency (NGA) where it is available and 1km GTOPO30 - data from the USGS elsewhere. Vertical units are measured in meters.]], + data from the USGS elsewhere. Vertical units are measured in meters]], } asset.onInitialize(function() @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "World Elevation (3D)", Version = "1.1", - Description = [[Main web loaded height layer for Earth. This layer is hosted by ESRI.]], + Description = "Main web loaded height layer for Earth. This layer is hosted by ESRI", Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=1b48cd3b6276416784fe90a68c580a89", License = "Esri Master License Agreement" 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 36829712b3..9c541b8993 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 @@ -4,8 +4,8 @@ local layer = { Identifier = "Earth_at_Night_2012", Name = "Earth at Night 2012", FilePath = asset.localResource("earth_at_night_2012.wms"), - Description = [[ The lights of cities and villages trace the outlines of civilization - in this global view. ]], + Description = [[The lights of cities and villages trace the outlines of civilization + in this global view]], } asset.onInitialize(function() @@ -23,7 +23,7 @@ asset.export("layer", layer) asset.meta = { Name = "Earth at Night 2012", Version = "1.1", - Description = [[Main web loaded night layer for Earth. This layer is hosted by GIBS.]], + Description = "Main web loaded night layer for Earth. This layer is hosted by GIBS", Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", License = "NASA" 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 3453f13b32..e330cf8039 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 @@ -18,7 +18,7 @@ local layer = { "png" ) }, - Description = [[ The VIIRS Nighttime Imagery (Day/Night Band, Enhanced Near Constant + Description = [[The VIIRS Nighttime Imagery (Day/Night Band, Enhanced Near Constant Contrast) layer shows the Earth's surface and atmosphere using a sensor designed to capture low-light emission sources, under varying illumination conditions. It is displayed as a grey-scale image. Sources of illumination include both natural @@ -53,8 +53,7 @@ asset.export("layer", layer) asset.meta = { Name = "Earth at Night (Temporal)", Version = "1.1", - Description = [[Temporal layer for earth with daily night image. This layer is a GIBS - hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], + Description = "Temporal layer for earth with daily night image", Author = "OpenSpace Team", URL = "https://worldview.earthdata.nasa.gov/?l=VIIRS_SNPP_DayNightBand_ENCC", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset index bd0ab2c2f9..49aeda825e 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal_blue_yellow.asset @@ -18,7 +18,7 @@ local layer = { "jpg" ) }, - Description = [[ The VIIRS Nighttime Imagery (Day/Night Band, Enhanced Near Constant + Description = [[The VIIRS Nighttime Imagery (Day/Night Band, Enhanced Near Constant Contrast) layer shows the Earth's surface and atmosphere using a sensor designed to capture low-light emission sources, under varying illumination conditions. It is displayed as a grey-scale image. Sources of illumination include both natural @@ -53,8 +53,7 @@ asset.export("layer", layer) asset.meta = { Name = "Earth at Night Blue Yellow(Temporal)", Version = "1.1", - Description = [[Temporal layer for earth with daily night image. This layer is a GIBS - hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], + Description = "Temporal layer for earth with daily night image", Author = "OpenSpace Team", URL = "https://worldview.earthdata.nasa.gov/?l=VIIRS_SNPP_DayNightBand_ENCC", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset index 7cec8d6206..cf7a34ef29 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset @@ -11,7 +11,7 @@ local layer = { Identifier = "Earth_Night_Texture", Name = "Earth Night Texture", FilePath = texturesPath .. "earth_night.png", - Description = [[ Earth's city lights are clearly visible from space ]] + Description = "Earth's city lights are clearly visible from space" } asset.onInitialize(function() @@ -28,7 +28,7 @@ asset.export("layer", layer) asset.meta = { Name = "Blue Marble Night", Version = "1.1", - Description = [[ Fallback layer for earth night image if no internet is available. ]], + Description = "Fallback layer for earth night image if no internet is available", Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset index ab44e00901..568b087fe0 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset @@ -20,7 +20,7 @@ asset.export("layer", layer) asset.meta = { Name = "Earth Coastlines Layer", Version = "1.0", - Description = [[ Coastlines layer for Earth globe.]], + Description = "Coastlines layer for Earth globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset index 3232549cec..e3f84f7918 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset @@ -21,7 +21,7 @@ asset.export("layer", layer) asset.meta = { Name = "Earth Reference Features", Version = "1.0", - Description = [[ Reference Features layer for Earth globe.]], + Description = "Reference Features layer for Earth globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset index 254303aae0..4745c70177 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset @@ -21,7 +21,7 @@ asset.export("layer", layer) asset.meta = { Name = "Earth Reference Labels", Version = "1.0", - Description = [[ Reference Labels layer for Earth globe.]], + Description = "Reference Labels layer for Earth globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset index 7bec98489d..a4867896b0 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset @@ -23,7 +23,7 @@ asset.export("layer", layer) asset.meta = { Name = "Earth Size Reference", Version = "1.0", - Description = [[ Size reference layer for Earth globe.]], + Description = "Size reference layer for Earth globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset index 0b863335b9..d91e58ba3f 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset @@ -21,7 +21,7 @@ asset.export("layer", layer) asset.meta = { Name = "Earth Tile Indices", Version = "1.0", - Description = [[ Tile index layer for Earth globe.]], + Description = "Tile index layer for Earth globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset index 5a916507a1..4c7dc96545 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset @@ -21,7 +21,7 @@ asset.export("layer", layer) asset.meta = { Name = "Gebco WaterMask Layer (Sweden)", Version = "1.0", - Description = [[ WaterMask layer for Earth globe.]], + Description = "WaterMask layer for Earth globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset index 531fd5647a..a58102ee58 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset @@ -21,7 +21,7 @@ asset.export("layer", layer) asset.meta = { Name = "Gebco WaterMask Layer (Utah)", Version = "1.0", - Description = [[ WaterMask layer for Earth globe.]], + Description = "WaterMask layer for Earth globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset index bfa47738a4..a619e498ec 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset @@ -21,7 +21,7 @@ asset.export("layer", layer) asset.meta = { Name = "MODIS Water Mask", Version = "1.0", - Description = [[ MODIS Water Mask layer for Earth globe.]], + Description = "MODIS Water Mask layer for Earth globe", Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. "eosdis-components/gibs", diff --git a/data/assets/scene/solarsystem/planets/earth/markers.asset b/data/assets/scene/solarsystem/planets/earth/markers.asset index 1d52f4682f..ce7527babf 100644 --- a/data/assets/scene/solarsystem/planets/earth/markers.asset +++ b/data/assets/scene/solarsystem/planets/earth/markers.asset @@ -41,7 +41,7 @@ asset.export(EarthMarker) asset.meta = { Name = "Earth marker", Version = "1.1", - Description = [[ Earth marker with name, sized for Solar System view]], + Description = "Earth marker with name, sized for Solar System view", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset index 8508881a65..be4f41a0ff 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset @@ -29,7 +29,7 @@ end) asset.meta = { Name = "Default Moon layers", Version = "1.0", - Description = [[This asset adds the default layers to the Moon globe.]], + Description = "This asset adds the default layers to the Moon globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset index 36bbfc62c1..5e79235670 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset @@ -9,9 +9,9 @@ local layer = { Multiplier = 1.4 }, Description = [[The Clementine Ultraviolet/Visible (UVVIS) Version 2 mosaic is a - grayscale data set representing the albedo (brightness of the lunar surface) as - measured at the 750 nanometer (nm) wavelength by the UVVIS camera (Lee, et al., 2009). - Resolution of this mosaic is 118 meters per pixel (m).]] + grayscale data set representing the albedo (brightness of the lunar surface) as + measured at the 750 nanometer (nm) wavelength by the UVVIS camera (Lee, et al., 2009). + Resolution of this mosaic is 118 meters per pixel (m)]] } asset.onInitialize(function() @@ -30,7 +30,7 @@ asset.meta = { Name = "Clem Uvvis [Sweden]", Version = "1.1", Description = [[Moon Clementine UVVIS Global Mosaic 118m v2 map of the Moon. This map - is hosted on the OpenSpace server in Sweden.]], + is hosted on the OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/Clementine/UVVIS/Lunar_Clementine_UVVIS_750nm_Global_Mosaic_118m_v2", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset index 47de662ddf..1903877509 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset @@ -9,9 +9,9 @@ local layer = { Multiplier = 1.4 }, Description = [[The Clementine Ultraviolet/Visible (UVVIS) Version 2 mosaic is a - grayscale data set representing the albedo (brightness of the lunar surface) as - measured at the 750 nanometer (nm) wavelength by the UVVIS camera (Lee, et al., 2009). - Resolution of this mosaic is 118 meters per pixel (m).]] + grayscale data set representing the albedo (brightness of the lunar surface) as + measured at the 750 nanometer (nm) wavelength by the UVVIS camera (Lee, et al., 2009). + Resolution of this mosaic is 118 meters per pixel (m)]] } asset.onInitialize(function() @@ -31,7 +31,7 @@ asset.meta = { Name = "Clem Uvvis [Utah]", Version = "1.1", Description = [[Moon Clementine UVVIS Global Mosaic 118m v2 map of the Moon. This map - is hosted on the OpenSpace server in Utah.]], + is hosted on the OpenSpace server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/Clementine/UVVIS/Lunar_Clementine_UVVIS_750nm_Global_Mosaic_118m_v2", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset index b38d54fe8f..d5f52fc565 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset @@ -9,8 +9,9 @@ local layer = { Multiplier = 1.23 }, Description = [[This near-global mosaic was generated using data from the SELenological - and Engineering Explorer (SELENE) “Kaguya” Terrain Camera (TC) instrument. TC source - data originated as map-projected tiles at ~10 meters per pixel (m) spatial resolution.]] + and Engineering Explorer (SELENE) "Kaguya" Terrain Camera (TC) instrument. TC source + data originated as map-projected tiles at ~10 meters per pixel (m) spatial + resolution]] } asset.onInitialize(function() @@ -29,7 +30,7 @@ asset.meta = { Name = "Kaguya [Sweden]", Version = "1.1", Description = [[Moon SELENE Kaguya TC Global Orthomosaic 474m v2 layer for Moon globe. - This map is hosted on the OpenSpace server in Sweden.]], + This map is hosted on the OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/Kaguya/TC/Ortho/v02/Lunar_Kaguya_TC_Ortho_Global_64ppd_v02", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset index 42ccc9394e..eb48c09932 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset @@ -9,8 +9,9 @@ local layer = { Multiplier = 1.23 }, Description = [[This near-global mosaic was generated using data from the SELenological - and Engineering Explorer (SELENE) “Kaguya” Terrain Camera (TC) instrument. TC source - data originated as map-projected tiles at ~10 meters per pixel (m) spatial resolution.]] + and Engineering Explorer (SELENE) "Kaguya" Terrain Camera (TC) instrument. TC source + data originated as map-projected tiles at ~10 meters per pixel (m) spatial + resolution]] } asset.onInitialize(function() @@ -29,7 +30,7 @@ asset.meta = { Name = "Kaguya [Utah]", Version = "1.1", Description = [[Moon SELENE Kaguya TC Global Orthomosaic 474m v2 layer for Moon globe. - This map is hosted on the OpenSpace server in Utah.]], + This map is hosted on the OpenSpace server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/Kaguya/TC/Ortho/v02/Lunar_Kaguya_TC_Ortho_Global_64ppd_v02", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset index e874b43ce9..d649a03e29 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset @@ -4,13 +4,13 @@ local layer = { Identifier = "Lola_Clr_Shade_Sweden", Name = "LRO LOLA Color Shaded Relief 388m v4 [Sweden]", Description = [[This is a colorized shaded-relief of a original polar digital elevation - model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an - instrument on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance - Orbiter (LRO) spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the - Moon at a resolution 100 meters per pixel (m) based on altimetry data acquired through - September, 2011 by the LOLA instrument. The ground tracks were interpolated using the - Generic Mapping Tools programs "surface" and "grdblend". Map values are referred to a - radius of 1,737,400 m.]], + model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an + instrument on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance + Orbiter (LRO) spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the + Moon at a resolution 100 meters per pixel (m) based on altimetry data acquired through + September, 2011 by the LOLA instrument. The ground tracks were interpolated using the + Generic Mapping Tools programs "surface" and "grdblend". Map values are referred to a + radius of 1,737,400 m]], FilePath = asset.localResource("lola_clr_shade_sweden.wms") } @@ -30,7 +30,7 @@ asset.meta = { Name = "Lola Color Shade [Sweden]", Version = "1.1", Description = [[Moon LRO LOLA Color Shaded Relief 388m v4 layer for Moon globe. This - map is hosted on the OpenSpace server in Sweden.]], + map is hosted on the OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/LMMP/LOLA-derived/Lunar_LRO_LOLA_ClrShade_Global_128ppd_v04", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset index c7a6b62336..087b524796 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset @@ -4,13 +4,13 @@ local layer = { Identifier = "Lola_Clr_Shade_Utah", Name = "LRO LOLA Color Shaded Relief 388m v4 [Utah]", Description = [[This is a colorized shaded-relief of a original polar digital elevation - model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an - instrument on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance - Orbiter (LRO) spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the - Moon at a resolution 100 meters per pixel (m) based on altimetry data acquired through - September, 2011 by the LOLA instrument. The ground tracks were interpolated using the - Generic Mapping Tools programs "surface" and "grdblend". Map values are referred to a - radius of 1,737,400 m.]], + model (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an + instrument on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance + Orbiter (LRO) spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the + Moon at a resolution 100 meters per pixel (m) based on altimetry data acquired through + September, 2011 by the LOLA instrument. The ground tracks were interpolated using the + Generic Mapping Tools programs "surface" and "grdblend". Map values are referred to a + radius of 1,737,400 m]], FilePath = asset.localResource("lola_clr_shade_utah.wms") } @@ -30,7 +30,7 @@ asset.meta = { Name = "Lola Color Shade [Utah]", Version = "1.1", Description = [[Moon LRO LOLA Color Shaded Relief 388m v4 layer for Moon globe. This - map is hosted on the OpenSpace server in Utah.]], + map is hosted on the OpenSpace server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/LMMP/LOLA-derived/Lunar_LRO_LOLA_ClrShade_Global_128ppd_v04", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset index 0b28493b38..93302820e8 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset @@ -4,13 +4,13 @@ local layer = { Identifier = "Lola_Shade_Sweden", Name = "Lola Shade [Sweden]", Description = [[This is a shaded-relief of a original polar digital elevation model - (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument - on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO) - spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the Moon at a - resolution 100 meters per pixel (m) based on altimetry data acquired through September, - 2011 by the LOLA instrument. The ground tracks were interpolated using the Generic - Mapping Tools programs "surface" and "grdblend". Map values are referred to a radius - of 1,737,400 m.]], + (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument + on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO) + spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the Moon at a + resolution 100 meters per pixel (m) based on altimetry data acquired through September, + 2011 by the LOLA instrument. The ground tracks were interpolated using the Generic + Mapping Tools programs "surface" and "grdblend". Map values are referred to a radius + of 1,737,400 m]], FilePath = asset.localResource("lola_shade_sweden.wms") } @@ -30,7 +30,7 @@ asset.meta = { Name = "Lola Shade [Sweden]", Version = "1.1", Description = [[Moon LRO LOLA Shaded Relief 237m v4 layer for Moon globe. This - map is hosted on the OpenSpace server in Sweden.]], + map is hosted on the OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/LMMP/LOLA-derived/Lunar_LRO_LOLA_Shade_Global_128ppd_v04", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset index 4faaae1cb6..abb9cc777e 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset @@ -4,13 +4,13 @@ local layer = { Identifier = "Lola_Shade_Utah", Name = "Lola Shade [Utah]", Description = [[This is a shaded-relief of a original polar digital elevation model - (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument - on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO) - spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the Moon at a - resolution 100 meters per pixel (m) based on altimetry data acquired through September, - 2011 by the LOLA instrument. The ground tracks were interpolated using the Generic - Mapping Tools programs "surface" and "grdblend". Map values are referred to a radius - of 1,737,400 m.]], + (DEM) from the Lunar Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument + on the National Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO) + spacecraft (Tooley et al., 2010). The DEM is a shape map (radius) of the Moon at a + resolution 100 meters per pixel (m) based on altimetry data acquired through September, + 2011 by the LOLA instrument. The ground tracks were interpolated using the Generic + Mapping Tools programs "surface" and "grdblend". Map values are referred to a radius + of 1,737,400 m]], FilePath = asset.localResource("lola_shade_utah.wms") } @@ -31,7 +31,7 @@ asset.meta = { Name = "Lola Shade [Utah]", Version = "1.1", Description = [[Moon LRO LOLA Shaded Relief 237m v4 layer for Moon globe. This - map is hosted on the OpenSpace server in Utah.]], + map is hosted on the OpenSpace server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/LMMP/LOLA-derived/Lunar_LRO_LOLA_Shade_Global_128ppd_v04", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset index 16d8613ddc..3c4a4e33f5 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset @@ -9,12 +9,13 @@ local layer = { Multiplier = 0.65 }, Description = [[The is a blend (or overlay) of the U.S. Geological Survey (USGS) - Clementine Ultraviolet/Visible (UVVIS) V2 mosaic and the original USGS Lunar Orbiter - mosaic. The Clementine 750 nm Version 2 mosaic is a grayscale data set representing the - albedo (brightness of the lunar surface) as measured at the 750 nm wavelength by the - UVVIS camera. The original base map was radiometrically and geometrically controlled, - photometrically modeled global image mosaic compiled using more than 43,000 images - from the 750 nanometer filter observations of the UVVIS (Lee et al., 2009).]] + Clementine Ultraviolet/Visible (UVVIS) V2 mosaic and the original USGS Lunar Orbiter + mosaic. The Clementine 750 nm Version 2 mosaic is a grayscale data set representing + the albedo (brightness of the lunar surface) as measured at the 750 nm wavelength by + the UVVIS camera. The original base map was radiometrically and geometrically + controlled, photometrically modeled global image mosaic compiled using more than + 43,000 images from the 750 nanometer filter observations of the UVVIS + (Lee et al., 2009)]] } asset.onInitialize(function() @@ -33,8 +34,8 @@ asset.export("layer", layer) asset.meta = { Name = "Uvvis Hybrid [Sweden]", Version = "1.1", - Description = [[Moon Lunar Orbiter - Clementine UVVISv2 Hybrid Mosaic 59m v1 - map of the Moon. This map is hosted on the OpenSpace server in Sweden.]], + Description = [[Moon Lunar Orbiter - Clementine UVVISv2 Hybrid Mosaic 59m v1 map of the + Moon. This map is hosted on the OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/Lunar-Orbiter/Lunar_LO_UVVISv2_Hybrid_Mosaic_Global_59m", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset index 3ee8388aa2..9f4d5a1bc5 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset @@ -9,12 +9,13 @@ local layer = { Multiplier = 0.65 }, Description = [[The is a blend (or overlay) of the U.S. Geological Survey (USGS) - Clementine Ultraviolet/Visible (UVVIS) V2 mosaic and the original USGS Lunar Orbiter - mosaic. The Clementine 750 nm Version 2 mosaic is a grayscale data set representing the - albedo (brightness of the lunar surface) as measured at the 750 nm wavelength by the - UVVIS camera. The original base map was radiometrically and geometrically controlled, - photometrically modeled global image mosaic compiled using more than 43,000 images - from the 750 nanometer filter observations of the UVVIS (Lee et al., 2009).]] + Clementine Ultraviolet/Visible (UVVIS) V2 mosaic and the original USGS Lunar Orbiter + mosaic. The Clementine 750 nm Version 2 mosaic is a grayscale data set representing + the albedo (brightness of the lunar surface) as measured at the 750 nm wavelength by + the UVVIS camera. The original base map was radiometrically and geometrically + controlled, photometrically modeled global image mosaic compiled using more than + 43,000 images from the 750 nanometer filter observations of the UVVIS + (Lee et al., 2009)]] } asset.onInitialize(function() @@ -33,7 +34,7 @@ asset.meta = { Name = "Uvvis Hybrid [Utah]", Version = "1.1", Description = [[Moon Lunar Orbiter - Clementine UVVISv2 Hybrid Mosaic 59m v1 - map of the Moon. This map is hosted on the OpenSpace server in Utah.]], + map of the Moon. This map is hosted on the OpenSpace server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/Lunar-Orbiter/Lunar_LO_UVVISv2_Hybrid_Mosaic_Global_59m", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset index 32f71977d8..275db5ab05 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset @@ -3,17 +3,15 @@ local globeIdentifier = asset.require("../../moon").Moon.Identifier local layer = { Identifier = "WAC_Sweden", Name = "WAC [Sweden]", - Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle - Camera (WAC) aboard the Lunar Reconnaissance Orbiter (LRO) has - allowed the instrument team to create a global mosaic comprised of - over 15,000 images acquired between November 2009 and February 2011. - The WAC maps the whole Moon in one month, however the solar incidence - angle at the equator changes about 28° from the beginning to the end - of the month. To even out the incidence angle variations (generally - angles between 55-75 degrees), this morphology mosaic (at 643 nm), - is comprised of data collected over three periods (1/20/2010 to - 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010). - (Description from URL).]], + Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC) + aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to + create a global mosaic comprised of over 15,000 images acquired between November 2009 + and February 2011. The WAC maps the whole Moon in one month, however the solar + incidence angle at the equator changes about 28° from the beginning to the end of the + month. To even out the incidence angle variations (generally angles between 55-75 + degrees), this morphology mosaic (at 643 nm), is comprised of data collected over + three periods (1/20/2010 to 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010). + (Description from URL)]], FilePath = asset.localResource("wac_sweden.wms"), Settings = { Gamma = 0.84 } } @@ -33,8 +31,8 @@ asset.export("layer", layer) asset.meta = { Name = "WAC [Sweden]", Version = "1.1", - Description = [[Wide Angle Color map of the Moon. This map is hosted on - the OpenSpace server in Sweden.]], + Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace + server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/LRO/LROC_WAC/Lunar_LRO_LROC-WAC_Mosaic_global_100m_June2013", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset index 34c6fbd21d..df8b4d5e70 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset @@ -5,17 +5,15 @@ local layer = { Name = "WAC [Utah]", FilePath = asset.localResource("wac_utah.wms"), Settings = { Gamma = 0.84 }, - Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle - Camera (WAC) aboard the Lunar Reconnaissance Orbiter (LRO) has - allowed the instrument team to create a global mosaic comprised of - over 15,000 images acquired between November 2009 and February 2011. - The WAC maps the whole Moon in one month, however the solar incidence - angle at the equator changes about 28° from the beginning to the end - of the month. To even out the incidence angle variations (generally - angles between 55-75 degrees), this morphology mosaic (at 643 nm), - is comprised of data collected over three periods (1/20/2010 to - 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010). - (Description from URL).]] + Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC) + aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to + create a global mosaic comprised of over 15,000 images acquired between November 2009 + and February 2011. The WAC maps the whole Moon in one month, however the solar + incidence angle at the equator changes about 28° from the beginning to the end of the + month. To even out the incidence angle variations (generally angles between 55-75 + degrees), this morphology mosaic (at 643 nm), is comprised of data collected over + three periods (1/20/2010 to 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010). + (Description from URL)]] } asset.onInitialize(function() @@ -33,8 +31,8 @@ asset.export("layer", layer) asset.meta = { Name = "WAC [Utah]", Version = "1.1", - Description = [[Wide Angle Color map of the Moon. This map is hosted on - the OpenSpace server in Utah.]], + Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace + server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/LRO/LROC_WAC/Lunar_LRO_LROC-WAC_Mosaic_global_100m_June2013", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset index 3591bb2d7d..5f937788f1 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset @@ -24,7 +24,7 @@ asset.meta = { Name = "Lola DEM [Sweden]", Version = "1.1", Description = [[Moon LRO LOLA DEM 118m v1 layer for Moon globe. This map is hosted on - the OpenSpace server in Sweden.]], + the OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/LRO/LOLA/Lunar_LRO_LOLA_Global_LDEM_118m_Mar2014", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset index fc1f0ca69b..7b237eb0b4 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset @@ -7,11 +7,11 @@ local layer = { TilePixelSize = 64, Settings = { Multiplier = 0.5 }, Description = [[This digital elevation model (DEM) is based on data from the Lunar - Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument on the National - Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO) spacecraft - (Tooley et al., 2010). The created DEM represents more than 6.5 billion measurements - gathered between July 2009 and July 2013, adjusted for consistency in the coordinate - system described below, and then converted to lunar radii (Mazarico et al., 2012).]] + Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument on the National + Aeronautics and Space Agency (NASA) Lunar Reconnaissance Orbiter (LRO) spacecraft + (Tooley et al., 2010). The created DEM represents more than 6.5 billion measurements + gathered between July 2009 and July 2013, adjusted for consistency in the coordinate + system described below, and then converted to lunar radii (Mazarico et al., 2012)]] } asset.onInitialize(function() @@ -30,7 +30,7 @@ asset.meta = { Name = "Lola DEM [Utah]", Version = "1.1", Description = [[Moon LRO LOLA DEM 118m v1 layer for Moon globe. This map is hosted on - the OpenSpace server in Utah.]], + the OpenSpace server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Moon/LRO/LOLA/Lunar_LRO_LOLA_Global_LDEM_118m_Mar2014", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset index 5f8e2a2513..bb8019b7ed 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset @@ -23,7 +23,7 @@ asset.export("layer", layer) asset.meta = { Name = "Moon Size Reference", Version = "1.0", - Description = [[ Size reference layer for Moon globe.]], + Description = "Size reference layer for Moon globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index 3d95a8d507..0d95c5f7d0 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -71,7 +71,7 @@ asset.export(Moon) asset.meta = { Name = "Moon", Version = "1.1", - Description = [[ Moon globe with labels. ]], + Description = "Moon globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset index a5be241b0f..d435690511 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset @@ -39,8 +39,8 @@ asset.export(MoonTrail) asset.meta = { Name = "Moon Trail", Version = "1.1", - Description = [[ Moon Trail - This asset contains the trail of the Moon. - Data from NASA Spice (see base spice asset)]], + Description = [[Moon Trail - This asset contains the trail of the Moon. Data from NASA + Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset index 2ad26a23d2..34a3c051a4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Carbon Monoxide - 2000" local Identifier = "noaa-sos-atmosphere-carbon_monoxide" -local Description = [[ Carbon monoxide is known as "The Silent Killer" because it is a +local Description = [[Carbon monoxide is known as "The Silent Killer" because it is a colorless, odorless, tasteless gas that is poisonous to humans and other oxygen breathing organisms. It is also naturally occurring in the atmosphere. Only in high concentrations is carbon monoxide deadly. At the Earth's surface the concentration of carbon monoxide is @@ -12,7 +12,7 @@ million) or 100 times higher. One of the main anthropogenic sources of carbon mo the atmosphere is emissions from automobiles. In areas with heavy traffic the carbon monoxide can be measured at 50 ppm. The natural sources of carbon monoxide include volcanoes and brush burning. Between the anthropogenic and natural sources, scientists -estimate that the annual production of carbon monoxide is 2-5 gigatons. ]] +estimate that the annual production of carbon monoxide is 2-5 gigatons]] local URL = "https://sos.noaa.gov/catalog/datasets/carbon-monoxide-2000/" local syncedDirectory = asset.syncedResource({ @@ -63,7 +63,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset index 46c3081a6a..ee3c28317c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Hurricane Season - 2004" local Identifier = "noaa-sos-atmosphere-2004_ir_hurricane" -local Description = [[ The 2004 hurricane season started on July 31 with Hurricane Alex +local Description = [[The 2004 hurricane season started on July 31 with Hurricane Alex and continued all the way through to December 2 with Tropical Storm Otto. The season featured 15 tropical storms, 9 of which became hurricanes, and 6 of those were classified as major hurricanes. This over-active hurricane season tallied up a bill of $42 billion @@ -11,7 +11,7 @@ in damages, which at the time was record high. Florida took the brunt of the dam 4 major hurricanes making landfall in the state. Two of the hurricanes, Frances and Jeanne, landed in almost the same location on the east coast of Florida only 3 weeks apart. It is estimated that one in every five homes in Florida was damaged in the 2004 -hurricane season. ]] +hurricane season]] local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-2004/" @@ -57,7 +57,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset index 0f33967b5f..9fb23276d5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Hurricane Season - 2005" local Identifier = "noaa-sos-atmosphere-2005_hurricane-grayir" -local Description = [[ "This hurricane season shattered records that have stood for +local Description = [["This hurricane season shattered records that have stood for decades - most named storms, most hurricanes and most category five storms. Arguably, it was the most devastating hurricane season the country has experienced in modern times," said retired Navy Vice Adm. Conrad C. Lautenbacher, Jr., Ph.D., undersecretary of -commerce for oceans and atmosphere and NOAA administrator. ]] +commerce for oceans and atmosphere and NOAA administrator]] local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-2005/" @@ -69,7 +69,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset index 45e5d246ec..9e492bf45c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Hurricane Season: Water Vapor and SST - 2005" local Identifier = "noaa-sos-atmosphere-2005_hurricane-wvsst" -local Description = [[ "This hurricane season shattered records that have stood for +local Description = [["This hurricane season shattered records that have stood for decades - most named storms, most hurricanes and most category five storms. Arguably, it was the most devastating hurricane season the country has experienced in modern times," said retired Navy Vice Adm. Conrad C. Lautenbacher, Jr., Ph.D., undersecretary of -commerce for oceans and atmosphere and NOAA administrator. ]] +commerce for oceans and atmosphere and NOAA administrator]] local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-water-vapor-and-sst-2005/" @@ -53,7 +53,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset index e5ff06d806..d66290b22a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2012_hurricane.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Hurricane Season - 2012" local Identifier = "noaa-sos-atmosphere-2012_hurricane" -local Description = [[ "It was an extremely devastating and destructive storm, hopefully +local Description = [["It was an extremely devastating and destructive storm, hopefully one that people will only see once in their lifetime," National Weather Service meteorologist, Joe Pollina, said of Hurricane Sandy. The 2012 Atlantic Hurricane season was tied with 1887, 1995, 2010 and 2011 as the third most active year in recorded @@ -13,7 +13,7 @@ University fell short of the actual numbers despite raising their numbers after active start to the season, which began on June 1st and ended on November 30th. The Eastern Pacific season was moderately active. This dataset names all the Atlantic and Pacific named tropical storms and hurricanes in 2012 from the Linear IR Satellite data -recorded by geostationary satellites. ]] +recorded by geostationary satellites]] local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-2012/" @@ -80,7 +80,7 @@ asset.export(layer_sat) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset index 3ad4154a15..a4dd85a3d7 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Aerosols: Black Carbon" local Identifier = "noaa-sos-atmosphere-aerosol-blackcarbon" -local Description = [[ With so many uncertainties attached to climate change, it is +local Description = [[With so many uncertainties attached to climate change, it is important to look at all of the factors. As early as 1896, scientists have been analyzing the presence of black carbon in the atmosphere. This group of three datasets looks at the presence of aerosols in the Earth's atmosphere. The first dataset contains only black @@ -15,7 +15,7 @@ result of incomplete combustion, especially of coal, diesel fuels, biofuels and biomass burnings. Sulfate is the result of sulfur dioxide and sulfur trioxide interacting with other compounds in the atmosphere. Sulfate aerosols in the atmosphere are associated with the combustion of fossil fuels and also the eruption of volcanoes like Mt. -Pinatubo. ]] +Pinatubo]] local URL = "https://sos.noaa.gov/catalog/datasets/aerosols-black-carbon/" @@ -67,7 +67,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset index 881bdd51fc..516eca61dc 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Aerosols: Black Carbon and Sulfate" local Identifier = "noaa-sos-atmosphere-aerosol-blackcarbon_and_sulfate" -local Description = [[ With so many uncertainties attached to climate change, it is +local Description = [[With so many uncertainties attached to climate change, it is important to look at all of the factors. As early as 1896, scientists have been analyzing the presence of black carbon in the atmosphere. This group of three datasets looks at the presence of aerosols in the Earth's atmosphere. The first dataset contains only black @@ -15,7 +15,7 @@ result of incomplete combustion, especially of coal, diesel fuels, biofuels and biomass burnings. Sulfate is the result of sulfur dioxide and sulfur trioxide interacting with other compounds in the atmosphere. Sulfate aerosols in the atmosphere are associated with the combustion of fossil fuels and also the eruption of volcanoes like Mt. -Pinatubo. ]] +Pinatubo]] local URL = "https://sos.noaa.gov/catalog/datasets/aerosols-black-carbon-and-sulfate/" @@ -67,7 +67,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset index afadb4a0d9..ab4b6b4ba6 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Aerosols: Sulfate" local Identifier = "noaa-sos-atmosphere-aerosol-sulfate" -local Description = [[ With so many uncertainties attached to climate change, it is +local Description = [[With so many uncertainties attached to climate change, it is important to look at all of the factors. As early as 1896, scientists have been analyzing the presence of black carbon in the atmosphere. This group of three datasets looks at the presence of aerosols in the Earth's atmosphere. The first dataset contains only black @@ -15,7 +15,7 @@ result of incomplete combustion, especially of coal, diesel fuels, biofuels and biomass burnings. Sulfate is the result of sulfur dioxide and sulfur trioxide interacting with other compounds in the atmosphere. Sulfate aerosols in the atmosphere are associated with the combustion of fossil fuels and also the eruption of volcanoes like Mt. -Pinatubo. ]] +Pinatubo]] local URL = "https://sos.noaa.gov/catalog/datasets/aerosols-sulfate/" @@ -67,7 +67,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset index 682e46efaa..1162f02173 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Air Traffic" local Identifier = "noaa-sos-atmosphere-air_traffic" -local Description = [[ "On any given day, more than 87,000 flights are in the skies in +local Description = [["On any given day, more than 87,000 flights are in the skies in the United States. Only one-third are commercial carriers, like American, United or Southwest. On an average day, air traffic controllers handle 28,537 commercial flights (major and regional airlines), 27,178 general aviation flights (private planes), 24,548 air taxi flights (planes for hire), 5,260 military flights and 2,148 air cargo flights (Federal Express, UPS, etc.). At any given moment, roughly 5,000 planes are in the skies above the United States. In one year, controllers handle an average of 64 million -takeoffs and landings." - From the National Air Traffic Controllers Association webpage ]] +takeoffs and landings." - From the National Air Traffic Controllers Association webpage]] local URL = "https://sos.noaa.gov/catalog/datasets/air-traffic/" @@ -52,7 +52,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset index b49e04a9b8..61a3361021 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Satellites: Paths and Positions" local Identifier = "noaa-sos-atmosphere-all_sats" -local Description = [[ Satellites are a key tool for scientists to monitor and observe +local Description = [[Satellites are a key tool for scientists to monitor and observe the Earth's atmosphere from space. Geostationary satellites orbit around the Earth at the same rate as the Earth rotates so that the satellites are over the same spot on Earth all the time. This allows them to collect a continuous stream of data for one location so @@ -15,7 +15,7 @@ also use polar orbiting satellites. These satellites circle the Earth, crossing on each orbit. Typically, polar orbiting satellites are about 500 miles above the Earth's surface. The satellites travel at almost 17,000mph, allowing them to orbit the Earth in roughly 100 minutes. A polar orbiting satellite is able to cover the whole Earth in less -than one day. ]] +than one day]] local URL = "https://sos.noaa.gov/catalog/datasets/satellites-paths-and-positions/" @@ -55,7 +55,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset index 74287aa4e4..6ec572d938 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Polar Orbiting: Aqua Satellite and MODIS Swath" local Identifier = "noaa-sos-atmosphere-aqua_swath" -local Description = [[ Satellites are important to scientists because the instruments on +local Description = [[Satellites are important to scientists because the instruments on board can provide almost daily global coverage of the Earth that would otherwise not be available. There are six instruments on board NASA's Aqua satellite. One of them is MODIS, the Moderate Resolution Imaging Spectroradiometer. MODIS measures 36 spectral @@ -14,7 +14,7 @@ circling the Earth at an altitude of 438 miles (705 kilometers) every 99 minutes polar orbit passing within 10 degrees of each pole every orbit. The orbit is sun-synchronous, which means that the satellite passes over the same spot of the Earth at about the same local time everyday. Aqua crosses the equator from south to north at about -1:30 pm local time. ]] +1:30 pm local time]] local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-aqua-satellite-and-modis-swath/" @@ -57,7 +57,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset index cca5f5a1f4..8361691085 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Carbon Flux" local Identifier = "noaa-sos-atmosphere-carbonflux" -local Description = [[ The Global Monitoring Division at NOAA diligently monitors carbon +local Description = [[The Global Monitoring Division at NOAA diligently monitors carbon dioxide and other trace gases in the atmosphere. One of the methods they use to sample trace gases is collecting flasks of air from around the world that can be tested. They have several other means for collecting samples as well. In this data set, the NOAA GMD @@ -13,7 +13,7 @@ they race from Australia and New Zealand to the US west coast or Japan, or from to the US east coast. The coloration in the dataset represents the fluxes constructed by the ocean, biosphere, and fossil fuel modules of the NOAA ESRL data assimilation system for CO2 and related trace gases. The data set shows daily average fluxes constructed from -3-hour model output. ]] +3-hour model output]] local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-aqua-satellite-and-modis-swath/" @@ -53,7 +53,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset index f03e14c136..a8369b5677 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-fixed_scale.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "CarbonTracker: Fixed Scale" local Identifier = "noaa-sos-atmosphere-carbontracker_2000_2100-fixed_scale" -local Description = [[ "NOAA encourages science that adds benefit to society and the +local Description = [["NOAA encourages science that adds benefit to society and the environment. CarbonTracker does both." said retired Navy Vice Admiral Conrad Lautenbacher, Ph.D., former undersecretary of commerce for oceans and atmosphere and NOAA administrator. CarbonTracker is a system to keep track of carbon dioxide uptake and @@ -13,7 +13,7 @@ CarbonTracker has helped improve the understanding of carbon uptake and release land and oceans, and how those sources and sinks are responding to the changing climate, increasing levels of atmospheric CO2 (the CO2 fertilization effect), and human management of land and oceans. CarbonTracker relies on the long-term monitoring of atmospheric CO2 -performed by the NOAA Global Monitoring Division and international partners. ]] +performed by the NOAA Global Monitoring Division and international partners]] local URL = "https://sos.noaa.gov/catalog/datasets/carbon-tracker-fixed-scale/" @@ -105,7 +105,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset index b6102f9191..8ce27bd93f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbontracker_2000_2100-sliding_scale.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "CarbonTracker: Sliding Scale" local Identifier = "noaa-sos-atmosphere-carbontracker_2000_2100-sliding_scale" -local Description = [[ "NOAA encourages science that adds benefit to society and the +local Description = [["NOAA encourages science that adds benefit to society and the environment. CarbonTracker does both." said retired Navy Vice Admiral Conrad Lautenbacher, Ph.D., former undersecretary of commerce for oceans and atmosphere and NOAA administrator. CarbonTracker is a system to keep track of carbon dioxide uptake and @@ -13,7 +13,7 @@ CarbonTracker has helped improve the understanding of carbon uptake and release land and oceans, and how those sources and sinks are responding to the changing climate, increasing levels of atmospheric CO2 (the CO2 fertilization effect), and human management of land and oceans. CarbonTracker relies on the long-term monitoring of atmospheric CO2 -performed by the NOAA Global Monitoring Division and international partners. ]] +performed by the NOAA Global Monitoring Division and international partners]] local URL = "https://sos.noaa.gov/catalog/datasets/carbon-tracker-sliding-scale/" @@ -106,7 +106,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset index d54b10fdc2..e6aa2736d7 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/climate_niche.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Human Climate Niche - 2020 and 2070" local Identifier = "noaa-sos-atmosphere-climate_niche" -local Description = [[ The human climate niche are areas on Earth where humans have +local Description = [[The human climate niche are areas on Earth where humans have historically lived due to favorable climate conditions related to temperature and precipitation. For the past 6000 years, humans have mostly lived in the same climate conditions as they do now. In addition to humans, this climate niche is also where the @@ -16,7 +16,7 @@ climate niche in 2070 based on the climate projection scenario of RCP 8.5. Also as an additional layer that can be turned on and off is a map that shows the areas where the mean annual temperature is greater than 84 °F (29 °C). Currently, only 0.8% of the global land surface has a mean annual temperature greater than 84 °F, but in 2070 that is -projected to cover 19% of the global land and impact an estimated 3.5 billion people. ]] +projected to cover 19% of the global land and impact an estimated 3.5 billion people]] local URL = "https://sos.noaa.gov/catalog/datasets/human-climate-niche-2020-and-2070/" @@ -91,7 +91,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset index c43a8b36e1..6cf337ac2b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Carbon Monoxide - 2008 - 2011" local Identifier = "noaa-sos-atmosphere-co_gmd" -local Description = [[ Carbon Monoxide (CO) is a colorless, odorless gas existing in the +local Description = [[Carbon Monoxide (CO) is a colorless, odorless gas existing in the atmosphere at levels between 40 and 150 parts per billion (ppb). About 40% of that is produced by burning (combustion) of fossil fuels (coal, oil and natural gas) and biomass (for example, wood in forest fires). CO is the primary consumer of oxidant OH, the @@ -14,7 +14,7 @@ such as benzene, isoprene and halocarbons, which would otherwise give rise to sm reduce air quality. Therefore, an excess of atmospheric CO leads to a reduction of OH's cleansing capacity. Another reason for measuring CO concentrations is that it is an indicator of combustion, such as forest fires and urban emissions. A large forest fire or -emissions from heavy traffic can produce CO concentrations of 200 - 5000 ppb. ]] +emissions from heavy traffic can produce CO concentrations of 200 - 5000 ppb]] local URL = "https://sos.noaa.gov/catalog/datasets/carbon-monoxide-2008-2011/" @@ -78,7 +78,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset index 48435ad71d..919d76aabd 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Aerosols: FIM Chem Model" local Identifier = "noaa-sos-atmosphere-fim_chem" -local Description = [[ The Flow Following Finite Volume Icosahedral Model (FIM) was +local Description = [[The Flow Following Finite Volume Icosahedral Model (FIM) was developed by NOAA to produce weather forecasts. In fact, weather forecasts from the FIM model are available for SOS here. Building upon the success of the FIM model, the FIM-Chem model was created. The FIM-Chem is the FIM model with chemistry and aerosol modules added. Aerosols are one of the biggest uncertainties in climate models due to their varied affects on radiation and cloud physics. The FIM-Chem allows researchers to forecast and study the behavior of aerosols in the atmosphere, leading to the potential -for better Earth system modeling for climate prediction. ]] +for better Earth system modeling for climate prediction]] local URL = "https://sos.noaa.gov/catalog/datasets/aerosols-fim-chem-model/" @@ -62,7 +62,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset index a1d8bcd6e1..5f0ad1e592 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Fossil Fuel: CO2 Release - 2011-2012" local Identifier = "noaa-sos-atmosphere-fossil_fuel" -local Description = [[ This dataset shows the result of emitting carbon dioxide from +local Description = [[This dataset shows the result of emitting carbon dioxide from fossil fuel burning into the atmosphere over two years. A computer model of the atmosphere called TM5 was used to create this powerful visualization. TM5 simulates the movement of atmospheric gases globally, using winds and atmospheric mixing as derived @@ -17,7 +17,7 @@ observations and instead visualizes the transport of fossil fuel emissions. Visualizations such as this dataset and CarbonTracker, aim to improve our understanding of atmospheric carbon and how various sources and sinks may respond to the changing climate, increasing levels of atmospheric CO2 (via the CO2 fertilization effect), and -human management of global resources. ]] +human management of global resources]] local URL = "https://sos.noaa.gov/catalog/datasets/fossil-fuel-co2-release-2011-2012/" @@ -75,7 +75,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset index bd55933421..f383b6b997 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Fukushima Radioactive Aerosol Dispersion Model" local Identifier = "noaa-sos-atmosphere-fukushima" -local Description = [[ The Hybrid Single-Particle Lagrangian Integrated Trajectory +local Description = [[The Hybrid Single-Particle Lagrangian Integrated Trajectory (HYSPLIT) model was developed by NOAA to follow the transport and dispersion of pollutants in the atmosphere. In HYSPLIT, the computation is composed of four components: transport by the mean wind, turbulent dispersion, scavenging and decay. A large number of pollutant particles, which by convention are called "particles" but are just computational "points" (particles or gases), are released at the source location and -passively follow the wind. ]] +passively follow the wind]] local URL = "https://sos.noaa.gov/catalog/datasets/fukushima-radioactive-aerosol-dispersion-model/" @@ -61,7 +61,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset index 141e7ad099..7b27ff9bc2 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset @@ -3,17 +3,17 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Geostationary Satellites" local Identifier = "noaa-sos-atmosphere-geo_sat" -local Description = [[ Geostationary satellites are a key tool for scientists to monitor -and observe the Earth's atmosphere. They are called geostationary due to their movement. -Geostationary satellites orbit around the Earth at the same rate as the Earth rotates so -that the satellites are over the same spot on Earth all the time. This allows them to -collect a continuous stream of data for one location so that "movies" of the data can be -made. The satellites are positioned 22,300 miles above the Earth's surface in order to -view the Earth's full disk and to maintain their geostationary orbit. Geostationary -satellites travel at about 7000mph in order to maintain their geostationary orbit. Over -the United States there are two such satellites, the GOES (Geostationary Operational -Environmental Satellite) - East and GOES-West. There are many such satellites -worldwide. ]] +local Description = [[Geostationary satellites are a key tool for scientists to monitor + and observe the Earth's atmosphere. They are called geostationary due to their movement. + Geostationary satellites orbit around the Earth at the same rate as the Earth rotates so + that the satellites are over the same spot on Earth all the time. This allows them to + collect a continuous stream of data for one location so that "movies" of the data can be + made. The satellites are positioned 22,300 miles above the Earth's surface in order to + view the Earth's full disk and to maintain their geostationary orbit. Geostationary + satellites travel at about 7000mph in order to maintain their geostationary orbit. Over + the United States there are two such satellites, the GOES (Geostationary Operational + Environmental Satellite) - East and GOES-West. There are many such satellites + worldwide]] local URL = "https://sos.noaa.gov/catalog/datasets/geostationary-satellites/" @@ -53,7 +53,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset index 7e8d774ded..84ee897c10 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Geostationary Satellites: Scanning Pattern" local Identifier = "noaa-sos-atmosphere-geo_scan" -local Description = [[ Geostationary satellites are a key tool for scientists to monitor +local Description = [[Geostationary satellites are a key tool for scientists to monitor and observe the Earth's atmosphere. They are called geostationary due to their movement. Geostationary satellites orbit around the Earth at the same rate as the Earth rotates so that the satellites are over the same spot on Earth all the time. This allows them to @@ -13,7 +13,7 @@ view the Earth's full disk and to maintain their geostationary orbit. Geostation satellites travel at about 7000mph in order to maintain their geostationary orbit. Over the United States there are two such satellites, the GOES (Geostationary Operational Environmental Satellite) - East and GOES-West. There are many such satellites -worldwide. ]] +worldwide]] local URL = "https://sos.noaa.gov/catalog/datasets/geostationary-satellites-scanning-pattern/" @@ -53,7 +53,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset index e87538d6af..80528b57e4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Temperature Anomaly: (NASA) - 1884 - 2012" local Identifier = "noaa-sos-atmosphere-giss_temp_anom" -local Description = [[ These maps, developed by NASA's Goddard Institute for Space +local Description = [[These maps, developed by NASA's Goddard Institute for Space Studies (GISS), depict how much various regions of the world have warmed or cooled when compared with a base period of 1951-1980. They show temperature anomalies, or changes, -not absolute temperature. ]] +not absolute temperature]] local URL = "https://sos.noaa.gov/catalog/datasets/temperature-anomaly-nasa-1884-2012/" @@ -58,7 +58,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset index f1655c3a67..afb62576a2 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Solar Insolation - Monthly (NASA)" local Identifier = "noaa-sos-atmosphere-globe-insolation" -local Description = [[ These maps show where and how much sunlight fell on Earth's +local Description = [[These maps show where and how much sunlight fell on Earth's surface during each month in 2018. Scientists call this measure solar insolation. Knowing how much of the Sun's energy reaches the surface helps scientists understand weather and climate patterns as well as patterns of plant growth around our world. Solar insolation maps are also useful to engineers who design solar panels and batteries designed to convert energy from the Sun into electricity to power appliances in our homes and work -places. ]] +places]] local URL = "https://sos.noaa.gov/catalog/datasets/solar-insolation-monthly-nasa/" @@ -68,7 +68,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset index 2f15dee165..aa8201b1be 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Solar Rainfall - Monthly (NASA)" local Identifier = "noaa-sos-atmosphere-globe-rainfall" -local Description = [[ Globally, rain is the main source of fresh water for plants and +local Description = [[Globally, rain is the main source of fresh water for plants and animals rainfall is essential for life across Earth's landscapes. In addition to moving tremendous amounts of water through Earth's atmosphere, rain clouds also move tremendous amounts of energy. When water evaporates from the surface and rises as vapor into the atmosphere, it carries heat from the sun-warmed surface with it. Later, when the water vapor condenses to form cloud droplets and rain, the heat is released into the -atmosphere. This heating is a major part of Earth's energy budget and climate. ]] +atmosphere. This heating is a major part of Earth's energy budget and climate]] local URL = "https://sos.noaa.gov/catalog/datasets/rainfall-monthly-nasa/" @@ -68,7 +68,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset index 1eb5f35caf..5218dd0d53 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Hurricane Harvey: Clouds with Precipitation - 2017" local Identifier = "noaa-sos-atmosphere-harvey-clouds_precip" -local Description = [[ Hurricane Harvey was an extremely destructive Atlantic hurricane -which became the first major hurricane to make landfall in the U.S. since Wilma in 2005. -In a four-day period, many areas of eastern Texas received over 40 inches of rain as the -system meandered along the gulf coast causing catastrophic flooding. With a record of -51.88 inches, Harvey is the wettest tropical hurricane on record in the contiguous U.S. -The resulting floods inundated hundreds of thousands of homes, displaces more than -30,000 people, and prompted more than 17,000 rescues. ]] +local Description = [[Hurricane Harvey was an extremely destructive Atlantic hurricane + which became the first major hurricane to make landfall in the U.S. since Wilma in 2005. + In a four-day period, many areas of eastern Texas received over 40 inches of rain as the + system meandered along the gulf coast causing catastrophic flooding. With a record of + 51.88 inches, Harvey is the wettest tropical hurricane on record in the contiguous U.S. + The resulting floods inundated hundreds of thousands of homes, displaces more than + 30,000 people, and prompted more than 17,000 rescues]] local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-harvey-clouds-with-precipitation-2017/" @@ -79,7 +79,7 @@ asset.export(colorbar_snow) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset index 83a4548b29..293a5e661b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Hurricane Season - 2017" local Identifier = "noaa-sos-atmosphere-hurricane_season_2017" -local Description = [[ After a long lull in major hurricanes striking the U.S. +local Description = [[After a long lull in major hurricanes striking the U.S. (2005 - 2017), the 2017 season was an extremely destructive season, featuring 17 named storms in just the Atlantic Ocean, tying it with 1936 as the fifth-most active season since records began in 1851. All ten of the Atlantic hurricanes occurred in a row, the @@ -12,7 +12,7 @@ the costliest season on record, with a preliminary total of over $368.66 billion damages, which is more than double the cost of 2005's total, and nearly all of which was due to three of the season's major hurricanes — Harvey, Irma, and Maria. All three occurred within one month in August - September, sending disaster aide efforts reeling -and calling on volunteers for help. ]] +and calling on volunteers for help]] local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-2017/" @@ -61,7 +61,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset index b5d44492dc..05f1288e27 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset @@ -3,16 +3,16 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Hurricane Season: Water Vapor and SST - 2017" local Identifier = "noaa-sos-atmosphere-hurricane_season_2017_wvsst" -local Description = [[ After a long lull in major hurricanes striking the U.S. -(2005 - 2017), the 2017 season was an extremely destructive season, featuring 17 named -storms in just the Atlantic Ocean, tying it with 1936 as the fifth-most active season -since records began in 1851. All ten of the Atlantic hurricanes occurred in a row, the -greatest number of consecutive hurricanes in the satellite era. In addition, it is by far -the costliest season on record, with a preliminary total of over $368.66 billion (USD) in -damages, which is more than double the cost of 2005's total, and nearly all of which was -due to three of the season's major hurricanes — Harvey, Irma, and Maria. All three -occurred within one month in August - September, sending disaster aide efforts reeling -and calling on volunteers for help. ]] +local Description = [[After a long lull in major hurricanes striking the U.S. + (2005 - 2017), the 2017 season was an extremely destructive season, featuring 17 named + storms in just the Atlantic Ocean, tying it with 1936 as the fifth-most active season + since records began in 1851. All ten of the Atlantic hurricanes occurred in a row, the + greatest number of consecutive hurricanes in the satellite era. In addition, it is by + far the costliest season on record, with a preliminary total of over $368.66 billion + (USD) in damages, which is more than double the cost of 2005's total, and nearly all of + which was due to three of the season's major hurricanes — Harvey, Irma, and Maria. All + three occurred within one month in August - September, sending disaster aide efforts + reeling and calling on volunteers for help]] local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-season-water-vapor-and-sst-2017/" @@ -58,7 +58,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset index aa6165382b..61cbddd2a8 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_tracks-cumulative.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Hurricane Tracks: Cumulative - 1950 - 2020" local Identifier = "noaa-sos-atmosphere-hurricane_tracks-cumulative" -local Description = [[ Tracking historical hurricanes is an important way for hurricane +local Description = [[Tracking historical hurricanes is an important way for hurricane researchers to learn about the paths of future hurricanes. Because of this, records of hurricane paths are archived and studied. Not all hurricanes follow the same path, but there are certainly noticeable trends for hurricane paths. Many computer models that have -been created to predict hurricane paths include the historical data in their models. ]] +been created to predict hurricane paths include the historical data in their models]] local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-tracks-cumulative-1950-2005/" @@ -39,7 +39,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset index e410f821c1..48cff7c8c5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Hurricane Isaac - 2012" local Identifier = "noaa-sos-atmosphere-isaac" -local Description = [[ Hurricane Isaac formed as a tropical depression east of the Lesser +local Description = [[Hurricane Isaac formed as a tropical depression east of the Lesser Antilles on August 21 and that same day was upgraded to a tropical storm. As a tropical storm Hurricane Isaac passed over Hispaniola and Cuba, killing many people. It them entered the Gulf of Mexico. Shortly before making landfall near the mouth of the Mississippi River, Tropical Storm Isaac strengthened and became Hurricane Isaac on August 28. Isaac actually made landfall twice, briefly returning offshore after its first landfall before returning to land. Isaac was a very slow moving storm after landfall and -brought significant amounts of rain to the southeastern United States. ]] +brought significant amounts of rain to the southeastern United States]] local URL = "https://sos.noaa.gov/catalog/datasets/hurricane-isaac-2012/" @@ -79,7 +79,7 @@ asset.export(layer_sat) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset index da67b4c29a..2bd511bce3 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/iss_track.asset @@ -3,17 +3,17 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "International Space Station Track" local Identifier = "noaa-sos-atmosphere-iss_track" -local Description = [[ The first piece of the International Space Station was sent into -orbit in 1998. Following two more pieces, astronauts first entered the space station in -November of 2000. Since then, the space station has been continuously inhabited by at -least 2 people. The station is currently designed to house 3 crew members. The -International Space Station is a cooperative space research facility being constructed -cooperatively by many nations. Several space organizations had planned their own space -stations and the groups decided to merge and work together. The original space station -was a combination of NASA's Space Station Freedom, Russia's Mir-2, and the European -Space Agency's Columbus. The project now involves NASA, the Russian Space agency, RKA; -the European Space Agency, ESA; the Japanese Space agency, JAXA; and the Canadian Space -agency, CSA. ]] +local Description = [[The first piece of the International Space Station was sent into + orbit in 1998. Following two more pieces, astronauts first entered the space station in + November of 2000. Since then, the space station has been continuously inhabited by at + least 2 people. The station is currently designed to house 3 crew members. The + International Space Station is a cooperative space research facility being constructed + cooperatively by many nations. Several space organizations had planned their own space + stations and the groups decided to merge and work together. The original space station + was a combination of NASA's Space Station Freedom, Russia's Mir-2, and the European + Space Agency's Columbus. The project now involves NASA, the Russian Space agency, RKA; + the European Space Agency, ESA; the Japanese Space agency, JAXA; and the Canadian Space + agency, CSA]] local URL = "https://sos.noaa.gov/catalog/datasets/international-space-station-track/" @@ -45,7 +45,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset index 5240adfa05..491d76b130 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Land Surface Temperature - 1950 - 1999" local Identifier = "noaa-sos-atmosphere-land_temp" -local Description = [[ The temperature of the air varies dramatically in both time and +local Description = [[The temperature of the air varies dramatically in both time and space. Because the Earth's rotational axis is at a 23° tilt, the Northern Hemisphere and Southern Hemisphere simultaneously experience opposite seasons. This dataset displays the gridded, monthly, historical terrestrial air temperature from 1950 - 1999. The original data is from the Global Historical Climatology Network, which is part of NOAA's National Climatic Data Center. The data was interpolated by the Center for Climatic Research at -the University of Delaware. ]] +the University of Delaware]] local URL = "https://sos.noaa.gov/catalog/datasets/international-space-station-track/" @@ -55,7 +55,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset index ab7228928e..60e9dc0cb5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/lightning.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Lightning Flash Rate" local Identifier = "noaa-sos-atmosphere-lightning" -local Description = [[ Typically, more than 2,000 thunderstorms are active throughout the +local Description = [[Typically, more than 2,000 thunderstorms are active throughout the world at a given moment, producing on the order of 100 flashes per second. NASA has two different sensors on satellites that measuring flash frequency, the Optical Transient Detector, OTD, and the Lightning Imaging Sensor, LIS. Data from the OTD from 1995 - 2000 and the LIS from 1998 - 2005 has been combined and averaged to create an average annual lightning flash rate map. 11 year of data is included to remove any anomalies that might be present in just one year. The color variations in the map display the average annual -number of lightning flashes per square kilometer. ]] +number of lightning flashes per square kilometer]] local URL = "https://sos.noaa.gov/catalog/datasets/lightning-flash-rate/" @@ -55,7 +55,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset index e5e8368b91..8caf37b87d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Lightning Detection - Jun 2011 - Aug 2012" local Identifier = "noaa-sos-atmosphere-ltg_vaisala" -local Description = [[ The Global Lightning Dataset GLD360 network detects between 1 and +local Description = [[The Global Lightning Dataset GLD360 network detects between 1 and 3 million lightning events around the world every day of the year. Lightning activity is not uniformly distributed across the globe. About ten times as many flashes occur over land than over the oceans, and the majority of global lightning is concentrated in the @@ -14,7 +14,7 @@ patterns can be clearly seen in these images, which show the total number of eve detected in each month per square kilometer. The color scale ranges from less than .01 lightning pulses per square kilometer in the corresponding month to over 20 pulses per square kilometer. Each color range corresponds to a factor of two of increase in the -number of events. This dataset runs from June 2011 through August 2012. ]] +number of events. This dataset runs from June 2011 through August 2012]] local URL = "c" @@ -73,7 +73,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset index 085c54d657..b33b4a1244 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Polar Orbiting: NASA A-Train Satellites" local Identifier = "noaa-sos-atmosphere-nasa_sats" -local Description = [[ In order to enable coordinated science observations, the Earth +local Description = [[In order to enable coordinated science observations, the Earth Observations System has created the A-Train. When finally completed in 2008, the A-Train will consist of 6 polar-orbiting satellites that travel just minutes apart in a line. Four of the satellites are NASA satellites, one is a French Centre National d'Etudes @@ -13,7 +13,7 @@ degrees. Together, their overlapping science instruments give a comprehensive pi Earth weather and climate. The "A" in the A-Train is for "afternoon" because the lead satellite, Aqua, crosses the equator at the mean local time of approximately 1:30pm. Five of the satellites are currently in orbit, and the sixth satellite is scheduled to be -launched in 2008. ]] +launched in 2008]] local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-nasa-a-train-satellites/" local syncedDirectory = asset.syncedResource({ @@ -52,7 +52,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset index 869b7da8fc..366b5121ac 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Carbon Dioxide Concentration: GEOS-5 Model" local Identifier = "noaa-sos-atmosphere-nccs_models-carbon" -local Description = [[ Models create a dynamic portrait of the Earth through numerical +local Description = [[Models create a dynamic portrait of the Earth through numerical experiments that simulate our current knowledge of the dynamical and physical processes governing weather and climate variability. This new simulation of carbon dioxide in Earth's atmosphere provides an ultra-high-resolution look at how the key greenhouse gas moves around the globe and fluctuates in volume throughout the year. These three close-up views show how local geography affects the transport of carbon dioxide in the -atmosphere. ]] +atmosphere]] local URL = "https://sos.noaa.gov/catalog/datasets/carbon-dioxide-concentration-geos-5-model/" @@ -62,7 +62,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset index 6865c8e6df..60b6bd32b5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Atmospheric Chemistry: GEOS-5 Model" local Identifier = "noaa-sos-atmosphere-nccs_models-chem" -local Description = [[ Models create a dynamic portrait of the Earth through numerical +local Description = [[Models create a dynamic portrait of the Earth through numerical experiments that simulate our current knowledge of the dynamical and physical processes governing weather and climate variability. The simulation visualized here captures how winds lift up aerosols from the Earth's surface and transport them around the globe during the period September 1, 2006 to March 17, 2007. Such simulations allow scientists to identify the sources and pathways of these tiny particulates that influence weather -and climate. ]] +and climate]] local URL = "https://sos.noaa.gov/catalog/datasets/atmospheric-chemistry-geos-5-model/" @@ -92,7 +92,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset index adfae393cd..8aeab2aa59 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Winds: GEOS-5 Model" local Identifier = "noaa-sos-atmosphere-nccs_models-winds" -local Description = [[ Models create a dynamic portrait of the Earth through numerical +local Description = [[Models create a dynamic portrait of the Earth through numerical experiments that simulate our current knowledge of the dynamical and physical processes governing weather and climate variability. The simulation visualized here captures the speed of winds at the tropopause, about 6-9 miles above the Earth's surface during the period September 1, 2006 to March 17, 2007. Such simulations allow scientists to view the intensity and turbulence of the polar and sub-tropic jet streams, which carry weather -around the globe. Red, orange and yellow are used for the fastest moving air. ]] +around the globe. Red, orange and yellow are used for the fastest moving air]] local URL = "https://sos.noaa.gov/catalog/datasets/winds-geos-5-model/" @@ -80,7 +80,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset index bb418c4895..675911fcbb 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Nitrogen Dioxide" local Identifier = "noaa-sos-atmosphere-no2_omsi" -local Description = [[ Nitrogen dioxide (NO2) is a key component of urban air pollution. -The nitrogen oxides ("NOx" of which NO2 is one component) are emitted from any combustion -process. Coal- and gas-fired power plants and vehicles constitute the major anthropogenic -(human-produced) sources. Forest fires and lightning are natural sources of NO2, but -globally it is clear that anthropogenic sources dominate. High levels of NO2 are -significant as they are associated with: 1) haze that reduces visibility; 2) irritation -of the eyes, nose, throat, and lungs; 3) acid rain; 4) reduced terrestrial plant growth; -5) oxygen-depleting algal blooms; and 6) corrosion of building materials. ]] +local Description = [[Nitrogen dioxide (NO2) is a key component of urban air pollution. + The nitrogen oxides ("NOx" of which NO2 is one component) are emitted from any + combustion process. Coal- and gas-fired power plants and vehicles constitute the major + anthropogenic (human-produced) sources. Forest fires and lightning are natural sources + of NO2, but globally it is clear that anthropogenic sources dominate. High levels of NO2 + are significant as they are associated with: 1) haze that reduces visibility; 2) + irritation of the eyes, nose, throat, and lungs; 3) acid rain; 4) reduced terrestrial + plant growth; 5) oxygen-depleting algal blooms; and 6) corrosion of building materials]] local URL = "https://sos.noaa.gov/catalog/datasets/nitrogen-dioxide/" @@ -68,7 +68,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset index ecf42296d5..916db35131 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/noaa_sat-tracks.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Polar Orbiting: NOAA Satellite Tracks" local Identifier = "noaa-sos-atmosphere-noaa_sat-tracks" -local Description = [[ NOAA has four POES, Polar Operational Environmental Satellites, +local Description = [[NOAA has four POES, Polar Operational Environmental Satellites, currently in orbit. The satellites are named chronologically, based on launch date. NOAA 15 was launched in 1998, NOAA 16 was launched in 2000, NOAA 17 was launched in 2002 and NOAA 18 was launched in 2005. In May and August of 2007 two older satellites, NOAA 14 and @@ -14,7 +14,7 @@ satellites to collect daily global data for land, ocean, and atmospheric applica This data is used a large variety of environmental monitoring applications such as weather analysis and forecasting, climate research and prediction, global sea surface temperature measurements, ocean dynamics research, global vegetation analysis and many -other applications. ]] +other applications]] local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-noaa-satellite-tracks/" @@ -46,7 +46,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset index e4cb0d05b4..720b88fffd 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Temperature Anomaly: Yearly - 500 - 2006 (Paleoclimate Evidence)" local Identifier = "noaa-sos-atmosphere-pclim" -local Description = [[ This animation shows annual average temperature anomalies +local Description = [[This animation shows annual average temperature anomalies (departure from normal) over the globe for the past 1,500 years compared to the average temperature (normal) from 1961-1990. This data collected from over 1,000 paleoclimate proxies. Areas shaded red are warmer than normal while areas shaded blue are cooler than -normal. ]] +normal]] local URL = "https://sos.noaa.gov/catalog/datasets/temperature-anomaly-yearly-500-2006-paleoclimate-evidence/" @@ -59,7 +59,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset index 3fc4209024..e3e273e8a7 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Polar Orbiting: NOAA-17 Satellite Coverage" local Identifier = "noaa-sos-atmosphere-poes_sat" -local Description = [[ Satellites allow scientists to observe the Earth from above the +local Description = [[Satellites allow scientists to observe the Earth from above the atmosphere. The National Oceanic and Atmospheric Administration, NOAA, has several different types of satellites, including geostationary and polar orbiting satellites. These datasets show the path of Polar-orbiting Operational Environmental Satellites, or POES for short. NOAA has two POES in operation currently, a morning and afternoon satellite. The morning satellite crosses the equator on the sun-light side of the Earth in the morning, and the afternoon satellite crosses in the afternoon. Both satellites -orbit the Earth 14.1 times per day. ]] +orbit the Earth 14.1 times per day]] local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-noaa-17-satellite-coverage/" @@ -56,7 +56,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset index d058d8dfc5..2a5ffe279a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Precipitable Water - Antarctic Expedition - 1902 - 1903" local Identifier = "noaa-sos-atmosphere-reanalysis-antarctic" -local Description = [[ Until 2010, the longest globally-complete estimate of the +local Description = [[Until 2010, the longest globally-complete estimate of the four-dimensional atmospheric circulation was from a dataset produced jointly by NOAA's National Centers for Environmental Prediction and the National Center for Atmospheric Research: the NCEP-NCAR Reanalysis. This dataset of computer-generated weather map @@ -21,7 +21,7 @@ recently-developed Ensemble Filter data assimilation method which directly yield six-hourly reanalysis field or weather map as the most likely state of the global atmosphere, and also estimates uncertainty in that map. This dataset will provide the first estimates of global tropospheric variability spanning 1871 to present at six-hourly -temporal resolution and 2 degree longitude by 2 degree latitude resolution. ]] +temporal resolution and 2 degree longitude by 2 degree latitude resolution]] local URL = "https://sos.noaa.gov/catalog/datasets/precipitable-water-antarctic-expedition-1902-1903/" @@ -74,7 +74,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset index 55a561d92a..c7330f3122 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Precipitable Water - El Nino - 1917 - 1919" local Identifier = "noaa-sos-atmosphere-reanalysis-elnino" -local Description = [[ Until 2010, the longest globally-complete estimate of the +local Description = [[Until 2010, the longest globally-complete estimate of the four-dimensional atmospheric circulation was from a dataset produced jointly by NOAA's National Centers for Environmental Prediction and the National Center for Atmospheric Research: the NCEP-NCAR Reanalysis. This dataset of computer-generated weather map @@ -21,7 +21,7 @@ recently-developed Ensemble Filter data assimilation method which directly yield six-hourly reanalysis field or weather map as the most likely state of the global atmosphere, and also estimates uncertainty in that map. This dataset will provide the first estimates of global tropospheric variability spanning 1871 to present at six-hourly -temporal resolution and 2 degree longitude by 2 degree latitude resolution. ]] +temporal resolution and 2 degree longitude by 2 degree latitude resolution]] local URL = "https://sos.noaa.gov/catalog/datasets/precipitable-water-el-nino-1917-1919/" @@ -74,7 +74,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset index ece40e4edc..55dc4b9d21 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset @@ -3,25 +3,25 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Precipitable Water - Galveston Hurricane - 1900" local Identifier = "noaa-sos-atmosphere-reanalysis-hurricane" -local Description = [[ Until 2010, the longest globally-complete estimate of the -four-dimensional atmospheric circulation was from a dataset produced jointly by NOAA's -National Centers for Environmental Prediction and the National Center for Atmospheric -Research: the NCEP-NCAR Reanalysis. This dataset of computer-generated weather map -reconstructions or "reanalyses" starts from 1948, leaving many important climate events -such as 1930's Dust Bowl drought uncovered. To expand the coverage of global gridded -reanalyses, the 20th Century Reanalysis Project is an effort led by NOAA's Earth System -Research Laboratory Physical Sciences Division and the University of Colorado CIRES -Climate Diagnostics Center to produce a reanalysis dataset spanning the entire twentieth -century, assimilating only surface observations of synoptic pressure, monthly sea surface -temperature and sea ice distribution. The pressure observations have been assembled -through international cooperation under the auspices of the Atmospheric Circulation -Reconstructions over the Earth initiative, ACRE, and working groups of the Global Climate -Observing System and World Climate Research Program. The Project uses a -recently-developed Ensemble Filter data assimilation method which directly yields each -six-hourly reanalysis field or weather map as the most likely state of the global -atmosphere, and also estimates uncertainty in that map. This dataset will provide the -first estimates of global tropospheric variability spanning 1871 to present at six-hourly -temporal resolution and 2 degree longitude by 2 degree latitude resolution. ]] +local Description = [[Until 2010, the longest globally-complete estimate of the + four-dimensional atmospheric circulation was from a dataset produced jointly by NOAA's + National Centers for Environmental Prediction and the National Center for Atmospheric + Research: the NCEP-NCAR Reanalysis. This dataset of computer-generated weather map + reconstructions or "reanalyses" starts from 1948, leaving many important climate events + such as 1930's Dust Bowl drought uncovered. To expand the coverage of global gridded + reanalyses, the 20th Century Reanalysis Project is an effort led by NOAA's Earth System + Research Laboratory Physical Sciences Division and the University of Colorado CIRES + Climate Diagnostics Center to produce a reanalysis dataset spanning the entire twentieth + century, assimilating only surface observations of synoptic pressure, monthly sea + surface temperature and sea ice distribution. The pressure observations have been + assembled through international cooperation under the auspices of the Atmospheric + Circulation Reconstructions over the Earth initiative, ACRE, and working groups of the + Global Climate Observing System and World Climate Research Program. The Project uses a + recently-developed Ensemble Filter data assimilation method which directly yields each + six-hourly reanalysis field or weather map as the most likely state of the global + atmosphere, and also estimates uncertainty in that map. This dataset will provide the + first estimates of global tropospheric variability spanning 1871 to present at six-hourly + temporal resolution and 2 degree longitude by 2 degree latitude resolution]] local URL = "https://sos.noaa.gov/catalog/datasets/precipitable-water-galveston-hurricane-1900/" @@ -74,7 +74,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset index e22de7049b..fb059b926d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Hurricane Sandy: Linear IR - Oct. 2012" local Identifier = "noaa-sos-atmosphere-sandy" -local Description = [[ Hurricane Sandy was a memorable and disastrous storm that hit the -Caribbean islands and the Mid-Atlantic States in October of 2012.It was the second -costliest storm in U.S. history, after Hurricane Katrina. ]] +local Description = [[Hurricane Sandy was a memorable and disastrous storm that hit the + Caribbean islands and the Mid-Atlantic States in October of 2012.It was the second + costliest storm in U.S. history, after Hurricane Katrina]] local URL = "https://sos.noaa.gov/catalog/datasets/precipitable-water-galveston-hurricane-1900/" @@ -51,7 +51,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset index ddd7a16019..17f6895e3b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Polar Orbiting: NOAA-17 and NOAA-18" local Identifier = "noaa-sos-atmosphere-sunsync_sat" -local Description = [[ Satellites allow scientists to observe the Earth from above the +local Description = [[Satellites allow scientists to observe the Earth from above the atmosphere. The National Oceanic and Atmospheric Administration, NOAA, has several different types of satellites, including geostationary and polar orbiting satellites. These datasets show the path of Polar-orbiting Operational Environmental Satellites, or POES for short. NOAA has two POES in operation currently, a morning and afternoon satellite. The morning satellite crosses the equator on the sun-light side of the Earth in the morning, and the afternoon satellite crosses in the afternoon. Both satellites -orbit the Earth 14.1 times per day. ]] +orbit the Earth 14.1 times per day]] local URL = "https://sos.noaa.gov/catalog/datasets/polar-orbiting-noaa-17-and-noaa-18/" @@ -56,7 +56,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset index b1c3b1417b..1084ae7fd9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Temperature Anomaly: Yearly (NOAA) - 1880 - Present" local Identifier = "noaa-sos-atmosphere-temp_anom" -local Description = [[ This animation shows Earth's surface temperature from 1880 through +local Description = [[This animation shows Earth's surface temperature from 1880 through 2019 compared to the 20th century average. Maps are based on data from NOAA's National Climatic Data Center. In 2016, the combined land and ocean surface temperature was 1.69°F (0.94°C) above the 20th century average, making the year the warmest since records began @@ -13,7 +13,7 @@ four months were ranked among the top five for each month's temperature records. all 16 years of the 21st century rank among the seventeen warmest on record (1998 is currently the eighth warmest.) The five warmest years have all occurred since 2010. 2017 was the third warmest, slightly cooler than the previous two. 2018 was the fourth -warmest. ]] +warmest]] local URL = "https://sos.noaa.gov/catalog/datasets/temperature-anomaly-yearly-noaa-1880-present/" @@ -72,7 +72,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset index 30018e37be..55337af0e1 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/tropical_widening.asset @@ -3,8 +3,8 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Tropical Widening" local Identifier = "noaa-sos-atmosphere-tropical_widening" -local Description = [[ This dataset was developed as part of the EarthNow project, and -shows the changes in the tropical zone boundaries over the last three decades. ]] +local Description = [[This dataset was developed as part of the EarthNow project, and +shows the changes in the tropical zone boundaries over the last three decades]] local URL = "https://sos.noaa.gov/catalog/datasets/tropical-widening/" @@ -49,7 +49,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset index 1e685a4c34..5f85383abc 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Typhoon Haiyan: Water Vapor and SST - Oct - Nov 2013" local Identifier = "noaa-sos-atmosphere-typhoon_haiyan-wvsst" -local Description = [[ Typhoon Haiyan, also known in the Phillippines as Typhoon Yolanda, +local Description = [[Typhoon Haiyan, also known in the Phillippines as Typhoon Yolanda, may be the strongest recorded tropical cyclone to make landfall with sustained speeds up to 195 mph. If confirmed, it would beat the previous record holder, Hurricane Camille (1969). This dataset is taken from the Real-Time Linear IR satellite dataset and -Real-time: SST from October 30th to November 12th, 2013. ]] +Real-time: SST from October 30th to November 12th, 2013]] local URL = "https://sos.noaa.gov/catalog/datasets/typhoon-haiyan-water-vapor-and-sst-oct-nov-2013/" @@ -57,7 +57,7 @@ asset.export(track) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset index f22d909709..202b2d39ec 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Typhoon Haiyan - Oct - Nov 2013" local Identifier = "noaa-sos-atmosphere-typhoon_haiyan" -local Description = [[ Typhoon Haiyan, also known in the Phillippines as Typhoon Yolanda, +local Description = [[Typhoon Haiyan, also known in the Phillippines as Typhoon Yolanda, may be the strongest recorded tropical cyclone to make landfall with sustained speeds up to 195 mph. If confirmed, it would beat the previous record holder, Hurricane Camille (1969). This dataset is taken from the Real-Time Linear IR satellite dataset from October -30th to November 12th, 2013. ]] +30th to November 12th, 2013]] local URL = "https://sos.noaa.gov/catalog/datasets/typhoon-haiyan-oct-nov-2013/" @@ -63,7 +63,7 @@ asset.export(track) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset index 55eb70e0e7..aee63526b6 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Volcanic Ash Eruption: Iceland" local Identifier = "noaa-sos-atmosphere-volcano_ash" -local Description = [[ Eyjafjallajokull, a glacier covered volcano in southern Iceland, +local Description = [[Eyjafjallajokull, a glacier covered volcano in southern Iceland, erupted explosively on April 14, 2010. The name Eyjafjallajokull is Icelandic for -"island-mountain glacier." The volcano initially erupted on March 20, but this original +island-mountain glacier. The volcano initially erupted on March 20, but this original eruption was much smaller and only caused a brief evacuation of the local area. The April 14 event was 10 to 20 times more powerful and had international impacts. Locally, the eruption and resulting lava melted the surrounding glacier, causing major flooding. @@ -13,7 +13,7 @@ Internationally, air traffic was impacted for several days following the eruptio volcano ejected ash over 30,000ft into the atmosphere, causing significant disruptions to the European and Trans-Atlantic air travel. Airspace over much of northern Europe was closed from April 15 through April 23 for concerns over the abrasive volcanic ash causing -engine failures. ]] +engine failures]] local URL = "https://sos.noaa.gov/catalog/datasets/volcanic-ash-eruption-iceland/" @@ -53,7 +53,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset index ba03bb84af..dd5d60ca5d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-cropland.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "NOAA Science on a Sphere. Agriculture: Cropland Intensity" local Identifier = "noaa-sos-land-agriculture-cropland" -local Description = [[ These visualizations, created by the University of Minnesota's +local Description = [[These visualizations, created by the University of Minnesota's Institute on the Environment, show the global land use intensity for pastureland and cropland. Cropland is land devoted to growing plants for humans use for food, material, or fuel. Pastureland is land used for raising and grazing animals. Altogether, cropland covers about 16 million square kilometers, an area of land approximately the size of South America. Global pastureland occupies more than 30 million square kilometers, about -the area of Africa. ]] +the area of Africa]] local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-cropland-intensity/" @@ -63,7 +63,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset index 3fda0f5946..499e0aa094 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/agriculture-pastureland.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "NOAA Science on a Sphere. Agriculture: Pastureland Intensity" local Identifier = "noaa-sos-land-agriculture-pastureland" -local Description = [[ These visualizations, created by the University of Minnesota's +local Description = [[These visualizations, created by the University of Minnesota's Institute on the Environment, show the global land use intensity for pastureland and cropland. Cropland is land devoted to growing plants for humans use for food, material, or fuel. Pastureland is land used for raising and grazing animals. Altogether, cropland covers about 16 million square kilometers, an area of land approximately the size of South America. Global pastureland occupies more than 30 million square kilometers, about -the area of Africa. ]] +the area of Africa]] local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-pastureland-intensity/" @@ -63,7 +63,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset index 9d98b04ba8..b81e20fc31 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset @@ -2,12 +2,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "NOAA Science on a Sphere. Bird Migration Patterns - Western Hemisphere" local Identifier = "noaa-sos-land-birds" -local Description = [[ This dataset shows the migration of 118 species of terrestrial +local Description = [[This dataset shows the migration of 118 species of terrestrial bird populations in the Western Hemisphere. Each dot represents the estimated location of the center of each species' population for each day of the year. These estimations come from millions of observations from the eBird citizen-science database. eBird is a real-time, online checklist program, launched in 2002 by the Cornell Lab of Ornithology -and National Audubon Society, that allows birdwatchers to enter their observations. ]] +and National Audubon Society, that allows birdwatchers to enter their observations]] local URL = "https://sos.noaa.gov/catalog/datasets/bird-migration-patterns-western-hemisphere/" @@ -59,7 +59,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset index 82ab35c64f..1d4d564666 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "NOAA Science on a Sphere. Blue Marble: without Clouds" local Identifier = "noaa-sos-land-blue_marble-blue_marble" -local Description = [[ The Blue Marble is an incredibly detailed, true-color depiction of +local Description = [[The Blue Marble is an incredibly detailed, true-color depiction of the Earth. NASA is responsible for this dataset made from a compilation of satellite images throughout 2001. Most of the information came from NASA's MODIS, the Moderate Resolution Imaging Spectroradiometer, which is attached to the Terra satellite 435 miles above Earth. The background image of the land and oceans was created using data from June through September of 2001. This could not be done in a single day or even a week because -on any given day clouds are blocking a significant portion of the surface. ]] +on any given day clouds are blocking a significant portion of the surface]] local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble-without-clouds/" @@ -41,7 +41,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset index 80ae191923..770b187188 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Blue Marble: with Topography - Seasonal" local Identifier = "noaa-sos-land-blue_marble-next_gen-topo" -local Description = [[ The Blue Marble is an incredibly detailed, true-color depiction of -the Earth. The Blue Marble Next Generation is an update on the original that has greater -detail. "The original Blue Marble was a composite of four months of MODIS observations -with a spatial resolution (level of detail) of 1 square kilometer per pixel. Blue Marble: -Next Generation offers a years worth of monthly composites at a spatial resolution of -500 meters.". ]] +local Description = [[The Blue Marble is an incredibly detailed, true-color depiction of + the Earth. The Blue Marble Next Generation is an update on the original that has greater + detail. "The original Blue Marble was a composite of four months of MODIS observations + with a spatial resolution (level of detail) of 1 square kilometer per pixel. + Blue Marble: Next Generation offers a years worth of monthly composites at a spatial + resolution of 500 meters]] local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble-with-topography-seasonal/" @@ -54,7 +54,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset index d45c913042..c731706879 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Blue Marble: with Topography and Bathymetry" local Identifier = "noaa-sos-land-blue_marble-next_gen-topo_bathy" -local Description = [[ The Blue Marble is an incredibly detailed, true-color depiction of -the Earth. The Blue Marble Next Generation is an update on the original that has greater -detail. "The original Blue Marble was a composite of four months of MODIS observations -with a spatial resolution (level of detail) of 1 square kilometer per pixel. Blue Marble: -Next Generation offers a years worth of monthly composites at a spatial resolution of -500 meters.". ]] +local Description = [[The Blue Marble is an incredibly detailed, true-color depiction of + the Earth. The Blue Marble Next Generation is an update on the original that has greater + detail. "The original Blue Marble was a composite of four months of MODIS observations + with a spatial resolution (level of detail) of 1 square kilometer per pixel. Blue Marble: + Next Generation offers a years worth of monthly composites at a spatial resolution of + 500 meters]] local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble-with-topography-seasonal/" @@ -54,7 +54,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset index c978409898..f1766e8cfb 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Blue Marble and Nighttime Lights" local Identifier = "noaa-sos-land-bluemarble_nightlights" -local Description = [[ This dataset shows the Earth with daytime and nighttime views of +local Description = [[This dataset shows the Earth with daytime and nighttime views of the Earth, to demonstrate how only half of the Earth is illumintated at one time. The Blue Marble is an incredibly detailed, true-color depiction of the Earth, and is shown on the daylight side of the Earth in this dataset. NASA is responsible for The Blue Marble, @@ -14,7 +14,7 @@ was created using data from June through September of 2001. This could not be do single day or even a week because on any given day clouds are blocking a significant portion of the surface. The cloud image is a composite of three days worth of data. The first two days of data were collected in the visible wavelength and the third day was -needed to get a view of the clouds over the poles using thermal infrared imagery. ]] +needed to get a view of the clouds over the poles using thermal infrared imagery]] local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble-and-nighttime-lights/" @@ -59,7 +59,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset index f9076a3a43..0d803ba699 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Blue Marble - Seasonal" local Identifier = "noaa-sos-land-seasonal_blue_marble" -local Description = [[ The Blue Marble is an incredibly detailed, true-color depiction of +local Description = [[The Blue Marble is an incredibly detailed, true-color depiction of the Earth. NASA is responsible for this dataset made from a compilation of satellite images throughout 2001. Most of the information came from NASA's MODIS, the Moderate Resolution Imaging Spectroradiometer, which is attached to the Terra satellite 435 miles above Earth. The background image of the land and oceans was created using data from June through September of 2001. This could not be done in a single day or even a week because -on any given day clouds are blocking a significant portion of the surface. ]] +on any given day clouds are blocking a significant portion of the surface]] local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble-seasonal/" @@ -55,7 +55,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset index 9fa2b53633..cf385378e7 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Dams and Reservoirs - 1800 - 2010" local Identifier = "noaa-sos-land-dams-global" -local Description = [[ Humans have manipulated rivers for thousands of years, but over +local Description = [[Humans have manipulated rivers for thousands of years, but over the last 200 years dams on rivers have become rampant. Reservoirs and dams are constructed for water storage, to reduce the risk of river flooding, and for the generation of power. They are one of the major footprints of humans on Earth and change -the world's hydrological cycle. ]] +the world's hydrological cycle]] local URL = "https://sos.noaa.gov/catalog/datasets/dams-and-reservoirs-1800-2010/" @@ -47,7 +47,7 @@ asset.export(layer_images) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset index 83bd8e4534..2636adf2bb 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Dams and Reservoirs: Mississippi River - 1800 - 2010" local Identifier = "noaa-sos-land-dams-mississippi" -local Description = [[ This dataset illustrates the construction of dams in the +local Description = [[This dataset illustrates the construction of dams in the Mississippi River Basin from 1800 to the present. We display all dams listed in the Global Reservoir and Dam Database (GRanD). All dams that have a reservoir with a storage capacity of more than 0.1 cubic kilometers are included, and many smaller dams were added -where data were available. ]] +where data were available]] local URL = "https://sos.noaa.gov/catalog/datasets/dams-and-reservoirs-mississippi-river-1800-2010/" @@ -47,7 +47,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset index 6a6a3e6320..d419077239 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Dams and Reservoirs: Yangtze - 1800 - 2010" local Identifier = "noaa-sos-land-dams-yangtze" -local Description = [[ Humans have manipulated rivers for thousands of years, but over +local Description = [[Humans have manipulated rivers for thousands of years, but over the last 200 years dams on rivers have become rampant. Reservoirs and dams are constructed for water storage, to reduce the risk of river flooding, and for the generation of power. They are one of the major footprints of humans on Earth and change -the world's hydrological cycle. ]] +the world's hydrological cycle]] local URL = "https://sos.noaa.gov/catalog/datasets/dams-and-reservoirs-yangtze-1800-2010/" @@ -47,7 +47,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset index 21d4a962f2..91df3efe2c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Day/Night Terminator (daily)" local Identifier = "noaa-sos-land-day_night-06z_only" -local Description = [[ The line that separates day and night is called the terminator. It +local Description = [[The line that separates day and night is called the terminator. It is also referred to as the "grey line" and the "twilight zone." It is a fuzzy line due to our atmosphere bending sunlight. In fact, the atmosphere bends sunlight by half a degree, which is about 37 miles (60 km). It is commonly thought that while half of the Earth is covered in darkness, the other half is covered in sunlight. This is actually not true because of the bending of the sunlight results in the land covered by sunlight having -greater area than the land covered by darkness. ]] +greater area than the land covered by darkness]] local URL = "https://sos.noaa.gov/catalog/datasets/daynight-terminator-daily/" @@ -55,7 +55,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset index ca3ee5b8c8..1386654086 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Day/Night Terminator (hourly)" local Identifier = "noaa-sos-land-day_night-full_year" -local Description = [[ The line that separates day and night is called the terminator. It +local Description = [[The line that separates day and night is called the terminator. It is also referred to as the "grey line" and the "twilight zone." It is a fuzzy line due to our atmosphere bending sunlight. In fact, the atmosphere bends sunlight by half a degree, which is about 37 miles (60 km). It is commonly thought that while half of the Earth is covered in darkness, the other half is covered in sunlight. This is actually not true because of the bending of the sunlight results in the land covered by sunlight having -greater area than the land covered by darkness. ]] +greater area than the land covered by darkness]] local URL = "https://sos.noaa.gov/catalog/datasets/daynight-terminator-hourly/" @@ -57,7 +57,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset index 18727ba3c3..27c118d32d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Day/Night Terminator (single day)" local Identifier = "noaa-sos-land-day_night-oneday" -local Description = [[ The line that separates day and night is called the terminator. It +local Description = [[The line that separates day and night is called the terminator. It is also referred to as the "grey line" and the "twilight zone." It is a fuzzy line due to our atmosphere bending sunlight. In fact, the atmosphere bends sunlight by half a degree, which is about 37 miles (60 km). It is commonly thought that while half of the Earth is covered in darkness, the other half is covered in sunlight. This is actually not true because of the bending of the sunlight results in the land covered by sunlight having -greater area than the land covered by darkness. ]] +greater area than the land covered by darkness]] local URL = "https://sos.noaa.gov/catalog/datasets/daynight-terminator-single-day/" @@ -49,7 +49,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset index efb3d03922..401add7ca7 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2002.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Nighttime Lights Comparison - 1992 and 2002" local Identifier = "noaa-sos-land-earth_night-1992_2002" -local Description = [[ The data was recorded by the Defense Meteorological Satellite -Program (DMSP) in the National Geophysical Data Center (NGDC), now part of NOAA National -Centers for Environmental Information (NCEI). The data was collected using polar orbiting -satellites that provide full cover of the globe twice a day. The satellites have an -Operation Linescan system which allows them to detect low levels of visible-near infrared -radiance at night. ]] +local Description = [[The data was recorded by the Defense Meteorological Satellite + Program (DMSP) in the National Geophysical Data Center (NGDC), now part of NOAA National + Centers for Environmental Information (NCEI). The data was collected using polar + orbiting satellites that provide full cover of the globe twice a day. The satellites + have an Operation Linescan system which allows them to detect low levels of visible-near + infrared radiance at night]] local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights-comparison-1992-and-2002/" @@ -50,7 +50,7 @@ asset.export(layer_2002) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset index d4e2851d92..d7b7403274 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2008.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Nighttime Lights Comparison - 1992, 2000, and 2008" local Identifier = "noaa-sos-land-earth_night-1992_2008" -local Description = [[ The data was recorded by the Defense Meteorological Satellite +local Description = [[The data was recorded by the Defense Meteorological Satellite Program (DMSP) in the National Geophysical Data Center (NGDC), now part of NOAA National Centers for Environmental Information (NCEI). The data was collected using polar orbiting satellites that provide full cover of the globe twice a day. The satellites have an Operation Linescan system which allows them to detect low levels of visible-near -infrared radiance at night. ]] +infrared radiance at night]] local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights-comparison-1992-2000-and-2008/" @@ -40,7 +40,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset index 01a235a422..0da176eb9d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-1992_2009.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Nighttime Lights Comparison - 1992 and 2009" local Identifier = "noaa-sos-land-earth_night-1992_2009" -local Description = [[ The data was recorded by the Defense Meteorological Satellite +local Description = [[The data was recorded by the Defense Meteorological Satellite Program (DMSP) in the National Geophysical Data Center (NGDC), now part of NOAA National Centers for Environmental Information (NCEI). The data was collected using polar orbiting satellites that provide full cover of the globe twice a day. The satellites have an Operation Linescan system which allows them to detect low levels of visible-near infrared -radiance at night. ]] +radiance at night]] local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights-comparison-1992-and-2009/" @@ -52,7 +52,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset index 66785d457d..fa4f6bc738 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-2012.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Nighttime Lights - 2012" local Identifier = "noaa-sos-land-earth_night-2012" -local Description = [[ Earth at Night has been an SOS-user favorite dataset for many +local Description = [[Earth at Night has been an SOS-user favorite dataset for many years. Black Marble 2012 is the newest version of the spectacular view of our planet from near-Earth orbit at night, which is the result of a partnership between NOAA, NASA, and -the Department of Defense. ]] +the Department of Defense]] local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights-2012/" @@ -38,7 +38,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset index ed2b6c3dd2..3a0735173f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-color_nightlights.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Nighttime Lights (colorized)" local Identifier = "noaa-sos-land-earth_night-color_nightlights" -local Description = [[ The data was recorded by the Defense Meteorological Satellite +local Description = [[The data was recorded by the Defense Meteorological Satellite Program (DMSP) in the National Geophysical Data Center (NGDC), now part of NOAA National Centers for Environmental Information (NCEI). The data was collected using polar orbiting satellites that provide full cover of the globe twice a day. The satellites have an @@ -11,7 +11,7 @@ Operation Linescan system which allows them to detect low levels of visible-near radiance at night. With this data, it is possible to detect clouds illuminated by moonlight, lights from cities and towns, industrial sites, gas flares, fires, lightning, and aurora. The Nighttime Lights of the World data set was complied from Defense -Meteorological Satellite Program (DMSP) data spanning October 1994 - March 1995. ]] +Meteorological Satellite Program (DMSP) data spanning October 1994 - March 1995]] local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights-colorized/" @@ -43,7 +43,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset index 9505ff905f..acad4e494b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earth_night-nightlights.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Nighttime Lights" local Identifier = "noaa-sos-land-earth_night-nightlights" -local Description = [[ The data was recorded by the Defense Meteorological Satellite +local Description = [[The data was recorded by the Defense Meteorological Satellite Program (DMSP) in the National Geophysical Data Center (NGDC), now part of NOAA National Centers for Environmental Information (NCEI). The data was collected using polar orbiting satellites that provide full cover of the globe twice a day. The satellites have an @@ -11,7 +11,7 @@ Operation Linescan system which allows them to detect low levels of visible-near radiance at night. With this data, it is possible to detect clouds illuminated by moonlight, lights from cities and towns, industrial sites, gas flares, fires, lightning, and aurora. The Nighttime Lights of the World data set was complied from Defense -Meteorological Satellite Program (DMSP) data spanning October 1994 - March 1995. ]] +Meteorological Satellite Program (DMSP) data spanning October 1994 - March 1995]] local URL = "https://sos.noaa.gov/catalog/datasets/nighttime-lights/" @@ -43,7 +43,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset index 96944d0dcd..b4c1b60d55 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Earthquakes: Cumulative - 1980 - 1995" local Identifier = "noaa-sos-land-earthquake-1980_1995_quakes" -local Description = [[ It is estimated that there are 500,000 detectable earthquakes in +local Description = [[It is estimated that there are 500,000 detectable earthquakes in the world each year. Of those, 100,000 can be felt and 100 of them cause damage. Anything that causes seismic waves to radiate throughout the Earth is an earthquake. The cause of earthquakes can be natural, such as one tectonic plate slipping below another, or @@ -16,7 +16,7 @@ volcanoes frequently occur. In order to rate the strength and magnitude of earth the Richter magnitude scale was created. It is a base-10 logarithm scale of ground motion 100km from the epicenter. Every whole-number increase in magnitude means the amplitude of the seismic wave is ten times greater. 4.0 - 4.9 on the scale is considered light, with -some shaking of indoor items and significant damage unlikely. ]] +some shaking of indoor items and significant damage unlikely]] local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-cumulative-1980-1995/" @@ -95,7 +95,7 @@ asset.export(quakebar_combined) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset index ddb01347e0..d874e87d7d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-2001_2015.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Earthquakes - 2001-2015" local Identifier = "noaa-sos-land-earthquake-2001_2015" -local Description = [[ This animation shows every recorded earthquake in sequence as they +local Description = [[This animation shows every recorded earthquake in sequence as they occurred from January 1, 2001, through December 31, 2015, at a rate of 30 days per second. The earthquake hypocenters first appear as flashes then remain as colored circles before shrinking with time so as not to obscure subsequent earthquakes. The size of the @@ -13,7 +13,7 @@ period. Next, it will show only those earthquakes greater than magnitude 6.5, th smallest earthquake size known to make a tsunami. Finally it will only show those earthquakes with magnitudes of magnitude 8.0 or larger, the "great" earthquakes most likely to pose a tsunami threat when they occur under the ocean or near a coastline and -when they are shallow within the earth (less than 100 km or 60 mi. deep). ]] +when they are shallow within the earth (less than 100 km or 60 mi. deep)]] local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-2001-2015/" @@ -96,7 +96,7 @@ asset.export(layer_quakes_gte8) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset index 6d6bc694b8..c71f5963e0 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_1901_2000.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Earthquakes of the 20th Century" local Identifier = "noaa-sos-land-earthquakes_1901_2000" -local Description = [[ This animation shows every recorded earthquake in sequence as they +local Description = [[This animation shows every recorded earthquake in sequence as they occurred from January 1, 1901, through December 31, 2000, at a rate of 1 year per second. The earthquake hypocenters first appear as flashes then remain as colored circles before shrinking with time so as not to obscure subsequent earthquakes. The size of the circle @@ -14,7 +14,7 @@ earthquake size known to make a tsunami. It will then show only those earthquake magnitudes of 8.0 or larger, the "great" earthquakes most likely to pose a tsunami threat when they occur under the ocean or near a coastline and when they are shallow within the earth (less than 100 km or 60 mi. deep). The animation concludes by showing -the plate boundary faults responsible for the majority of all of these earthquakes. ]] +the plate boundary faults responsible for the majority of all of these earthquakes]] local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-of-the-20th-century/" @@ -97,7 +97,7 @@ asset.export(layer_quakes_gte8) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset index ae627a2654..46750cec1f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Earthquakes and Eruptions - 1960 - 2010" local Identifier = "noaa-sos-land-earthquakes_and_eruptions" -local Description = [[ Most of Earth's earthquakes and volcanic eruptions occur at the +local Description = [[Most of Earth's earthquakes and volcanic eruptions occur at the boundaries of the tectonic plates. This dataset shows all earthquakes of magnitude 5.0 or greater from 1960 through 2010. The earthquakes are illustrated with a large white dot at the time of the event. The size of the dot is proportional to the magnitude of the earthquake. A musical tone is generated for the larger events. The larger the earthquake, the lower the tone. The white dots eventually turn gray and slowly shrink to single-pixel -dots. ]] +dots]] local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-and-eruptions-1960-2010/" @@ -61,7 +61,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset index 3adb02b9c7..f85b83419d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Earth's Magnetic Lines" local Identifier = "noaa-sos-land-earths_magnetism_magnetic_lines" -local Description = [[ Earth is like a giant magnet with a North and South Pole. However, +local Description = [[Earth is like a giant magnet with a North and South Pole. However, the magnetic North and South Pole are not aligned with the Geographic North and South Pole. The Geographic North Pole is defined by the latitude 90° N and is the axis of the Earth's rotation. The Magnetic North Pole is where the Earth's magnetic field points @@ -14,7 +14,7 @@ the changes in the magnetic field from 1590 - 2010. The first dataset shows the field lines at the surface of the Earth. The magnetic poles are indicated by stars. The blue lines show where the magnetic field dips into the Earth and the red lines show where the magnetic field emerges from the Earth. Where the field lines are horizontal to the -Earth, between the red and blue lines, is the magnetic equator shaded yellow. ]] +Earth, between the red and blue lines, is the magnetic equator shaded yellow]] local URL = "https://sos.noaa.gov/catalog/datasets/earths-magnetic-lines/" @@ -60,7 +60,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset index f75ed1f5c8..99be0df057 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Earth's Magnetic Field (compass needles)" local Identifier = "noaa-sos-land-earths_magnetism_magnets" -local Description = [[ Earth is like a giant magnet with a North and South Pole. However, +local Description = [[Earth is like a giant magnet with a North and South Pole. However, the magnetic North and South Pole are not aligned with the Geographic North and South Pole. The Geographic North Pole is defined by the latitude 90° N and is the axis of the Earth's rotation. The Magnetic North Pole is where the Earth's magnetic field points @@ -14,7 +14,7 @@ the changes in the magnetic field from 1590 - 2010. The first dataset shows the field lines at the surface of the Earth. The magnetic poles are indicated by stars. The blue lines show where the magnetic field dips into the Earth and the red lines show where the magnetic field emerges from the Earth. Where the field lines are horizontal to the -Earth, between the red and blue lines, is the magnetic equator shaded yellow. ]] +Earth, between the red and blue lines, is the magnetic equator shaded yellow]] local URL = "https://sos.noaa.gov/catalog/datasets/earths-magnetic-field-compass-needles/" @@ -60,7 +60,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset index 49cd39f781..5dda77a597 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo1.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "ETOPO1: Topography and Bathymetry" local Identifier = "noaa-sos-land-etopo1" -local Description = [[ ETOPO1 is a 1 arc-minute global relief model of Earth's surface +local Description = [[ETOPO1 is a 1 arc-minute global relief model of Earth's surface that integrates land topography and ocean bathymetry. It was built from numerous global and regional data sets, and is available in "Ice Surface" (top of Antarctic and Greenland ice sheets) and "Bedrock" (base of the ice sheets) versions. The "Ice Surface" version is @@ -11,7 +11,7 @@ available for Science On a Sphere. This dataset is a higher resolution version o ETOPO2, which is a 2 arc-minute global relief model of Earth's surface. An arc-minute is 1/60 of a degree. Scientists use high resolution maps like ETOPO1 to improve accuracy in tsunami forecasting, modeling, and warnings, and also to enhance ocean circulation -modeling and Earth visualization. ]] +modeling and Earth visualization]] local URL = "https://sos.noaa.gov/catalog/datasets/etopo1-topography-and-bathymetry/" @@ -56,7 +56,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset index 4a96a9f8be..6440cc3266 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_bright.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "ETOPO2: Topography and Bathymetry (bright colors)" local Identifier = "noaa-sos-land-etopo2-earth_bright" -local Description = [[ Many datasets have been created by utilizing the ETOPO2 dataset, +local Description = [[Many datasets have been created by utilizing the ETOPO2 dataset, which was generated from digital databases of seafloor and land elevations on a 2-minute latitude/longitude grid (1 minute of latitude = 1 nautical mile, or 1.15 statute miles). The ETOPO2 is a combination of satellite altimetry observations, shipboard echo-sounding measurements, data from the Digital Bathymetric Data Base Variable Resolution and data from the GLOBE project which has a global digital elevation model. Earth Color Enhanced -uses green, yellow, orange, red and white to denote increasing elevation of the land. ]] +uses green, yellow, orange, red and white to denote increasing elevation of the land]] local URL = "https://sos.noaa.gov/catalog/datasets/etopo2-topography-and-bathymetry-bright-colors/" @@ -41,7 +41,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset index 27170de3d9..c9291eb9f0 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_color.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "ETOPO2: Topography and Bathymetry (color enhanced)" local Identifier = "noaa-sos-land-etopo2-earth_color" -local Description = [[ Many datasets have been created by utilizing the ETOPO2 dataset, +local Description = [[Many datasets have been created by utilizing the ETOPO2 dataset, which was generated from digital data bases of seafloor and land elevations on a 2-minute latitude/longitude grid (1 minute of latitude = 1 nautical mile, or 1.15 statute mile). The ETOPO2 is a combination of satellite altimetry observations, shipboard echo-sounding measurements, data from the Digital Bathymetric Data Base Variable Resolution and data from the GLOBE project which has a global digital elevation model. This dataset uses -green, yellow, orange, red and white to denote increasing elevation of the land. ]] +green, yellow, orange, red and white to denote increasing elevation of the land]] local URL = "https://sos.noaa.gov/catalog/datasets/etopo2-topography-and-bathymetry-color-enhanced/" @@ -41,7 +41,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset index 384ee6b197..6fee5d934a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_shaded.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "ETOPO2: Topography and Bathymetry (shaded colors)" local Identifier = "noaa-sos-land-etopo2-earth_shaded" -local Description = [[ Many datasets have been created by utilizing the ETOPO2 dataset. +local Description = [[Many datasets have been created by utilizing the ETOPO2 dataset. This dataset was generated from digital data bases of seafloor and land elevations on a 2-minute latitude/longitude grid (1 minute of latitude = 1 nautical mile, or 1.15 statute mile). ETOPO2 is a combination of satellite altimetry observations, shipboard echo-sounding measurements, data from the Digital Bathymetric Data Base Variable Resolution and data from the GLOBE project which has a global digital elevation -model. ]] +model]] local URL = "https://sos.noaa.gov/catalog/datasets/etopo2-topography-and-bathymetry-shaded-colors/" @@ -41,7 +41,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset index 62d71c1ac1..8f193229c5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-earth_topo.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "ETOPO2: Topography and Bathymetry (natural colors)" local Identifier = "noaa-sos-land-etopo2-earth_topo" -local Description = [[ Many datasets have been created by utilizing the ETOPO2 dataset, +local Description = [[Many datasets have been created by utilizing the ETOPO2 dataset, which was generated from digital data bases of seafloor and land elevations on a 2-minute latitude/longitude grid (1 minute of latitude = 1 nautical mile, or 1.15 statute mile). The ETOPO2 is a combination of satellite altimetry observations, shipboard echo-sounding @@ -12,7 +12,7 @@ from the GLOBE project which has a global digital elevation model. The topograph bathymetry side of the Hot Topo dataset was created with this digital data base, as well as the datasets EarthLiteColor, EarthOne, and Earth Land/Bathymetry. EarthOne and Earth Land/Bathymetry are shaded in relatively true color, while Hot Topo and EarthLiteColor -use green, yellow, orange, red and white to denote increasing elevation of the land. ]] +use green, yellow, orange, red and white to denote increasing elevation of the land]] local URL = "https://sos.noaa.gov/catalog/datasets/etopo2-topography-and-bathymetry-natural-colors/" @@ -44,7 +44,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset index fa87c57fc3..0df61650e5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/etopo2-landsat.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "ETOPO2: Bathymetry" local Identifier = "noaa-sos-land-etopo2-landsat" -local Description = [[ Many datasets have been created by utilizing the ETOPO2 dataset, +local Description = [[Many datasets have been created by utilizing the ETOPO2 dataset, which was generated from digital data bases of seafloor and land elevations on a 2-minute latitude/longitude grid (1 minute of latitude = 1 nautical mile, or 1.15 statute mile). The ETOPO2 is a combination of satellite altimetry observations, shipboard echo-sounding measurements, data from the Digital Bathymetric Data Base Variable Resolution and data -from the GLOBE project which has a global digital elevation model. ]] +from the GLOBE project which has a global digital elevation model]] local URL = "https://sos.noaa.gov/catalog/datasets/etopo2-bathymetry/" @@ -40,7 +40,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset index ed8c9256bd..9a94dcee09 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Fires - 2009" local Identifier = "noaa-sos-land-fire" -local Description = [[ In order to monitor the fires occurring globally, a special sensor +local Description = [[In order to monitor the fires occurring globally, a special sensor has been mounted on the Terra and Aqua satellites. The sensor, named the Moderate Resolution Imaging Spectroradiometer (MODIS), is able to provide daily satellite images of the Earth's landmasses in near real-time using the MODIS Rapid Response System. There @@ -12,7 +12,7 @@ detecting the abnormally high temperature anomalies at the surface. When a locat much warmer than the surrounding area, it suggests the presence of a fire or a lava flow. It is important to know the size, location and intensity of fires because of the damage that they can cause, and also to help scientists understand the emissions from the fires -and their short- and long-term effects on ecosystems. ]] +and their short- and long-term effects on ecosystems]] local URL = "https://sos.noaa.gov/catalog/datasets/fires-2009/" @@ -58,7 +58,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset index db585df313..4c5911d09a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset @@ -3,15 +3,15 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Fire Observations and Vegetation - 2002 - 2011" local Identifier = "noaa-sos-land-fire_veg" -local Description = [[ This dataset leads viewers on a narrated global tour of fire -detections beginning in July 2002 and ending July 2011. The dataset also includes -vegetation and snow cover data to show how fires respond to seasonal changes. The tour -begins in Australia in 2002 by showing a network of massive grassland fires spreading -across interior Australia as well as the greener Eucalyptus forests in the northern and -eastern part of the continent. The tour then shifts to Asia where large numbers of -agricultural fires are visible first in China in June 2004, then across a huge swath of -Europe and western Russia in August, and then across India and Southeast Asia through the -early part of 2005. ]] +local Description = [[This dataset leads viewers on a narrated global tour of fire + detections beginning in July 2002 and ending July 2011. The dataset also includes + vegetation and snow cover data to show how fires respond to seasonal changes. The tour + begins in Australia in 2002 by showing a network of massive grassland fires spreading + across interior Australia as well as the greener Eucalyptus forests in the northern and + eastern part of the continent. The tour then shifts to Asia where large numbers of + agricultural fires are visible first in China in June 2004, then across a huge swath of + Europe and western Russia in August, and then across India and Southeast Asia through + the early part of 2005]] local URL = "https://sos.noaa.gov/catalog/datasets/fire-observations-and-vegetation-2002-2011/" @@ -75,7 +75,7 @@ asset.export(colorbar_veg) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset index 9ff08367f8..c5d40828fd 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-displaced_250.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Flood Events: Displaced 250 or More People - 2000 - 2009" local Identifier = "noaa-sos-land-flooding-displaced_250" -local Description = [[ Flooding is the nation's most common, costly and deadly natural +local Description = [[Flooding is the nation's most common, costly and deadly natural hazard. Heavy rain is the most frequent cause of floods, but there are many other natural triggers, including hurricanes, tidal surges, ice jams and snow melt. Floods and flash floods have happened in all 50 states in the USA. Flooding in river basins is a natural @@ -12,7 +12,7 @@ habitat to species, among other benefits. Flooding is a matter of scientific int well as cultural significance, and is critical to land-use planning and policy. It is also a vital concern to the safety and welfare of communities in flood prone areas including those who live along waterways and coasts. People from all walks of life are -vulnerable to the effects of flooding. ]] +vulnerable to the effects of flooding]] local URL = "https://sos.noaa.gov/catalog/datasets/flood-events-displaced-250-or-more-people-2000-2009/" @@ -54,7 +54,7 @@ asset.export(layer_night) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset index 2509643d4a..51421d078a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-fatal.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Flood Events: 50 or More Fatalities - 2000 - 2009" local Identifier = "noaa-sos-land-flooding-fatal" -local Description = [[ Flooding is the nation's most common, costly and deadly natural +local Description = [[Flooding is the nation's most common, costly and deadly natural hazard. Heavy rain is the most frequent cause of floods, but there are many other natural triggers, including hurricanes, tidal surges, ice jams and snow melt. Floods and flash floods have happened in all 50 states in the USA. Flooding in river basins is a natural @@ -12,7 +12,7 @@ habitat to species, among other benefits. Flooding is a matter of scientific int as well as cultural significance, and is critical to land-use planning and policy. It is also a vital concern to the safety and welfare of communities in flood prone areas including those who live along waterways and coasts. People from all walks of life are -vulnerable to the effects of flooding. ]] +vulnerable to the effects of flooding]] local URL = "https://sos.noaa.gov/catalog/datasets/flood-events-50-or-more-fatalities-2000-2009/" @@ -54,7 +54,7 @@ asset.export(layer_night) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset index ed53372d60..6408286ef9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-heavy_rain.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Flood Events: Due to Heavy Rain - 2000 - 2009" local Identifier = "noaa-sos-land-flooding-heavy_rain" -local Description = [[ Flooding is the nation's most common, costly and deadly natural +local Description = [[Flooding is the nation's most common, costly and deadly natural hazard. Heavy rain is the most frequent cause of floods, but there are many other natural triggers, including hurricanes, tidal surges, ice jams and snow melt. Floods and flash floods have happened in all 50 states in the USA. Flooding in river basins is a natural @@ -12,7 +12,7 @@ habitat to species, among other benefits. Flooding is a matter of scientific int well as cultural significance, and is critical to land-use planning and policy. It is also a vital concern to the safety and welfare of communities in flood prone areas including those who live along waterways and coasts. People from all walks of life are -vulnerable to the effects of flooding. ]] +vulnerable to the effects of flooding]] local URL = "https://sos.noaa.gov/catalog/datasets/flood-events-due-to-heavy-rain-2000-2009/" @@ -54,7 +54,7 @@ asset.export(layer_night) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset index b48561778d..289b2e8404 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/flooding-major_floods.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Flood Events - 2000 - 2009" local Identifier = "noaa-sos-land-flooding-major_floods" -local Description = [[ Flooding is the nation's most common, costly and deadly natural +local Description = [[Flooding is the nation's most common, costly and deadly natural hazard. Heavy rain is the most frequent cause of floods, but there are many other natural triggers, including hurricanes, tidal surges, ice jams and snow melt. Floods and flash floods have happened in all 50 states in the USA. Flooding in river basins is a natural @@ -12,7 +12,7 @@ habitat to species, among other benefits. Flooding is a matter of scientific int well as cultural significance, and is critical to land-use planning and policy. It is also a vital concern to the safety and welfare of communities in flood prone areas including those who live along waterways and coasts. People from all walks of life are -vulnerable to the effects of flooding. ]] +vulnerable to the effects of flooding]] local URL = "https://sos.noaa.gov/catalog/datasets/flood-events-2000-2009/" @@ -54,7 +54,7 @@ asset.export(layer_floods) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset index eef748d7f0..b195b2dac8 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/food_v_feed.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Agriculture: Food vs. Feed" local Identifier = "noaa-sos-land-food_v_feed" -local Description = [[ Not all cropland is used for producing food directly for people. A +local Description = [[Not all cropland is used for producing food directly for people. A lot of the food crops grown are actually used as feed for animals. This map shows which regions produce crops that are mostly consumed directly by humans (in green), which regions produce about the same amount of human food and animal feed (in orange), and -where most of the crops are used as animal feed (in red). ]] +where most of the crops are used as animal feed (in red)]] local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-food-vs-feed/" @@ -61,7 +61,7 @@ asset.export(label) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset index 9dbeb29be1..64b2c5b25c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/forests.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Forest Change (Extent, Gain, and Loss) - 2000 - 2014" local Identifier = "noaa-sos-land-forests" -local Description = [[ This dataset shows annual tree cover extent,gain, and loss from +local Description = [[This dataset shows annual tree cover extent,gain, and loss from the year 2001 to 2014, at 30 meter resolution, as colored layers that can be seen together or one at a time as individual layers that can be toggled on and off. Green is used to represent tree cover in 2000, red shows tree cover loss between 2001-2014, blue shows tree cover gain between 2001-2014, and purple is gain and loss together due to -replanting after loss has occurred. ]] +replanting after loss has occurred]] local URL = "https://sos.noaa.gov/catalog/datasets/forest-change-extent-gain-and-loss-2000-2014/" @@ -107,7 +107,7 @@ asset.export(label1) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset index b4a90051dc..bbebc4aee4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/geomag_tracklines.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Geomagnetic Tracklines" local Identifier = "noaa-sos-land-geomag_tracklines" -local Description = [[ Earth is like a giant magnet with a North and South Pole. However, +local Description = [[Earth is like a giant magnet with a North and South Pole. However, the magnetic North and South Pole are not aligned with the Geographic North and South Pole. The Geographic North Pole is defined by the latitude 90° N and is the axis of the Earth's rotation. The Magnetic North Pole is where the Earth's magnetic field points vertically downward. The Earth creates its own magnetic field from the electric currents -created in the liquid iron-nickel core. ]] +created in the liquid iron-nickel core]] local URL = "https://sos.noaa.gov/catalog/datasets/geomagnetic-tracklines/" @@ -53,7 +53,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset index 913cbbb992..31e32286f4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Vegetation: Seasonal Changes - Apr 2012 - Apr 2013" local Identifier = "noaa-sos-land-global_vegetation" -local Description = [[ Although 75% of the planet is a relatively unchanging ocean of +local Description = [[Although 75% of the planet is a relatively unchanging ocean of blue, the remaining 25% of Earth's surface is a dynamic green. Data from the NASA/NOAA Suomi NPP satellite is able to show these subtle differences in greenness using the Visible-Infrared Imager/Radiometer Suite (VIIRS) instrument on board the satellite. This dataset highlights our ever-changing planet, using a highly detailed vegetation index -data from the satellite, developed by scientists at NOAA. ]] +data from the satellite, developed by scientists at NOAA]] local URL = "https://sos.noaa.gov/catalog/datasets/vegetation-seasonal-changes-apr-2012-apr-2013/" @@ -93,7 +93,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset index a41f2b561d..7a1d8cf1a1 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/gray_earth.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Gray Earth" local Identifier = "noaa-sos-land-gray_earth" -local Description = [[ This dataset provides a view of the topography and bathymetry of +local Description = [[This dataset provides a view of the topography and bathymetry of Earth by shading the continents and sea floor. Gray Earth also shows major continental river systems and drainages. @@ -19,7 +19,7 @@ According to the dataset source, Natural Earth Data, the relief shading and hyps (study of Earth's topography; measurement and mapping of land elevations) are derived from the modified SRTM - Shuttle Radar Topography Mission - Plus elevation data at 1km resolution. Daniel Huffman, University of Wisconsin, Madison created the regionally -equalized hypsography that forms the foundation of the Gray Earth imagery. ]] +equalized hypsography that forms the foundation of the Gray Earth imagery]] local URL = "https://sos.noaa.gov/catalog/datasets/gray-earth/" @@ -51,7 +51,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset index 6ecf7c0e63..0caa5e8f68 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Topography and Bathymetry with Nighttime Lights" local Identifier = "noaa-sos-land-hot_topo" -local Description = [[ This planet Earth visualization shows a rotating planet in order +local Description = [[This planet Earth visualization shows a rotating planet in order to display both a nighttime and daytime view. The daytime side of the visualization shows the bathymetry and topography of the globe. Color coding is used to distinguish between the elevations. Red and gray represent the highest terrain on the land, green and yellow @@ -15,7 +15,7 @@ the oceans, such as the mid-Atlantic Ridge in the middle of the Atlantic Ocean, spreading. Also in the ocean is the Marianas Trench, which is south of Japan. This trench is the deepest location in the ocean with an amazing depth of 36,201 feet, almost 7 miles. On land, the Himalayas are a noteworthy feature, as they are the home of Mount -Everest, the tallest point on earth at a height of 29,035 feet, almost 5.5 miles. ]] +Everest, the tallest point on earth at a height of 29,035 feet, almost 5.5 miles]] local URL = "https://sos.noaa.gov/catalog/datasets/topography-and-bathymetry-with-nighttime-lights/" @@ -58,7 +58,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset index 5efc1ec693..0bcdb94ad7 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Day/Night Terminator (with clouds)" local Identifier = "noaa-sos-land-irsat_nightlights" -local Description = [[ The line that separates day and night is called the terminator. It +local Description = [[The line that separates day and night is called the terminator. It is also referred to as the "grey line" and the "twilight zone." It is a fuzzy line due to our atmosphere bending sunlight. In fact, the atmosphere bends sunlight by half a degree, which is about 37 miles (60 km). It is commonly thought that while half of the Earth is covered in darkness, the other half is covered in sunlight. This is actually not true because of the bending of the sunlight results in the land covered by sunlight having -greater area than the land covered by darkness. ]] +greater area than the land covered by darkness]] local URL = "https://sos.noaa.gov/catalog/datasets/daynight-terminator-with-clouds/" @@ -49,7 +49,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset index 6666c4758a..cc1f3fdd23 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Japan Earthquake - March 2011" local Identifier = "noaa-sos-land-japan_quake" -local Description = [[ On March 11, 2011 at 2:45 local time, a 9.0 magnitude earthquake +local Description = [[On March 11, 2011 at 2:45 local time, a 9.0 magnitude earthquake occurred 81 miles (130 km) off the east coast of Sendai, Japan, triggering a massive tsunami. It is estimated that the initial tsunami wave took 10 to 30 minutes to make its first landfall. Forecasted wave heights were up to 33 ft (10 m) and there were many reports of tsunami waves three stories high in parts of Japan. Across the Pacific Ocean, many countries issued evacuations along the coasts because of the predicted tsunami -waves. ]] +waves]] local URL = "https://sos.noaa.gov/catalog/datasets/japan-earthquake-march-2011/" @@ -61,7 +61,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset index 28856391ee..6ce38ff1de 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Koppen-Geiger Climate Changes - 1901 - 2100" local Identifier = "noaa-sos-land-koppen_climate-koppen_1901_2100" -local Description = [[ Köppen climate classification is a widely used vegetation-based +local Description = [[Köppen climate classification is a widely used vegetation-based empirical climate classification system developed by German botanist-climatologist Wladimir Köppen. It's based on the idea that climate is best defined by native vegetation. The formulas used in the classification correspond to those of the vegetation zones (biomes) that were being mapped for the first time in the late 19th century. It was first published in 1884 and was revised until 1940 with collaboration by German -climatologist Rudolf Geiger. ]] +climatologist Rudolf Geiger]] local URL = "https://sos.noaa.gov/catalog/datasets/koppen-geiger-climate-changes-1901-2100/" @@ -74,7 +74,7 @@ asset.export(legend1) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset index a6f5a2121e..1ed3e86513 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_2007.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Koppen-Geiger Climate Classification - 2007" local Identifier = "noaa-sos-land-koppen_climate-koppen_2007" -local Description = [[ Köppen climate classification is a widely used vegetation-based +local Description = [[Köppen climate classification is a widely used vegetation-based empirical climate classification system developed by German botanist-climatologist Wladimir Köppen. It's based on the idea that climate is best defined by native vegetation. The formulas used in the classification correspond to those of the vegetation zones (biomes) that were being mapped for the first time in the late 19th century. It was first published in 1884 and was revised until 1940 with collaboration by German -climatologist Rudolf Geiger.This particular revision is from 2007. ]] +climatologist Rudolf Geiger.This particular revision is from 2007]] local URL = "https://sos.noaa.gov/catalog/datasets/koppen-geiger-climate-classification-2007/" @@ -66,7 +66,7 @@ asset.export(legend1) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset index fcfb6cdb22..f49238c1f8 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Land Cover (animation)" local Identifier = "noaa-sos-land-land_cover-animation" -local Description = [[ The Moderate Resolution Imaging Spectroradiometer (MODIS) +local Description = [[The Moderate Resolution Imaging Spectroradiometer (MODIS) instrument on NASA's Terra satellite provides scientists with a new view of the Earth. Using data collected by MODIS, researchers at Boston University were able to create these land cover maps. Understanding the land cover of Earth aids policy makers involved in @@ -14,7 +14,7 @@ determine the extent of vegetation covering the land surface that is absorbing c dioxide. Each of the varying land types have different impacts on the Earth system. Snow and ice cover cool the planet by reflecting sunlight back to space, forests absorb huge amounts of carbon dioxide, and croplands and urban areas reflect the human impact on the -Earth. ]] +Earth]] local URL = "https://sos.noaa.gov/catalog/datasets/land-cover-animation/" @@ -67,7 +67,7 @@ asset.export(label) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset index 2616e54f2e..40fcc91247 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-ribbon.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Land Cover (map with ribbon of labels)" local Identifier = "noaa-sos-land-land_cover-ribbon" -local Description = [[ The Moderate Resolution Imaging Spectroradiometer (MODIS) +local Description = [[The Moderate Resolution Imaging Spectroradiometer (MODIS) instrument on NASA's Terra satellite provides scientists with a new view of the Earth. Using data collected by MODIS, researchers at Boston University were able to create these land cover maps. Understanding the land cover of Earth aids policy makers involved in @@ -14,7 +14,7 @@ determine the extent of vegetation covering the land surface that is absorbing c dioxide. Each of the varying land types have different impacts on the Earth system. Snow and ice cover cool the planet by reflecting sunlight back to space, forests absorb huge amounts of carbon dioxide, and croplands and urban areas reflect the human impact on the -Earth. ]] +Earth]] local URL = "https://sos.noaa.gov/catalog/datasets/land-cover-map-with-ribbon-of-labels/" @@ -59,7 +59,7 @@ asset.export(label) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset index b1d66802af..78a7671a62 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Land Cover (map with slideshow of labels)" local Identifier = "noaa-sos-land-land_cover-slideshow" -local Description = [[ The Moderate Resolution Imaging Spectroradiometer (MODIS) +local Description = [[The Moderate Resolution Imaging Spectroradiometer (MODIS) instrument on NASA's Terra satellite provides scientists with a new view of the Earth. Using data collected by MODIS, researchers at Boston University were able to create these land cover maps. Understanding the land cover of Earth aids policy makers involved in @@ -14,7 +14,7 @@ determine the extent of vegetation covering the land surface that is absorbing c dioxide. Each of the varying land types have different impacts on the Earth system. Snow and ice cover cool the planet by reflecting sunlight back to space, forests absorb huge amounts of carbon dioxide, and croplands and urban areas reflect the human impact on the -Earth. ]] +Earth]] local URL = "https://sos.noaa.gov/catalog/datasets/land-cover-map-with-slideshow-of-labels/" @@ -95,7 +95,7 @@ end asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset index fc4ff07c5e..86b2267b12 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_current.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Agriculture: Cropland Yield (current)" local Identifier = "noaa-sos-land-land_production-cropland_current" -local Description = [[ A major component of the 2 Billion More Coming to Dinner film, +local Description = [[A major component of the 2 Billion More Coming to Dinner film, this dataset shows the current yield for the three top global crops, corn, wheat and rice, measured in tons per hectare. Similarly, Cropland Yield - Potential, illustrates the potential yield for a given area, determined by using the productivity of another region with analogous environmental conditions and optimized water and nutrient input as a benchmark. For both maps, darker areas show smaller yields, while bright pink areas -indicate higher yields. ]] +indicate higher yields]] local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-cropland-yield-current/" @@ -63,7 +63,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset index 9392161945..f69bd45682 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-cropland_potential.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Agriculture: Cropland Yield (potential)" local Identifier = "noaa-sos-land-land_production-cropland_potential" -local Description = [[ A major component of the 2 Billion More Coming to Dinner film, +local Description = [[A major component of the 2 Billion More Coming to Dinner film, these datasets show current and potential yields for the three top crops, corn, wheat and rice, measured in tons per hectare. Potential yield for a given area is determined by using the productivity of another region with analogous environmental conditions and optimized water and nutrient input as a benchmark. In this map, darker areas show smaller -yields, while bright pink areas indicate higher yields. ]] +yields, while bright pink areas indicate higher yields]] local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-cropland-yield-potential/" @@ -62,7 +62,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset index 38eca7acc1..4e6c2b9329 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_production-production_gap.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Agriculture: Cropland Production Gap" local Identifier = "noaa-sos-land-land_production-production_gap" -local Description = [[ A major component of the 2 Billion More Coming to Dinner film, -these datasets show current and potential yields for the three top global crops, corn, -wheat and rice, measured in tons per hectare. Potential yield for a given area is -determined by using the productivity of another region with analogous environmental -conditions and optimized water and nutrient input as a benchmark. In both maps, darker -areas show smaller yields, while bright pink areas indicate higher yields. ]] +local Description = [[A major component of the 2 Billion More Coming to Dinner film, + these datasets show current and potential yields for the three top global crops, corn, + wheat and rice, measured in tons per hectare. Potential yield for a given area is + determined by using the productivity of another region with analogous environmental + conditions and optimized water and nutrient input as a benchmark. In both maps, darker + areas show smaller yields, while bright pink areas indicate higher yields]] local URL = "https://sos.noaa.gov/catalog/datasets/agriculture-cropland-yield-potential/" @@ -62,7 +62,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset index 0e3640c252..f5dc4c56d9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset @@ -3,8 +3,8 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Land to Sea Ratio" local Identifier = "noaa-sos-land-land_ratio" -local Description = [[ In this dataset, we witness the world map transform into a graph -that shows the ratio of land and sea at different latitudes. ]] +local Description = [[In this dataset, we witness the world map transform into a graph +that shows the ratio of land and sea at different latitudes]] local URL = "https://sos.noaa.gov/catalog/datasets/land-to-sea-ratio/" @@ -44,7 +44,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset index 11036a362d..d20b4f30cf 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/latitude_longitude.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Latitude Longitude Layers" local Identifier = "noaa-sos-land-latitude_longitude" -local Description = [[ Showing the relationship of latitude and longitude lines on Earth, +local Description = [[Showing the relationship of latitude and longitude lines on Earth, this dataset is useful when talking about geographical features or areas, GPS and the -introduction of map reading and exploration. ]] +introduction of map reading and exploration]] local URL = "https://sos.noaa.gov/catalog/datasets/latitude-longitude-layers/" @@ -67,7 +67,7 @@ asset.export(layer_longitude) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset index 1fc9ff9c66..a7e18c81f5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Earth's Magnetic Declination" local Identifier = "noaa-sos-land-magnetic_declination" -local Description = [[ Earth is like a giant magnet with a North and South Pole. However, +local Description = [[Earth is like a giant magnet with a North and South Pole. However, the magnetic North and South Pole are not aligned with the Geographic North and South Pole. The Geographic North Pole is defined by the latitude 90° N and is the axis of the Earth's rotation. The Magnetic North Pole is where the Earth's magnetic field points vertically downward. The Earth creates its own magnetic field from the electric currents -created in the liquid iron-nickel core. ]] +created in the liquid iron-nickel core]] local URL = "https://sos.noaa.gov/catalog/datasets/earths-magnetic-declination/" @@ -62,7 +62,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset index de70f1fb0a..e8a6118338 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nightsky.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Light Pollution - Artificial Sky Brightness" local Identifier = "noaa-sos-land-nightsky" -local Description = [[ Light pollution in urban centers creates a sky glow that can blot +local Description = [[Light pollution in urban centers creates a sky glow that can blot out the stars. The brighter the area in this map the harder it is to see stars and -constellations in the night sky. ]] +constellations in the night sky]] local URL = "https://sos.noaa.gov/catalog/datasets/light-pollution-artificial-sky-brightness/" @@ -49,7 +49,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset index 1f8cc09835..bedf5a684e 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/nuclear_earthquake.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Earthquakes and Nuclear Power Plants" local Identifier = "noaa-sos-land-nuclear_earthquake" -local Description = [[ Earthquakes have been occurring on Earth since its formation. They +local Description = [[Earthquakes have been occurring on Earth since its formation. They occur when tectonic plates that are sliding against or past each other build up enough tension to slip, causing the rock to settle into a new position and the ground to shake. The United States Geological Survey predicts that 500,000 earthquakes happen every year, @@ -14,7 +14,7 @@ there is debate over whether such a thing is even possible. Current prediction m involve measuring the tension that has been bled off by past earthquakes and how often earthquakes have occurred at that location before. Due to the fact that the instruments that can measure tension and accurate seismographs are a recent invention, earthquake -prediction continues to be inaccurate and imprecise. ]] +prediction continues to be inaccurate and imprecise]] local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-and-nuclear-power-plants/" @@ -99,7 +99,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset index 512eec1107..68a1d6a7d1 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset @@ -3,17 +3,17 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "PALEOMAP PaleoAtlas 0 - 750 Million Years Ago" local Identifier = "noaa-sos-land-paleomap" -local Description = [[ The PALEOMAP PaleoAtlas for GPlates consists of 91 paleogeographic -maps spanning the Phanerozoic and late Neoproterozoic. The PaleoAtlas can be directly -loaded into GPlates as a Time Dependent Raster file. The paleogeographic maps in the -PaleoAtlas illustrate the ancient configuration of the ocean basins and continents, as -well as important topographic and bathymetric features such as mountains, lowlands, -shallow sea, continental shelves, and deep oceans. This tutorial also describes how the -maps in the PaleoAtlas were made, documents the sources of information used to make the -paleogeographic maps, and provides instructions how to plot user-defined paleodata on the -paleogeographic maps using the program PaleoDataPlotter. +local Description = [[The PALEOMAP PaleoAtlas for GPlates consists of 91 paleogeographic + maps spanning the Phanerozoic and late Neoproterozoic. The PaleoAtlas can be directly + loaded into GPlates as a Time Dependent Raster file. The paleogeographic maps in the + PaleoAtlas illustrate the ancient configuration of the ocean basins and continents, as + well as important topographic and bathymetric features such as mountains, lowlands, + shallow sea, continental shelves, and deep oceans. This tutorial also describes how the + maps in the PaleoAtlas were made, documents the sources of information used to make the + paleogeographic maps, and provides instructions how to plot user-defined paleodata on + the paleogeographic maps using the program PaleoDataPlotter. -For any questions about the resource, please email: Christopher Scotese ]] + For any questions about the resource, please email: Christopher Scotese]] local URL = "https://sos.noaa.gov/catalog/datasets/paleomap-paleoatlas-0-750-million-years-ago/" @@ -169,7 +169,7 @@ end asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset index 0363aa7f41..f937407ff8 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_overlays.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Paleoclimate Proxies" local Identifier = "noaa-sos-land-paleo_overlays" -local Description = [[ Every year, particles eroding from the continents are transported +local Description = [[Every year, particles eroding from the continents are transported to the oceans by the wind as dust and by rivers as sands and gravels. Once they get to the ocean, they mix with billions of tons of dead plankton shells, sink, and settle on the seafloor. There, they accumulate vertically in layers on top of previous years' @@ -13,7 +13,7 @@ new layers of ice. Trees, much the same way, add yearly layers of new cells in c circles just below their bark - called tree rings. And, in many caves around the world, the strength of the seasonal cycle of a wet monsoon followed by a dry season is recorded in the chemistry of stalagmites rising up from the cave floor, formed by drips of -mineral-rich water from the roof of the cave. ]] +mineral-rich water from the roof of the cave]] local URL = "https://sos.noaa.gov/catalog/datasets/paleoclimate-proxies/" @@ -108,7 +108,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset index a8377e6044..0e30e7988d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/pantropical_biomass.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Land Cover: Woody Biomass in Pan-tropics" local Identifier = "noaa-sos-land-pantropical_biomass" -local Description = [[ Tropical deforestation and forest degradation account for an +local Description = [[Tropical deforestation and forest degradation account for an estimated 20% of the world's anthropogenic emissions of carbon dioxide, a significant greenhouse gas contributor. Despite the important services that tropical forests provide, there is incomplete data and knowledge of their condition and coverage, and thus no -accurate baseline for evaluating and monitoring future changes. ]] +accurate baseline for evaluating and monitoring future changes]] local URL = "https://sos.noaa.gov/catalog/datasets/land-cover-woody-biomass-in-pan-tropics/" @@ -52,7 +52,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset index e83fe28b8c..b18647dfbe 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Plate Movement - 200 Million Years Ago to Today" local Identifier = "noaa-sos-land-plate_movement" -local Description = [[ Our planet's surface has been shaped and re-shaped by plate +local Description = [[Our planet's surface has been shaped and re-shaped by plate tectonics through cycles of supercontinent amalgamation and breakup. We can study the motion of the tectonic plates, and the continents that they carry, by measuring the magnetic signatures recorded in rocks that form the seafloor. As plates move apart at mid @@ -16,7 +16,7 @@ marine scientists use ocean-going scientific vessels to criss-cross the oceans i to reveal the entire "barcode" of seafloor spreading histories. This data enables the creation of "plate tectonic reconstructions" where the seafloor spreading history can be unwound to restore the past position of continents as they are pushed and pulled by the -motion of the oceanic plates. ]] +motion of the oceanic plates]] local URL = "https://sos.noaa.gov/catalog/datasets/plate-movement-200-million-years-ago-to-today/" @@ -70,7 +70,7 @@ asset.export(age_scale) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset index 79aabfd15a..1b4ade531f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Rivers: Daily Discharge - 2010" local Identifier = "noaa-sos-land-river_discharge_2010" -local Description = [[ This dataset illustrates hydrological conditions worldwide for the +local Description = [[This dataset illustrates hydrological conditions worldwide for the year 2010. The data originates from a computational model, the Water Balance Model (WBM). WBM takes daily rainfall and temperature data, maps of vegetation, land-use, irrigation and soil properties, and then calculates the hydrological balance for each of its grid -cells. ]] +cells]] local URL = "https://sos.noaa.gov/catalog/datasets/rivers-daily-discharge-2010/" @@ -60,7 +60,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset index e32ccf1960..5be4bf63c5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-iso_lines_yellow.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Age of the Seafloor Contour Lines" local Identifier = "noaa-sos-land-sea_floor_age-iso_lines_yellow" -local Description = [[ The surface of the Earth is composed of a mosaic tectonic plates +local Description = [[The surface of the Earth is composed of a mosaic tectonic plates moving with respect to each other. The Earth is made of seven major plates and several smaller plates. As the plates move, new sea floor can be created. The plates form three different kinds of boundaries: convergent, divergent, and transform. Convergent @@ -13,7 +13,7 @@ divergent boundaries are the areas where plates are moving apart from one anothe plates move apart, new crustal material is formed from molten magma from below the Earth's surface. Because of this, the youngest sea floor can be found along divergent boundaries, such as the Mid-Atlantic Ocean Ridge. The spreading, however, is generally -not uniform causing linear features perpendicular to the divergent boundaries. ]] +not uniform causing linear features perpendicular to the divergent boundaries]] local URL = "https://sos.noaa.gov/catalog/datasets/age-of-the-seafloor-contour-lines/" @@ -59,7 +59,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset index e7d898eec3..d3c2ddce50 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-shaded_veg.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Age of the Seafloor (vegetation)" local Identifier = "noaa-sos-land-sea_floor_age-shaded_veg" -local Description = [[ The surface of the Earth is composed of a mosaic tectonic plates +local Description = [[The surface of the Earth is composed of a mosaic tectonic plates moving with respect to each other. The Earth is made of seven major plates and several smaller plates. As the plates move, new sea floor can be created. The plates form three different kinds of boundaries: convergent, divergent, and transform. Convergent @@ -13,7 +13,7 @@ divergent boundaries are the areas where plates are moving apart from one anothe plates move apart, new crustal material is formed from molten magma from below the Earth's surface. Because of this, the youngest sea floor can be found along divergent boundaries, such as the Mid-Atlantic Ocean Ridge. The spreading, however, is generally -not uniform causing linear features perpendicular to the divergent boundaries. ]] +not uniform causing linear features perpendicular to the divergent boundaries]] local URL = "https://sos.noaa.gov/catalog/datasets/age-of-the-seafloor-vegetation/" @@ -89,7 +89,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset index 75f4479bfe..d55a14cc24 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/sea_floor_age-topo.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Age of the Seafloor (topography)" local Identifier = "noaa-sos-land-sea_floor_age-topo" -local Description = [[ The surface of the Earth is composed of a mosaic tectonic plates +local Description = [[The surface of the Earth is composed of a mosaic tectonic plates moving with respect to each other. The Earth is made of seven major plates and several smaller plates. As the plates move, new sea floor can be created. The plates form three different kinds of boundaries: convergent, divergent, and transform. Convergent @@ -13,7 +13,7 @@ divergent boundaries are the areas where plates are moving apart from one anothe plates move apart, new crustal material is formed from molten magma from below the Earth's surface. Because of this, the youngest sea floor can be found along divergent boundaries, such as the Mid-Atlantic Ocean Ridge. The spreading, however, is generally -not uniform causing linear features perpendicular to the divergent boundaries. ]] +not uniform causing linear features perpendicular to the divergent boundaries]] local URL = "https://sos.noaa.gov/catalog/datasets/age-of-the-seafloor-topography/" @@ -79,7 +79,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset index 9921ef04ef..00d027d0d3 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Seismic Waves: Northridge Earthquake - 1994" local Identifier = "noaa-sos-land-seismic_waves-1994northride" -local Description = [[ At 4:30 a.m. on January 17, 1994, the shaking of an earthquake +local Description = [[At 4:30 a.m. on January 17, 1994, the shaking of an earthquake awakened 10 million people in the Los Angeles region of Southern California. The earthquake's epicenter was in Northridge, CA, and it was a magnitude 6.7 shock that proved to be the most costly earthquake in United States history. The shaking heavily damaged communities throughout the San Fernando Valley and Simi Valley, and the surrounding mountains north and west of Los Angeles, causing estimated losses of $20 billion. Fifty-seven people died, more than 9,000 were injured, and more than 20,000 were -displaced from their homes by the effects of the quake. ]] +displaced from their homes by the effects of the quake]] local URL = "https://sos.noaa.gov/catalog/datasets/seismic-waves-northridge-earthquake-1994/" @@ -90,7 +90,7 @@ asset.export(pips) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset index 59bf949089..cea57c8df9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Species Richness - Amphibians" local Identifier = "noaa-sos-land-species_richness-amphibians" -local Description = [[ Understanding the biodiversity of our planet is critical for +local Description = [[Understanding the biodiversity of our planet is critical for developing conservation strategies. This series of datasets shows the biodiversity of birds, mammals, and amphibians. Said simply, these maps show how many kinds of birds or mammals or amphibians live in each area around the world. These maps look at just the animals on land and don't include any marine animals. Also included are corresponding maps of where the threatened species live, the ones at greatest risk of extinction. Knowing where these threatened species live can help direct conservation efforts to -ensure that the places with the most vulnerable species are being protected. ]] +ensure that the places with the most vulnerable species are being protected]] local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-amphibians/" @@ -64,7 +64,7 @@ asset.export(labels) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset index b077c9c8d8..5fba43e402 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-amphibians_threatened.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Species Richness - Amphibians Threatened" local Identifier = "noaa-sos-land-species_richness-amphibians_threatened" -local Description = [[ Understanding the biodiversity of our planet is critical for +local Description = [[Understanding the biodiversity of our planet is critical for developing conservation strategies. This series of datasets shows the biodiversity of birds, mammals, and amphibians. Said simply, these maps show how many kinds of birds or mammals or amphibians live in each area around the world. These maps look at just the animals on land and don't include any marine animals. Also included are corresponding maps of where the threatened species live, the ones at greatest risk of extinction. Knowing where these threatened species live can help direct conservation efforts to -ensure that the places with the most vulnerable species are being protected. ]] +ensure that the places with the most vulnerable species are being protected]] local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-amphibians-threatened/" @@ -65,7 +65,7 @@ asset.export(labels) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset index b14b04f016..6bcbb5866b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Species Richness - Birds" local Identifier = "noaa-sos-land-species_richness-birds" -local Description = [[ Understanding the biodiversity of our planet is critical for +local Description = [[Understanding the biodiversity of our planet is critical for developing conservation strategies. This series of datasets shows the biodiversity of birds, mammals, and amphibians. Said simply, these maps show how many kinds of birds or mammals or amphibians live in each area around the world. These maps look at just the animals on land and don't include any marine animals. Also included are corresponding maps of where the threatened species live, the ones at greatest risk of extinction. Knowing where these threatened species live can help direct conservation efforts to -ensure that the places with the most vulnerable species are being protected. ]] +ensure that the places with the most vulnerable species are being protected]] local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-birds/" @@ -64,7 +64,7 @@ asset.export(labels) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset index 06c649d640..32f0e732f7 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-birds_threatened.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Species Richness - Birds Threatened" local Identifier = "noaa-sos-land-species_richness-birds_threatened" -local Description = [[ Understanding the biodiversity of our planet is critical for +local Description = [[Understanding the biodiversity of our planet is critical for developing conservation strategies. This series of datasets shows the biodiversity of birds, mammals, and amphibians. Said simply, these maps show how many kinds of birds or mammals or amphibians live in each area around the world. These maps look at just the animals on land and don't include any marine animals. Also included are corresponding maps of where the threatened species live, the ones at greatest risk of extinction. Knowing where these threatened species live can help direct conservation efforts to -ensure that the places with the most vulnerable species are being protected. ]] +ensure that the places with the most vulnerable species are being protected]] local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-birds-threatened/" @@ -65,7 +65,7 @@ asset.export(labels) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset index 52f7ca1024..f29cc36a02 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Species Richness - Mammals" local Identifier = "noaa-sos-land-species_richness-mammals" -local Description = [[ Understanding the biodiversity of our planet is critical for +local Description = [[Understanding the biodiversity of our planet is critical for developing conservation strategies. This series of datasets shows the biodiversity of birds, mammals, and amphibians. Said simply, these maps show how many kinds of birds or mammals or amphibians live in each area around the world. These maps look at just the animals on land and don't include any marine animals. Also included are corresponding maps of where the threatened species live, the ones at greatest risk of extinction. Knowing where these threatened species live can help direct conservation efforts to -ensure that the places with the most vulnerable species are being protected. ]] +ensure that the places with the most vulnerable species are being protected]] local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-mammals/" @@ -64,7 +64,7 @@ asset.export(labels) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset index b8b70db907..0faee78153 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/species_richness-mammals_threatened.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Species Richness - Mammals Threatened" local Identifier = "noaa-sos-land-species_richness-mammals_threatened" -local Description = [[ Understanding the biodiversity of our planet is critical for +local Description = [[Understanding the biodiversity of our planet is critical for developing conservation strategies. This series of datasets shows the biodiversity of birds, mammals, and amphibians. Said simply, these maps show how many kinds of birds or mammals or amphibians live in each area around the world. These maps look at just the animals on land and don't include any marine animals. Also included are corresponding maps of where the threatened species live, the ones at greatest risk of extinction. Knowing where these threatened species live can help direct conservation efforts to -ensure that the places with the most vulnerable species are being protected. ]] +ensure that the places with the most vulnerable species are being protected]] local URL = "https://sos.noaa.gov/catalog/datasets/species-richness-mammals-threatened/" @@ -65,7 +65,7 @@ asset.export(labels) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset index 1d1dc131df..b732f8ea06 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Surface Temperature" local Identifier = "noaa-sos-land-surface_temperature" -local Description = [[ These maps combine high-resolution daytime surface temperatures +local Description = [[These maps combine high-resolution daytime surface temperatures derived from satellite observations for both land and sea and display them with a common color scale. Displaying these high-resolution data with a common color scale makes evident the large difference between surface heating on land versus the sea. It also shows the relatively small seasonal variation in sea surface temperature over the globe relative to land temperatures. The larger seasonal variation in average temperature of the northern hemisphere relative to the southern hemisphere, a result of the larger land -area in the northern hemisphere, is also evident. ]] +area in the northern hemisphere, is also evident]] local URL = "https://sos.noaa.gov/catalog/datasets/surface-temperature/" @@ -43,7 +43,7 @@ local colorbar = { } local colorbar2 = { - Identifier = Identifier .."-1", + Identifier = Identifier .. "-1", Name = Name .. " (1)", Type = "ScreenSpaceImageLocal", TexturePath = syncedDirectory .. "colorbar2.png", @@ -76,7 +76,7 @@ asset.export(colorbar2) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset index e4ae9f9802..4961a4e3ff 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/top_quakes.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Earthquakes: Historical Top 10 - through 2011" local Identifier = "noaa-sos-land-top_quakes" -local Description = [[ t is estimated that there are 500,000 detectable earthquakes in +local Description = [[It is estimated that there are 500,000 detectable earthquakes in the world each year. Of those, 100,000 can be felt and 100 of them cause damage. Anything that causes seismic waves to radiate throughout the Earth is an earthquake. The cause of earthquakes can be natural, such as one tectonic plate slipping below another, or @@ -16,7 +16,7 @@ most natural earthquakes occur due to slipping plates, the boundaries between te plates are "hot spots" for earthquakes. The magnitude of earthquakes is measured by the Richter magnitude scale. It is a base-10 logarithm scale of the ground motion caused by the earthquake. Each increase of 1 in magnitude represents 10 times more ground -motion. ]] +motion]] local URL = "https://sos.noaa.gov/catalog/datasets/earthquakes-historical-top-10-through-2011/" @@ -48,7 +48,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset index 353c6a63e5..b2bb921e96 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-eruptions.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Volcano Eruptions - through 2010" local Identifier = "noaa-sos-land-volcanoes-eruptions" -local Description = [[ According to the Smithsonian Institute's Global Volcanism Program, +local Description = [[According to the Smithsonian Institute's Global Volcanism Program, there are probably about 20 volcanoes erupting right now, and about 550 volcanoes have had historically documented eruptions. A volcano is an opening, or rupture, in the Earth's crust through which molten lava, ash, and gases are ejected. Volcanoes typically @@ -14,7 +14,7 @@ sea floor. The second location is convergent plate boundaries, where two plates, typically an oceanic and continental plate, are colliding. The volcanoes along the Pacific Ring of Fire are from convergent plate boundaries. The third location is over hotspots, which are typically in the middle of tectonic plates and caused by hot magma -rising to the surface. The volcanoes on Hawaii are the result of hotspots. ]] +rising to the surface. The volcanoes on Hawaii are the result of hotspots]] local URL = "https://sos.noaa.gov/catalog/datasets/volcano-eruptions-through-2010/" @@ -56,7 +56,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset index 0e9713198a..4057c886ed 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-global_volcanoes.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Volcano Locations" local Identifier = "noaa-sos-land-volcanoes-global_volcanoes" -local Description = [[ According to the Smithsonian Institute's Global Volcanism Program, +local Description = [[According to the Smithsonian Institute's Global Volcanism Program, there are probably about 20 volcanoes erupting right now, and about 550 volcanoes have had historically documented eruptions. A volcano is an opening, or rupture, in the Earth's crust through which molten lava, ash, and gases are ejected. Volcanoes typically @@ -14,7 +14,7 @@ sea floor. The second location is convergent plate boundaries, where two plates, typically an oceanic and continental plate, are colliding. The volcanoes along the Pacific Ring of Fire are from convergent plate boundaries. The third location is over hotspots, which are typically in the middle of tectonic plates and caused by hot magma -rising to the surface. The volcanoes on Hawaii are the result of hotspots. ]] +rising to the surface. The volcanoes on Hawaii are the result of hotspots]] local URL = "https://sos.noaa.gov/catalog/datasets/volcano-locations/" @@ -56,7 +56,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset index 5eb2b967f8..98bc88c9d6 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/volcanoes-tsunami.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Volcano Eruptions: Causing Tsunamis - through 2010" local Identifier = "noaa-sos-land-volcanoes-tsunami" -local Description = [[ According to the Smithsonian Institute's Global Volcanism Program, +local Description = [[According to the Smithsonian Institute's Global Volcanism Program, there are probably about 20 volcanoes erupting right now, and about 550 volcanoes have had historically documented eruptions. A volcano is an opening, or rupture, in the Earth's crust through which molten lava, ash, and gases are ejected. Volcanoes typically @@ -14,7 +14,7 @@ sea floor. The second location is convergent plate boundaries, where two plates, typically an oceanic and continental plate, are colliding. The volcanoes along the Pacific Ring of Fire are from convergent plate boundaries. The third location is over hotspots, which are typically in the middle of tectonic plates and caused by hot magma -rising to the surface. The volcanoes on Hawaii are the result of hotspots. ]] +rising to the surface. The volcanoes on Hawaii are the result of hotspots]] local URL = "https://sos.noaa.gov/catalog/datasets/volcano-eruptions-causing-tsunamis-through-2010/" @@ -56,7 +56,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset index 5a50f589fb..cdc299ad2e 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Blue Marble: Sea Level, Ice and Vegetation Changes - 19,000BC - 10,000AD" local Identifier = "noaa-sos-models-bm10000" -local Description = [[ The Earth has been through many changes and continues to change +local Description = [[The Earth has been through many changes and continues to change today. To better understand these changes, the Zürich University of Applied Sciences created a simulation using past climate data, observations, and computer models. The simulation starts 21,000 years ago and ends 8,000 years in the future, showing the @@ -32,7 +32,7 @@ northern ice cap quickly disappears and the ice on Greenland and Antarctica begi melt steadily. By the year 3,000AD, there is predicted 6m (19ft) sea level rise. The simulation continues from 3,000AD to 10,000 AD in 500 year time steps in a fictional scenario of worldwide glacier meltdown and shows the impacts this would have on the -coasts. ]] +coasts]] local URL = "https://sos.noaa.gov/catalog/datasets/blue-marble-sea-level-ice-and-vegetation-changes-19000bc-10000ad/" @@ -72,7 +72,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset index b2c052bc46..0e21580a8c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Sea Ice Change (GFDL a1b) 1861 - 2100" local Identifier = "noaa-sos-models-gfdl_seaice" -local Description = [[ In the coming decades, the Arctic region is projected to warm at +local Description = [[In the coming decades, the Arctic region is projected to warm at about twice the rate of the global average according to the scientists at NOAA's Geophysical Fluid Dynamics Laboratory. This is not good news for the Arctic sea ice. In fact, the concentration of sea ice in the northern latitudes has been decreasing over the @@ -15,7 +15,7 @@ much of the sun's warming back to space. As the ice melts, more of this energy i absorbed in the darker ocean water. The temperature increases as more sunlight is absorbed rather than reflected. This is a positive feedback loop because as temperature rises, more sea ice melts causing increased absorption which leads to rising -temperatures. ]] +temperatures]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-sea-ice-change-gfdl-a1b-1861-2100/" @@ -69,7 +69,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset index f78fb0bb20..bead05eac0 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (CCSM a1b) - 1870 - 2100" local Identifier = "noaa-sos-models-ipcc_temp-ccsm-a1b" -local Description = [[ "The Intergovernmental Panel on Climate Change (IPCC) was +local Description = [["The Intergovernmental Panel on Climate Change (IPCC) was established by WMO and UNEP to assess scientific, technical and socio- economic information relevant for the understanding of climate change, its potential impacts and options for adaptation and mitigation. It is open to all members of the UN and of WMO." @@ -12,7 +12,7 @@ IPCC releases assessment reports on the current state of the atmosphere and what future could hold. Models from various atmospheric and oceanic organizations are included in these reports in order to establish a broad understanding of the science. Data from three of the IPCC models following temperature change from 1870 - 2100 have been -formatted for Science On a Sphere. ]] +formatted for Science On a Sphere]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-ccsm-a1b-1870-2100/" @@ -66,7 +66,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset index ce06d48181..31cc286e89 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (CCSM b1) - 1870 - 2100" local Identifier = "noaa-sos-models-ipcc_temp-ccsm-b1" -local Description = [[ "The Intergovernmental Panel on Climate Change (IPCC) was +local Description = [["The Intergovernmental Panel on Climate Change (IPCC) was established by WMO and UNEP to assess scientific, technical and socio- economic information relevant for the understanding of climate change, its potential impacts and options for adaptation and mitigation. It is open to all members of the UN and of WMO." @@ -12,7 +12,7 @@ IPCC releases assessment reports on the current state of the atmosphere and what future could hold. Models from various atmospheric and oceanic organizations are included in these reports in order to establish a broad understanding of the science. Data from three of the IPCC models following temperature change from 1870 - 2100 have been -formatted for Science On a Sphere. ]] +formatted for Science On a Sphere]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-ccsm-b1-1870-2100/" @@ -66,7 +66,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset index c1517436f3..fb2f9c1a5a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-compare.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change Comparison (GFDL a1b and b1)" local Identifier = "noaa-sos-models-ipcc_temp-compare" -local Description = [[ "The Intergovernmental Panel on Climate Change (IPCC) was +local Description = [["The Intergovernmental Panel on Climate Change (IPCC) was established by WMO and UNEP to assess scientific, technical and socio- economic information relevant for the understanding of climate change, its potential impacts and options for adaptation and mitigation. It is open to all members of the UN and of WMO." @@ -12,7 +12,7 @@ IPCC releases assessment reports on the current state of the atmosphere and what future could hold. Models from various atmospheric and oceanic organizations are included in these reports in order to establish a broad understanding of the science. Data from three of the IPCC models following temperature change from 1870 - 2100 have been -formatted for Science On a Sphere. ]] +formatted for Science On a Sphere]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-comparison-gfdl-a1b-and-b1/" @@ -80,7 +80,7 @@ end asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset index 9f360f9d9f..8bd88b87a2 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (GFDL a1b) - 1870 - 2100" local Identifier = "noaa-sos-models-ipcc_temp-gfdl-a1b" -local Description = [[ "The Intergovernmental Panel on Climate Change (IPCC) was +local Description = [["The Intergovernmental Panel on Climate Change (IPCC) was established by WMO and UNEP to assess scientific, technical and socio- economic information relevant for the understanding of climate change, its potential impacts and options for adaptation and mitigation. It is open to all members of the UN and of WMO." @@ -12,7 +12,7 @@ IPCC releases assessment reports on the current state of the atmosphere and what future could hold. Models from various atmospheric and oceanic organizations are included in these reports in order to establish a broad understanding of the science. Data from three of the IPCC models following temperature change from 1870 - 2100 have been -formatted for Science On a Sphere. ]] +formatted for Science On a Sphere]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-gfdl-a1b-1870-2100/" @@ -66,7 +66,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset index a966cf6542..e503d0bdf2 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (GFDL b1) - 1870 - 2100" local Identifier = "noaa-sos-models-ipcc_temp-gfdl-b1" -local Description = [[ "The Intergovernmental Panel on Climate Change (IPCC) was +local Description = [["The Intergovernmental Panel on Climate Change (IPCC) was established by WMO and UNEP to assess scientific, technical and socio-economic information relevant for the understanding of climate change, its potential impacts and options for adaptation and mitigation. It is open to all members of the UN and of WMO." @@ -12,7 +12,7 @@ IPCC releases assessment reports on the current state of the atmosphere and what future could hold. Models from various atmospheric and oceanic organizations are included in these reports in order to establish a broad understanding of the science. Data from three of the IPCC models following temperature change from 1870 - 2100 have been -formatted for Science On a Sphere. ]] +formatted for Science On a Sphere]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-gfdl-b1-1870-2100/" @@ -66,7 +66,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset index 9dd5b87f3f..7c5ab698a1 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (Hadley a1b) - 1870 - 2100" local Identifier = "noaa-sos-models-ipcc_temp-had-a1b" -local Description = [[ "The Intergovernmental Panel on Climate Change (IPCC) was +local Description = [["The Intergovernmental Panel on Climate Change (IPCC) was established by WMO and UNEP to assess scientific, technical and socio- economic information relevant for the understanding of climate change, its potential impacts and options for adaptation and mitigation. It is open to all members of the UN and of WMO." @@ -12,7 +12,7 @@ IPCC releases assessment reports on the current state of the atmosphere and what future could hold. Models from various atmospheric and oceanic organizations are included in these reports in order to establish a broad understanding of the science. Data from three of the IPCC models following temperature change from 1870 - 2100 have been -formatted for Science On a Sphere. ]] +formatted for Science On a Sphere]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-hadley-a1b-1870-2100/" @@ -66,7 +66,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset index f6f156de66..b8b922900c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (Hadley b1) - 1870 - 2100" local Identifier = "noaa-sos-models-ipcc_temp-had-b1" -local Description = [[ "The Intergovernmental Panel on Climate Change (IPCC) was +local Description = [["The Intergovernmental Panel on Climate Change (IPCC) was established by WMO and UNEP to assess scientific, technical and socio- economic information relevant for the understanding of climate change, its potential impacts and options for adaptation and mitigation. It is open to all members of the UN and of WMO." @@ -12,7 +12,7 @@ IPCC releases assessment reports on the current state of the atmosphere and what future could hold. Models from various atmospheric and oceanic organizations are included in these reports in order to establish a broad understanding of the science. Data from three of the IPCC models following temperature change from 1870 - 2100 have been -formatted for Science On a Sphere. ]] +formatted for Science On a Sphere]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-hadley-b1-1870-2100/" @@ -66,7 +66,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset index 3937970d3d..8bc4de9a5c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset @@ -3,8 +3,8 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (RCP 2.6) - 2006 - 2100" local Identifier = "noaa-sos-models-rcp-ga26" -local Description = [[ Climate models are used for a variety of purposes from the study -of dynamics of the weather and climate system to projections of future climate. ]] +local Description = [[Climate models are used for a variety of purposes from the study +of dynamics of the weather and climate system to projections of future climate]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-rcp-26-2006-2100/" @@ -63,7 +63,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset index 15a2fc61d6..04be9b14a2 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset @@ -3,8 +3,8 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (RCP 4.5) - 2006 - 2100" local Identifier = "noaa-sos-models-rcp-ga45" -local Description = [[ Climate models are used for a variety of purposes from the study -of dynamics of the weather and climate system to projections of future climate. ]] +local Description = [[Climate models are used for a variety of purposes from the study +of dynamics of the weather and climate system to projections of future climate]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-rcp-45-2006-2100/" @@ -63,7 +63,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset index c36dd41856..395671950f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset @@ -3,8 +3,8 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (RCP 6.0) - 2006 - 2100" local Identifier = "noaa-sos-models-rcp-ga60" -local Description = [[ Climate models are used for a variety of purposes from the study -of dynamics of the weather and climate system to projections of future climate. ]] +local Description = [[Climate models are used for a variety of purposes from the study +of dynamics of the weather and climate system to projections of future climate]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-rcp-60-2006-2100/" @@ -63,7 +63,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset index 1a87c5d5f8..eab61ee75a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset @@ -3,8 +3,8 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (RCP 8.5) - 2006 - 2100" local Identifier = "noaa-sos-models-rcp-ga85" -local Description = [[ Climate models are used for a variety of purposes from the study -of dynamics of the weather and climate system to projections of future climate. ]] +local Description = [[Climate models are used for a variety of purposes from the study +of dynamics of the weather and climate system to projections of future climate]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-rcp-85-2006-2100/" @@ -63,7 +63,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset index ed55a2abac..46d4850e2f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset @@ -3,17 +3,18 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (Hadley a1b) - 1860 - 2099" local Identifier = "noaa-sos-models-ukmet-a1b" -local Description = [[ cientists use computer climate models as a way to understand how -the climate has behaved in the past and how it is likely to change in the future. -Scientists use different scenarios to allow them to evaluate all the different future -possibilities for the climate. The United Kingdom Met Office Hadley Centre has created -two datasets for Science On a Sphere, using two different scenarios. The first scenario, -A1B-IMAGE, assumes a "business-as-usual" path forward in the future with continually -increasing carbon dioxide rates. In this scenario, CO2 rises to 774ppm by 2099 and the -global mean temperature increases by 4.41°C. The second scenario, E1, is an aggressive -mitigation scenario that includes reduced fossil fuel use with the goal of keeping global -mean warming below 2°C. In the E1 scenario, carbon dioxide increases to 435ppm by 2050 -and then drops to 421ppm by 2099, with a global mean temperature increase of 2.12°C. ]] +local Description = [[Scientists use computer climate models as a way to understand how + the climate has behaved in the past and how it is likely to change in the future. + Scientists use different scenarios to allow them to evaluate all the different future + possibilities for the climate. The United Kingdom Met Office Hadley Centre has created + two datasets for Science On a Sphere, using two different scenarios. The first scenario, + A1B-IMAGE, assumes a "business-as-usual" path forward in the future with continually + increasing carbon dioxide rates. In this scenario, CO2 rises to 774ppm by 2099 and the + global mean temperature increases by 4.41°C. The second scenario, E1, is an aggressive + mitigation scenario that includes reduced fossil fuel use with the goal of keeping + global mean warming below 2°C. In the E1 scenario, carbon dioxide increases to 435ppm by + 2050 and then drops to 421ppm by 2099, with a global mean temperature increase of + 2.12°C]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-hadley-a1b-1860-2099/" @@ -71,7 +72,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset index d40e6dca9b..d798d44c25 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Climate Model: Temperature Change (Hadley e1) - 1860 - 2099" local Identifier = "noaa-sos-models-ukmet-e1" -local Description = [[ Scientists use computer climate models as a way to understand how +local Description = [[Scientists use computer climate models as a way to understand how the climate has behaved in the past and how it is likely to change in the future. Scientists use different scenarios to allow them to evaluate all the different future possibilities for the climate. The United Kingdom Met Office Hadley Centre has created @@ -13,7 +13,7 @@ increasing carbon dioxide rates. In this scenario, CO2 rises to 774ppm by 2099 a global mean temperature increases by 4.41°C. The second scenario, E1, is an aggressive mitigation scenario that includes reduced fossil fuel use with the goal of keeping global mean warming below 2°C. In the E1 scenario, carbon dioxide increases to 435ppm by 2050 -and then drops to 421ppm by 2099, with a global mean temperature increase of 2.12°C. ]] +and then drops to 421ppm by 2099, with a global mean temperature increase of 2.12°C]] local URL = "https://sos.noaa.gov/catalog/datasets/climate-model-temperature-change-hadley-e1-1860-2099/" @@ -71,7 +71,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset index 56b4d6b7fd..ec314384f6 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Ice Animation - 2009" local Identifier = "noaa-sos-oceans-2009_ice_animation" -local Description = [[ Sea ice is simply ocean water that has frozen. At least 15% of the +local Description = [[Sea ice is simply ocean water that has frozen. At least 15% of the ocean is covered by sea ice some part of the year. This means that on average, sea ice covers almost 10 million square miles (about 25 million square kilometers) of the Earth. Sea ice concentrations are monitored closely by scientists because changing sea ice @@ -13,7 +13,7 @@ indicator of climate change. The Global Snow and Ice Cover Map that is used in t dataset is created from a combination of observations from NOAA Advanced Very High Resolution Radiometer, Meteosat Second Generation Satellite Spectral Response Characterisation, GOES Imager and Defense Meteorological Satellite Program Special Sensor -Microwave/Imager. The resolution is 2 km. ]] +Microwave/Imager. The resolution is 2 km]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-ice-animation-2009/" @@ -89,7 +89,7 @@ asset.export(colorbar_2009_iceconcentration) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset index a020cee489..e03e9d09cd 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-black.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Level Rise: Impact of 6 meter (black)" local Identifier = "noaa-sos-oceans-6m_sea_level_rise-black" -local Description = [[ There are many questions surrounding climate change. One big +local Description = [[There are many questions surrounding climate change. One big question is how the changing climate will affect the oceans. The sea level has been steadily rising since 1900 at a rate of 1 to 2.5 millimeters per year. In fact, since 1992 new methods of satellite altimetry using the TOPEX/Poseidon satellite indicate a @@ -16,7 +16,7 @@ mechanisms with respect to climate change. The first is the expansion of the sea the oceans warm due to an increasing global temperature. The second mechanism is the melting of ice over land, which then adds water to the ocean. The IPCC Fourth Assessment Report predicts that total global-average sea level rise from 1990 - 2100 will be 7 - 15 -inches for low emission scenarios and 10 - 23 inches for high emission scenarios. ]] +inches for low emission scenarios and 10 - 23 inches for high emission scenarios]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-level-rise-impact-of-6-meter-black/" @@ -108,7 +108,7 @@ asset.export(layer_6m) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset index f98f0c3ebd..95af9b4ab4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/6m_sea_level_rise-red.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Level Rise: Impact of 6 meter (red)" local Identifier = "noaa-sos-oceans-6m_sea_level_rise-red" -local Description = [[ There are many questions surrounding climate change. One big +local Description = [[There are many questions surrounding climate change. One big question is how the changing climate will affect the oceans. The sea level has been steadily rising since 1900 at a rate of 1 to 2.5 millimeters per year. In fact, since 1992 new methods of satellite altimetry using the TOPEX/Poseidon satellite indicate a @@ -16,7 +16,7 @@ mechanisms with respect to climate change. The first is the expansion of the sea the oceans warm due to an increasing global temperature. The second mechanism is the melting of ice over land, which then adds water to the ocean. The IPCC Fourth Assessment Report predicts that total global-average sea level rise from 1990 - 2100 will be 7 - -15 inches for low emission scenarios and 10 - 23 inches for high emission scenarios. ]] +15 inches for low emission scenarios and 10 - 23 inches for high emission scenarios]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-level-rise-impact-of-6-meter-red/" @@ -108,7 +108,7 @@ asset.export(layer_6m) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset index 7ca47aafb2..0c1bdcd81e 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Seal and Seabird Tracks: Pacific Ocean" local Identifier = "noaa-sos-oceans-animal_tracking" -local Description = [[ "TOPP, Tagging of the Pacific Predators, began in 2000 as one of -17 projects of the Census of Marine Life, an ambitios 10-year, 80-nation endeavor to -assess and explain the diversity and abundance of life in the oceans, and where that life -has lived, is living, and will live." - From TOPP website . Out of this came the Tagging -of the Pacific Pelagics Project. Pelagaics are open ocean species such as sea birds and -elephant seals. Scientists put satellite tags on animals that collect information about -position, ocean temperature, pressure, salinity and more! This allows scientists to -better understand the migration patterns and habits of these animals. ]] +local Description = [["TOPP, Tagging of the Pacific Predators, began in 2000 as one of + 17 projects of the Census of Marine Life, an ambitios 10-year, 80-nation endeavor to + assess and explain the diversity and abundance of life in the oceans, and where that + life has lived, is living, and will live." - From TOPP website . Out of this came the + Tagging of the Pacific Pelagics Project. Pelagaics are open ocean species such as sea + birds and elephant seals. Scientists put satellite tags on animals that collect + information about position, ocean temperature, pressure, salinity and more! This allows + scientists to better understand the migration patterns and habits of these animals]] local URL = "https://sos.noaa.gov/catalog/datasets/seal-and-seabird-tracks-pacific-ocean/" @@ -68,7 +68,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset index df5f378fec..2f463be979 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Float Tracks: Argo (buoy surface animation)" local Identifier = "noaa-sos-oceans-argo_buoy_tracks" -local Description = [[ "Argo is a global array of 3,000 free-drifting profiling floats +local Description = [["Argo is a global array of 3,000 free-drifting profiling floats that measures the temperature and salinity of the upper 2000 m of the ocean. This allows, for the first time, continuous monitoring of the temperature, salinity, and velocity of the upper ocean, with all data being relayed and made publicly available within hours @@ -12,7 +12,7 @@ Argo to capture a golden fleece. In the world of oceanography, Jason is a satell altimeter that allows scientists to measure the heights of the ocean surfaces. This worldwide buoy program was named Argo because the data from the Jason project and from this buoy project will be used together in computer models to help forecast ocean -climate. ]] +climate]] local URL = "https://sos.noaa.gov/catalog/datasets/float-tracks-argo-buoy-surface-animation/" @@ -64,7 +64,7 @@ asset.export(buoy) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset index b356232df7..518b4efbaf 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Float Tracks: Argo (buoy depths animation)" local Identifier = "noaa-sos-oceans-argo_buoy_waterfall" -local Description = [[ "Argo is a global array of 3,000 free-drifting profiling floats +local Description = [["Argo is a global array of 3,000 free-drifting profiling floats that measures the temperature and salinity of the upper 2000 m of the ocean. This allows, for the first time, continuous monitoring of the temperature, salinity, and velocity of the upper ocean, with all data being relayed and made publicly available within hours @@ -12,7 +12,7 @@ Argo to capture a golden fleece. In the world of oceanography, Jason is a satell altimeter that allows scientists to measure the heights of the ocean surfaces. This worldwide buoy program was named Argo because the data from the Jason project and from this buoy project will be used together in computer models to help forecast ocean -climate. ]] +climate]] local URL = "https://sos.noaa.gov/catalog/datasets/float-tracks-argo-buoy-depths-animation/" @@ -52,7 +52,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset index 7b4b286cd1..ee1e3ca130 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Turtle Track: Atlantic Ocean" local Identifier = "noaa-sos-oceans-atl_turtle" -local Description = [[ The Virginia Institute of Marine Science found a sub-adult +local Description = [[The Virginia Institute of Marine Science found a sub-adult juvenile loggerhead (Caretta caretta) sea turtle stranded off of Deltaville, Virginia along the western Chesapeake Bay in July 2004. The sea turtle, appropriately named Delta for the location where s/he was found stranded, had a broken left flipper and a severe @@ -12,7 +12,7 @@ the Virginia Aquarium Stranding Program for rehabilitation. After many months of and head surgery, Delta was ready for release in November of 2004. Before release, Delta was outfitted with a satellite tag by Kate Mansfield, then a Ph.D. student at the Virginia Institute of Marine Science (College of William and Mary). This was done in - order to track Delta's movements and determine the success of the recovery. ]] + order to track Delta's movements and determine the success of the recovery]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-turtle-track-atlantic-ocean/" @@ -58,7 +58,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset index af0ee015fe..db6d21fd01 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/buoy_locations.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Buoy and Float Locations" local Identifier = "noaa-sos-oceans-buoy_locations" -local Description = [[ Buoys and floats with the ability to collect data are scattered +local Description = [[Buoys and floats with the ability to collect data are scattered through out the world's oceans in order to gain a better understanding of how the oceans work and how they are changing. The data is being used for monitoring chemical levels in the oceans, garnering accurate ocean temperatures and change in temperature, and many other endless uses. Each dot on this visualization represents a buoy or float, and each color indicates the use of the instrument. The buoy network is still expanding past what -can be seen on this visualization. ]] +can be seen on this visualization]] local URL = "https://sos.noaa.gov/catalog/datasets/buoy-and-float-locations/" @@ -53,7 +53,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset index 4d9927e081..fa783aadf9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/catch_model.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Fisheries Catch Model - 2005 vs 2050" local Identifier = "noaa-sos-oceans-catch_model" -local Description = [[ Climate change may pose a significant threat to fisheries +local Description = [[Climate change may pose a significant threat to fisheries resources globally. This dataset shows percent change in global fisheries catch projected to occur by 2050 due to climate change. Comparison is made with fisheries catch levels reported in 2005. This study suggests that the distribution of major fish stocks will @@ -13,7 +13,7 @@ general pattern is a poleward shift in potential fisheries catches - that is fis distributions will shift to higher latitude areas (towards poles) and cooler waters as ocean temperatures increase. The study also predicts species extinction to occur in areas where species are most sensitive to temperature changes, resulting in reduced fisheries -catch in these areas. ]] +catch in these areas]] local URL = "https://sos.noaa.gov/catalog/datasets/fisheries-catch-model-2005-vs-2050/" @@ -57,7 +57,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset index 08850f73ba..69f103c5f8 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Biosphere: Marine Chlorophyll Concentration Model" local Identifier = "noaa-sos-oceans-chlorophyll_model" -local Description = [[ This animation shows the daily concentration of ocean surface +local Description = [[This animation shows the daily concentration of ocean surface chlorophyll as simulated by the Parallel Ocean Program (POP) with an embedded marine ecosystem model. While POP calculates the ocean currents, temperature and salinity, the ecosystem model simulates the complex interaction of microscopic marine plants @@ -12,7 +12,7 @@ nitrogen, phosphorus and iron). In addition to constituting a major part of the food web, phytoplankton remove carbon dioxide from the atmosphere via photosynthesis much like their counterparts on land. As conditions in the ocean and atmosphere change due to increased carbon emissions, it is important to be able to use these kinds of models to -understand the possible effects on life in the ocean and the global carbon cycle. ]] +understand the possible effects on life in the ocean and the global carbon cycle]] local URL = "https://sos.noaa.gov/catalog/datasets/biosphere-marine-chlorophyll-concentration-model/" @@ -66,7 +66,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset index e606d75f1b..882e3e07d5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/currents.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ocean Circulation (labeled currents)" local Identifier = "noaa-sos-oceans-currents" -local Description = [[ The ocean is not a still body of water. There is constant motion +local Description = [[The ocean is not a still body of water. There is constant motion in the ocean in the form of a global ocean conveyor belt due to thermohaline currents. These currents are density driven, which are affected by both temperature and salinity. Cold, salty water is dense and sinks to the bottom of the ocean while warm water is less @@ -16,7 +16,7 @@ transported north, the cooler water sinks and moves south to make room for the i warm water. This cold bottom water flows south of the equator all the way down to Antarctica. Eventually, the cold bottom waters are able to warm and rise to the surface, continuing the conveyor belt that encircles the global. It takes water almost 1000 years -to move through the whole conveyor belt. ]] +to move through the whole conveyor belt]] local URL = "https://sos.noaa.gov/catalog/datasets/ocean-circulation-labeled-currents/" @@ -60,7 +60,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset index 69b488be73..767101abf7 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/dart_buoy.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Buoy Locations (DART only)" local Identifier = "noaa-sos-oceans-dart_buoy" -local Description = [[ After the horrific events of the Indian Ocean Tsunami on December +local Description = [[After the horrific events of the Indian Ocean Tsunami on December 26, 2004, the need for a tsunami warning system was apparent. As part of the U.S. National Tsunami Hazard Mitigation Program (NTHMP), the Deep Ocean Assessment and Reporting of Tsunamis (DART) Project is an ongoing effort to maintain and improve the @@ -11,7 +11,7 @@ capability for the early detection and real-time reporting of tsunamis in the op Developed by NOAA's Pacific Marine Environmental Laboratory (PMEL) and operated by NOAA's National Data Buoy Center (NDBC), DART is essential to fulfilling NOAA's national responsibility for tsunami hazard mitigation and warnings. When completed in mid2007, the -DART Project will consist of 32 DART buoys. ]] +DART Project will consist of 32 DART buoys]] local URL = "https://sos.noaa.gov/catalog/datasets/buoy-locations-dart-only/" @@ -43,7 +43,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset index c649d8896a..19fa77d50c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Surface Currents and Temperature (gray land)" local Identifier = "noaa-sos-oceans-ecco2_sst-gray_land" -local Description = [[ To increase understanding and predictive capability for the +local Description = [[To increase understanding and predictive capability for the ocean's role in future climate change scenarios, the NASA Modeling, Analysis, and Prediction (MAP) program has created a project called Estimating the Circulation and Climate of the Ocean, Phase II (ECCO2): High-Resolution Global-Ocean and Sea-Ice Data @@ -14,7 +14,7 @@ syntheses are created by using the available satellite and in-situ data in the Massachusetts Institute of Technology General Circulation Model (MIT GCM). ECCO2 simulates ocean flows at all depths, but only surface flows are used in this visualization. The global sea surface current flows are colored by corresponding sea -surface temperatures. The sea surface temperature data is also from the ECCO2 model. ]] +surface temperatures. The sea surface temperature data is also from the ECCO2 model]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-currents-and-temperature-gray-land/" @@ -72,7 +72,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset index e6eed7449b..efa9e3e862 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Surface Currents and Temperature (vegetation on land)" local Identifier = "noaa-sos-oceans-ecco2_sst-veg_land" -local Description = [[ To increase understanding and predictive capability for the +local Description = [[To increase understanding and predictive capability for the ocean's role in future climate change scenarios, the NASA Modeling, Analysis, and Prediction (MAP) program has created a project called Estimating the Circulation and Climate of the Ocean, Phase II (ECCO2): High-Resolution Global-Ocean and Sea-Ice Data @@ -14,7 +14,7 @@ syntheses are created by using the available satellite and in-situ data in the Massachusetts Institute of Technology General Circulation Model (MIT GCM). ECCO2 simulates ocean flows at all depths, but only surface flows are used in this visualization. The global sea surface current flows are colored by corresponding sea -surface temperatures. The sea surface temperature data is also from the ECCO2 model. ]] +surface temperatures. The sea surface temperature data is also from the ECCO2 model]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-currents-and-temperature-vegetation-on-land/" @@ -74,7 +74,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset index d013f867e0..9979ec633a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/elnino.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "El Nino and La Nina Seasonal Impacts" local Identifier = "noaa-sos-oceans-elnino" -local Description = [[ El Nino is the warming of the Pacific Ocean off of the western +local Description = [[El Nino is the warming of the Pacific Ocean off of the western coast of South America near Ecuador and Peru. It is called El Nino, or little boy in Spanish, referring to the Christ child because the phenomena was originally noticed near Christmas time. The opposite of El Nino is La Nina, or little girl in Spanish, which is a @@ -11,7 +11,7 @@ cooling of the Pacific Ocean. Because the Earth system is interconnected, change ocean cause changes in the atmosphere. El Nino and La Nina events not only impact ocean temperatures in the tropical Pacific, but also global weather. The occurrence of El Nino and La Nina is not predictable, but on average occurs once every four year and usually -lasts for about 18 months. ]] +lasts for about 18 months]] local URL = "https://sos.noaa.gov/catalog/datasets/el-nino-and-la-nina-seasonal-impacts/" @@ -73,7 +73,7 @@ asset.export(layer_lanina_winter) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset index 91245e549b..6cc559aa7e 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Surface Temperature NOAA Model (black land)" local Identifier = "noaa-sos-oceans-gfdl_sst-black_background" -local Description = [[ This dataset shows how the global ocean's surface water +local Description = [[This dataset shows how the global ocean's surface water temperatures vary over the course of few years. In addition to seeing the effects of the seasonal cycle, the viewer can see how surface ocean currents and eddies transport heat and water around the globe. The images were generated not from observations, but from a state-of-the-art computer model of Earth's climate created at NOAA's Geophysical Fluid -Dynamics Laboratory (GFDL). ]] +Dynamics Laboratory (GFDL)]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-temperature-noaa-model-black-land/" @@ -68,7 +68,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset index d3393d6000..892ee8f4f6 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Surface Temperature NOAA Model (with vegetation)" local Identifier = "noaa-sos-oceans-gfdl_sst-land_background" -local Description = [[ This dataset shows how the global ocean's surface water +local Description = [[This dataset shows how the global ocean's surface water temperatures vary over the course of few years. In addition to seeing the effects of the seasonal cycle, the viewer can see how surface ocean currents and eddies transport heat and water around the globe. The images were generated not from observations, but from a state-of-the-art computer model of Earth's climate created at NOAA's Geophysical Fluid -Dynamics Laboratory (GFDL). ]] +Dynamics Laboratory (GFDL)]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-temperature-noaa-model-with-vegetation/" @@ -70,7 +70,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset index c370da29d7..a66869d94c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Greenland Melting Trends" local Identifier = "noaa-sos-oceans-greenland_melt" -local Description = [[ Changes in the climate around Greenland can have a world-wide +local Description = [[Changes in the climate around Greenland can have a world-wide effect. According to Dr. Konrad Steffen, professor of geography at the University of Colorado and director of the NOAA joint institute CIRES, "For every degree (F) increase in the mean annual temperature near Greenland, the rate of sea level rise increases by @@ -12,7 +12,7 @@ oceans. In order to study melting trends on Greenland, researchers at NASA devel "melt index" which is the number of days that melting occurred multiplied by the melting area. There is a steady increase in the melt index from 1988 through present. In fact, in 2006 Greenland experienced more days of melting snow and at higher altitudes than the -average over the past 18 years that have been studied. ]] +average over the past 18 years that have been studied]] local URL = "https://sos.noaa.gov/catalog/datasets/greenland-melting-trends/" @@ -58,7 +58,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset index aa5d96e225..1a9154ea70 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Japan Tsunami: Wave Heights - March 11, 2011" local Identifier = "noaa-sos-oceans-japan_tsunami" -local Description = [[ On March 11, 2011 at 2:45 local time, a 9.0 magnitude earthquake +local Description = [[On March 11, 2011 at 2:45 local time, a 9.0 magnitude earthquake occurred 81 miles (130 km) off the east coast of Sendai, Japan, triggering a massive tsunami. It is estimated that the initial tsunami wave took 10 to 30 minutes to make its first landfall. Forecasted wave heights were up to 33 ft (10 m) and there were many reports of tsunami waves three stories high in parts of Japan. Across the Pacific Ocean, many countries issued evacuations along the coasts because of the predicted tsunami -waves. ]] +waves]] local URL = "https://sos.noaa.gov/catalog/datasets/japan-tsunami-wave-heights-march-11-2011/" @@ -41,7 +41,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset index d475c106d7..f2ff4d92c6 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Japan Tsunami: Wave Propagation - March 11, 2011" local Identifier = "noaa-sos-oceans-japan_tsunami_waves" -local Description = [[ On March 11, 2011 at 2:45 p.m. local time, a 9.0 magnitude +local Description = [[On March 11, 2011 at 2:45 p.m. local time, a 9.0 magnitude earthquake occurred 81 miles (130 km) off the east coast of Sendai, Honshu, Japan, triggering a massive tsunami. A tsunami is a series of ocean waves generated by sudden displacements in the sea floor, landslides, or volcanic activity. In the deep ocean, the @@ -15,7 +15,7 @@ many countries issued evacuations along the coasts because of the predicted tsun waves. Propagation of the tsunami was computed with the NOAA forecast method using the MOST (Method of Splitting Tsunami) model with the tsunami source inferred from DART. Approximately 25 minutes after the earthquake, the tsunami was first recorded by one of -the DART buoys. ]] +the DART buoys]] local URL = "https://sos.noaa.gov/catalog/datasets/japan-tsunami-wave-propagation-march-11-2011/" @@ -55,7 +55,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset index 705944d456..9677cd371b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Loggerhead Sea Turtle Tracks" local Identifier = "noaa-sos-oceans-loggerheadseaturtletracks" -local Description = [[ Using satellite transmitting tags on wildlife allows scientists to +local Description = [[Using satellite transmitting tags on wildlife allows scientists to monitor the behaviors of the wildlife in their natural habitats. This dataset contains the tracks of juvenile loggerhead sea turtles that were tagged and monitored. Some of the turtles were caught on commercial fishing vessels north of Hawaii and the other turtles @@ -12,7 +12,7 @@ the turtles were released at various at-sea locations. The data used in this dat from 1997 through 2006. The animation represents a daily climatology showing the turtle daily movement, independent of the year. The background is a daily climatology of satellite remotely-sensed sea surface temperature. The size of the turtle graphic is -proportional to the turtle length. ]] +proportional to the turtle length]] local URL = "https://sos.noaa.gov/catalog/datasets/loggerhead-sea-turtle-tracks/" @@ -52,7 +52,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset index a2f63b138b..55228f1a1c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_impacts.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Human Influences on Marine Ecosystems" local Identifier = "noaa-sos-oceans-marine_impacts" -local Description = [[ The ocean has an impact on the lives of everyone on Earth, even +local Description = [[The ocean has an impact on the lives of everyone on Earth, even those who don't live on the coasts. It has been estimated that one in every six jobs in the United States is marine-related and that 50% of all species on Earth are supported by the ocean. Because of this, it is important to protect and preserve the oceans. Humans @@ -12,7 +12,7 @@ February 2008 found that 40% of the world's oceans are heavily impacted by human activities, such as overfishing and pollution. In all 17 different human activities were examined in the report, including fertilizer run-off, commercial shipping, and indirect activities such as changes in sea surface temperature, UV radiation, and ocean -acidification. ]] +acidification]] local URL = "https://sos.noaa.gov/catalog/datasets/human-influences-on-marine-ecosystems/" @@ -69,7 +69,7 @@ asset.export(colorbar_human_impact) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset index 82e101f63c..25f937eb54 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/marine_life_tracking.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Marine Life Tracks: Pacific Ocean" local Identifier = "noaa-sos-oceans-marine_life_tracking" -local Description = [[ This dataset contains the locations of a leatherback turtle, a +local Description = [[This dataset contains the locations of a leatherback turtle, a northern elephant seal, and two white sharks for each day over the course of several months. The data used was taken from topp.org (TOPP stands for Tagging of Pelagic Predators), a site that tracks marine animals in an attempt to learn more about them. TOPP's goal is to protect marine wildlife from overfishing, climate change, and various other threats. The purpose of this dataset is to serve as an example of a hand-made -animal tracking dataset. For a more extensive dataset using data from TOPP, go here. ]] +animal tracking dataset. For a more extensive dataset using data from TOPP, go here]] local URL = "https://sos.noaa.gov/catalog/datasets/marine-life-tracks-pacific-ocean/" @@ -53,7 +53,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset index 7ccfdf50ed..1c7c36214a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Turtle Track: Gulf of Mexico (94-7293)" local Identifier = "noaa-sos-oceans-mexico_turtles_947293" -local Description = [[ Three Kemp's ridley sea turtles were captured near the Calcasieu +local Description = [[Three Kemp's ridley sea turtles were captured near the Calcasieu Pass jetties at Cameron, Louisiana and tracked by National Oceanographic and Atmospheric Administration's (NOAA) National Marine Fisheries Service Galveston Laboratory. Two adult females (94-7293 and 94-7295) were captured on 11 August 1994 in a turtle entanglement @@ -11,7 +11,7 @@ net by Texas A&M University biologists. Turtle 94-7293's shell measured 65.6 cm and 64.9 cm in width, and weighed 84.4 pounds (38.3 kg). Turtle 94-7295's shell measured 65.8 cm in length and 64.9 cm in width, and weighed 93.9 pounds (42.6 kg). Both were fitted with Telonics ST-10 satellite transmitters and released within 2 days at the -capture site. ]] +capture site]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-turtle-track-gulf-of-mexico-94-7293/" @@ -57,7 +57,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset index 200c480009..7ae4d6714c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Turtle Track: Gulf of Mexico (94-8002)" local Identifier = "noaa-sos-oceans-mexico_turtles_958002" -local Description = [[ These three Kemp's ridley sea turtles were captured near the +local Description = [[These three Kemp's ridley sea turtles were captured near the Calcasieu Pass jetties at Cameron, Louisiana and tracked by National Oceanographic and Atmospheric Administration's (NOAA) National Marine Fisheries Service Galveston Laboratory. Two adult females (94-7293 and 94-7295) were captured on 11 August 1994 in a @@ -11,7 +11,7 @@ turtle entanglement net by Texas A&M University biologists. Turtle 94-7293's she measured 65.6 cm in length and 64.9 cm in width, and weighed 84.4 pounds (38.3 kg). Turtle 94-7295's shell measured 65.8 cm in length and 64.9 cm in width, and weighed 93.9 pounds (42.6 kg). Both were fitted with Telonics ST-10 satellite transmitters and -released within 2 days at the capture site. ]] +released within 2 days at the capture site]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-turtle-track-gulf-of-mexico-94-8002/" @@ -57,7 +57,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset index b495283c22..234770f176 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Surface Temperature Observations - 2002 - 2006" local Identifier = "noaa-sos-oceans-modis_sst" -local Description = [[ Sea surface temperature, much like the atmosphere's temperature, +local Description = [[Sea surface temperature, much like the atmosphere's temperature, is constantly changing. The interaction between the ocean and the atmosphere is one that scientists are constantly researching, especially in light of climate change. Water warms up and cools down at a slower rate than air, so diurnal variations (heating during the day and cooling during the night) seen in the atmosphere are hard to observe in the ocean. The seasons, however, can be seen as the warmest water near the equator expands toward the United States during the summer months and withdraws again during the winter -months. ]] +months]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-temperature-observations-2002-2006/" @@ -50,7 +50,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset index b0d8dd4d8e..cb848aff22 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Surface Currents" local Identifier = "noaa-sos-oceans-nasa_speed" -local Description = [[ The water in the ocean is constantly moving. Ocean currents are +local Description = [[The water in the ocean is constantly moving. Ocean currents are typically driven by surface wind and can have a huge impact on climate. Northwest Europe is moderately temperate considering its latitude because the Gulf Stream off of the eastern coast of the United States transports warm water north to those areas. In fact, the Atlantic Ocean along the U.S. coast is much warmer than the Pacific Ocean along the U.S. coast because of the warm water transported in the Gulf Stream. In this visualization, a model created by NASA, the color variations denote speed. The lighter -green areas are moving faster than the blue areas. ]] +green areas are moving faster than the blue areas]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-currents/" @@ -50,7 +50,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset index 14aee5b2c3..b727ad7534 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Surface Temperature Model" local Identifier = "noaa-sos-oceans-nasa_sst" -local Description = [[ " Sea surface temperature plays a vital role in the behavior of +local Description = [["Sea surface temperature plays a vital role in the behavior of the Earth's climate and weather. It is both a causal factor and a resulting effect of complex interactions of natural forces on Earth. NASA not only measures sea surface temperature from space using powerful scientific instruments, but it also studies temperature processes in advanced computer models." -Gretchen Cook-Anderson, Goddard -Space Flight Center. ]] +Space Flight Center]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-temperature-model/" @@ -48,7 +48,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset index c4a29120cb..c9ebcdbdb9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ocean-Atmosphere CO2 Exchange" local Identifier = "noaa-sos-oceans-ocean_acid-co2_flux" -local Description = [[ When carbon dioxide CO2 is released into the atmosphere from the +local Description = [[When carbon dioxide CO2 is released into the atmosphere from the burning of fossil fuels, approximately 50% remains in the atmosphere, while 25% is absorbed by land plants and trees, and the other 25% is absorbed into certain areas of the ocean. In other areas of the ocean, where the concentration of CO2 is higher in the -water than in atmosphere above, CO2 is released to the atmosphere. ]] +water than in atmosphere above, CO2 is released to the atmosphere]] local URL = "https://sos.noaa.gov/catalog/datasets/ocean-atmosphere-co2-exchange/" @@ -66,7 +66,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset index c6a0939d88..966cedc7e5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ocean Acidification: Surface pH" local Identifier = "noaa-sos-oceans-ocean_acid-ph" -local Description = [[ Ranging from 0 to 14, pH is a scale that describes the acid and +local Description = [[Ranging from 0 to 14, pH is a scale that describes the acid and base properties of a solution. The ocean's surface has an average pH of around 8.1, which is slightly basic. The pH of the open ocean is relatively stable in both time and space; however, the uptake of CO2 by the ocean has caused measurable changes in seawater. The imagery here shows the output of a computer model that makes predictions of how the pH will change over time based on best estimates of likely CO2 emissions (RCP 8.5) used in the United Nations Intergovernmental Panel on Climate Change's AR5 assessment. The -dataset starts in 1861 and runs through 2100. ]] +dataset starts in 1861 and runs through 2100]] local URL = "https://sos.noaa.gov/catalog/datasets/ocean-acidification-surface-ph/" @@ -68,7 +68,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset index 3138c61ec2..fc2ad6594e 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ocean Acidification: Saturation State" local Identifier = "noaa-sos-oceans-ocean_acid-saturation" -local Description = [[ Ocean acidification is an often overlooked consequence of +local Description = [[Ocean acidification is an often overlooked consequence of humankind's release of carbon dioxide emissions into the atmosphere from fossil fuel burning. Excess carbon dioxide enters the ocean and reacts with water to form carbonic acid, which decreases ocean pH (i.e., makes seawater less basic), and lowers carbonate @@ -15,7 +15,7 @@ reproduce less successfully, or leave an area. Other organisms such as seagrass plankton species may do better in oceans affected by ocean acidification because they use carbon dioxide to photosynthesize, but do not require carbonate ions to survive. Ocean ecosystem diversity and ecosystem services may therefore change dramatically from ocean -acidification. ]] +acidification]] local URL = "https://sos.noaa.gov/catalog/datasets/ocean-acidification-saturation-state/" @@ -83,7 +83,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset index a7222d6a56..755f678518 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ocean Temperature at Depth - Seasonal" local Identifier = "noaa-sos-oceans-ocean_depths_temp" -local Description = [[ Though satellites provide highly detailed analyses of the +local Description = [[Though satellites provide highly detailed analyses of the temperature of the ocean surface, they cannot measure temperatures below the first 1 mm of water. For that deeper understanding, NOAA relies on thousands of buoys, ships, undersea gliders and other devices to measure temperatures at depth. The measurements are consolidated every few years by the National Oceanographic Data Center into a product known as the World Ocean Atlas. The measurements shown here go as deep as 5,000 m — far deeper than many places in the ocean — which is why there is a lack of data (black areas) -in some of the deeper imagery. ]] +in some of the deeper imagery]] local URL = "https://sos.noaa.gov/catalog/datasets/ocean-temperature-at-depth-seasonal/" @@ -76,7 +76,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset index 695f1dead5..07bdeef944 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ocean Drain (with gray bathymetry)" local Identifier = "noaa-sos-oceans-ocean_drain-gray" -local Description = [[ Beneath the sea surface is an amazing sea floor that contains +local Description = [[Beneath the sea surface is an amazing sea floor that contains mountain ranges, trenches and plains. The ocean covers 71% of the Earth's surface, has an area of 139,400,000 square miles and an average depth of 2.3 miles. Due to this vast size, only a few percent the sea floor has been mapped by ships. Maps of the sea floor are created by combining soundings from ships, sonar scans from ships, and gravity -anomalies in the sea surface detected by satellites. ]] +anomalies in the sea surface detected by satellites]] local URL = "https://sos.noaa.gov/catalog/datasets/ocean-drain-with-gray-bathymetry/" @@ -48,7 +48,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset index c2d428e604..3f12fdec93 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Turtle Track: Pacific Ocean" local Identifier = "noaa-sos-oceans-pac_turtle" -local Description = [[ It is common for scientists to tag animals and release them into +local Description = [[It is common for scientists to tag animals and release them into their natural environment in order to study their behaviors and migration. Adelita, a loggerhead (Caretta caretta) sea turtle, was originally captured off of Baja, Mexico as an 8-pound juvenile. After being raised in captivity, Adelita was released on August 10, 1996 from Santa Rosaliita, a small town in Mexico on the Baja Peninsula. Adelita weighed 223 pounds when she was released. Before she was released, Wallace J. Nichols, then a - Ph.D. student at the University of Arizona, outfitted Adelita with a satellite tag. The - tag transmitted a signal that allowed Adelita's track to be monitored post-release. ]] +Ph.D. student at the University of Arizona, outfitted Adelita with a satellite tag. The +tag transmitted a signal that allowed Adelita's track to be monitored post-release]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-turtle-track-pacific-ocean/" @@ -56,7 +56,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset index ca35f0a57c..af5fded59d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Phytoplankton Model" local Identifier = "noaa-sos-oceans-phytoplankton" -local Description = [[ Phytoplankton are the base of the marine food web and are crucial +local Description = [[Phytoplankton are the base of the marine food web and are crucial players in the Earth's carbon cycle. They are also incredibly diverse. This visualization shows dominant phytoplankton types from 1994-1998 generated by the Darwin Project using a high-resolution ocean and ecosystem model. The model contains flow fields from 1994-1999 @@ -14,7 +14,7 @@ to uptake nutrients. Red represents diatoms (big phytoplankton, which need silic yellow represents flagellates (other big phytoplankton), green represents prochlorococcus (small phytoplankton that cannot use nitrate), and cyan represents synechococcus (other small phytoplankton). Opacity indicates concentration of the phytoplankton as carbon -biomass. ]] +biomass]] local URL = "https://sos.noaa.gov/catalog/datasets/phytoplankton-model/" @@ -72,7 +72,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset index 4df07ef217..d4e0c9b4d4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Puerto Rico Hypothetical Tsunami" local Identifier = "noaa-sos-oceans-pr_tsunami" -local Description = [[ After the devastation of the Indian Ocean Tsunami on December 26, +local Description = [[After the devastation of the Indian Ocean Tsunami on December 26, 2004, much attention has been given to tsunami research. The National Center for Tsunami Research, which is part of the Pacific Marine Environmental Laboratory, spearheaded the research efforts in the United States. A tsunami is a series of waves generated when a @@ -11,7 +11,7 @@ body of water, such as the ocean, is rapidly displaced on a massive scale. This likely to happen where the tectonic plates meet and create trenches. An earthquake in these regions can cause one plate to subduct under another and displace huge amounts of water. One location that has garnered much attention from scientists is the Puerto Rico -Trench, the deepest location in the Atlantic Ocean. ]] +Trench, the deepest location in the Atlantic Ocean]] local URL = "https://sos.noaa.gov/catalog/datasets/puerto-rico-hypothetical-tsunami/" @@ -51,7 +51,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset index 10adb3332f..5c9c6213a2 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/reefs_risk.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Coral Reef Risk Outlook" local Identifier = "noaa-sos-oceans-reefs_risk" -local Description = [[ From tourism to disease prevention, it's clear that reefs offer +local Description = [[From tourism to disease prevention, it's clear that reefs offer much more than recreation. According to the newly released Reefs at Risk Revisited report, coral reefs: @@ -19,7 +19,7 @@ pressures pose the most immediate threat - especially from overfishing and destr fishing, which is particularly widespread in Southeast Asia. Global threats from climate change and alterations in ocean chemistry (i.e. ocean acidification) are compounding the pressures on reefs. Climate change is causing ocean temperatures to rise, which, in turn, -is leading to wide-spread coral bleaching. ]] +is leading to wide-spread coral bleaching]] local URL = "https://sos.noaa.gov/catalog/datasets/coral-reef-risk-outlook/" @@ -84,7 +84,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset index 4e7aa0eaae..a8ba4c4b46 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Level Rise: 10m Increments" local Identifier = "noaa-sos-oceans-sea_level" -local Description = [[ There are many questions surrounding climate change. One big +local Description = [[There are many questions surrounding climate change. One big question is how the changing climate will affect the oceans. The sea level has been steadily rising since 1900 at a rate of 1 to 2.5 millimeters per year. In fact, since 1992 new methods of satellite altimetry using the TOPEX/Poseidon satellite indicate a @@ -16,7 +16,7 @@ mechanisms with respect to climate change. The first is the expansion of the sea the oceans warm due to an increasing global temperature. The second mechanism is the melting of ice over land, which then adds water to the ocean. The IPCC Fourth Assessment Report predicts that total global-average sea level rise from 1990 - 2100 will be 7 - 15 -inches for low emission scenarios and 10 - 23 inches for high emission scenarios. ]] +inches for low emission scenarios and 10 - 23 inches for high emission scenarios]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-level-rise-10m-increments/" @@ -56,7 +56,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset index d9c8e89878..8246d353e8 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level_trends.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Level Trends - 1993 - 2012" local Identifier = "noaa-sos-oceans-sea_level_trends" -local Description = [[ There are many questions surrounding climate change. One big +local Description = [[There are many questions surrounding climate change. One big question is how the changing climate will affect the oceans. The sea level has been steadily rising since 1900 at a rate of 1 to 2.5 millimeters per year. In fact, since 1992 new methods of satellite altimetry using the TOPEX/Poseidon satellite indicate a @@ -17,7 +17,7 @@ the oceans warm due to an increasing global temperature. The second mechanism is melting of ice over land, which then adds water to the ocean. The IPCC Fourth Assessment Report predicts that total global-average sea level rise from 1990 - 2100 will be 7 - 15 inches (177 - 381 mm) for low emission scenarios and 10 - 23 inches (254 - 584 mm) for -high emission scenarios. ]] +high emission scenarios]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-level-trends-1993-2012/" @@ -62,7 +62,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset index 1187e8c627..797038de4a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Surface Height Anomaly" local Identifier = "noaa-sos-oceans-sea_surface_height_anomaly" -local Description = [[ To gather long-term information about the world's oceans and +local Description = [[To gather long-term information about the world's oceans and currents, satellite instruments make extremely precise measurements of the height of the ocean surface above the center of the Earth, a measurement commonly called sea level. These data are combined to reveal the ocean surface topography (not to be confused with @@ -11,7 +11,7 @@ bathymetry, which is the relief on the bottom of the ocean). Sea surface height interest to scientists because it reveals information about how much heat is stored in the ocean. Warm water is less dense than cold water, so higher areas tend to be warmer than lower areas. Radar altimeter instruments onboard spacecraft have been continuously -collecting sea surface height data over the global ocean for almost two decades. ]] +collecting sea surface height data over the global ocean for almost two decades]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-height-anomaly/" @@ -66,7 +66,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset index 7c00ef3d7e..500cb07b7d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset @@ -3,14 +3,14 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Ice Extent (Arctic only) - 1850 - Present" local Identifier = "noaa-sos-oceans-seaice_monthly" -local Description = [[ Arctic sea ice extent is declining at a rapid rate; the extent in +local Description = [[Arctic sea ice extent is declining at a rapid rate; the extent in September, 2019 was about 30% lower than the average September extent over 1980-2010. Sea ice in both hemispheres can be easily monitored now, with data from a series of satellites that have been operating since the late 1970s. Every year, NOAA publishes the Arctic Report Card. In it, scientists summarize how sea ice, along with snow cover, tundra greenness, marine algae, caribou, and other indicators of change are responding to warming that is taking place about two times faster in the Arctic than elsewhere on the -planet. ]] +planet]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-ice-extent-arctic-only-1850-present/" @@ -56,7 +56,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset index 2b373ea854..2cd8e3dc98 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_radiation.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Ice: Fraction and Solar Radiation Absorption" local Identifier = "noaa-sos-oceans-seaice_radiation" -local Description = [[ While sea ice is mostly white and reflects the sun's rays, ocean +local Description = [[While sea ice is mostly white and reflects the sun's rays, ocean water is dark and absorbs the sun's energy at a higher rate. A decline in the region's albedo - its reflectivity, in effect - has been a key concern among scientists since the summer Arctic sea ice cover began shrinking in recent decades. As more of the sun's energy is absorbed by the climate system, it enhances ongoing warming in the region, -which is more pronounced than anywhere else on the planet. ]] +which is more pronounced than anywhere else on the planet]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-ice-fraction-and-solar-radiation-absorption/" @@ -50,7 +50,7 @@ asset.export(layer_solar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset index b0a7cc7c73..77bb313c6b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Biosphere: Marine Chlorophyll Concentration" local Identifier = "noaa-sos-oceans-seawifs-land_background" -local Description = [[ The term biosphere refers to the regions of the surface, +local Description = [[The term biosphere refers to the regions of the surface, atmosphere, and hydrosphere of the earth occupied by living organisms.This dataset shows -quantity of marine plant-life as it changes throughout the seasons of the year. ]] +quantity of marine plant-life as it changes throughout the seasons of the year]] local URL = "https://sos.noaa.gov/catalog/datasets/biosphere-marine-chlorophyll-concentration/" @@ -57,7 +57,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset index af079a3d04..aa69e5657b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Biosphere: Marine Chlorophyll Concentration and Land Vegetation (with CO2 labels)" local Identifier = "noaa-sos-oceans-seawifs-no_holes" -local Description = [[ The term biosphere refers to the regions of the surface, +local Description = [[The term biosphere refers to the regions of the surface, atmosphere, and hydrosphere of the earth occupied by living organisms.This dataset shows quantity of marine and land-based plant-life as it changes throughout the seasons of the -year. ]] +year]] local URL = "https://sos.noaa.gov/catalog/datasets/biosphere-marine-chlorophyll-concentration-and-land-vegetation-with-co2-labels/" @@ -58,7 +58,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset index 4edbacf3d5..9ef194cff8 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Biosphere: Marine Chlorophyll Concentration and Land Vegetation" local Identifier = "noaa-sos-oceans-seawifs-polar_holes" -local Description = [[ The term biosphere refers to the regions of the surface, +local Description = [[The term biosphere refers to the regions of the surface, atmosphere, and hydrosphere of the earth occupied by living organisms.This dataset shows quantity of marine and land-based plant-life as it changes throughout the seasons of the -year. ]] +year]] local URL = "https://sos.noaa.gov/catalog/datasets/biosphere-marine-chlorophyll-concentration-and-land-vegetation/" @@ -58,7 +58,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset index ee2886ddec..ec87b9d70c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Great White Shark Track" local Identifier = "noaa-sos-oceans-shark" -local Description = [[ Before satellite tagging technology became feasible, it was +local Description = [[Before satellite tagging technology became feasible, it was thought that great white sharks (Carcharodon carcharias), spent most of their time close to the coasts feeding on seals and sea lions. With the advent of satellite tagging technology, many new behaviors of the great white shark have been discovered. By tagging @@ -11,7 +11,7 @@ a shark with a satellite transmitter, scientists are able to track the movement shark for extended periods. In 2001, a shark tagged off of the coast of California was tracked all the way to Hawaii, 3,800 km (2,280 miles) away. The shark spent the winter there before returning to waters closer to California. Several other sharks tagged off -the coast of California also were tracked traveling great distances from California. ]] +the coast of California also were tracked traveling great distances from California]] local URL = "https://sos.noaa.gov/catalog/datasets/great-white-shark-track/" @@ -57,7 +57,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset index 5563c5c108..20ac869d62 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-mosaic.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ship Multibeam Bathymetric Surveys Mosaic" local Identifier = "noaa-sos-oceans-ship_tracks-mosaic" -local Description = [[ Beneath the sea surface is an amazing sea floor that contains +local Description = [[Beneath the sea surface is an amazing sea floor that contains mountain ranges, trenches and plains. The ocean covers 71% of the Earth's surface, has an area of 139,400,000 square miles and an average depth of 2.3 miles. The first measurements of the sea floor were made with weighted lines that were lowered until they @@ -17,7 +17,7 @@ how long it takes the beams to return to the ship after bouncing off the sea flo the speed of sound in water is known for the full water column, then the depth of the sea floor can be calculated from the travel time. Multiple beams are sent out in a fan shape to collect depth information in a swath beneath the boat as it travels through the -ocean. ]] +ocean]] local URL = "https://sos.noaa.gov/catalog/datasets/ship-multibeam-bathymetric-surveys-mosaic/" @@ -61,7 +61,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset index 915231716f..58ee67280f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ship_tracks-tracks.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ship Tracklines of Multibeam Bathymetric Surveys" local Identifier = "noaa-sos-oceans-ship_tracks-tracks" -local Description = [[ Beneath the sea surface is an amazing sea floor that contains +local Description = [[Beneath the sea surface is an amazing sea floor that contains mountain ranges, trenches and plains. The ocean covers 71% of the Earth's surface, has an area of 139,400,000 square miles and an average depth of 2.3 miles. The first measurements of the sea floor were made with weighted lines that were lowered until they @@ -17,7 +17,7 @@ how long it takes the beams to return to the ship after bouncing off the sea flo the speed of sound in water is known for the full water column, then the depth of the sea floor can be calculated from the travel time. Multiple beams are sent out in a fan shape to collect depth information in a swath beneath the boat as it travels through the -ocean. ]] +ocean]] local URL = "https://sos.noaa.gov/catalog/datasets/ship-tracklines-of-multibeam-bathymetric-surveys/" @@ -61,7 +61,7 @@ asset.export(legend) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset index 61e0b05366..6c5972b9c0 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shipping.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Shipping Routes (with labels) - One Year" local Identifier = "noaa-sos-oceans-shipping" -local Description = [[ There were more than 30,000 merchant ships greater than 1000 gross +local Description = [[There were more than 30,000 merchant ships greater than 1000 gross tonnage at sea in 2005. The World Meteorological Organization has a Voluntary Observing Ships Scheme that equips ships with weather instruments in order to provide observations for weather models and forecasters. In addition to observing the weather, the location of @@ -12,7 +12,7 @@ the ships is also recorded through GPS. From October 2004 through October of 200 vessels, which is about 11% of all ships at sea in 2005. By connecting the data points for each vessel, shipping routes over the course of one year were plotted. The National Center for Ecological Analysis and Synthesis compiled this data to include in their -Global Map of Human Impacts to Marine Ecosystems. ]] +Global Map of Human Impacts to Marine Ecosystems]] local URL = "https://sos.noaa.gov/catalog/datasets/shipping-routes-with-labels-one-year/" @@ -44,7 +44,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset index e670103f56..b332726150 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/species_richness.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Fisheries Species Richness" local Identifier = "noaa-sos-oceans-species_richness" -local Description = [[ pecies richness is a count of the number of different species in +local Description = [[Species richness is a count of the number of different species in an ecological community, landscape or region. Species richness is one of several measurements used by scientists to help determine how biologically rich and diverse a given area is. This map shows the predicted global distribution of 1066 commercially @@ -15,7 +15,7 @@ the coasts. These coastal areas are also where we find our largest marine ecosys such as coral reefs, mangroves and marshes, which provide food and shelter for economically, culturally, and ecologically important marine species. This stresses the importance of protecting critical habitat along our coasts for marine life and -fisheries. ]] +fisheries]] local URL = "https://sos.noaa.gov/catalog/datasets/fisheries-species-richness/" @@ -60,7 +60,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset index 246a085805..7c71415b28 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Surface Salinity" local Identifier = "noaa-sos-oceans-sss" -local Description = [[ Processes that took place through Earth's history, such as the +local Description = [[Processes that took place through Earth's history, such as the weathering of rocks, evaporation of ocean water, and the formation of sea ice, have made the ocean salty. Those are still at work today and are counterbalanced by processes that decrease the salt in the ocean, like freshwater input from rivers, precipitation, and the melting of ice. The result is an ocean surface where the salinity - the concentration of salt - changes and these changes, small as they may be, have large-scale effects on -Earth's water cycle and ocean circulation. ]] +Earth's water cycle and ocean circulation]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-salinity/" @@ -61,7 +61,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset index 3224cd26c8..08b1be9618 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Surface Temperature Anomalies - 1980 - 1999" local Identifier = "noaa-sos-oceans-sst_1980_1999" -local Description = [[ Rather than plotting sea surface temperatures, sea surface +local Description = [[Rather than plotting sea surface temperatures, sea surface temperature anomalies have been plotted here to show the dramatic departures from normal that are associated with El Nino and La Nina from 1980 - 1999. El Nino is the warming of the Pacific Ocean off of the western coast of South America near Ecuador and Peru. It is @@ -11,7 +11,7 @@ called El Nino, or little boy in Spanish, referring to the Christ child because phenomena usually occurs near Christmas time. The opposite of El Nino is La Nina, or little girl in Spanish, which is a cooling of the Pacific Ocean. The red shading signifies a warming of the ocean by 5-10°F, the green shading is normal and the blue -shading is a cooling of the ocean by 5-10°F. ]] +shading is a cooling of the ocean by 5-10°F]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-surface-temperature-anomalies-1980-1999/" @@ -57,7 +57,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset index 58167e4d13..e659b6b5dd 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-alaska.asset @@ -3,25 +3,25 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Tsunami Historical Series: Alaska - 1964" local Identifier = "noaa-sos-oceans-tsunami_historical_series-alaska" -local Description = [[ At 5:36 pm on Friday, March 27, 1964 (28 March, 03:36Z UTC) the +local Description = [[At 5:36 pm on Friday, March 27, 1964 (28 March, 03:36Z UTC) the largest earthquake ever measured in North America, and the second-largest recorded anywhere, struck 40 miles west of Valdez, Alaska in Prince William Sound with a moment magnitude we now know to be 9.2. Almost an hour and a half later the Honolulu Magnetic and Seismic Observatory (later renamed the Pacific Tsunami Warning Center, or PTWC) was -able to issue its first “tidal wave advisory” that noted that a tsunami was possible and +able to issue its first "tidal wave advisory" that noted that a tsunami was possible and that it could arrive in the Hawaiian Islands five hours later. Upon learning of a tsunami observation in Kodiak Island, Alaska, an hour and a half later the Honolulu Observatory -issued a formal “tidal wave/seismic sea-wave warning” cautioning that damage was possible +issued a formal "tidal wave/seismic sea-wave warning" cautioning that damage was possible in Hawaii and throughout the Pacific Ocean but that it was not possible to predict the intensity of the tsunami. The earthquake did in fact generate a tsunami that killed 124 people (106 in Alaska, 13 in California, and 5 in Oregon) and caused about $2.3 billion (2016 dollars) in property loss all along the Pacific coast of North America from Alaska to southern California and in Hawaii. The greatest wave heights were in Alaska at over 67 m or 220 ft. and waves almost 10 m or 32 ft high struck British Columbia, Canada. In -the “lower 48” waves as high as 4.5 m or 15 ft. struck Washington, as high as 3.7 m or +the "lower 48" waves as high as 4.5 m or 15 ft. struck Washington, as high as 3.7 m or 12 ft. struck Oregon, and as high as 4.8 m or over 15 ft. struck California. Waves of similar size struck Hawaii at nearly 5 m or over 16 ft. high. Waves over 1 m or 3 ft. -high also struck Mexico, Chile, and even New Zealand. ]] +high also struck Mexico, Chile, and even New Zealand]] local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-alaska-1964/" @@ -84,7 +84,7 @@ asset.export(layer_null) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset index 697318282b..362108fa59 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Tsunami Historical Series: Aleutian Islands - 1946" local Identifier = "noaa-sos-oceans-tsunami_historical_series-aleutians" -local Description = [[ On April 1, 1946 at 4:28 am (12:28 UTC), an 8.6 moment magnitude +local Description = [[On April 1, 1946 at 4:28 am (12:28 UTC), an 8.6 moment magnitude earthquake struck off the coast of Unimak Island in Alaska's Aleutian Islands, generating a tsunami that caused the greatest damage and number of deaths in Hawaii's history, leading to the creation of the United States' first tsunami warning system. As @@ -18,7 +18,7 @@ Fernandez Islands got nearly 3 m or 9 ft. high waves. Pitcairn Island also had 5 ft. high waves, New Zealand had over 2 m or 8 ft. high waves, and Samoa had over 1 m or about 4 ft. high waves. In North America the highest waves were in California at over 2 m or over 8 ft. and killed one person there and in South America it killed one more person -in Peru. ]] +in Peru]] local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-aleutian-islands-1946/" @@ -82,7 +82,7 @@ asset.export(layer_null) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset index bdb9e7209e..10ef41ea40 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-aleutians_1957.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Tsunami Historical Series: Aleutian Islands - 1957" local Identifier = "noaa-sos-oceans-tsunami_historical_series-aleutians_1957" -local Description = [[ At 4:22 am on Saturday, March 9, 1957 (9 March, 14:22 Z UTC) the +local Description = [[At 4:22 am on Saturday, March 9, 1957 (9 March, 14:22 Z UTC) the second great earthquake in 11 years struck Alaska's Aleutian Islands. This earthquake had the same magnitude of the earlier earthquake--8.6 on the moment magnitude scale (Johnson et al. 1994)--but was to the west of the 1946 earthquake, near the Andreanof Islands. As @@ -19,7 +19,7 @@ would reach heights of 6 m or 20 ft. in the Marquesas Islands (French Polynesia) Chile. Unlike the earlier event, however, it did not kill any people thanks to effective tsunami alerts from to the Honolulu Observatory and the Seismic Sea Wave Warning System. These efforts, established in 1948, would later become the Pacific Tsunami Warning Center -(PTWC) and Pacific Tsunami Warning System. ]] +(PTWC) and Pacific Tsunami Warning System]] local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-aleutian-islands-1957/" @@ -83,7 +83,7 @@ asset.export(layer_null) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset index 0584e796fe..578adc305e 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-cascadia.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Tsunami Historical Series: Cascadia - 1700" local Identifier = "noaa-sos-oceans-tsunami_historical_series-cascadia" -local Description = [[ Just before midnight on January 27, 1700 a tsunami struck the +local Description = [[Just before midnight on January 27, 1700 a tsunami struck the coasts of Japan without warning since no one in Japan felt the earthquake that must have caused it. Nearly 300 years later scientists and historians in Japan and the United States solved the mystery of what caused this "orphan tsunami" through careful analysis @@ -21,7 +21,7 @@ the Great Alaska Earthquake of 1964. Such an earthquake would have ruptured the along the entire length of the 1000 km (~600 mi) long fault of the Cascadia Subduction Zone and severe shaking could have lasted for 5 minutes or longer. Its tsunami would cross the Pacific Ocean and reach Japan in about 9 hours, so the earthquake must have -occurred around 9:00 at night in Cascadia on January 26, 1700 (05:00 January 27 UTC). ]] +occurred around 9:00 at night in Cascadia on January 26, 1700 (05:00 January 27 UTC)]] local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-cascadia-1700/" @@ -84,7 +84,7 @@ asset.export(layer_null) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset index 1b8b2461b1..41e45bd71f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-chile.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Tsunami Historical Series: Chile - 2010" local Identifier = "noaa-sos-oceans-tsunami_historical_series-chile" -local Description = [[ At 3:34 on the morning of February 27, 2010 (06:34 UTC), an 8.8 +local Description = [[At 3:34 on the morning of February 27, 2010 (06:34 UTC), an 8.8 moment magnitude earthquake struck near the coastline of central Chile. The Pacific Tsunami Warning Center (PTWC) quickly determined that the large magnitude of this earthquake, its location near the coastline, its relatively shallow depth within the @@ -23,7 +23,7 @@ high as 29 m or 95 ft. on the mainland, over 18 m or 60 ft. in its Juan Fernande Islands, and over 4 m or 14 ft. at Rapa Nui (Easter Island). Outside of Chile tsunami wave heights exceeded 1 m or 3 ft. in the Marquesas Islands (French Polynesia), New Zealand, the Kuril Islands (Russia), and in the United States in California and Hawaii, -and caused minor damage in San Diego, California and in Japan. ]] +and caused minor damage in San Diego, California and in Japan]] local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-chile-2010/" @@ -86,7 +86,7 @@ asset.export(layer_null) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset index 614baeafc8..7c3f652865 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-japan.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Tsunami Historical Series: Japan - 2011" local Identifier = "noaa-sos-oceans-tsunami_historical_series-japan" -local Description = [[ At 14:46 in the afternoon of March 11, 2011 (05:46 UTC), a 9.0 +local Description = [[At 14:46 in the afternoon of March 11, 2011 (05:46 UTC), a 9.0 moment magnitude earthquake struck near the coastline of Honshu, Japan. The Pacific Tsunami Warning Center (PTWC) quickly determined that the very large magnitude of this earthquake, its offshore location, its relatively shallow depth within the earth, and a @@ -28,7 +28,7 @@ Islands (French Polynesia), Mexico, Papua New Guinea, and Peru. In the United St tsunami rose to more than 5 m or 16 ft. in Hawaii, more than 2 m or 6.5 ft in California and Oregon, and more than 1 m or 3 ft. in the U.S. island territories of Midway and Saipan (Northern Mariana Islands). The tsunami also killed one person in Crescent City, -California. ]] +California]] local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-japan-2011/" @@ -91,7 +91,7 @@ asset.export(layer_null) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset index 637b30283b..34808ea567 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-lisbon.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Tsunami Historical Series: Lisbon - 1755" local Identifier = "noaa-sos-oceans-tsunami_historical_series-lisbon" -local Description = [[ On the morning of November 1, 1755, a great earthquake shook +local Description = [[On the morning of November 1, 1755, a great earthquake shook Portugal's capital city of Lisbon as worshipers filled churches and cathedrals for the All Saints' Day Mass. In seconds it left the city in ruins and in minutes those ruins were on fire. The earthquake probably killed about 30,000 people, though some estimates @@ -11,7 +11,7 @@ double that figure. Many of the survivors fled to the wharves and keys of Lisbon but they would find no safety there. The first tsunami wave surged up the Tagus estuary about an hour after the earthquake, reached a maximum runup of 12 meters (40 feet), and killed another 1000 people. At least two more tsunami waves surged into the city, -completing the earthquake's destruction. ]] +completing the earthquake's destruction]] local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-lisbon-1755/" @@ -74,7 +74,7 @@ asset.export(layer_null) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset index 1ee0498014..624cc30b31 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-samoa.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Tsunami Historical Series: Samoa - 2009" local Identifier = "noaa-sos-oceans-tsunami_historical_series-samoa" -local Description = [[ At 6:48 on the morning of September 29, 2009 (17:48 UTC), an 8.1 +local Description = [[At 6:48 on the morning of September 29, 2009 (17:48 UTC), an 8.1 moment magnitude earthquake struck near the Samoan Islands in the southwest Pacific Ocean. The Pacific Tsunami Warning Center (PTWC) quickly determined that the large magnitude of this earthquake, its location under the sea floor, its relatively shallow @@ -13,7 +13,7 @@ issued its first tsunami warning several minutes later for Samoa, American Samoa and other nearby island groups. The earthquake did in fact cause a dangerous tsunami, and over the following hours PTWC tracked it through the Pacific Ocean and updated its alerts with measured tsunami wave heights and recommended that additional areas consider coastal -evacuation. PTWC canceled all tsunami alerts about four hours after the earthquake. ]] +evacuation. PTWC canceled all tsunami alerts about four hours after the earthquake]] local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-samoa-2009/" @@ -76,7 +76,7 @@ asset.export(layer_null) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset index 71867327a0..31aee63d59 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_historical_series-sumatra.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Tsunami Historical Series: Sumatra - 2004" local Identifier = "noaa-sos-oceans-tsunami_historical_series-sumatra" -local Description = [[ The magnitude 9.1 Great Sumatra-Andaman Earthquake of December 26, +local Description = [[The magnitude 9.1 Great Sumatra-Andaman Earthquake of December 26, 2004, spawned the deadliest tsunami in history, killing more than 230,000 people in 14 countries around the Indian Ocean. More than half of those killed had lived in Acheh Province, Sumatra, where the tsunami rose as high as 30 m (100 ft.) and traveled more than -4 km (2.5 mi.) inland in this low-lying region. ]] +4 km (2.5 mi.) inland in this low-lying region]] local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-historical-series-sumatra-2004//" @@ -70,7 +70,7 @@ asset.export(layer_null) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset index 5c4da42bc5..84c4b55b30 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/tsunami_locations.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Tsunami Locations - 2000 BCE - 2014" local Identifier = "noaa-sos-oceans-tsunami_locations" -local Description = [[ Earthquakes, landslides, volcanoes, explosions, and atmospheric +local Description = [[Earthquakes, landslides, volcanoes, explosions, and atmospheric processes - all of these disasters have caused tsunamis in the past. But by far, the most common generator of tsunamis is earthquakes, as has recently been seen in Sumatra, Chile, and Japan. The NOAA National Geophysical Data Center archives academic and historical @@ -17,7 +17,7 @@ of event origins are located around the Pacific "Ring of Fire" known for its pre of volcanic and tectonic activity. The points are overlaid on top of a map of ocean bathymetry (Natural Earth 2 from the Natural Earth project), which indicates many of the pronounced ocean features, such as volcanic islands, rift zones, and plate boundaries - that are often associated with generating tsunamis. ]] + that are often associated with generating tsunamis]] local URL = "https://sos.noaa.gov/catalog/datasets/tsunami-locations-2000-bce-2014/" @@ -91,7 +91,7 @@ asset.export(layer_events) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset index d9e42f3d94..92e420bb5d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ocean Surface Winds" local Identifier = "noaa-sos-oceans-vector_winds" -local Description = [[ The SeaWinds scatterometer, carried aboard NASA's QuikSCAT +local Description = [[The SeaWinds scatterometer, carried aboard NASA's QuikSCAT satellite, is a microwave radar designed to measure the backscatter related to near-surface wind speed and direction over the oceans. A rougher ocean surface returns a stronger signal because the waves reflect more of the radar energy back toward the @@ -11,7 +11,7 @@ scatterometer antenna (backscatter), and a smoother ocean surface returns a weak because less of the energy is reflected. Given the known relationship between the roughness of the surface and the strength of the wind, it is possible to compute the wind speed and direction - the wind vector - from multiple observations of the signal returned -from a given area on the ocean surface. ]] +from a given area on the ocean surface]] local URL = "https://sos.noaa.gov/catalog/datasets/ocean-surface-winds/" @@ -64,7 +64,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset index 66dded0bc3..5d24cd5c02 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Deep-Sea Vent Discoveries" local Identifier = "noaa-sos-oceans-vent_discoveries_animation" -local Description = [[ This dataset is an animation showing the discoveries of deep-sea +local Description = [[This dataset is an animation showing the discoveries of deep-sea hydrothermal vents from 1977-2016 (cumulative, annually). In 1977 scientists made a stunning discovery that changed our understanding of life on Earth. On the deep seafloor they had discovered hot springs, or hydrothermal vents, with animals that had never been seen before. These discoveries continue today. Over 240 vent fields have been discovered -with human-occupied, remotely-operated, and autonomous vehicles. ]] +with human-occupied, remotely-operated, and autonomous vehicles]] local URL = "https://sos.noaa.gov/catalog/datasets/deep-sea-vent-discoveries/" @@ -54,7 +54,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset index ef30e85173..51bf44dd1f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_locations.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Deep-Sea Vent Locations" local Identifier = "noaa-sos-oceans-vent_locations" -local Description = [[ This dataset shows all known locations of deep-sea hydrothermal +local Description = [[This dataset shows all known locations of deep-sea hydrothermal vents. Hydrothermal vents form in places where there is volcanic activity, such as along Earth's plate boundaries. They occur when seawater seeps down and is heated deep beneath the seafloor. The hot fluid rises and gushes out of vents at temperatures up to 400 deg C (more than 750 deg F!), carrying with it chemical energy that supports life in the -otherwise cold, dark, deep sea. ]] +otherwise cold, dark, deep sea]] local URL = "https://sos.noaa.gov/catalog/datasets/deep-sea-vent-locations/" @@ -40,7 +40,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset index 2faa980c7f..b8bf31f587 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset @@ -3,13 +3,13 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ocean Surface Vorticity" local Identifier = "noaa-sos-oceans-vorticity" -local Description = [[ This animation shows daily values of the ocean surface relative +local Description = [[This animation shows daily values of the ocean surface relative vorticity as simulated by the Parallel Ocean Program (POP). Vorticity, which can be thought of as the rate of fluid rotation, is particularly useful for visualizing ocean turbulent flow, highlighting the presence of swirling eddies. A significant amount of the total kinetic energy in the world ocean is attributable to these turbulent motions, making them an important component in balances of energy, momentum, heat, salt, and -chemical constituents (such as carbon dioxide) throughout the globe. ]] +chemical constituents (such as carbon dioxide) throughout the globe]] local URL = "https://sos.noaa.gov/catalog/datasets/ocean-surface-vorticity/" @@ -61,7 +61,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset index d87df890ed..7288045709 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Wave Heights 2012" local Identifier = "noaa-sos-oceans-waves-wave_height_2012" -local Description = [[ Meteorological offices worldwide forecast ocean wave heights for +local Description = [[Meteorological offices worldwide forecast ocean wave heights for the shipping and fisheries industry. In the United States, NOAA's National Weather Service provides the wave forecasts. Just like in weather forecasting, scientists run -numerical models to make these predictions. ]] +numerical models to make these predictions]] local URL = "https://sos.noaa.gov/catalog/datasets/wave-heights-2012/" @@ -58,7 +58,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset index 341d4381cb..de2f10bf1a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Wave Heights - Hurricane Katrina 2005" local Identifier = "noaa-sos-oceans-waves-wave_height_katrina" -local Description = [[ This movie shows calculations of the NOAA wave forecasting model, +local Description = [[This movie shows calculations of the NOAA wave forecasting model, called WAVEWATCH III, over the Atlantic Ocean and focuses on the time period that Hurricane Katrina occurred. Hurricane Katrina formed near the Bahamas on August 23rd, 2005. It made landfall in Florida on Monday August 27th and then regained energy tracking though the Gulf of Mexico. Finally it hit the southeast Louisiana coast on Monday August -29th, 2005. ]] +29th, 2005]] local URL = "https://sos.noaa.gov/catalog/datasets/wave-heights-hurricane-katrina-2005/" @@ -60,7 +60,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset index ef9f7c2695..5301290036 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset @@ -3,12 +3,12 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Wave Heights - Hurricane Sandy 2012" local Identifier = "noaa-sos-oceans-waves-wave_height_sandy" -local Description = [[ Meteorological offices worldwide forecast ocean wave heights for +local Description = [[Meteorological offices worldwide forecast ocean wave heights for the shipping and fisheries industry. In the United States, NOAA's National Weather Service provides the wave forecasts. Just like in weather forecasting, scientists run numerical models to make these predictions. This movie shows wave height calculations of a wave model called 'WAVEWATCH III'. The movie shows 3 hourly model output over October -1st - October 31st, 2012. ]] +1st - October 31st, 2012]] local URL = "https://sos.noaa.gov/catalog/datasets/wave-heights-hurricane-sandy-2012/" @@ -60,7 +60,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset index d0a3f77e59..436eb19ff3 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Wave Power 2012" local Identifier = "noaa-sos-oceans-waves-wave_power_2012" -local Description = [[ Meteorological offices worldwide forecast ocean wave heights for +local Description = [[Meteorological offices worldwide forecast ocean wave heights for the shipping and fisheries industry. In the United States, NOAA's National Weather Service provides the wave forecasts. Just like in weather forecasting, scientists run -numerical models to make these predictions. ]] +numerical models to make these predictions]] local URL = "https://sos.noaa.gov/catalog/datasets/wave-power-2012/" @@ -58,7 +58,7 @@ asset.export(colorbar) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset index 28befd564e..bf26d1f153 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Ice Extent- 1978 - Present" local Identifier = "noaa-sos-oceans-weeklyseaice-10day_seaice" -local Description = [[ Sea ice is simply ocean water that has frozen. At least 15% of the +local Description = [[Sea ice is simply ocean water that has frozen. At least 15% of the ocean is covered by sea ice some part of the year. This means that on average, sea ice covers almost 10 million square miles (about 25 million square kilometers) of the Earth. Sea ice is monitored closely by scientists because changing sea ice coverage can have a @@ -12,7 +12,7 @@ Because of this, monitoring changes in sea ice can be a good indicator of climat The National Snow and Ice Data Center monitors sea ice using a passive microwave satellite data record that begins in 1978. The Special Sensor Microwave Imager/Sounder (SSMIS) is the current monitoring instrument. This sea ice extent dataset is on a 25km -cell size grid covering both Arctic and Antarctic polar regions. ]] +cell size grid covering both Arctic and Antarctic polar regions]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-ice-extent-1978-present/" @@ -58,7 +58,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset index a466877eb2..51da3c07a8 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Sea Ice Extent: September Only" local Identifier = "noaa-sos-oceans-weeklyseaice-sept_seaice" -local Description = [[ Sea ice is simply ocean water that has frozen. At least 15% of the +local Description = [[Sea ice is simply ocean water that has frozen. At least 15% of the ocean is covered by sea ice some part of the year. This means that on average, sea ice covers almost 10 million square miles (about 25 million square kilometers) of the Earth. Sea ice is monitored closely by scientists because changing sea ice coverage can have a @@ -20,7 +20,7 @@ extent dataset that is available shows Sea Ice Extent from 1987-2013. In the Arc maximum coverage usually occurs in March and the minimum coverage occurs in September. The opposite is true for Antarctic, where the minimum occurs in March and the maximum occurs in September. An interesting point to note is that the extent of sea ice in the -Arctic is shrinking, while the Antarctic sea ice is not trending downward. ]] +Arctic is shrinking, while the Antarctic sea ice is not trending downward]] local URL = "https://sos.noaa.gov/catalog/datasets/sea-ice-extent-september-only/" @@ -66,7 +66,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset index 2ff1695da9..464ee2243c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/cables.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Undersea Communication Cables" local Identifier = "noaa-sos-overlays-cables" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays undersea communications cables onto any dataset that you are viewing. The data was found -at Wikipedia. ]] +at Wikipedia]] local URL = "https://sos.noaa.gov/catalog/datasets/undersea-communication-cables/" @@ -38,7 +38,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset index c557c24c6a..5774c1c60b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/capitals.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Capital City Names" local Identifier = "noaa-sos-overlays-capitals" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays -country capitals onto any dataset that you are viewing. ]] +country capitals onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/capital-city-names/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset index bcf80fbd21..20e60de2ca 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/city_names.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "City Names" local Identifier = "noaa-sos-overlays-city_names" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays city names from Wikipedia's List of Metropolitan Areas by Population onto any dataset that you -are viewing. ]] +are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/city-names/" @@ -38,7 +38,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset index 0331d581ca..01f2804c97 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-black.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Continent Borders (black)" local Identifier = "noaa-sos-overlays-continent_borders-black" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays -continent borders in black onto any dataset that you are viewing. ]] +continent borders in black onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/continent-borders-black/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset index 2d1db3bc3e..921f1e012f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_borders-white.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Continent Borders (white)" local Identifier = "noaa-sos-overlays-continent_borders-white" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays -continent borders in white onto any dataset that you are viewing. ]] +continent borders in white onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/continent-borders-white/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset index fedf85decb..b8198cc313 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/continent_names.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Continent Names" local Identifier = "noaa-sos-overlays-continent_names" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays -continent continent names onto any dataset that you are viewing. ]] +continent continent names onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/continent-names/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset index 592def368a..8f8fd7e40d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-black.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Country Borders (black)" local Identifier = "noaa-sos-overlays-country_borders-black" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays -country borders onto any dataset that you are viewing. ]] +country borders onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/country-borders-black/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset index c239fe1503..468ccc961f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_borders-white.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Continent Borders (white)" local Identifier = "noaa-sos-overlays-country_borders-white" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays -country borders onto any dataset that you are viewing. ]] +country borders onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/country-borders-white/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset index f3dd8da9f4..624e02bab5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/country_pop_names.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Country Names" local Identifier = "noaa-sos-overlays-country_pop_names" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays country names with font size according to population onto any dataset that you are -viewing. ]] +viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/country-names/" @@ -38,7 +38,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset index e35f21fba9..29a705d988 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/currents.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ocean Currents" local Identifier = "noaa-sos-overlays-currents" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset is an overlay -of ocean currents, taken from the Ocean Circulation dataset. ]] +of ocean currents, taken from the Ocean Circulation dataset]] local URL = "https://sos.noaa.gov/catalog/datasets/ocean-currents/" @@ -57,7 +57,7 @@ asset.export(layer_labels) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset index 3813fa89d8..64ae8aae29 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/general_circulation.asset @@ -3,11 +3,11 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Atmospheric General Circulation" local Identifier = "noaa-sos-overlays-general_circulation" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays arrows and names of the approximate prevailing wind onto any dataset that you are viewing. General circulation overlay would be particularly useful when pointing out the -rain shadow effect as well as cloud movement or when describing the coriolis effect. ]] +rain shadow effect as well as cloud movement or when describing the coriolis effect]] local URL = "https://sos.noaa.gov/catalog/datasets/atmospheric-general-circulation/" @@ -39,7 +39,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset index 342301194f..e33b229966 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-black.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Land Mask (black)" local Identifier = "noaa-sos-overlays-land_mask-black" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays a -black mask over all the land on any dataset that you are viewing. ]] +black mask over all the land on any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/land-mask-black/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset index 1a603b79e8..023a3bc9ae 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/land_mask-veg.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Land Mask (vegetation)" local Identifier = "noaa-sos-overlays-land_mask-veg" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays a land mask of general vegetation over all the land onto any dataset that you are -viewing. ]] +viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/land-mask-vegetation/" @@ -38,7 +38,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset index be1c06a264..5f59c0c0be 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-black.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Lat/Long Grid (black)" local Identifier = "noaa-sos-overlays-latlon_grid-black" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays a -latitude and longitude grid in black onto any dataset that you are viewing. ]] +latitude and longitude grid in black onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/latlong-grid-black/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset index 47c6616222..4fc62a041f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/latlon_grid-white.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Lat/Long Grid (white)" local Identifier = "noaa-sos-overlays-latlon_grid-white" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays a -latitude and longitude grid in white onto any dataset that you are viewing. ]] +latitude and longitude grid in white onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/latlong-grid-white/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset index ac714c82d4..dd8e3f6c0b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/ocean_names.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Ocean Names" local Identifier = "noaa-sos-overlays-ocean_names" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays ocean -names onto any dataset that you are viewing. ]] +names onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/ocean-names/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset index cd3063246b..dfd7b990d6 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-color.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Plate Boundaries (colorized)" local Identifier = "noaa-sos-overlays-plate_boundary-color" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays tectonic plate boundaries, with types of boundaries differentiated in color, onto any -dataset that you are viewing. ]] +dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/plate-boundaries-colorized/" @@ -38,7 +38,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset index b9911c672e..ec2052fac9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_boundary-white.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Plate Boundaries (white)" local Identifier = "noaa-sos-overlays-plate_boundary-white" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays -tectonic plate boundaries in white onto any dataset that you are viewing. ]] +tectonic plate boundaries in white onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/plate-boundaries-white/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset index b8890c9579..c2c451beb6 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/plate_names.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Plate Names" local Identifier = "noaa-sos-overlays-plate_names" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays -tectonic plate names onto any dataset that you are viewing. ]] +tectonic plate names onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/plate-names/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset index ebc6375d68..2554594507 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/railroad.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Railroads" local Identifier = "noaa-sos-overlays-railroad" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays railroads onto any dataset that you are viewing. The data was found at Natural Earth -Data. ]] +Data]] local URL = "https://sos.noaa.gov/catalog/datasets/railroads/" @@ -38,7 +38,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset index ebe39b7fa0..7683e85074 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/rivers.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Rivers" local Identifier = "noaa-sos-overlays-rivers" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays global rivers and lakes onto any dataset that you are viewing. The river's size is -indicated by the size of the lines. The data was found at Natural Earth Data. ]] +indicated by the size of the lines. The data was found at Natural Earth Data]] local URL = "https://sos.noaa.gov/catalog/datasets/rivers/" @@ -38,7 +38,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset index 800224b8b0..5e7c2a6b4a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-black.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Roads (black)" local Identifier = "noaa-sos-overlays-roads-black" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays black roads onto any dataset that you are viewing. The data was found at Natural Earth -Data. ]] +Data]] local URL = "https://sos.noaa.gov/catalog/datasets/roads-black/" @@ -38,7 +38,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset index 88a2b4b659..a9443593be 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/roads-white.asset @@ -3,10 +3,10 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Roads (white)" local Identifier = "noaa-sos-overlays-roads-white" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays white roads onto any dataset that you are viewing. The data was found at Natural Earth -Data. ]] +Data]] local URL = "https://sos.noaa.gov/catalog/datasets/roads-white/" @@ -38,7 +38,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset index b4f124d9cf..5a12b11b7a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-black.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Country Borders with North American States (black)" local Identifier = "noaa-sos-overlays-state_borders-black" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays -country and North American state borders onto any dataset that you are viewing. ]] +country and North American state borders onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/country-borders-with-north-american-states-black/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset index 9cf86d7738..3f338650a2 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/state_borders-white.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Country Borders with North American States (white)" local Identifier = "noaa-sos-overlays-state_borders-white" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays -country and North American state borders onto any dataset that you are viewing. ]] +country and North American state borders onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/country-borders-with-north-american-states-white/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset index df5518d397..5ccd09a06a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/overlays/timezones.asset @@ -3,9 +3,9 @@ local globeIdentifier = asset.require("../../earth").Earth.Identifier local Name = "Time zones" local Identifier = "noaa-sos-overlays-timezones" -local Description = [[ Overlays are datasets with transparent backgrounds that contain +local Description = [[Overlays are datasets with transparent backgrounds that contain foreground data used to augment other SOS datasets.This particular dataset overlays -timezones onto any dataset that you are viewing. ]] +timezones onto any dataset that you are viewing]] local URL = "https://sos.noaa.gov/catalog/datasets/time-zones/" @@ -37,7 +37,7 @@ asset.export(layer) asset.meta = { Name = Name, Version = "1.0", - Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration.", + Description = Description .. "Data provided by the National Oceanic and Atmospheric Administration", Author = "National Oceanic and Atmospheric Administration", URL = URL, License = "https://sos.noaa.gov/copyright/" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset index d7f69e2a1a..bc96ff5b4b 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Amateur Radio", Version = "1.0", - Description = [[ Satellites asset for Communications - Amateur Radio. Data from + Description = [[Satellites asset for Communications - Amateur Radio. Data from Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset index 4f89772b6c..029e39a8e3 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Experimental", Version = "1.0", - Description = [[ Satellites asset for Communications - Experimental. Data from + Description = [[Satellites asset for Communications - Experimental. Data from Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset index be0effa9cc..b7f6737b90 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset @@ -6,7 +6,7 @@ local group = { Url = "https://celestrak.com/NORAD/elements/gp.php?GROUP=geo&FORMAT=TLE", TrailColor = { 0.9, 0.9, 0.0 }, Description = [[Satellites that are currently active and in a Geosynchronous orbit, meaning - their orbital period matches Earth's rotation.]] + their orbital period matches Earth's rotation]] } local tle = shared.downloadTLEFile(asset, group.Url, group.Title, group.Filename) @@ -16,8 +16,8 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Geostationary", Version = "1.0", - Description = [[ Satellites asset for Communications - Geostationary. Data from - Celestrak]], + Description = [[Satellites asset for Communications - Geostationary. Data from + Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset index dfd0dd7cc8..bb7a8d0f5e 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - GlobalStar", Version = "1.0", - Description = [[ Satellites asset for Communications - GlobalStar. Data from - Celestrak]], + Description = "Satellites asset for Communications - GlobalStar. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset index 60d65edb28..852f12a2bb 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Gorizont", Version = "1.0", - Description = [[ Satellites asset for Communications - Gorizont. Data from - Celestrak]], + Description = "Satellites asset for Communications - Gorizont. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset index e709846270..a817df5ad7 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Intelsat", Version = "1.0", - Description = [[ Satellites asset for Communications - Intelsat. Data from - Celestrak]], + Description = "Satellites asset for Communications - Intelsat. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset index 73740570e3..905ce90d16 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Iridium", Version = "1.0", - Description = [[ Satellites asset for Communications - Iridium. Data from - Celestrak]], + Description = "Satellites asset for Communications - Iridium. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset index aed70e4608..0e4f4a760a 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Iridium NEXT", Version = "1.0", - Description = [[ Satellites asset for Communications - Iridium NEXT. Data from - Celestrak]], + Description = "Satellites asset for Communications - Iridium NEXT. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset index ce25fc3c20..eaf318a501 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Molniya", Version = "1.0", - Description = [[ Satellites asset for Communications - Molniya. Data from - Celestrak]], + Description = "Satellites asset for Communications - Molniya. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset index c47fb4d6b9..f0292bf64d 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Orbcomm", Version = "1.0", - Description = [[ Satellites asset for Communications - Orbcomm. Data from - Celestrak]], + Description = "Satellites asset for Communications - Orbcomm. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset index f923679848..27aad6d3a4 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Other comm", Version = "1.0", - Description = [[ Satellites asset for Communications - Other comm. Data from - Celestrak]], + Description = "Satellites asset for Communications - Other comm. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset index f06a5af27a..5e6edbd691 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Raduga", Version = "1.0", - Description = [[ Satellites asset for Communications - Raduga. Data from - Celestrak]], + Description = "Satellites asset for Communications - Raduga. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset index 685ee5802d..cc8a74517d 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - SES", Version = "1.0", - Description = [[ Satellites asset for Communications - SES. Data from - Celestrak]], + Description = "Satellites asset for Communications - SES. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset index 284e616255..e368c302d9 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/starlink.asset @@ -6,7 +6,7 @@ local group = { Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=starlink&FORMAT=TLE", TrailColor = { 0.65, 0.55, 0.55 }, Description = [[LEO satellite constellation launched by SpaceX to provide - broadband internet access.]] + broadband internet access]] } local tle = shared.downloadTLEFile(asset, group.Url, group.Title, group.Filename) @@ -16,8 +16,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Communications - Starlink", Version = "1.0", - Description = [[ Satellites asset for Communications - Starlink. Data from - Celestrak]], + Description = "Satellites asset for Communications - Starlink. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset index ddc4417015..60fd1f4dfe 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_asat.asset @@ -14,8 +14,8 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Debris - Indian ASAT test Debris", Version = "1.0", - Description = [[ Satellites asset for Debris - Indian ASAT test Debris. Data from - Celestrak]], + Description = [[Satellites asset for Debris - Indian ASAT test Debris. Data from + Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset index c266bc1ff3..f2433c58a2 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Debris - Breeze-M Breakup", Version = "1.0", - Description = [[ Satellites asset for Debris - Breeze-M Breakup. Data from - Celestrak]], + Description = "Satellites asset for Debris - Breeze-M Breakup. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/events/38746-Breakup/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset index 034529a792..c59a51cc27 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Debris - Fengyun Debris", Version = "1.0", - Description = [[ Satellites asset for Debris - Fengyun Debris. Data from - Celestrak]], + Description = "Satellites asset for Debris - Fengyun Debris. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset index fc7a2ae0b1..1551e3fd96 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Debris - Iridium 33 Debris", Version = "1.0", - Description = [[ Satellites asset for Debris - Iridium 33 Debris. Data from - Celestrak]], + Description = "Satellites asset for Debris - Iridium 33 Debris. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset index be400da852..4ac9eef903 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Debris - Kosmos 2251 Debris", Version = "1.0", - Description = [[ Satellites asset for Debris - Kosmos 2251 Debris. Data from - Celestrak]], + Description = "Satellites asset for Debris - Kosmos 2251 Debris. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset index 323d0cd0dc..7ff3aa8fc1 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/cartesian_volume.asset @@ -48,7 +48,7 @@ asset.export(volume) asset.meta = { Name = "Satellites Debris - Volume Cartesian", Version = "1.0", - Description = [[ Satellites asset for Debris - Volume Cartesian. Example asset.]], + Description = "Satellites asset for Debris - Volume Cartesian. Example asset", Author = "OpenSpace Team", URL = "", License = "MIT" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset index 215440de76..f7aa9ec5e2 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/spherical_volume.asset @@ -48,7 +48,7 @@ asset.export(volume) asset.meta = { Name = "Satellites Debris - Volume Spherical", Version = "1.0", - Description = [[ Satellites asset for Debris - Volume Spherical. Example asset.]], + Description = "Satellites asset for Debris - Volume Spherical. Example asset", Author = "OpenSpace Team", URL = "", License = "MIT" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/.hubble_trail.asset.swp b/data/assets/scene/solarsystem/planets/earth/satellites/misc/.hubble_trail.asset.swp deleted file mode 100644 index f792886402..0000000000 Binary files a/data/assets/scene/solarsystem/planets/earth/satellites/misc/.hubble_trail.asset.swp and /dev/null differ diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset index 114b5fb13e..dd1bea3c74 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/active.asset @@ -5,7 +5,7 @@ local group = { Filename = "active.txt", Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=active&FORMAT=TLE", TrailColor = { 0.45, 0.25, 0.45 }, - Description = [[Satellites that employ active communication.]] + Description = "Satellites that employ active communication" } local tle = shared.downloadTLEFile(asset, group.Url, group.Title, group.Filename) @@ -15,7 +15,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Active", Version = "1.0", - Description = [[ Satellites that employ active communication. Data from Celestrak]], + Description = "Satellites that employ active communication. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset index 2d942d3083..f936d31184 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset @@ -6,7 +6,7 @@ local group = { Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=visual&FORMAT=TLE", TrailColor = { 0.55, 0.25, 0.65 }, Description = [[The 100 (or so) satellites that will appear brightest when viewed - from Earth.]] + from Earth]] } local tle = shared.downloadTLEFile(asset, group.Url, group.Title, group.Filename) @@ -16,7 +16,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites 100 Brightest", Version = "1.0", - Description = [[ Satellites asset for 100 Brightest. Data from Celestrak]], + Description = "Satellites asset for 100 Brightest. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset index f74a548963..70ca3d1c9e 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites CubeSat", Version = "1.0", - Description = [[ Satellites asset for CubeSat. Data from Celestrak]], + Description = "Satellites asset for CubeSat. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset index 97955c876e..6ceb27ca5c 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/hubble_trail.asset @@ -81,9 +81,7 @@ end) asset.meta = { Name = "Hubble Space Telescope Trail", Version = "1.0", - Description = [[ Position and Trail for Hubble Space Telescope, trail from - celestrak.com - ]], + Description = "Position and Trail for Hubble Space Telescope, trail from Celestrak", Author = "Dan Tell", URL = "www.calacademy.org", License = "CC-BY" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset index e2a84a2714..e2356aafcd 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset @@ -145,8 +145,8 @@ end) asset.meta = { Name = "ISS", Version = "1.0", - Description = [[ Model and Trail for ISS. Model from NASA 3D models, trail from - CELESTRAK]], + Description = [[Model and Trail for ISS. Model from NASA 3D models, trail from + Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset index 0808f44ca5..9b2072efe7 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Military", Version = "1.0", - Description = [[ Satellites asset for Military. Data from Celestrak]], + Description = "Satellites asset for Military. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset index e638b290b6..ecbef9aedb 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Other", Version = "1.0", - Description = [[ Satellites asset for Other. Data from Celestrak]], + Description = "Satellites asset for Other. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset index 3fec0df32e..6c84bd6de5 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Radar Calibration", Version = "1.0", - Description = [[ Satellites asset for Radar Calibration. Data from Celestrak]], + Description = "Satellites asset for Radar Calibration. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset index d507457617..1b8166f83b 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset @@ -7,7 +7,7 @@ local group = { TrailColor = { 0.9, 0.1, 0.0 }, Description = [[A collection of space stations (including the ISS and China's Tiangong), along with certain cubesats and satellite constellations from space - agencies.]] + agencies]] } local tle = shared.downloadTLEFile(asset, group.Url, group.Title, group.Filename) @@ -17,7 +17,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites SpaceStations", Version = "1.0", - Description = [[ Satellites asset for SpaceStations. Data from Celestrak]], + Description = "Satellites asset for SpaceStations. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset index 7aa2f56f98..b2b93189d0 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset @@ -5,7 +5,7 @@ local group = { Filename = "tle-new.txt", Url = "https://www.celestrak.com/NORAD/elements/gp.php?GROUP=last-30-days&FORMAT=TLE", TrailColor = { 0.65, 0.25, 0.45 }, - Description = [[All the satellites that have been launched in the last 30 days.]] + Description = [[All the satellites that have been launched in the last 30 days]] } local tle = shared.downloadTLEFile(asset, group.Url, group.Title, group.Filename) @@ -15,7 +15,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Last 30 Days", Version = "1.0", - Description = [[ Satellites asset for Last 30 Days. Data from Celestrak]], + Description = "Satellites asset for Last 30 Days. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset index c7bf8fdec5..8bb732b8a6 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Navigation Beidou", Version = "1.0", - Description = [[ Satellites asset for Navigation Beidou. Data from Celestrak]], + Description = "Satellites asset for Navigation Beidou. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset index 6a2c34de1d..fd33f0c75a 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Navigation Galileo", Version = "1.0", - Description = [[ Satellites asset for Navigation Galileo. Data from Celestrak]], + Description = "Satellites asset for Navigation Galileo. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset index daa3aa3425..709afd10f9 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Navigation Glosnass", Version = "1.0", - Description = [[ Satellites asset for Navigation Glosnass. Data from Celestrak]], + Description = "Satellites asset for Navigation Glosnass. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset index ce8af3192c..703d9694de 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset @@ -5,8 +5,7 @@ local group = { Filename = "gps-ops.txt", Url = "https://celestrak.com/NORAD/elements/gp.php?GROUP=gps-ops&FORMAT=TLE", TrailColor = { 0.9, 0.5, 0.0 }, - Description = [[The GPS satellites that give us our precise locations back here - on Earth.]] + Description = "The GPS satellites that give us our precise locations back here on Earth" } local tle = shared.downloadTLEFile(asset, group.Url, group.Title, group.Filename) @@ -16,7 +15,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Navigation GPS", Version = "1.0", - Description = [[ Satellites asset for Navigation GPS. Data from Celestrak]], + Description = "Satellites asset for Navigation GPS. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset index d128d1236e..66d855c44b 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset @@ -14,8 +14,8 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Navigation Russian LEO Navigation", Version = "1.0", - Description = [[ Satellites asset for Navigation Russian LEO Navigation. - Data from Celestrak]], + Description = [[Satellites asset for Navigation Russian LEO Navigation. Data from + Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset index 8ffa5894a8..e41d42c2ec 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset @@ -14,8 +14,8 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Navigation Navy Navigation Satellite System", Version = "1.0", - Description = [[ Satellites asset for Navigation Navy Navigation Satellite System. - Data from Celestrak]], + Description = [[Satellites asset for Navigation Navy Navigation Satellite System. Data + from Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset index db22539b2b..46b8d416cc 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset @@ -14,8 +14,8 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Navigation Satellite Based Augmentation System", Version = "1.0", - Description = [[ Satellites asset for Navigation Satellite Based Augmentation System. - Data from Celestrak]], + Description = [[Satellites asset for Navigation Satellite Based Augmentation System. + Data from Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset index 0e85684c8d..a30d4457e5 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset @@ -4,8 +4,7 @@ asset.require("./satellites_interesting") asset.meta = { Name = "Satellites", Version = "1.0", - Description = [[ Default Earth Satellites. This file is the same as - satellites_interesting.]], + Description = "Default Earth Satellites. This file is loads satellites_interesting", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset index ecb92357e0..31bf01d19d 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset @@ -11,8 +11,7 @@ asset.require("./satellites_weather") asset.meta = { Name = "Satellites All", Version = "1.0", - Description = [[ Meta asset for all satellites of Earth. Containing all other meta - assets.]], + Description = "Meta asset for all satellites of Earth. Containing other meta assets", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset index b5caa1c6f5..14ac147a59 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset @@ -17,9 +17,9 @@ asset.require("./communications/starlink") asset.meta = { Name = "Satellites Communications", Version = "1.0", - Description = [[ Meta asset for communications satellites of Earth. Containing groups: + Description = [[Meta asset for communications satellites of Earth. Containing groups: geostationary, intelsat, ses, iridium, iridium_next, orbcomm, globalstar, amateur, - experimental, other_comm, gorizont, raduga and molniya.]], + experimental, other_comm, gorizont, raduga and molniya]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset index 7a0e81da0d..a951eea4c4 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset @@ -8,9 +8,8 @@ asset.require("./debris/debris_kosmos2251") asset.meta = { Name = "Satellites Debris", Version = "1.0", - Description = [[ Meta asset for space debris of Earth. Containing groups: - debris_asat, debris_breezem, debris_fengyun, debris_iridium33, and - debris_kosmos2251.]], + Description = [[Meta asset for space debris of Earth. Containing groups: debris_asat, + debris_breezem, debris_fengyun, debris_iridium33, and debris_kosmos2251]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset index 81d86836e5..663e0e7193 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset @@ -9,8 +9,8 @@ asset.require("./misc/tle-new") asset.meta = { Name = "Satellites Interesting", Version = "1.0", - Description = [[ Meta asset for interesting satellites of Earth. Containing groups: - brightest, geostationary, gps, spacestations, iss, and tle-new.]], + Description = [[Meta asset for interesting satellites of Earth. Containing groups: + brightest, geostationary, gps, spacestations, iss, and tle-new]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset index b05af852dc..5ee521bae1 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset @@ -8,8 +8,8 @@ asset.require("./misc/active") asset.meta = { Name = "Satellites Misc", Version = "1.0", - Description = [[ Meta asset for misc satellites of Earth. Containing groups: - military, radar, cubesats, and other.]], + Description = [[Meta asset for misc satellites of Earth. Containing groups: + military, radar, cubesats, and other]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset index 0539825a0e..a41f198cae 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset @@ -10,8 +10,8 @@ asset.require("./navigation/sbas") asset.meta = { Name = "Satellites Navigation", Version = "1.0", - Description = [[ Meta asset for navigation satellites of Earth. Containing groups: - beidou, galileo, glosnass, gps, musson, nnss, and sbas.]], + Description = [[Meta asset for navigation satellites of Earth. Containing groups: + beidou, galileo, glosnass, gps, musson, nnss, and sbas]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset index 8e11bd7e66..cab6378cf6 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset @@ -7,8 +7,8 @@ asset.require("./science/education") asset.meta = { Name = "Satellites Science", Version = "1.0", - Description = [[ Meta asset for science satellites of Earth. Containing groups: - spaceearth, geodetic, engineering, and education.]], + Description = [[Meta asset for science satellites of Earth. Containing groups: + spaceearth, geodetic, engineering, and education]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset index c8aab8059f..2eb430a68b 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset @@ -13,8 +13,8 @@ asset.require("./weather/weather") asset.meta = { Name = "Satellites Weather", Version = "1.0", - Description = [[ Meta asset for weather satellites of Earth. Containing groups: argos, - dmc, earth_resources, geos, noaa, planet, sarsat, spire, tdrss, and weather.]], + Description = [[Meta asset for weather satellites of Earth. Containing groups: argos, + dmc, earth_resources, geos, noaa, planet, sarsat, spire, tdrss, and weather]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset index 1dd5122c96..4fff51fad5 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Science Education", Version = "1.0", - Description = [[ Satellites asset for Science Education. Data from Celestrak]], + Description = "Satellites asset for Science Education. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset index 5db4d80a50..ff18399024 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Science Engineering", Version = "1.0", - Description = [[ Satellites asset for Science Engineering. Data from Celestrak]], + Description = "Satellites asset for Science Engineering. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset index acb53722be..41ebd84e6a 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Science Geodect", Version = "1.0", - Description = [[ Satellites asset for Science Geodect. Data from Celestrak]], + Description = "Satellites asset for Science Geodect. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset index de8550b89d..4c66fdfe04 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset @@ -14,8 +14,8 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Science Space & Earth Science", Version = "1.0", - Description = [[ Satellites asset for Science Space & Earth Science. Data from - Celestrak]], + Description = [[Satellites asset for Science Space & Earth Science. Data from + Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset index 4017b449c6..1dce9889d4 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset @@ -110,8 +110,8 @@ end asset.meta = { Name = "Aqua", Version = "1.0", - Description = [[ Trail for Aqua. trail from - CELESTRAK. Can be used in conjuntion with Aqua Modis (Temporal) layer for Earth]], + Description = [[Trail for Aqua. trail from Celestrak. Can be used in conjuntion with + Aqua Modis (Temporal) layer for Earth]], Author = "OpenSpace Team", URL = "https://celestrak.com/", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset index 58c88e3f05..f06309e5f3 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Weather - ARGOS", Version = "1.0", - Description = [[ Satellites asset for Weather - ARGOS. Data from - Celestrak]], + Description = "Satellites asset for Weather - ARGOS. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset index 50cf97be6d..1a520c399f 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset @@ -14,8 +14,8 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Weather - Disaster Monitoring", Version = "1.0", - Description = [[ Satellites asset for Weather - Disaster Monitoring. Data from - Celestrak]], + Description = [[Satellites asset for Weather - Disaster Monitoring. Data from + Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset index 28100eea98..c63991ad64 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Weather - Earth Resources", Version = "1.0", - Description = [[ Satellites asset for Weather - Earth Resources. Data from - Celestrak]], + Description = "Satellites asset for Weather - Earth Resources. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset index dddef7aab8..d7e1386c12 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Weather - GOES", Version = "1.0", - Description = [[ Satellites asset for Weather - GOES. Data from - Celestrak]], + Description = "Satellites asset for Weather - GOES. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset index af71e60a45..9e5b411435 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Weather - NOAA", Version = "1.0", - Description = [[ Satellites asset for Weather - NOAA. Data from - Celestrak]], + Description = "Satellites asset for Weather - NOAA. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset index 9b4ea1567a..037509071a 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset @@ -14,8 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Weather - Planet", Version = "1.0", - Description = [[ Satellites asset for Weather - Planet. Data from - Celestrak]], + Description = "Satellites asset for Weather - Planet. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset index d35fa72e22..c5129910aa 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset @@ -14,8 +14,8 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Weather - Search & Rescue (SARSAT)", Version = "1.0", - Description = [[ Satellites asset for Weather - Search & Rescue (SARSAT). Data from - Celestrak]], + Description = [[Satellites asset for Weather - Search & Rescue (SARSAT). Data from + Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset index db469f6491..35bd126b15 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset @@ -109,8 +109,8 @@ end) asset.meta = { Name = "SNPP", Version = "1.0", - Description = [[ Trail for SNPP. trail from - CELESTRAK. Can be used in conjunction with VIIRS SNPP (Temporal) layer for Earth.]], + Description = [[Trail for SNPP. trail from Celestrak. Can be used in conjunction with + VIIRS SNPP (Temporal) layer for Earth]], Author = "OpenSpace Team", URL = "https://celestrak.com/", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset index 1881ca5437..8bae8bd82e 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset @@ -14,8 +14,8 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Weather - Spire", Version = "1.0", - Description = [[ Satellites asset for Weather - Search & Rescue (SARSAT). Data from - Celestrak]], + Description = [[Satellites asset for Weather - Search & Rescue (SARSAT). Data from + Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset index a60e96733f..c20f949738 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset @@ -14,8 +14,8 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Weather - Tracking and Data Relay Satellite System (TDRSS)", Version = "1.0", - Description = [[ Satellites asset for Weather - Tracking and Data Relay Satellite - System (TDRSS). Data from Celestrak]], + Description = [[Satellites asset for Weather - Tracking and Data Relay Satellite + System (TDRSS). Data from Celestrak]], Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset index 5defc3ab95..aa546bf337 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset @@ -109,8 +109,8 @@ end) asset.meta = { Name = "Terra", Version = "1.0", - Description = [[ Trail for Terra. trail from - CELESTRAK. Can be used in conjuntion with Terra Modis (Temporal) layer for Earth]], + Description = [[Trail for Terra. trail from Celestrak. Can be used in conjuntion with + Terra Modis (Temporal) layer for Earth]], Author = "OpenSpace Team", URL = "https://celestrak.com/", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset index da75afb369..80afc7a097 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset @@ -14,7 +14,7 @@ shared.registerSatelliteGroupObjects(asset, group, tle, true) asset.meta = { Name = "Satellites Weather - Weather", Version = "1.0", - Description = [[ Satellites asset for Weather - Weather. Data from Celestrak]], + Description = "Satellites asset for Weather - Weather. Data from Celestrak", Author = "OpenSpace Team", URL = "https://celestrak.com/NORAD/elements/", License = "Celestrak" diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset index 77cdd90ab6..4461ebc028 100644 --- a/data/assets/scene/solarsystem/planets/earth/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/trail.asset @@ -39,8 +39,8 @@ asset.export(EarthTrail) asset.meta = { Name = "Earth Trail", Version = "1.1", - Description = [[ Trail of Earth as observed by the Sun. Data from NASA Spice (see - base spice asset)]], + Description = [[Trail of Earth as observed by the Sun. Data from NASA Spice (see base + spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset index e9d1038028..141de9ad80 100644 --- a/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset +++ b/data/assets/scene/solarsystem/planets/earth/trail_barycenter.asset @@ -40,8 +40,8 @@ asset.export(EarthBarycenterTrail) asset.meta = { Name = "Earth Trail", Version = "1.1", - Description = [[ Trail of Earth's Barycenter as observed by the Sun. Data from NASA Spice (see - base spice asset)]], + Description = [[Trail of Earth's Barycenter as observed by the Sun. Data from NASA Spice + (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/transforms.asset b/data/assets/scene/solarsystem/planets/earth/transforms.asset index 0b509390de..48f2211715 100644 --- a/data/assets/scene/solarsystem/planets/earth/transforms.asset +++ b/data/assets/scene/solarsystem/planets/earth/transforms.asset @@ -92,8 +92,8 @@ asset.export(EarthIAU) asset.meta = { Name = "Earth Transforms", Version = "1.1", - Description = [[ Earth transforms: Earth Barycenter, Earth Center, Earth Inertial, - Earth IAU. A scene graph node is created for each transform.]], + Description = [[Earth transforms: Earth Barycenter, Earth Center, Earth Inertial, Earth + IAU. A scene graph node is created for each transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset index 81562a5b0b..0f43db985b 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset @@ -67,7 +67,7 @@ asset.export(Callisto) asset.meta = { Name = "Callisto", Version = "1.1", - Description = [[ Callisto globe with labels.]], + Description = "Callisto globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset index e76b4e01b9..bcb1989602 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset @@ -11,7 +11,7 @@ end) asset.meta = { Name = "Default Callisto Layers", Version = "1.0", - Description = [[ Default Callisto layers are: Callisto Texture]], + Description = "Default Callisto layers are: Callisto Texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset index 50131f0702..96f6eb02cd 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Callisto Texutre", Version = "2.0", - Description = [[ Default texture for Callisto]], + Description = "Default texture for Callisto", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset index d3eeed8f8f..04663f891a 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset @@ -41,7 +41,7 @@ asset.export(CallistoTrail) asset.meta = { Name = "Callisto Trail", Version = "1.1", - Description = [[ Trail of Callisto as observed by the Jupiter. Data from NASA Spice + Description = [[Trail of Callisto as observed by the Jupiter. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset index 7c1ae73f88..58cb56000b 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset @@ -13,7 +13,7 @@ end) asset.meta = { Name = "Default Jupiter Layers", Version = "1.0", - Description = [[ Default Jupiter layers are: Jupiter Texture]], + Description = "Default Jupiter layers are: Jupiter Texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset index efb6a7510b..469f7a2275 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset @@ -14,7 +14,7 @@ end) asset.meta = { Name = "Default Europa Layers", Version = "1.0", - Description = [[ Default Europa layers are: Europa Texture]], + Description = "Default Europa layers are: Europa Texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset index 2b088a87dd..1c251f4e82 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset @@ -67,7 +67,7 @@ asset.export(Europa) asset.meta = { Name = "Mimas", Version = "1.1", - Description = [[ Europa globe with labels.]], + Description = "Europa globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset index db62e1c902..289e4b78cf 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset @@ -28,7 +28,7 @@ asset.export("layer", layer) asset.meta = { Name = "Europa Texutre", Version = "2.0", - Description = [[ Default texture for Europa]], + Description = "Default texture for Europa", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset index 68a387e6be..1128e66305 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset @@ -29,7 +29,7 @@ asset.export("layer", layer) asset.meta = { Name = "Voyager Global Mosaic", Version = "1.1", - Description = [[ Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map + Description = [[Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map base of Europa utilizes the best image quality and moderate resolution coverage supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2. The image data was selected on the basis of overall image quality, reasonable diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset index b6b0a5ff5e..b5d494c6bd 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_sweden.asset @@ -22,7 +22,7 @@ asset.export("layer", layer) asset.meta = { Name = "Voyager Global Mosaic", Version = "1.1", - Description = [[ Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map + Description = [[Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map base of Europa utilizes the best image quality and moderate resolution coverage supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2. The image data was selected on the basis of overall image quality, reasonable diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset index eb826b9e0e..3972456a14 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset @@ -39,7 +39,7 @@ asset.export(EuropaTrail) asset.meta = { Name = "Europa Trail", Version = "1.1", - Description = [[ Trail of Europa as observed by the Jupiter. Data from NASA Spice (see + Description = [[Trail of Europa as observed by the Jupiter. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset index b44fbbb498..7026f47a11 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset @@ -13,7 +13,7 @@ end) asset.meta = { Name = "Default Ganymede Layers", Version = "1.0", - Description = [[ Default Ganymede layers are: Ganymede Texture]], + Description = "Default Ganymede layers are: Ganymede Texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset index 71c66c02d5..95e9f8ee30 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset @@ -66,7 +66,7 @@ asset.export(Ganymede) asset.meta = { Name = "Ganymede", Version = "1.1", - Description = [[ Ganymede globe with labels.]], + Description = "Ganymede globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset index 63ccdc310f..80df9f2a75 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Ganymede Texutre", Version = "1.0", - Description = [[ Default jpg texture for Ganymede]], + Description = "Default jpg texture for Ganymede", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset index e69492321c..66afd7968e 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset @@ -41,7 +41,7 @@ asset.export(GanymedeTrail) asset.meta = { Name = "Ganymede Trail", Version = "1.1", - Description = [[ Trail of Ganymede as observed by the Jupiter. Data from NASA Spice + Description = [[Trail of Ganymede as observed by the Jupiter. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset index e1d9a5cc67..574d1d16ea 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset @@ -13,7 +13,7 @@ end) asset.meta = { Name = "Default Io Layers", Version = "1.0", - Description = [[ Default Io layers are: Io Texture]], + Description = "Default Io layers are: Io Texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset index da913c5213..6e10f323e8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset @@ -66,7 +66,7 @@ asset.export(Io) asset.meta = { Name = "Io", Version = "1.1", - Description = [[ Io globe with labels.]], + Description = "Io globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset index b3550cfb8e..dd5cc30dff 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset @@ -26,7 +26,7 @@ asset.export("layer", layer) asset.meta = { Name = "Io Texutre", Version = "1.0", - Description = [[ Default jpg texture for Io]], + Description = "Default jpg texture for Io", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset index 175711701c..a697b5d2d7 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset @@ -41,7 +41,7 @@ asset.export(IoTrail) asset.meta = { Name = "Io Trail", Version = "1.1", - Description = [[ Trail of Io as observed by the Jupiter. Data from NASA Spice (see + Description = [[Trail of Io as observed by the Jupiter. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset index 9aee8e2089..ad55dbcd35 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset @@ -78,7 +78,7 @@ asset.export(JupiterLabel) asset.meta = { Name = "Jupiter", Version = "1.1", - Description = [[ Jupiter globe, and main planet label.]], + Description = "Jupiter globe, and main planet label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset index c71295f94e..cbc3414775 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset @@ -12,7 +12,7 @@ asset.export("jup341", Kernels .. "jup341.bsp") asset.meta = { Name = "Jupiter Spice Kernels", Version = "1.0", - Description = [[ Generic SPICE kernels for Jupiter.]], + Description = "Generic SPICE kernels for Jupiter", Author = "OpenSpace Team", URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset index d27cb31d33..4ef7abe9f8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Jupiter Texutre", Version = "2.0", - Description = [[ Default texture for Jupiter]], + Description = "Default texture for Jupiter", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset index bb87200aea..7df105f7c3 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset @@ -7,7 +7,7 @@ asset.require("./io/io") asset.meta = { Name = "Jupiter Major Moons", Version = "1.0", - Description = [[ Meta asset containing Jupiters major moons: Callisto, Europa, + Description = [[Meta asset containing Jupiters major moons: Callisto, Europa, Ganymede, and Io]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset index 2faa129446..a454b28d68 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset @@ -230,10 +230,9 @@ end asset.meta = { Name = "Jupiter Ananke Group Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Ananke Group - moons: S2010J2, Thelxinoe, Euanthe, Iocaste, S2003J16, Praxidike, Harpalyke, - Mneme, Hermippe, Thyone, and Ananke. Blank globes - and SPICE trails are generated for each moon.]], + Description = [[Procedural Globe asset containing Jupiter's Ananke Group moons: S2010J2, + Thelxinoe, Euanthe, Iocaste, S2003J16, Praxidike, Harpalyke, Mneme, Hermippe, Thyone, + and Ananke. Blank globes and SPICE trails are generated for each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset index f5a1256ddc..d142429a86 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset @@ -297,10 +297,10 @@ end asset.meta = { Name = "Jupiter Carme Group Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Carme Group - moons: Herse, Aitne, Kale, Taygete, Chaldene, Erinome, Kallichore, Kalyke, - Pasithee, S2010J1, Eukelade, Arche, Isonoe, Carme, and S2003J5. Blank globes - and SPICE trails are generated for each moon.]], + Description = [[Procedural Globe asset containing Jupiter's Carme Group moons: Herse, + Aitne, Kale, Taygete, Chaldene, Erinome, Kallichore, Kalyke, Pasithee, S2010J1, + Eukelade, Arche, Isonoe, Carme, and S2003J5. Blank globes and SPICE trails are + generated for each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset index 1cdaa9bd04..9072961ae8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset @@ -57,9 +57,8 @@ end asset.meta = { Name = "Jupiter Carpo Group Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Carpo Group - moons: Carpo. Blank globes and SPICE trails - are generated for each moon.]], + Description = [[Procedural Globe asset containing Jupiter's Carpo Group moons: Carpo. + Blank globes and SPICE trails are generated for each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset index 9143965e05..a4789cf0b9 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset @@ -126,9 +126,9 @@ end asset.meta = { Name = "Jupiter Himalia Group Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Himalia Group - moons: Leda, Himalia, Lysithea, Elara and Dia. Blank globes and SPICE trails - are generated for each moon.]], + Description = [[Procedural Globe asset containing Jupiter's Himalia Group moons: Leda, + Himalia, Lysithea, Elara and Dia. Blank globes and SPICE trails are generated for each + moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset index b8c0c23122..10859a53bf 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset @@ -108,9 +108,9 @@ end asset.meta = { Name = "Jupiter Inner Group Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Inner Group - moons: Metis, Adrastea, Amalthea, and Thebe. Blank globes and SPICE trails - are generated for each moon.]], + Description = [[Procedural Globe asset containing Jupiter's Inner Group moons: Metis, + Adrastea, Amalthea, and Thebe. Blank globes and SPICE trails are generated for each + moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset index 38751d1295..30c835ce96 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset @@ -184,9 +184,9 @@ end asset.meta = { Name = "Jupiter Pasiphae Other Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Other Group - moons: S2003J12, S/2003J3, S2011J1, S2003J19, S2003J10, S2003J23, S2003J9, - and S2003J2. Blank globes and SPICE trails are generated for each moon.]], + Description = [[Procedural Globe asset containing Jupiter's Other Group moons: S2003J12, + S/2003J3, S2011J1, S2003J19, S2003J10, S2003J23, S2003J9, and S2003J2. Blank globes + and SPICE trails are generated for each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset index dcb958985f..ffb66840e6 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset @@ -386,11 +386,10 @@ end asset.meta = { Name = "Jupiter Pasiphae Group Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Pasiphae Group - moons: Euporie, S2003J18, Helike, Orthosie, S2016J1, S2003J15, Aoede, Callirrhoe, - Eurydome, Kore, Cyllene, S2011J2, S2017J1, S2003J4, Pasiphae, Hegemone, Sinope, - Sponde, Autonoe and Megaclite. Blank globes and SPICE trails are generated for - each moon.]], + Description = [[Procedural Globe asset containing Jupiter's Pasiphae Group moons: + Euporie, S2003J18, Helike, Orthosie, S2016J1, S2003J15, Aoede, Callirrhoe, Eurydome, + Kore, Cyllene, S2011J2, S2017J1, S2003J4, Pasiphae, Hegemone, Sinope, Sponde, + Autonoe and Megaclite. Blank globes and SPICE trails are generated for each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset index fb6e8d14dc..8eb6615b22 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset @@ -56,8 +56,8 @@ end asset.meta = { Name = "Jupiter Themisto Group Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Jupiter's Themisto Group - moons: Themisto. Blank globes and SPICE trails are generated for each moon.]], + Description = [[Procedural Globe asset containing Jupiter's Themisto Group moons: + Themisto. Blank globes and SPICE trails are generated for each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset index 6b87a3618b..a5b0119172 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset @@ -11,8 +11,8 @@ asset.require("./minor/themisto_group") asset.meta = { Name = "Jupiter Minor Moons", Version = "1.0", - Description = [[ Meta asset containing eight moon groups: Ananke, Carme, Carpo, - Himalia, Pasiphae, Themisto, Inner, and Other]], + Description = [[Meta asset containing eight moon groups: Ananke, Carme, Carpo, Himalia, + Pasiphae, Themisto, Inner, and Other]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/trail.asset index 72ef7a7be5..928770f8e7 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail.asset @@ -39,8 +39,8 @@ asset.export(JupiterTrail) asset.meta = { Name = "Jupiter Trail", Version = "1.1", - Description = [[ Trail of Jupiter as observed by the Sun. Data from NASA Spice (see - base spice asset)]], + Description = [[Trail of Jupiter as observed by the Sun. Data from NASA Spice (see + base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset index e69fd2935f..b7cce875a3 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail_barycenter.asset @@ -40,8 +40,8 @@ asset.export(JupiterBarycenterTrail) asset.meta = { Name = "Jupiter Trail", Version = "1.1", - Description = [[ Trail of Jupiter's Barycenter as observed by the Sun. Data from NASA Spice (see - base spice asset)]], + Description = [[Trail of Jupiter's Barycenter as observed by the Sun. Data from NASA + Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset index 54f3aac12c..d2cbde3160 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset @@ -42,8 +42,8 @@ asset.export(JupiterTrailEarth) asset.meta = { Name = "Jupiter Trail from Earth", Version = "1.1", - Description = [[ Trail of Jupiter as observed by the Earth. Data from NASA - SPICE (see base spice asset)]], + Description = [[Trail of Jupiter as observed by the Earth. Data from NASA SPICE (see + base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset index 9c8e400875..dbcf392f46 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset @@ -35,7 +35,7 @@ asset.export(JupiterBarycenter) asset.meta = { Name = "Jupiter Transforms", Version = "1.1", - Description = [[ Jupiter Barycenter transform ]], + Description = "Jupiter Barycenter transform", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset index 734600d7c7..3eefaa60cd 100644 --- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset @@ -48,7 +48,7 @@ local Atmosphere = { GUI = { Name = "Mars Atmosphere", Path = "/Solar System/Planets/Mars", - Description = [[ Atmosphere of Mars.]] + Description = "Atmosphere of Mars" } } @@ -67,7 +67,7 @@ asset.export(Atmosphere) asset.meta = { Name = "Mars Atmosphere", Version = "1.1", - Description = [[ RenderableAtmosphere for Mars.]], + Description = "RenderableAtmosphere for Mars", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/default_layers.asset index 3440e29b42..b87d2ef7a8 100644 --- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset @@ -41,9 +41,9 @@ end) asset.meta = { Name = "Default Mars Layers", Version = "1.1", - Description = [[ Default Mars layers are: MOC WA Color, Viking MDIM, MOLA Pseudo - Color, MOLA HRSC, Themis IR Day, Themis IR Night, CTX Mosaic, CTX Blended - beta01, HiRISE, and HiRISE Local Set]], + Description = [[Default Mars layers are: MOC WA Color, Viking MDIM, MOLA Pseudo Color, + MOLA HRSC, Themis IR Day, Themis IR Night, CTX Mosaic, CTX Blended beta01, HiRISE, and + HiRISE Local Set]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset index 44727a84ea..60aca06344 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,7 +42,7 @@ asset.meta = { Name = "CTX Blended beta01", Version = "1.1", Description = [[New blended CTX map for Mars from CalTech Murray lab. This map is - hosted by ESRI.]], + hosted by ESRI]], Author = "Caltech Murray Lab", URL = "http://murray-lab.caltech.edu/CTX/", License = "Esri Master License Agreement" diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset index 7914ab1948..ee8d6e80a5 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset @@ -22,8 +22,8 @@ asset.export("layer", layer) asset.meta = { Name = "CTX Mosaic [Sweden]", Version = "1.0", - Description = [[ CTX Mosaic layer for Mars globe. This layer is served from the - OpenSpace servers in Sweden.]], + Description = [[CTX Mosaic layer for Mars globe. This layer is served from the + OpenSpace servers in Sweden]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset index 9571efd001..aec22a88ff 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset @@ -22,8 +22,8 @@ asset.export("layer", layer) asset.meta = { Name = "CTX Mosaic [Utah]", Version = "1.0", - Description = [[ CTX Mosaic layer for Mars globe. This layer is served from the - OpenSpace servers in Utah.]], + Description = [[CTX Mosaic layer for Mars globe. This layer is served from the + OpenSpace servers in Utah]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset index 14cb347416..f53ed4920e 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset @@ -38,7 +38,7 @@ asset.meta = { Name = "HiRISE", Version = "1.1", Description = [[Updated HiRISE layer for Mars with raw unselected imagery. This map is - hosted by ESRI.]], + hosted by ESRI]], Author = "esri_astro", URL = "https://www.arcgis.com/home/item.html?id=c1c4c750a2154842ae523c984cc14fa5", License = "Esri Master License Agreement" diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset index 8b50ff6ad6..0dfe5d8de7 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset @@ -5,18 +5,18 @@ local layer = { Name = "HiRISE Local Set", FilePath = asset.localResource("hirisels.vrt"), BlendMode = "Color", - Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most + Description = [[HiRISE (High Resolution Imaging Science Experiment) is the most powerful camera ever sent to another planet, one of six instruments onboard the Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have - been imaging ever since. Our camera’s high resolution capability (imaging up to 30 + been imaging ever since. Our camera's high resolution capability (imaging up to 30 centimeters per pixel) remains unprecedented for any existing orbiter in the study of the Red Planet, as well as being an indispensable instrument for helping to select landing sites for robotic and future human exploration. In the past decade, - we’ve also imaged avalanches in progress, and discovered dark flows that may or + we've also imaged avalanches in progress, and discovered dark flows that may or may not be briny seeps. Hundreds of science papers have been published with our data. (Description from URL). This map contains a subet set of the HiRISE imagaery, only containing locations where a corresponding HiRISE digital terrain - model (DTM) was available as of 2018.]], + model (DTM) was available as of 2018]], } asset.onInitialize(function() @@ -34,8 +34,8 @@ asset.export("layer", layer) asset.meta = { Name = "HiRISE Local Set", Version = "1.1", - Description = [[HiRISE layer for images with corresponding DEMs. This map is - hosted by ESRI.]], + Description = [[HiRISE layer for images with corresponding DEMs. This map is hosted by + ESRI]], Author = "USGS", URL = "https://www.uahirise.org", License = "Esri Master License Agreement" diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset index 911568c86f..9da8d1d675 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset @@ -11,7 +11,7 @@ local layer = { Identifier = "Mars_Texture", Name = "Mars Texture", FilePath = texturesPath .. "mars.jpg", - Description = [[ Default jpg texture for Mars]] + Description = "Default jpg texture for Mars" } asset.onInitialize(function() @@ -29,7 +29,7 @@ asset.export("layer", layer) asset.meta = { Name = "Mars Texutre", Version = "1.0", - Description = [[ Jpg texture for Mars, available for offline use.]], + Description = "Jpg texture for Mars, available for offline use", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset index 986d526984..e194f4f429 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_sweden.asset @@ -11,7 +11,7 @@ local layer = { Description = [[This map is an AMNH version of the global mossaic produced by the Mars Global Surveyor Wide Angle Camera. This version has color added and the shadows subdued based on the MOLA DTM. Data Reference: - https://www.jpl.nasa.gov/spaceimages/details.php?id=PIA03467.]], + https://www.jpl.nasa.gov/spaceimages/details.php?id=PIA03467]], } asset.onInitialize(function() @@ -30,7 +30,7 @@ asset.meta = { Name = "MOC WA Color [Sweden]", Version = "1.1", Description = [[Main color map layer for Mars. This map is hosted - on the OpenSpace server in Sweden.]], + on the OpenSpace server in Sweden]], Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset index 69cc100827..c02d7b28c2 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 @@ -29,8 +29,8 @@ asset.export("layer", layer) asset.meta = { Name = "MOC WA Color [Utah]", Version = "1.1", - Description = [[Main color map layer for Mars. This map is hosted - on the OpenSpace server in Utah.]], + Description = [[Main color map layer for Mars. This map is hosted on the OpenSpace + server in Utah]], Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", License = "NASA/PDS" 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 93cd918697..a0b64074aa 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 @@ -4,7 +4,7 @@ local layer = { Identifier = "MOLA_HRSC_Sweden", Name = "MOLA HRSC [Sweden]", FilePath = asset.localResource("mola_hrsc_sweden.wms"), - Description = [[ This map layer is colorzied based elevation data from MOLA and HRSC. + Description = [[This map layer is colorzied based elevation data from MOLA and HRSC. Compared to MOLA Psuedo Color, this layer has no terrain shading, which is suitable for use when combing with other layers. Data Reference: https://astrogeology.usgs.gov/search/map/Mars/Topography/HRSC_MOLA_Blend/Mars_HRSC_MOLA_BlendDEM_Global_200mp_v2]], @@ -25,8 +25,8 @@ asset.export("layer", layer) asset.meta = { Name = "MOLA HRSC [Sweden]", Version = "1.1", - Description = [[ Colorzied elevation data for Mars. This map is hosted on the - OpenSpace server in Sweden.]], + Description = [[Colorzied elevation data for Mars. This map is hosted on the OpenSpace + server in Sweden]], Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", License = "NASA/PDS" 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 5ed20cc70b..7707777eb6 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 @@ -4,7 +4,7 @@ local layer = { Identifier = "MOLA_HRSC_Utah", Name = "MOLA HRSC [Utah]", FilePath = asset.localResource("mola_hrsc_utah.wms"), - Description = [[ This map layer is colorzied based elevation data from MOLA and HRSC. + Description = [[This map layer is colorzied based elevation data from MOLA and HRSC. Compared to MOLA Psuedo Color, this layer has no terrain shading, which is suitable for use when combing with other layers. Data Reference: https://astrogeology.usgs.gov/search/map/Mars/Topography/HRSC_MOLA_Blend/Mars_HRSC_MOLA_BlendDEM_Global_200mp_v2]], @@ -25,8 +25,8 @@ asset.export("layer", layer) asset.meta = { Name = "MOLA HRSC [Utah]", Version = "1.1", - Description = [[ Colorzied elevation data for Mars. This map is hosted on the - OpenSpace server in Sweden.]], + Description = [[Colorzied elevation data for Mars. This map is hosted on the OpenSpace + server in Sweden]], Author = "OpenSpace Team", URL = "http://www.openspaceproject.com", License = "NASA/PDS" 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 36d453325c..02555797ea 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 @@ -5,7 +5,7 @@ local layer = { Name = "MOLA Pseudo Color [Sweden]", FilePath = asset.localResource("mola_pseudo_color_sweden.wms"), Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA) - (Smith, et al., 2001), an instrument on NASA’s Mars Global Surveyor (MGS) + (Smith, et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS) spacecraft (Albee, et al., 2001). The image used for the base of this map represents more than 600 million measurements gathered between 1999 and 2001, adjusted for consistency (Neumann, et al., 2001; Neumann, et al., 2003) and @@ -17,7 +17,7 @@ local layer = { Neumann, et al., 2003). However, the total elevation uncertainty is at least ±3 m due to the global error in the areoid (±1.8 meters; Lemoine, et al., 2001) and regional uncertainties in its shape (Neumann, 2002). Pixel resolution of this map - is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL).]], + is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL)]], } asset.onInitialize(function() @@ -35,8 +35,8 @@ asset.export("layer", layer) asset.meta = { Name = "MOLA Pseudo Color [Sweden]", Version = "1.1", - Description = [[ Colorzied elevation data for Mars (with shading). This map is hosted - on the OpenSpace server in Sweden.]], + Description = [[Colorzied elevation data for Mars (with shading). This map is hosted + on the OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_ClrShade_merge_global_463m", 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 77e8872282..e212b54ae2 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 @@ -5,7 +5,7 @@ local layer = { Name = "MOLA Pseudo Color [Utah]", FilePath = asset.localResource("mola_pseudo_color_utah.wms"), Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA) - (Smith, et al., 2001), an instrument on NASA’s Mars Global Surveyor (MGS) + (Smith, et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS) spacecraft (Albee, et al., 2001). The image used for the base of this map represents more than 600 million measurements gathered between 1999 and 2001, adjusted for consistency (Neumann, et al., 2001; Neumann, et al., 2003) and @@ -35,8 +35,8 @@ asset.export("layer", layer) asset.meta = { Name = "MOLA Pseudo Color [Utah]", Version = "1.1", - Description = [[ Colorzied elevation data for Mars (with shading). This map is hosted - on the OpenSpace server in Utah.]], + Description = [[Colorzied elevation data for Mars (with shading). This map is hosted + on the OpenSpace server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_ClrShade_merge_global_463m", 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 6d386e688f..a62a1c4c90 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 @@ -12,9 +12,9 @@ local layer = { make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image datasets: 1. Techniques and data processing for Thermal - Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, + Emission Imaging System (THEMIS) multi-spectral data, J. Geophys. Res., 116, E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 - (Description from URL).]], + (Description from URL)]], } asset.onInitialize(function() @@ -33,7 +33,7 @@ asset.meta = { Name = "Themis IR Day [Sweden]", Version = "1.1", Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server - in Sweden.]], + in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", 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 861700e630..320ee0811b 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 @@ -12,9 +12,9 @@ local layer = { make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image datasets: 1. Techniques and data processing for Thermal - Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, + Emission Imaging System (THEMIS) multi-spectral data, J. Geophys. Res., 116, E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 - (Description from URL).]], + (Description from URL)]], } asset.onInitialize(function() @@ -33,7 +33,7 @@ asset.meta = { Name = "Themis IR Day [Utah]", Version = "1.1", Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server - in Utah.]], + in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", 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 76781643a2..dace083eb6 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 @@ -13,9 +13,9 @@ local layer = { latitude.

Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image datasets: 1. Techniques and data processing for Thermal Emission Imaging System - (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008, + (THEMIS) multi-spectral data, J. Geophys. Res., 116, E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from - URL).]], + URL)]], } asset.onInitialize(function() @@ -34,7 +34,7 @@ asset.meta = { Name = "Themis IR Night [Sweden]", Version = "1.1", Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace - server in Sweden.]], + server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", 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 696049397f..6d3d9737eb 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 @@ -15,7 +15,7 @@ local layer = { datasets: 1. Techniques and data processing for Thermal Emission Imaging System (THEMIS) multi-spectral data, J. Geophys. Res., 116, E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from - URL).]], + URL)]], } asset.onInitialize(function() @@ -34,7 +34,7 @@ asset.meta = { Name = "Themis IR Night [Utah]", Version = "1.1", Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace - server in Utah.]], + server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", 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 8e2a5db8fc..cbdd1f5019 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 @@ -22,7 +22,7 @@ local layer = { as an accurate basemap on which data from future missions can be plotted. (Description from URL).

References: Williams, D. R. (2018). Viking Mission to Mars. https://nssdc.gsfc.nasa.gov/planetary/viking.html Additional - references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 ]], + references available here: http://astrogeology.usgs.gov/maps/mdim-2-1]], } asset.onInitialize(function() @@ -40,8 +40,8 @@ asset.export("layer", layer) asset.meta = { Name = "Viking MDIM [Sweden]", Version = "1.1", - Description = [[ Alternate image layer for Mars. This map is hosted - on the OpenSpace server in Sweden.]], + Description = [[Alternate image layer for Mars. This map is hosted on the OpenSpace + server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. "Mars_Viking_MDIM21_ClrMosaic_global_232m", 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 dc4c31dd40..618bffde0b 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 @@ -22,7 +22,7 @@ local layer = { as an accurate basemap on which data from future missions can be plotted. (Description from URL).

References: Williams, D. R. (2018). Viking Mission to Mars. https://nssdc.gsfc.nasa.gov/planetary/viking.html Additional - references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 ]], + references available here: http://astrogeology.usgs.gov/maps/mdim-2-1]], } asset.onInitialize(function() @@ -40,8 +40,8 @@ asset.export("layer", layer) asset.meta = { Name = "Viking MDIM [Utah]", Version = "1.1", - Description = [[ Alternate image layer for Mars. This map is hosted - on the OpenSpace server in Utah.]], + Description = [[Alternate image layer for Mars. This map is hosted on the OpenSpace + server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. "Mars_Viking_MDIM21_ClrMosaic_global_232m", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset index 72809965f1..749cd6d530 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset @@ -4,13 +4,13 @@ local layer = { Identifier = "MDEM200M", Name = "HRSC MOLA Blended DEM Global 200m v2", FilePath = asset.localResource("mdem200m.wms"), - Description = [[ Blend of data derived from the Mars Orbiter Laser Altimeter + Description = [[Blend of data derived from the Mars Orbiter Laser Altimeter (MOLA, an instrument aboard NASA's Mars Global Surveyor spacecraft), and data derived from the High-Resolution Stereo Camera (HRSC, an instrument aboard the European Space Agency's Mars Express spacecraft). The average accuracy is ~100 meters in horizontal position and the elevation uncertainty is at least ±3 m. This tiled elevation layer, hosted by ESRI, is made available using lossless LERC compression. - (Description from URL).]], + (Description from URL)]], } asset.onInitialize(function() @@ -28,7 +28,7 @@ asset.export("layer", layer) asset.meta = { Name = "Mars HRSC MOLA Blended DEM Global 200m v2", Version = "1.1", - Description = [[ESRI Hosted ars HRSC MOLA Blended DEM.]], + Description = "ESRI Hosted ars HRSC MOLA Blended DEM", Author = "esri_astro", URL = "https://www.arcgis.com/home/item.html?id=225adad86379474ebc3d51a74573c99b", License = "Esri Master License Agreement" 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 c771a9e8de..87928fb9a2 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset @@ -4,7 +4,7 @@ local layer = { Identifier = "HiRISE-LS-DEM", Name = "HiRISE Local Set DEM", FilePath = asset.localResource("hirisels.wms"), - Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most + Description = [[HiRISE (High Resolution Imaging Science Experiment) is the most powerful camera ever sent to another planet, one of six instruments onboard the Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have been imaging ever since. Our camera's high resolution capability (imaging up to 30 @@ -14,7 +14,7 @@ local layer = { we've also imaged avalanches in progress, and discovered dark flows that may or may not be briny seeps. Hundreds of science papers have been published with our data. (Description from URL). This map contains a subet set of the HiRISE - DEM where available as of 2018.]], + DEM where available as of 2018]], } asset.onInitialize(function() @@ -32,8 +32,8 @@ asset.export("layer", layer) asset.meta = { Name = "HiRISE Local Set DEM", Version = "1.1", - Description = [[HiRISE DEM layer for corresponding Local Set imager. This map is - hosted by ESRI.]], + Description = [[HiRISE DEM layer for corresponding Local Set imager. This map is hosted + by ESRI]], Author = "USGS", URL = "https://www.uahirise.org", License = "Esri Master License Agreement" diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset index 231a7dbf06..cdbc86a86e 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_sweden.asset @@ -5,7 +5,7 @@ local layer = { Name = "Mola Elevation [Sweden]", FilePath = asset.localResource("mola_sweden.wms"), TilePixelSize = 90, - Description = [[ This digital elevation model (DEM) is based on data from the Mars + Description = [[This digital elevation model (DEM) is based on data from the Mars Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS) spacecraft (Albee et al., 2001). The MOLA DEM represents more than 600 million measurements gathered between 1999 and 2001, adjusted for @@ -18,7 +18,7 @@ local layer = { elevation uncertainty is at least ±3 m due to the global error in the areoid (±1.8 meters; Neumann et al., 2001) and regional uncertainties in its shape (Neumann, 2002). Pixel resolution is 463 meters per pixel (m). (Description from - URL). Data Reference: (See URL).]], + URL). Data Reference: (See URL)]], } asset.onInitialize(function() @@ -37,8 +37,8 @@ asset.meta = { Name = "Mola Elevation [Sweden]", Version = "1.1", Author = "USGS", - Description = [[ Global elevation layer for Mars. This layer is hosted on the - OpenSpace server in Sweden.]], + Description = [[Global elevation layer for Mars. This layer is hosted on the OpenSpace + server in Sweden]], URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_DEM_mosaic_global_463m", License = "NASA/PDS" 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 550672c7be..de48d006a8 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 @@ -5,7 +5,7 @@ local layer = { Name = "Mola Elevation [Utah]", FilePath = asset.localResource("mola_utah.wms"), TilePixelSize = 90, - Description = [[ This digital elevation model (DEM) is based on data from the Mars + Description = [[This digital elevation model (DEM) is based on data from the Mars Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS) spacecraft (Albee et al., 2001). The MOLA DEM represents more than 600 million measurements gathered between 1999 and 2001, adjusted for @@ -18,7 +18,7 @@ local layer = { elevation uncertainty is at least ±3 m due to the global error in the areoid (±1.8 meters; Neumann et al., 2001) and regional uncertainties in its shape (Neumann, 2002). Pixel resolution is 463 meters per pixel (m). (Description from - URL). Data Reference: (See URL).]], + URL). Data Reference: (See URL)]], } asset.onInitialize(function() @@ -36,8 +36,8 @@ asset.export("layer", layer) asset.meta = { Name = "Mola Elevation [Utah]", Version = "1.1", - Description = [[ Global elevation layer for Mars. This layer is hosted on the - OpenSpace server in Utah.]], + Description = [[Global elevation layer for Mars. This layer is hosted on the OpenSpace + server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_DEM_mosaic_global_463m", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset index a601d8d2ff..955f80bf94 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset @@ -19,7 +19,7 @@ asset.export("layer", layer) asset.meta = { Name = "Mars Indices", Version = "1.0", - Description = [[ This asset supplies a tile index layer for the Mars globe.]], + Description = "This asset supplies a tile index layer for the Mars globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset index bcb7cb6884..6e22afd08a 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset @@ -23,7 +23,7 @@ asset.export("layer", layer) asset.meta = { Name = "Mars Size Reference", Version = "1.0", - Description = [[ This asset supplies a size reference layer for the Mars globe.]], + Description = "This asset supplies a size reference layer for the Mars globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 03ae56507b..1734cb053a 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -49,7 +49,7 @@ local Mars = { GUI = { Name = "Mars", Path = "/Solar System/Planets/Mars", - Description = [[ Main globe for Mars with labels and map layers.]] + Description = "Main globe for Mars with labels and map layers" } } @@ -76,7 +76,7 @@ local MarsLabel = { GUI = { Name = "Mars Label", Path = "/Solar System/Planets/Mars", - Description = [[ Main label for Mars]] + Description = "Main label for Mars" } } @@ -98,7 +98,7 @@ asset.export(MarsLabel) asset.meta = { Name = "Mars", Version = "1.1", - Description = [[ Mars globe, and main globe label.]], + Description = "Mars globe, and main globe label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset index db687edcbf..031336a8b3 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset @@ -50,7 +50,7 @@ local Deimos = { GUI = { Name = "Deimos", Path = "/Solar System/Planets/Mars", - Description = [[One of two moons of Mars.]] + Description = "One of two moons of Mars" } } @@ -72,7 +72,7 @@ local DeimosTrail = { GUI = { Name = "Deimos Trail", Path = "/Solar System/Planets/Mars", - Description = [[Trail for Deimos]] + Description = "Trail for Deimos" } } @@ -93,7 +93,7 @@ asset.export(DeimosTrail) asset.meta = { Name = "Deimos", Version = "1.0", - Description = [[ RenderableModel and Trail for Deimos.]], + Description = "RenderableModel and Trail for Deimos", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset index 4fb9ad6aa0..3326506aad 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos_globe.asset @@ -37,7 +37,7 @@ local DeimosGlobe = { GUI = { Name = "Deimos_Globe", Path = "/Solar System/Planets/Mars", - Description = [[One of two moons of Mars.]] + Description = "One of two moons of Mars" } } @@ -55,9 +55,8 @@ asset.export(DeimosGlobe) asset.meta = { Name = "Deimos Globe", Version = "1.0", - Description = [[ RenderableGlobe for Deimos.]], + Description = "RenderableGlobe for Deimos", Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Deimos"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset index bb4eac747d..d65661b0c3 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset @@ -5,7 +5,7 @@ local layer = { Name = "Deimos Global Mosaic [USGS]", Enabled = true, FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/deimos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Deimos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90", - Description = [[ This Viking-based cylindrical map of Deimos was created by Philip + Description = [[This Viking-based cylindrical map of Deimos was created by Philip Stooke with the assistance of Chris Jongkind and Megan Arntz. Control is based on a shape model and mosaic by Peter Thomas and colleagues at Cornell University. Date released 26 October 2001. (Description from URL)]] diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset index 6b259f3ab0..0032ec8520 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset @@ -5,7 +5,7 @@ local layer = { Name = "Phobos Global Shaded Relief [USGS]", Enabled = true, FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/phobos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Phobos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90", - Description = [[ Viking-base Phobos shaded relief created by USGS.]] + Description = "Viking-base Phobos shaded relief created by USGS" } asset.onInitialize(function() diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset index ad27d32b46..2749acc643 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset @@ -51,7 +51,7 @@ local Phobos = { GUI = { Name = "Phobos", Path = "/Solar System/Planets/Mars", - Description = [[One of two moons of Mars.]] + Description = "One of two moons of Mars" } } @@ -74,7 +74,7 @@ local PhobosTrail = { GUI = { Name = "Phobos Trail", Path = "/Solar System/Planets/Mars", - Description = [[Trail for Phobos.]] + Description = "Trail for Phobos" } } @@ -96,7 +96,7 @@ asset.export(PhobosTrail) asset.meta = { Name = "Phobos", Version = "1.0", - Description = [[ RenderableModel and Trail for Phobos.]], + Description = "RenderableModel and Trail for Phobos", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset index efdba64a7a..a43e3d9077 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos_globe.asset @@ -37,7 +37,7 @@ local PhobosGlobe = { GUI = { Name = "Phobos_Globe", Path = "/Solar System/Planets/Mars", - Description = [[One of two moons of Mars.]] + Description = "One of two moons of Mars" } } @@ -55,9 +55,8 @@ asset.export(PhobosGlobe) asset.meta = { Name = "Phobos Globe", Version = "1.0", - Description = [[ RenderableGlobe for Phobos.]], + Description = "RenderableGlobe for Phobos", Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Phobos"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset index e1b81178f4..93a6b92063 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail.asset @@ -21,7 +21,7 @@ local MarsTrail = { GUI = { Name = "Mars Trail", Path = "/Solar System/Planets/Mars", - Description = [[ Trail of Mars as observed by the Sun. Data from NASA Spice (see + Description = [[Trail of Mars as observed by the Sun. Data from NASA Spice (see base spice asset)]], } } @@ -41,7 +41,7 @@ asset.export(MarsTrail) asset.meta = { Name = "Mars Trail", Version = "1.1", - Description = [[ Main Mars trail from SPICE.]], + Description = "Main Mars trail from SPICE", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset index df80862588..505c537aff 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail_barycenter.asset @@ -22,8 +22,8 @@ local MarsBarycenterTrail = { GUI = { Name = "Mars Barycenter Trail", Path = "/Solar System/Planets/Mars", - Description = [[ Trail of Mars' Barycenter as observed by the Sun. Data from NASA Spice (see - base spice asset)]], + Description = [[Trail of Mars' Barycenter as observed by the Sun. Data from NASA Spice + (see base spice asset)]], } } @@ -42,7 +42,7 @@ asset.export(MarsBarycenterTrail) asset.meta = { Name = "Mars Trail", Version = "1.1", - Description = [[ Barycenter Mars trail from SPICE.]], + Description = "Barycenter Mars trail from SPICE", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset index 6e0e1874cf..e1da3b261d 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset @@ -24,7 +24,7 @@ local MarsTrailEarth = { Name = "Mars trail from Earth", Path = "/Solar System/Planets/Mars", Hidden = false, - Description = [[ Trail of Mars as observed by the Earth]], + Description = "Trail of Mars as observed by the Earth", } } @@ -43,8 +43,8 @@ asset.export(MarsTrailEarth) asset.meta = { Name = "Mars Trail from Earth", Version = "1.1", - Description = [[ Trail of Mars, parented to Earth with Earth as the SPICE observer. - Data from NASA SPICE (see base spice asset)]], + Description = [[Trail of Mars, parented to Earth with Earth as the SPICE observer. Data + from NASA SPICE (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset index e373087398..51a33f600f 100644 --- a/data/assets/scene/solarsystem/planets/mars/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset @@ -15,7 +15,7 @@ local MarsBarycenter = { Name = "Mars Barycenter", Path = "/Solar System/Planets/Mars", Hidden = true, - Description = [[ SPICE Translation for targeting Mars Barycenter]], + Description = "SPICE Translation for targeting Mars Barycenter", } } @@ -34,7 +34,7 @@ asset.export(MarsBarycenter) asset.meta = { Name = "Mars Transforms", Version = "1.1", - Description = [[ Transform with position for Mars.]], + Description = "Transform with position for Mars", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset index 3379168eec..a99403c520 100644 --- a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset @@ -48,7 +48,7 @@ end) asset.meta = { Name = "Default Mercury Layers", Version = "1.0", - Description = [[ Default Mercury layers are: Messenger MDIS, Messenger Mosaic2, + Description = [[Default Mercury layers are: Messenger MDIS, Messenger Mosaic2, Messenger BDR, Messenger MDR, Messenger MP3, Messenger Hie, Messenger Hiw, Messenger LOI, Messenger SHADE, Aluminum Abundance, Calcium Abundance, Iron Abundance, Magnesium Abundance, and Silicon Abundance]], diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset index 683a6830da..80b071a518 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset @@ -29,7 +29,7 @@ asset.export("layer", layer) asset.meta = { Name = "Mercury Aluminium Abundance", Version = "1.0", - Description = [[ Aluminium Abundance layer for Mercury globe]], + Description = "Aluminium Abundance layer for Mercury globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset index 39b4ff4faa..6a070d3a99 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset @@ -30,7 +30,7 @@ asset.export("layer", layer) asset.meta = { Name = "Mercury Calcium Abundance", Version = "1.0", - Description = [[ Calcium Abundance layer for Mercury globe]], + Description = "Calcium Abundance layer for Mercury globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset index e014f11702..66f619bcc2 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset @@ -30,7 +30,7 @@ asset.export("layer", layer) asset.meta = { Name = "Mercury Iron Abundance", Version = "1.0", - Description = [[ Iron Abundance layer for Mercury globe]], + Description = "Iron Abundance layer for Mercury globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset index 017ef4ad1b..93ad9ee5ff 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset @@ -12,7 +12,7 @@ local layer = { best fit the intended illumination geometry or low emission angle and incidence angle near 74 degrees. It is controlled and projected onto a global digital elevation model. It uses a Kasseleinin-Shkuratov photometric model, whose parameters are the same for any given - wavelength band across all MESSENGER end-of-mission map data products.]] + wavelength band across all MESSENGER end-of-mission map data products]] } asset.onInitialize(function() @@ -30,8 +30,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger BDR [Sweden]", Version = "1.0", - Description = [[ Mercury MESSENGER MDIS Global Basemap BDR 166m layer for Mercury globe. - This map is hosted on the OpenSpace server in Sweden.]], + Description = [[Mercury MESSENGER MDIS Global Basemap BDR 166m layer for Mercury globe. + This map is hosted on the OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_Basemap_BDR_Mosaic_Global_166m", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset index 2acff83235..f4d5715d9e 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset @@ -12,7 +12,7 @@ local layer = { best fit the intended illumination geometry or low emission angle and incidence angle near 74 degrees. It is controlled and projected onto a global digital elevation model. It uses a Kasseleinin-Shkuratov photometric model, whose parameters are the same for any given - wavelength band across all MESSENGER end-of-mission map data products.]] + wavelength band across all MESSENGER end-of-mission map data products]] } asset.onInitialize(function() @@ -30,8 +30,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger BDR [Utah]", Version = "1.0", - Description = [[ Mercury MESSENGER MDIS Global Basemap BDR 166m layer for Mercury globe. - This map is hosted on the OpenSpace server in Utah.]], + Description = [[Mercury MESSENGER MDIS Global Basemap BDR 166m layer for Mercury globe. + This map is hosted on the OpenSpace server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_Basemap_BDR_Mosaic_Global_166m", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset index fadefbb18c..a0c7f4f327 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger HIE [Sweden]", Version = "1.0", - Description = [[ Mercury HIE layer for Mercury globe. - This map is hosted on the OpenSpace server in Sweden.]], + Description = [[Mercury HIE layer for Mercury globe. This map is hosted on the OpenSpace + server in Sweden]], Author = "USGS", URL = "", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset index 5b2249f632..e103a376f2 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger HIE [Utah]", Version = "1.0", - Description = [[ Mercury HIE layer for Mercury globe. - This map is hosted on the OpenSpace server in Utah.]], + Description = [[Mercury HIE layer for Mercury globe. This map is hosted on the OpenSpace + server in Utah]], Author = "USGS", URL = "", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset index 9176323dc2..d401b7c1f5 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger HIW [Sweden]", Version = "1.0", - Description = [[ Messenger HIW layer for Mercury globe. - This map is hosted on the OpenSpace server in Sweden.]], + Description = [[Messenger HIW layer for Mercury globe. This map is hosted on the + OpenSpace server in Sweden]], Author = "USGS", URL = "", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset index f1fe3a0bd9..3e752a0ef2 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger HIW [Utah]", Version = "1.0", - Description = [[ Messenger HIW layer for Mercury globe. - This map is hosted on the OpenSpace server in Utah.]], + Description = [[Messenger HIW layer for Mercury globe. This map is hosted on the + OpenSpace server in Utah]], Author = "USGS", URL = "", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset index de14d966e2..177dbf0d85 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger LOI [Sweden]", Version = "1.0", - Description = [[ Mercury LOI layer for Mercury globe. - This map is hosted on the OpenSpace server in Sweden.]], + Description = [[Mercury LOI layer for Mercury globe. This map is hosted on the OpenSpace + server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_Basemap_LOI_Mosaic_Global_166m", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset index 3dcb3086c9..3ce8d879ce 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger LOI [Utah]", Version = "1.0", - Description = [[ Mercury LOI layer for Mercury globe. - This map is hosted on the OpenSpace server in Utah.]], + Description = [[Mercury LOI layer for Mercury globe. This map is hosted on the OpenSpace + server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_Basemap_LOI_Mosaic_Global_166m", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset index 33885c5862..71e8effe2f 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset @@ -13,7 +13,7 @@ local layer = { data, the 2013-05-10 version of the high-incidence global mosaic was underlain. This monochrome mosaic is composed of Mercury Dual Imaging System (MDIS) Narrow Angle Camera (NAC) images and Wide Angle Camers (WAC) images acquired in the filter centered - at 750 nm. The resolution of this mosaic is 250 meters per pixel (m).]] + at 750 nm. The resolution of this mosaic is 250 meters per pixel (m)]] } asset.onInitialize(function() @@ -31,8 +31,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger MDIS [Sweden]", Version = "1.0", - Description = [[ Messenger MDIS layer for Mercury globe. - This map is hosted on the OpenSpace server in Sweden.]], + Description = [[Messenger MDIS layer for Mercury globe. This map is hosted on the + OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_mosaic_global_250m_2013", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset index ef410e0480..c53f39fa62 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset @@ -13,7 +13,7 @@ local layer = { data, the 2013-05-10 version of the high-incidence global mosaic was underlain. This monochrome mosaic is composed of Mercury Dual Imaging System (MDIS) Narrow Angle Camera (NAC) images and Wide Angle Camers (WAC) images acquired in the filter centered - at 750 nm. The resolution of this mosaic is 250 meters per pixel (m).]] + at 750 nm. The resolution of this mosaic is 250 meters per pixel (m)]] } asset.onInitialize(function() @@ -31,8 +31,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger MDIS [Utah]", Version = "1.0", - Description = [[ Messenger MDIS layer for Mercury globe. - This map is hosted on the OpenSpace server in Utah.]], + Description = [[Messenger MDIS layer for Mercury globe. This map is hosted on the + OpenSpace server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_mosaic_global_250m_2013", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset index 1145b4bcec..71978969f8 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger MDR [Utah]", Version = "1.0", - Description = [[ Mercury MDR layer for Mercury globe. - This map is hosted on the OpenSpace server in Utah.]], + Description = [[Mercury MDR layer for Mercury globe. This map is hosted on the OpenSpace + server in Utah]], Author = "USGS", URL = "", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset index dec4bc602d..1813414f0a 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger Mosaic2 [Sweden]", Version = "1.0", - Description = [[ Mercury Messenger Mosaic2 layer for Mercury globe. - This map is hosted on the OpenSpace server in Sweden.]], + Description = [[Mercury Messenger Mosaic2 layer for Mercury globe. This map is hosted on + the OpenSpace server in Sweden]], Author = "USGS", URL = "", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset index 9b5234d85a..065631fc69 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger Mosaic2 [Utah]", Version = "1.0", - Description = [[ Mercury Messenger Mosaic2 layer for Mercury globe. - This map is hosted on the OpenSpace server in Utah.]], + Description = [[Mercury Messenger Mosaic2 layer for Mercury globe. This map is hosted on + the OpenSpace server in Utah]], Author = "USGS", URL = "", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset index 6c0ca846c2..b07bb98999 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger Mosaic [Sweden]", Version = "1.0", - Description = [[ Mercury Messenger Mosaic layer for Mercury globe. - This map is hosted on the OpenSpace server in Sweden.]], + Description = [[Mercury Messenger Mosaic layer for Mercury globe. This map is hosted on + the OpenSpace server in Sweden]], Author = "USGS", URL = "", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset index ae74f3472e..c86449508f 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger Mosaic [Utah]", Version = "1.0", - Description = [[ Mercury Messenger Mosaic layer for Mercury globe. - This map is hosted on the OpenSpace server in Utah.]], + Description = [[Mercury Messenger Mosaic layer for Mercury globe. This map is hosted on + the OpenSpace server in Utah]], Author = "USGS", URL = "", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset index ec14b039db..c91dd97387 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset @@ -21,8 +21,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger MP3 [Utah]", Version = "1.0", - Description = [[ Mercury Messenger MP3 layer for Mercury globe. - This map is hosted on the OpenSpace server in Utah.]], + Description = [[Mercury Messenger MP3 layer for Mercury globe. This map is hosted on the + OpenSpace server in Utah]], Author = "USGS", URL = "", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset index 29d676abc1..0514c65a09 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset @@ -26,8 +26,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger SHADE [Sweden]", Version = "1.0", - Description = [[ Mercury SHADE layer for Mercury globe. - This map is hosted on the OpenSpace server in Sweden.]], + Description = [[Mercury SHADE layer for Mercury globe. This map is hosted on the + OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mercury/Topography/MESSENGER/Mercury_Messenger_USGS_ClrShade_Global_2km", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset index 4e4fa0df0b..dbfa320ead 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset @@ -26,8 +26,8 @@ asset.export("layer", layer) asset.meta = { Name = "Messenger SHADE [Utah]", Version = "1.0", - Description = [[ Mercury Messenger SHADE layer for Mercury globe. - This map is hosted on the OpenSpace server in Utah.]], + Description = [[Mercury Messenger SHADE layer for Mercury globe. This map is hosted on + the OpenSpace server in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mercury/Topography/MESSENGER/Mercury_Messenger_USGS_ClrShade_Global_2km", License = "NASA/PDS" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset index 26772b155d..cbc5b10afd 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset @@ -33,7 +33,7 @@ asset.export("layer", layer) asset.meta = { Name = "Mercury Magnesium Abundance", Version = "1.0", - Description = [[ Magnesium Abundance layer for Mercury globe]], + Description = "Magnesium Abundance layer for Mercury globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset index 811a7a780f..adb81a0a5c 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset @@ -29,7 +29,7 @@ asset.export("layer", layer) asset.meta = { Name = "Mercury Silicon Abundance", Version = "1.0", - Description = [[ Silicon Abundance layer for Mercury globe]], + Description = "Silicon Abundance layer for Mercury globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset index 3fb3cc0207..e8e0beee5f 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset @@ -89,7 +89,7 @@ asset.export(MercuryLabel) asset.meta = { Name = "Mercury", Version = "1.1", - Description = [[ Mercury globe with labels, and main planet label.]], + Description = "Mercury globe with labels, and main planet label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset index 952f77e772..238ec0662b 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset @@ -21,7 +21,7 @@ local MercuryTrail = { GUI = { Name = "Mercury Trail", Path = "/Solar System/Planets/Mercury", - Description = [[ Trail of Mercury as observed by the Sun.]], + Description = "Trail of Mercury as observed by the Sun", } } @@ -40,8 +40,7 @@ asset.export(MercuryTrail) asset.meta = { Name = "Mercury Trail", Version = "1.1", - Description = [[ Main trail for Mercury. Data from NASA Spice (see - base spice asset)]], + Description = "Main trail for Mercury. Data from NASA Spice (see base spice asset)", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset index 187f51a70a..0d4a567fbf 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail_barycenter.asset @@ -22,7 +22,7 @@ local MercuryBarycenterTrail = { GUI = { Name = "Mercury Barycenter Trail", Path = "/Solar System/Planets/Mercury", - Description = [[ Barycenter Trail of Mercury as observed by the Sun.]], + Description = "Barycenter Trail of Mercury as observed by the Sun", } } @@ -41,8 +41,8 @@ asset.export(MercuryBarycenterTrail) asset.meta = { Name = "Mercury Trail", Version = "1.1", - Description = [[ Trail for Mercury's Barycenter. Data from NASA Spice (see - base spice asset)]], + Description = [[Trail for Mercury's Barycenter. Data from NASA Spice (see base spice + asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset index e31823edbf..aaebe35f01 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset @@ -24,7 +24,7 @@ local MercuryTrailEarth = { Name = "Mercury trail from Earth", Path = "/Solar System/Planets/Mercury", Hidden = false, - Description = [[ Trail of Mercury as observed by the Earth.]], + Description = "Trail of Mercury as observed by the Earth", } } @@ -43,8 +43,8 @@ asset.export(MercuryTrailEarth) asset.meta = { Name = "Mercury Trail from Earth", Version = "1.1", - Description = [[ Alternate trail of Mercury, as observed by the Earth rather then the - Sun.]], + Description = [[Alternate trail of Mercury, as observed by the Earth rather then the + Sun]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset index 9365e25254..a19bd84d39 100644 --- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset @@ -15,7 +15,7 @@ local MercuryBarycenter = { Name = "Mercury Barycenter", Path = "/Solar System/Planets/Mercury", Hidden = true, - Description = [[ Mercury Barycenter position]], + Description = "Mercury Barycenter position", } } @@ -34,7 +34,7 @@ asset.export(MercuryBarycenter) asset.meta = { Name = "Mercury Transforms", Version = "1.1", - Description = [[ Mercury Barycenter transform]], + Description = "Mercury Barycenter transform", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset index aaa96a1536..6effbe1ab0 100644 --- a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset @@ -11,7 +11,7 @@ end) asset.meta = { Name = "Default Neptune Layers", Version = "1.0", - Description = [[ Default Neptune layers are: Neptune Texture]], + Description = "Default Neptune layers are: Neptune Texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset index a22b904ed9..ba4d5ad49e 100644 --- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset @@ -163,9 +163,9 @@ end asset.meta = { Name = "Neptune Inner Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Neptune' inner prograde moons: + Description = [[Procedural Globe asset containing Neptune' inner prograde moons: Naiad, Thalassa, Despina, Galatea, Larissa, S2004N1, and Proteus. Blank globes and - SPICE trails are generated for each moon.]], + SPICE trails are generated for each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset index e6eafd5be7..3b9f6572de 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset @@ -94,9 +94,9 @@ end asset.meta = { Name = "Neptune Irregular Prograde Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Neptune' irregular prograde + Description = [[Procedural Globe asset containing Neptune' irregular prograde moons: Halimede, Psamathe and Neso. Blank globes and SPICE trails are generated for - each moon.]], + each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset index 88e2e54df5..6a545c1720 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset @@ -93,9 +93,9 @@ end asset.meta = { Name = "Neptune Irregular Retrograde Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Neptune' irregular retrograde + Description = [[Procedural Globe asset containing Neptune' irregular retrograde moons: Nereid, Sao and Laomedeia. Blank globes and SPICE trails are generated for - each moon.]], + each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/kernels.asset b/data/assets/scene/solarsystem/planets/neptune/kernels.asset index d512e3d7c3..1511116f76 100644 --- a/data/assets/scene/solarsystem/planets/neptune/kernels.asset +++ b/data/assets/scene/solarsystem/planets/neptune/kernels.asset @@ -14,7 +14,7 @@ asset.export("nep088", Kernels .. "nep088.bsp") asset.meta = { Name = "Neptune Spice Kernels", Version = "1.0", - Description = [[ Generic SPICE kernels for Neptune.]], + Description = "Generic SPICE kernels for Neptune", Author = "OpenSpace Team", URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset index a28c779835..26457c52a3 100644 --- a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset +++ b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Neptune Texutre", Version = "1.0", - Description = [[ Default jpg texture for Neptune]], + Description = "Default jpg texture for Neptune", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset index 18ffe8f9b0..b3ad035361 100644 --- a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset @@ -4,7 +4,7 @@ asset.require("./triton") asset.meta = { Name = "Neptune Major Moons", Version = "1.0", - Description = [[ Meta asset containing Neptune's major moon: Triton]], + Description = "Meta asset containing Neptune's major moon: Triton", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset index 584e67489b..c4d744d769 100644 --- a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset @@ -6,8 +6,8 @@ asset.require("./irregular_retrograde_moons") asset.meta = { Name = "Neptune Minor Moons", Version = "1.0", - Description = [[ Meta asset containing 3 moon groups: inner_moons, - irregular_prograde_moons, and irregular_retrograde_moons]], + Description = [[Meta asset containing 3 moon groups: inner_moons, + irregular_prograde_moons, and irregular_retrograde_moons]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset index a168e76df3..92360d16f6 100644 --- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset +++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset @@ -27,7 +27,7 @@ local Neptune = { GUI = { Name = "Neptune", Path = "/Solar System/Planets/Neptune", - Description = [[Neptune globe]] + Description = "Neptune globe" } } @@ -48,7 +48,7 @@ local NeptuneLabel = { GUI = { Name = "Neptune Label", Path = "/Solar System/Planets/Neptune", - Description = [[ Main planet label for Neptune.]], + Description = "Main planet label for Neptune", } } @@ -70,7 +70,7 @@ asset.export(NeptuneLabel) asset.meta = { Name = "Neptune", Version = "1.1", - Description = [[ Neptune globe, and main planet label.]], + Description = "Neptune globe, and main planet label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset index dbf45d8b65..bf0e729156 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset @@ -32,7 +32,7 @@ local NeptuneTrail = { GUI = { Name = "Neptune Trail", Path = "/Solar System/Planets/Neptune", - Description = [[ Trail of Neptune as observed by the Sun.]] + Description = "Trail of Neptune as observed by the Sun" } } @@ -51,7 +51,7 @@ asset.export(NeptuneTrail) asset.meta = { Name = "Neptune Trail", Version = "1.1", - Description = [[ Main trail of Neptune. Data from NASA Spice (see base spice asset)]], + Description = "Main trail of Neptune. Data from NASA Spice (see base spice asset)", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset index bd92b81d92..ec1e11566f 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset @@ -22,7 +22,7 @@ local NeptuneBarycenterTrail = { GUI = { Name = "Neptune Barycenter Trail", Path = "/Solar System/Planets/Neptune", - Description = [[ BarycenterTrail of Neptune as observed by the Sun.]] + Description = "BarycenterTrail of Neptune as observed by the Sun" } } @@ -41,7 +41,8 @@ asset.export(NeptuneBarycenterTrail) asset.meta = { Name = "Neptune Trail", Version = "1.1", - Description = [[ Trail of Neptune's Barycenter. Data from NASA Spice (see base spice asset)]], + Description = [[Trail of Neptune's Barycenter. Data from NASA Spice (see base spice + asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset index fdab646770..afc38367d7 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset @@ -24,7 +24,7 @@ local NeptuneTrailEarth = { Name = "Neptune trail from Earth", Path = "/Solar System/Planets/Neptune", Hidden = false, - Description = [[ Trail of Neptune as observed by the Earth.]], + Description = "Trail of Neptune as observed by the Earth", } } @@ -43,8 +43,8 @@ asset.export(NeptuneTrailEarth) asset.meta = { Name = "Neptune Trail from Earth", Version = "1.1", - Description = [[ Alternate trail of Neptune, as observed by the Earth rather then the - Sun.]], + Description = [[Alternate trail of Neptune, as observed by the Earth rather then the + Sun]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset index 2903a97f49..609a53eb4d 100644 --- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset +++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset @@ -15,7 +15,7 @@ local NeptuneBarycenter = { Name = "Neptune Barycenter", Path = "/Solar System/Planets/Neptune", Hidden = true, - Description = [[ Neptune Barycenter position]], + Description = "Neptune Barycenter position", } } @@ -34,7 +34,7 @@ asset.export(NeptuneBarycenter) asset.meta = { Name = "Neptune Transforms", Version = "1.1", - Description = [[ Neptune Barycenter transform ]], + Description = "Neptune Barycenter transform", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton.asset index de7145d24c..e27d507659 100644 --- a/data/assets/scene/solarsystem/planets/neptune/triton.asset +++ b/data/assets/scene/solarsystem/planets/neptune/triton.asset @@ -45,8 +45,8 @@ end asset.meta = { Name = "Triton", Version = "1.1", - Description = [[ Procedural Globe asset containing Neptune's moon: Triton. - A blank globe and SPICE trail are generated for the moon.]], + Description = [[Procedural Globe asset containing Neptune's moon: Triton. A blank globe + and SPICE trail are generated for the moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/planets.asset b/data/assets/scene/solarsystem/planets/planets.asset index 77fb625fc8..6046baebd5 100644 --- a/data/assets/scene/solarsystem/planets/planets.asset +++ b/data/assets/scene/solarsystem/planets/planets.asset @@ -33,7 +33,7 @@ asset.require("./neptune/major_moons") asset.meta = { Name = "Planets", Version = "1.0", - Description = [[ Collection of planets in the solar system ]], + Description = "Collection of planets in the solar system", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset index 5e92d43950..1e4648b3d7 100644 --- a/data/assets/scene/solarsystem/planets/saturn/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset @@ -10,7 +10,7 @@ end) asset.meta = { Name = "Default Saturn Layers", Version = "1.0", - Description = [[ Default Saturn layers are: Saturn texture]], + Description = "Default Saturn layers are: Saturn texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset index 267d525cf9..40b5d8353f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset @@ -11,7 +11,7 @@ end) asset.meta = { Name = "Default Dione Layers", Version = "1.0", - Description = [[ Default Dione layers are: Dione Texture]], + Description = "Default Dione layers are: Dione Texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset index bafd58fbc1..6286ffb82b 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset @@ -64,7 +64,7 @@ asset.export(Dione) asset.meta = { Name = "Dione", Version = "1.0", - Description = [[ Dione globe with labels]], + Description = "Dione globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset index ac97ec449d..852a68b2de 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Dione Texutre", Version = "1.0", - Description = [[ Default jpg texture for Dione]], + Description = "Default jpg texture for Dione", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset index 6540dcff54..71ec816017 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset @@ -22,7 +22,7 @@ local DioneTrail = { GUI = { Name = "Dione Trail", Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Dione as observed by Saturn]], + Description = "Trail of Saturn's moon Dione as observed by Saturn", } } @@ -41,7 +41,7 @@ asset.export(DioneTrail) asset.meta = { Name = "Dione Trail", Version = "1.0", - Description = [[ Trail for Dione. Data from NASA Spice (see base spice asset)]], + Description = "Trail for Dione. Data from NASA Spice (see base spice asset)", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset index 415a5f882d..eb6dd1c7b7 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset @@ -12,7 +12,7 @@ end) asset.meta = { Name = "Default Enceladus Layers", Version = "1.0", - Description = [[ Default Enceladus layers are: Enceladus Texture and Cassini Global + Description = [[Default Enceladus layers are: Enceladus Texture and Cassini Global Mosaic 100m HPF]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index 872b68b36d..a9f5c3eb00 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -47,7 +47,7 @@ local Enceladus = { GUI = { Name = "Enceladus", Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Enceladus globe with labels]] + Description = "Enceladus globe with labels" } } @@ -66,7 +66,7 @@ asset.export(Enceladus) asset.meta = { Name = "Enceladus", Version = "1.1", - Description = [[ Enceladus globe with labels and map layers]], + Description = "Enceladus globe with labels and map layers", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset index 6af48cb20d..f61328caee 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Enceladus Texutre", Version = "1.0", - Description = [[ Default jpg texture for Enceladus]], + Description = "Default jpg texture for Enceladus", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" 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 02eb75a9e5..f3eff7a850 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 @@ -4,12 +4,12 @@ local layer = { Identifier = "Global_Mosaic_100m_HPF", Name = "Cassini Global Mosaic 100m HPF", FilePath = asset.localResource("global_mosaic_100m_hpf.wms"), - Description = [[ This mosaic represents the completion of a global control network of + Description = [[This mosaic represents the completion of a global control network of Enceladus containing Cassini Imaging Science Subsystem (ISS) images. A total of 586 images in CLR, GRN, UV3, and IR3 filters were selected for the control network. The image selection criteria were based on coverage, quality, and a spatial resolution between 50 and 500 meters per pixel (m) with phase angles less - than 120 degrees. (Description from URL).]] + than 120 degrees. (Description from URL)]] } asset.onInitialize(function() @@ -27,8 +27,8 @@ asset.export("layer", layer) asset.meta = { Name = "Cassini Global Mosaic 100m HPF", Version = "1.0", - Description = [[ Cassini Global mosaic for Enceladus. This map is hosted on the - OpenSpace server Sweden.]], + Description = [[Cassini Global mosaic for Enceladus. This map is hosted on the OpenSpace + server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Enceladus/Cassini/" .. "Enceladus_Cassini_ISS_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 e1887631b7..32ebb9c0ec 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset @@ -20,9 +20,9 @@ local EnceladusTrail = { }, Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, GUI = { - Name = "Enceladus Trail", - Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Enceladus as observed by Saturn.]], + Name = "Enceladus Trail", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Trail of Saturn's moon Enceladus as observed by Saturn", } } @@ -41,7 +41,7 @@ asset.export(EnceladusTrail) asset.meta = { Name = "Enceladus Trail", Version = "1.1", - Description = [[ Trail for Enceladus. Data from NASA Spice (see base spice asset)]], + Description = "Trail for Enceladus. Data from NASA Spice (see base spice asset)", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index 9354cedd77..5f8b1e277f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -65,7 +65,7 @@ asset.export(Hyperion) asset.meta = { Name = "Hyperion", Version = "1.1", - Description = [[ Hyperion globe with labels]], + Description = "Hyperion globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset index 2043b08757..24a6fa3209 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset @@ -40,7 +40,7 @@ asset.export(HyperionTrail) asset.meta = { Name = "Hyperion Trail", Version = "1.1", - Description = [[ Trail of Saturn's moon Hyperion as observed by Saturn. Data from NASA + Description = [[Trail of Saturn's moon Hyperion as observed by Saturn. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset index b2ae09d769..e22052e8d5 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset @@ -11,7 +11,7 @@ end) asset.meta = { Name = "Default Iapetus Layers", Version = "1.0", - Description = [[ Default Iapetus layers are: Iapetus Texture]], + Description = "Default Iapetus layers are: Iapetus Texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index 801995f9d3..71582077b0 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -47,7 +47,7 @@ local Iapetus = { GUI = { Name = "Iapetus", Path = "/Solar System/Planets/Saturn/Moons", - Description = [[Third largest moon of Saturn.]] + Description = "Third largest moon of Saturn" } } @@ -66,9 +66,8 @@ asset.export(Iapetus) asset.meta = { Name = "Iapetus", Version = "1.0", - Description = [[ Iapetus globe with labels.]], + Description = "Iapetus globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"Iapetus"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset index 0324a02da2..44630b95e2 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Iapetus Texutre", Version = "1.0", - Description = [[ Default jpg texture for Iapetus]], + Description = "Default jpg texture for Iapetus", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset index 0d7e77df39..dc692ad016 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset @@ -22,7 +22,7 @@ local IapetusTrail = { GUI = { Name = "Iapetus Trail", Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Iapetus as observed by Saturn.]], + Description = "Trail of Saturn's moon Iapetus as observed by Saturn", } } @@ -41,7 +41,7 @@ asset.export(IapetusTrail) asset.meta = { Name = "Iapetus Trail", Version = "1.1", - Description = [[Main trail for Iapetus. Data from NASA Spice (see base spice asset)]], + Description = "Main trail for Iapetus. Data from NASA Spice (see base spice asset)", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels.asset b/data/assets/scene/solarsystem/planets/saturn/kernels.asset index f709f8f8b0..e6f3176e7b 100644 --- a/data/assets/scene/solarsystem/planets/saturn/kernels.asset +++ b/data/assets/scene/solarsystem/planets/saturn/kernels.asset @@ -14,7 +14,7 @@ asset.export("sat393", Kernels .. "sat393.bsp") asset.meta = { Name = "Saturn Spice Kernels", Version = "1.0", - Description = [[ Generic SPICE kernels for Saturn.]], + Description = "Generic SPICE kernels for Saturn", Author = "OpenSpace Team", URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset index e4957ce2a5..5228a2ad2f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Saturn Texutre", Version = "1.0", - Description = [[ Default jpg texture for Saturn]], + Description = "Default jpg texture for Saturn", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset index a17bdf389e..5601d3ee30 100644 --- a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset @@ -12,9 +12,9 @@ asset.require("./titan/atmosphere") asset.meta = { Name = "Saturn Major Moons", Version = "1.0", - Description = [[ Meta asset containing Saturn's major moons: Dione, Enceladus, - Hyperion, Iapetus, Mimas, Rhea, Tethys, and Titan]], - Author = "OpenSpace Team", + Description = [[Meta asset containing Saturn's major moons: Dione, Enceladus, Hyperion, + Iapetus, Mimas, Rhea, Tethys, and Titan]], + Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" } diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset index 67a2d8b367..75ed5d3936 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset @@ -11,7 +11,7 @@ end) asset.meta = { Name = "Default Mimas Layers", Version = "1.0", - Description = [[ Default Mimas layers are: Mimas Texture]], + Description = "Default Mimas layers are: Mimas Texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset index 0392990bff..e8d9e6ea01 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Mimas Texutre", Version = "1.0", - Description = [[ Default jpg texture for Mimas]], + Description = "Default jpg texture for Mimas", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index 1309dc9832..6afc469fbf 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -47,7 +47,7 @@ local Mimas = { GUI = { Name = "Mimas", Path = "/Solar System/Planets/Saturn/Moons", - Description = [[That's no moon...]] + Description = "That's no moon..." } } @@ -66,7 +66,7 @@ asset.export(Mimas) asset.meta = { Name = "Mimas", Version = "1.1", - Description = [[ Mimas globe with labels.]], + Description = "Mimas globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset index 0a7703d341..170286b22d 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset @@ -22,7 +22,7 @@ local MimasTrail = { GUI = { Name = "Mimas Trail", Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Mimas as observed by Saturn.]], + Description = "Trail of Saturn's moon Mimas as observed by Saturn", } } @@ -41,7 +41,7 @@ asset.export(MimasTrail) asset.meta = { Name = "Mimas Trail", Version = "1.1", - Description = [[ Main trail for Mimas. Data from NASA Spice (see base spice asset)]], + Description = "Main trail for Mimas. Data from NASA Spice (see base spice asset)", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset index 83d1c1a664..ecda3a9331 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset @@ -108,9 +108,9 @@ end asset.meta = { Name = "Saturn Gallic Group Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Saturn's Gallic Group - moons: Albiorix, Bebhionn, Erriapus, and Tarvos. Blank globes and SPICE trails are - generated for each moon.]], + Description = [[Procedural Globe asset containing Saturn's Gallic Group moons: Albiorix, + Bebhionn, Erriapus, and Tarvos. Blank globes and SPICE trails are generated for each + moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset index ac2b239055..51b51409dd 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset @@ -125,9 +125,9 @@ end asset.meta = { Name = "Saturn Inuit Group Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Saturn's Inuit Group - moons: Kiviuq, Ijiraq, Paaliaq, Siarnaq and Tarqeq. Blank globes and SPICE trails - are generated for each moon.]], + Description = [[Procedural Globe asset containing Saturn's Inuit Group moons: Kiviuq, + Ijiraq, Paaliaq, Siarnaq and Tarqeq. Blank globes and SPICE trails are generated for + each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset index c0fa61b17e..f7ffb62ca7 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset @@ -543,11 +543,11 @@ end asset.meta = { Name = "Saturn Norse Group Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Saturn's Norse Group - moons: Phoebe, Skathi, S2007S2, Skoll, S2004S13, Greip, Hyrrokkin, Jarnsaxa, - Mundilfari, S2006S1, S2004S17, Bergelmir, Narvi, Suttungr, Hati, S2004S12, - Farbauti, Thrymr, Aegir, S2007S3, Bestla, S2004S7, S2006S3, Fenrir, Kari, Ymir, - Loge, Fornjot. Blank globes and SPICE trails are generated for each moon.]], + Description = [[Procedural Globe asset containing Saturn's Norse Group moons: Phoebe, + Skathi, S2007S2, Skoll, S2004S13, Greip, Hyrrokkin, Jarnsaxa, Mundilfari, S2006S1, + S2004S17, Bergelmir, Narvi, Suttungr, Hati, S2004S12, Farbauti, Thrymr, Aegir, + S2007S3, Bestla, S2004S7, S2006S3, Fenrir, Kari, Ymir, Loge, Fornjot. Blank globes and + SPICE trails are generated for each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset index 9ffa6187b5..82576da913 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset @@ -178,9 +178,9 @@ end asset.meta = { Name = "Saturn Other Group Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Saturn's Other Group - moons: Aegaeon, Methone, Anthe, Pallene, Telesto, Calypso, Helene, Polydeuces. - Blank globes and SPICE trails are generated for each moon.]], + Description = [[Procedural Globe asset containing Saturn's Other Group moons: Aegaeon, + Methone, Anthe, Pallene, Telesto, Calypso, Helene, Polydeuces. Blank globes and SPICE + trails are generated for each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset index cc2af9d9d7..15d1402d0a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset @@ -169,9 +169,9 @@ end asset.meta = { Name = "Saturn Shepherd Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Saturn's Shepherd moons: - Prometheus, Pandora, Atlas, Janus, Epimetheus, Daphnis and Pan. Blank globes - and SPICE trails are generated for each moon.]], + Description = [[Procedural Globe asset containing Saturn's Shepherd moons: Prometheus, + Pandora, Atlas, Janus, Epimetheus, Daphnis and Pan. Blank globes and SPICE trails are + generated for each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset index 0a22263985..0012552b4c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset @@ -8,8 +8,8 @@ asset.require("./minor/shepherd_group") asset.meta = { Name = "Saturn Minor Moons", Version = "1.0", - Description = [[ Meta asset containing five moon groups: Gallic, Inuit, Norse, - Shepherd moons and Other]], + Description = [[Meta asset containing five moon groups: Gallic, Inuit, Norse, Shepherd + moons and Other]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset index 8d99012f73..e11c6525eb 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset @@ -11,7 +11,7 @@ end) asset.meta = { Name = "Default Rhea Layers", Version = "1.0", - Description = [[ Default Rhea layers are: Rhea Texture]], + Description = "Default Rhea layers are: Rhea Texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset index aa803aa26d..fab487a75e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Rhea Texutre", Version = "1.0", - Description = [[ Default jpg texture for Rhea]], + Description = "Default jpg texture for Rhea", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset index 322538b39f..0630f53e08 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset @@ -47,7 +47,7 @@ local Rhea = { GUI = { Name = "Rhea", Path = "/Solar System/Planets/Saturn/Moons", - Description = [[Second largest moon of Saturn.]] + Description = "Second largest moon of Saturn" } } @@ -66,7 +66,7 @@ asset.export(Rhea) asset.meta = { Name = "Rhea", Version = "1.0", - Description = [[ Rhea globe with labels.]], + Description = "Rhea globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset index 228d664547..a632b0928a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset @@ -22,7 +22,7 @@ local RheaTrail = { GUI = { Name = "Rhea Trail", Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Rhea as observed by Saturn.]], + Description = "Trail of Saturn's moon Rhea as observed by Saturn", } } @@ -41,7 +41,7 @@ asset.export(RheaTrail) asset.meta = { Name = "Rhea Trail", Version = "1.0", - Description = [[ Main trail for Rhea. Data from NASA Spice (see base spice asset)]], + Description = "Main trail for Rhea. Data from NASA Spice (see base spice asset)", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset index 57d98cf611..e5b13c0b6a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset +++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset @@ -55,7 +55,7 @@ local Saturn = { GUI = { Name = "Saturn", Path = "/Solar System/Planets/Saturn", - Description = [[Saturn globe.]] + Description = "Saturn globe" } } @@ -76,7 +76,7 @@ local SaturnLabel = { GUI = { Name = "Saturn Label", Path = "/Solar System/Planets/Saturn", - Description = [[ Main planet label for Saturn.]], + Description = "Main planet label for Saturn", } } @@ -98,7 +98,7 @@ asset.export(SaturnLabel) asset.meta = { Name = "Saturn", Version = "1.1", - Description = [[ Saturn globe, and main planet label.]], + Description = "Saturn globe, and main planet label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset index 8098061f28..43f3299daa 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset @@ -10,7 +10,7 @@ end) asset.meta = { Name = "Default Tethys Layers", Version = "1.0", - Description = [[ Default Tethys layers are: Tethys Texture]], + Description = "Default Tethys layers are: Tethys Texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset index 199047b1d2..2a4f053bbd 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Tethys Texutre", Version = "1.0", - Description = [[ Default jpg texture for Tethys]], + Description = "Default jpg texture for Tethys", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset index 1a0ca291e4..2ca80bdaee 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset @@ -64,7 +64,7 @@ asset.export(Tethys) asset.meta = { Name = "Tethys", Version = "1.0", - Description = [[ Tethys globe with labels.]], + Description = "Tethys globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset index 0e92d3eaf0..281b5b2803 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset @@ -22,7 +22,7 @@ local TethysTrail = { GUI = { Name = "Tethys Trail", Path = "/Solar System/Planets/Saturn/Moons", - Description = [[ Trail of Saturn's moon Tethys as observed by Saturn.]], + Description = "Trail of Saturn's moon Tethys as observed by Saturn", } } @@ -41,7 +41,7 @@ asset.export(TethysTrail) asset.meta = { Name = "Tethys Trail", Version = "1.0", - Description = [[ Main trail for Tethys. Data from NASA Spice (see base spice asset)]], + Description = "Main trail for Tethys. Data from NASA Spice (see base spice asset)", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset b/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset index 50b470d304..8af3a546e6 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/atmosphere.asset @@ -58,7 +58,7 @@ asset.export(Atmosphere) asset.meta = { Name = "Titan Atmosphere", Version = "1.1", - Description = [[ RenderableAtmosphere for Titan.]], + Description = "RenderableAtmosphere for Titan", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset index ac35370d9d..15f37ed6a3 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset @@ -11,8 +11,7 @@ end) asset.meta = { Name = "Default Titan Layers", Version = "1.0", - Description = [[ Default Titan layers are: Cassini ISS Global - Mosaic]], + Description = "Default Titan layers are: Cassini ISS Global Mosaic", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset index c54a9432b6..208a6764c3 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset @@ -11,7 +11,7 @@ local layer = { Identifier = "Cassini_ISS_Global_Mosaic_4km_Local", Name = "Cassini ISS Global Mosaic 4km", FilePath = texturesPath .. "Titan_ISS_P19658_Mosaic_Global_4km_os.tif", - Description = [[ This global digital map of Saturn's moon Titan was created using + Description = [[This global digital map of Saturn's moon Titan was created using images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map was produced in June 2015 using data collected through Cassini's flyby on April 7, 2014, known as "T100". The mean radius of Titan used for projection of this map is @@ -36,7 +36,7 @@ asset.export("layer", layer) asset.meta = { Name = "Cassini ISS Global Mosaic", Version = "1.1", - Description = [[ Cassini global image layer for Titan]], + Description = "Cassini global image layer for Titan", Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Titan/Cassini/Global-Mosaic/" .. "Titan_ISS_P19658_Mosaic_Global_4km", diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset index 31a6190c70..98c7a5e7a2 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_sweden.asset @@ -4,7 +4,7 @@ local layer = { Identifier = "Cassini_ISS_Global_Mosaic_4km_LiU", Name = "Cassini ISS Global Mosaic [Sweden]", FilePath = asset.localResource("cassini_iss_global_mosaic_4km_liu.wms"), - Description = [[ This global digital map of Saturn's moon Titan was created using + Description = [[This global digital map of Saturn's moon Titan was created using images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map was produced in June 2015 using data collected through Cassini's flyby on April 7, 2014, known as "T100". The mean radius of Titan used for projection of this map is @@ -29,7 +29,7 @@ asset.export("layer", layer) asset.meta = { Name = "Cassini ISS Global Mosaic", Version = "1.1", - Description = [[ Cassini global image layer for Titan. This layer is hosted on the + Description = [[Cassini global image layer for Titan. This layer is hosted on the OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Titan/Cassini/Global-Mosaic/" .. diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset index 0ae3ee4a65..5108690898 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset @@ -47,7 +47,7 @@ local Titan = { GUI = { Name = "Titan", Path = "/Solar System/Planets/Saturn/Moons/Titan", - Description = [[Largest moon of Saturn.]] + Description = "Largest moon of Saturn" } } @@ -66,7 +66,7 @@ asset.export(Titan) asset.meta = { Name = "Titan", Version = "1.2", - Description = [[ Titan globe with labels.]], + Description = "Titan globe with labels", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset index 1ba1e08fe9..705b7f02ad 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset @@ -22,7 +22,7 @@ local TitanTrail = { GUI = { Name = "Titan Trail", Path = "/Solar System/Planets/Saturn/Moons/Titan", - Description = [[ Trail of Saturn's moon Titan as observed by Saturn.]], + Description = "Trail of Saturn's moon Titan as observed by Saturn", } } @@ -41,7 +41,7 @@ asset.export(TitanTrail) asset.meta = { Name = "Titan Trail", Version = "1.2", - Description = [[ Main trail for Titan. Data from NASA Spice (see base spice asset)]], + Description = "Main trail for Titan. Data from NASA Spice (see base spice asset)", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset index 609414cbcf..9bf0bb2a6a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset @@ -20,7 +20,7 @@ local SaturnTrail = { GUI = { Name = "Saturn Trail", Path = "/Solar System/Planets/Saturn", - Description = [[ Trail of Saturn as observed by the Sun.]] + Description = "Trail of Saturn as observed by the Sun" } } @@ -39,7 +39,7 @@ asset.export(SaturnTrail) asset.meta = { Name = "Saturn Trail", Version = "1.1", - Description = [[ Main trail of Saturn. Data from NASA Spice (see base spice asset)]], + Description = "Main trail of Saturn. Data from NASA Spice (see base spice asset)", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset index ea4c2ae751..9c926add1c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail_barycenter.asset @@ -21,7 +21,7 @@ local SaturnBarycenterTrail = { GUI = { Name = "Saturn Barycenter Trail", Path = "/Solar System/Planets/Saturn", - Description = [[ Trail of Saturn's Barycenter as observed by the Sun.]] + Description = "Trail of Saturn's Barycenter as observed by the Sun" } } @@ -40,7 +40,8 @@ asset.export(SaturnBarycenterTrail) asset.meta = { Name = "Saturn Trail", Version = "1.1", - Description = [[ Trail of Saturn's Barycenter. Data from NASA Spice (see base spice asset)]], + Description = [[Trail of Saturn's Barycenter. Data from NASA Spice (see base spice + asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset index 2b637ff0a9..4d088f0787 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset @@ -24,7 +24,7 @@ local SaturnTrailEarth = { Name = "Saturn trail from Earth", Path = "/Solar System/Planets/Saturn", Hidden = false, - Description = [[ Trail of Saturn as observed by the Earth.]], + Description = "Trail of Saturn as observed by the Earth", } } @@ -42,8 +42,8 @@ asset.export(SaturnTrailEarth) asset.meta = { Name = "Saturn Trail from Earth", Version = "1.1", - Description = [[ Alternate trail of Saturn, as observed by the Earth rather then the - Sun. Data from NASA SPICE (see base spice asset)]], + Description = [[Alternate trail of Saturn, as observed by the Earth rather then the Sun. + Data from NASA SPICE (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset index ca0d4df871..6457f1a17c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset +++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset @@ -15,7 +15,7 @@ local SaturnBarycenter = { Name = "Saturn Barycenter", Path = "/Solar System/Planets/Saturn", Hidden = true, - Description = [[ Saturn Barycenter position]] + Description = "Saturn Barycenter position" } } @@ -34,7 +34,7 @@ asset.export(SaturnBarycenter) asset.meta = { Name = "Saturn Transforms", Version = "1.1", - Description = [[ Saturn Barycenter transform]], + Description = "Saturn Barycenter transform", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset index 3c5ccd63cc..ec4aefba8e 100644 --- a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset @@ -10,7 +10,7 @@ end) asset.meta = { Name = "Default Uranus Layers", Version = "1.0", - Description = [[ Default Uranus layers are: Uranus texture]], + Description = "Default Uranus layers are: Uranus texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset index 445962443e..ec89cafe3a 100644 --- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset @@ -263,10 +263,10 @@ end asset.meta = { Name = "Uranus Irregular Retrograde Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Uranus' irregular retrograde - moons: Cordelia, Ophelia, Bianca, Cressida, Desdemona, Juliet, Portia, Rosalind, - Cupid, Belinda, Perdita, Puck and Mab. Blank globes and SPICE trails are - generated for each moon.]], + Description = [[Procedural Globe asset containing Uranus' irregular retrograde moons: + Cordelia, Ophelia, Bianca, Cressida, Desdemona, Juliet, Portia, Rosalind, Cupid, + Belinda, Perdita, Puck and Mab. Blank globes and SPICE trails are generated for each + moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset index 6e99028f0d..7c865e7385 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset @@ -57,8 +57,8 @@ end asset.meta = { Name = "Uranus Irregular Prograde Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Uranus' irregular prograde - moon: Margaret. A blank globe and SPICE trail are generated for the moon.]], + Description = [[Procedural Globe asset containing Uranus' irregular prograde moon: + Margaret. A blank globe and SPICE trail are generated for the moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset index 75aa8e70d2..888821b770 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset @@ -176,9 +176,9 @@ end asset.meta = { Name = "Uranus Irregular Retrograde Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Uranus' irregular retrograde - moons: Francisco, Caliban, Stephano, Trinculo, Sycorax, Prospero, Setebos and - Ferdinand. Blank globes and SPICE trails are generated for each moon.]], + Description = [[Procedural Globe asset containing Uranus' irregular retrograde moons: + Francisco, Caliban, Stephano, Trinculo, Sycorax, Prospero, Setebos and Ferdinand. + Blank globes and SPICE trails are generated for each moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels.asset b/data/assets/scene/solarsystem/planets/uranus/kernels.asset index fed1e70e14..aaa96e06da 100644 --- a/data/assets/scene/solarsystem/planets/uranus/kernels.asset +++ b/data/assets/scene/solarsystem/planets/uranus/kernels.asset @@ -13,7 +13,7 @@ asset.export("ura112", Kernels .. "ura112.bsp") asset.meta = { Name = "Uranus Spice Kernels", Version = "1.0", - Description = [[ Generic SPICE kernels for Uranus.]], + Description = "Generic SPICE kernels for Uranus", Author = "OpenSpace Team", URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", License = "NASA" diff --git a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset index 484a3388d2..48a7585a20 100644 --- a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset +++ b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Uranus texture", Version = "1.0", - Description = [[ Uranus image texture ]], + Description = "Uranus image texture", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset index e9edef3cef..e325ee67f9 100644 --- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset @@ -121,9 +121,9 @@ end asset.meta = { Name = "Uranus Marjor Moons", Version = "1.0", - Description = [[ Procedural Globe asset containing Uranus' major moons: Miranda, - Ariel, Umbriel, Titania, and Oberon. Blank globes and SPICE trails are generated - for each moon.]], + Description = [[Procedural Globe asset containing Uranus' major moons: Miranda, Ariel, + Umbriel, Titania, and Oberon. Blank globes and SPICE trails are generated for each + moon]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset index 040c318cdb..7d58e98871 100644 --- a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset @@ -6,8 +6,8 @@ asset.require("./irregular_retrograde_moons") asset.meta = { Name = "Uranus Minor Moons", Version = "1.0", - Description = [[ Meta asset containing three moon groups: Inner Moons, Irregular - Prograde Moons and Irregular Retrograde Moons]], + Description = [[Meta asset containing three moon groups: Inner Moons, Irregular Prograde + Moons and Irregular Retrograde Moons]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset index 0ba057bb65..97c27a8053 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset @@ -20,7 +20,7 @@ local UranusTrail = { GUI = { Name = "Uranus Trail", Path = "/Solar System/Planets/Uranus", - Description = [[ Trail of Uranus as observed by the Sun.]], + Description = "Trail of Uranus as observed by the Sun", } } @@ -39,7 +39,7 @@ asset.export(UranusTrail) asset.meta = { Name = "Uranus Trail", Version = "1.1", - Description = [[ Main trail of Uranus. Data from NASA Spice (see base spice asset)]], + Description = "Main trail of Uranus. Data from NASA Spice (see base spice asset)", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset index 1c9b1e421f..51cd58e5e7 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail_barycenter.asset @@ -21,7 +21,7 @@ local UranusBarycenterTrail = { GUI = { Name = "Uranus Barycenter Trail", Path = "/Solar System/Planets/Uranus", - Description = [[ Trail of Uranus as observed by the Sun.]], + Description = "Trail of Uranus as observed by the Sun", } } @@ -40,7 +40,8 @@ asset.export(UranusBarycenterTrail) asset.meta = { Name = "Uranus Trail", Version = "1.1", - Description = [[ Trail of Uranus' Barycenter. Data from NASA Spice (see base spice asset)]], + Description = [[Trail of Uranus' Barycenter. Data from NASA Spice (see base spice + asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset index 3858ed10bc..43ccb1f95a 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset @@ -24,7 +24,7 @@ local UranusTrailEarth = { Name = "Uranus trail from Earth", Path = "/Solar System/Planets/Uranus", Hidden = false, - Description = [[ Trail of Uranus as observed by the Earth.]], + Description = "Trail of Uranus as observed by the Earth", } } @@ -43,8 +43,8 @@ asset.export(UranusTrailEarth) asset.meta = { Name = "Uranus Trail from Earth", Version = "1.1", - Description = [[ Alternate trail of Uranus, as observed by the Earth rather then the - Sun. Data from NASA SPICE (see base spice asset)]], + Description = [[Alternate trail of Uranus, as observed by the Earth rather then the Sun. + Data from NASA SPICE (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/transforms.asset b/data/assets/scene/solarsystem/planets/uranus/transforms.asset index 0cbc8cb828..ea2e82e775 100644 --- a/data/assets/scene/solarsystem/planets/uranus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/uranus/transforms.asset @@ -17,7 +17,7 @@ local UranusBarycenter = { Name = "Uranus Barycenter", Path = "/Solar System/Planets/Uranus", Hidden = true, - Description = [[ Uranus Barycenter position]], + Description = "Uranus Barycenter position", } } @@ -36,7 +36,7 @@ asset.export(UranusBarycenter) asset.meta = { Name = "Uranus Transforms", Version = "1.1", - Description = [[ Uranus Barycenter transform]], + Description = "Uranus Barycenter transform", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset index 9a36778a34..3b8581b479 100644 --- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset +++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset @@ -27,7 +27,7 @@ local Uranus = { GUI = { Name = "Uranus", Path = "/Solar System/Planets/Uranus", - Description = [[Globe for Uranus.]] + Description = "Globe for Uranus" } } @@ -48,7 +48,7 @@ local UranusLabel = { GUI = { Name = "Uranus Label", Path = "/Solar System/Planets/Uranus", - Description = [[ Main planet label for Uranus.]], + Description = "Main planet label for Uranus", } } @@ -70,7 +70,7 @@ asset.export(UranusLabel) asset.meta = { Name = "Uranus", Version = "1.1", - Description = [[ Uranus globe, and main planet label.]], + Description = "Uranus globe, and main planet label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset index 91c1d24e50..9a0f784386 100644 --- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset @@ -67,7 +67,7 @@ asset.export(Atmosphere) asset.meta = { Name = "Venus Atmosphere", Version = "1.1", - Description = [[ Atmosphere of Venus.]], + Description = "Atmosphere of Venus", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/venus/default_layers.asset b/data/assets/scene/solarsystem/planets/venus/default_layers.asset index 26f07e266c..f2bf427fb8 100644 --- a/data/assets/scene/solarsystem/planets/venus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/venus/default_layers.asset @@ -16,8 +16,7 @@ end) asset.meta = { Name = "Default Venus Layers", Version = "1.1", - Description = [[ Default Venus layers are: Venus Magellan Mosaic and Venus Magellan - DEM]], + Description = "Default Venus layers are: Venus Magellan Mosaic and Venus Magellan DEM", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" 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 675fd292bb..00b91cea01 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 @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../venus").Venus.Identifier local layer = { Identifier = "Magellan_Mosaic_Utah", Name = "Magellan Mosaic [Utah]", - Description = [[ Color layer for Venus. This mosaic was created from the Magellan + Description = [[Color layer for Venus. This mosaic was created from the Magellan F-BIDRs, (Full resolution Basic Image Data Records), the highest resolution radar images of the Venus surface (~75 m/pixel). Because Venus is shrouded by a dense, opaque atmosphere, conventional optical cameras cannot be used to image @@ -42,7 +42,7 @@ asset.meta = { Name = "Venus Magellan Mosaic", Version = "1.0", Description = [[Map layer for Venus containting Venus Magellan Mosaic from the USGS. - Hosted on the OpenSpace servers in Utah.]], + Hosted on the OpenSpace servers in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/" .. "Venus_Magellan_LeftLook_mosaic_global_75m", diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset index 1d919f192c..6c4884d253 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset @@ -31,7 +31,7 @@ asset.export("layer", layer) asset.meta = { Name = "Venus Texture", Version = "1.0", - Description = [[ This asset supplies a default texture for Venus.]], + Description = "This asset supplies a default texture for Venus", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset index 58510b7931..11df7d9cdb 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("../../venus").Venus.Identifier local layer = { Identifier = "Magellan", Name = "Magellan Elevation [Utah]", - Description = [[ Elevation layer for Venus. The represents the version 2 + Description = [[Elevation layer for Venus. The represents the version 2 (1997 release) of the Global Topographic Data Record (GTDR-SINUS.3;2). The range to surface is derived by fitting altimeter echoes from the fan-beam altimetry antenna as a function of time to Hagfors' radar backscatter model @@ -12,7 +12,7 @@ local layer = { planetary radius. The data are filtered to remove low-frequency errors in the in-plane elements of each spacecraft orbit, and then originally re-sampled into sinusoidal, Mercator, and north and south polar stereographic projections - at a resolution of 5 kilometers per pixel (4641 meters per pixel [m]).]], + at a resolution of 5 kilometers per pixel (4641 meters per pixel [m])]], FilePath = asset.localResource("magellan_utah.wms"), TilePixelSize = 64, Settings = { @@ -37,10 +37,9 @@ asset.meta = { Name = "Venus Magellan DEM", Version = "1.0", Description = [[Map layer for Venus containting Venus Magellan DEM from the USGS. - Hosted on the OpenSpace servers in Utah.]], + Hosted on the OpenSpace servers in Utah]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/RadarProperties" .. "/Venus_Magellan_Topography_Global_4641m_v02", - License = "NASA/PDS", - Identifiers = {"Magellan"} + License = "NASA/PDS" } diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset index 53f3fa13dc..f1097c23b4 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail.asset @@ -41,8 +41,8 @@ asset.export(VenusTrail) asset.meta = { Name = "Venus Trail", Version = "1.1", - Description = [[ Trail of Venus as observed by the Sun. Data from NASA Spice (see - base spice asset)]], + Description = [[Trail of Venus as observed by the Sun. Data from NASA Spice (see base + spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset index 83b7dd3c3a..ead7112d00 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail_barycenter.asset @@ -39,8 +39,8 @@ asset.export(VenusBarycenterTrail) asset.meta = { Name = "Venus Trail", Version = "1.1", - Description = [[ Barycenter Trail of Venus as observed by the Sun. Data from NASA Spice (see - base spice asset)]], + Description = [[Barycenter Trail of Venus as observed by the Sun. Data from NASA Spice + (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset index 2796e9819c..2a6a6dd990 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset @@ -22,7 +22,7 @@ local VenusTrailEarth = { GUI = { Name = "Venus trail from Earth", Path = "/Solar System/Planets/Venus", - Description = "Alternate trail for Venus, showing Venus as observed from Earth.", + Description = "Alternate trail for Venus, showing Venus as observed from Earth", Hidden = false } } @@ -42,8 +42,8 @@ asset.export(VenusTrailEarth) asset.meta = { Name = "Venus Trail from Earth", Version = "1.1", - Description = [[ Trail of Venus as observed by the Earth. Data from NASA - SPICE (see base spice asset)]], + Description = [[Trail of Venus as observed by the Earth. Data from NASA SPICE (see base + spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset index f1ca8a9193..43e8daf16d 100644 --- a/data/assets/scene/solarsystem/planets/venus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset @@ -34,7 +34,7 @@ asset.export(VenusBarycenter) asset.meta = { Name = "Venus Transforms", Version = "1.1", - Description = [[ Spice translation for Venus Barycenter ]], + Description = "Spice translation for Venus Barycenter", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index 7502fab742..b027f82d51 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -52,7 +52,7 @@ local Venus = { GUI = { Name = "Venus", Path = "/Solar System/Planets/Venus", - Description = "Venus globe with labels and map layers." + Description = "Venus globe with labels and map layers" } } @@ -73,7 +73,7 @@ local VenusLabel = { GUI = { Name = "Venus Label", Path = "/Solar System/Planets/Venus", - Description = "Label for Venus, viewable within the solar system." + Description = "Label for Venus, viewable within the solar system" } } @@ -95,7 +95,7 @@ asset.export(VenusLabel) asset.meta = { Name = "Venus", Version = "1.1", - Description = [[ Venus globe with labels, and main planet label.]], + Description = "Venus globe with labels, and main planet label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset index f6aa4d4292..86ba6ac74d 100644 --- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset @@ -8,8 +8,8 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 4 object.Renderable.TrailFade = 11 -object.GUI.Description = [[ Earth-approaching Near-Earth-Asteroids with orbits exterior to - Earth's but interior to Mars'. ]] +object.GUI.Description = [[Earth-approaching Near-Earth-Asteroids with orbits exterior to + Earth's but interior to Mars']] asset.onInitialize(function() @@ -27,11 +27,11 @@ asset.export(object) asset.meta = { Name = "Amor Asteroids", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Amor group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + the Amor group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws."]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset index 4b5af30cb6..4cdacd04f2 100644 --- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset @@ -8,7 +8,7 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 6 object.Renderable.TrailFade = 10 -object.GUI.Description = [[ Earth-crossing Near-Earth-Asteroids with semi-major axes +object.GUI.Description = [[Earth-crossing Near-Earth-Asteroids with semi-major axes larger than Earth's. ]] asset.onInitialize(function() @@ -26,11 +26,11 @@ asset.export(object) asset.meta = { Name = "Apollo Asteroids", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Apollo group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + the Apollo group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/astraea.asset b/data/assets/scene/solarsystem/sssb/astraea.asset index e4526b630d..a6b9a9722a 100644 --- a/data/assets/scene/solarsystem/sssb/astraea.asset +++ b/data/assets/scene/solarsystem/sssb/astraea.asset @@ -64,12 +64,11 @@ asset.export(AstraeaTrail) asset.meta = { Name = "5 Astraea", Version = "1.2", - Description = [[ This asset contains the trail - and position of 5 Astraea from 2014 JAN 01 00:00:00 - to 2050 JAN 01 00:00:00. Data from JPL Horizons']], + Description = [[This asset contains the trail and position of 5 Astraea from + 2014 JAN 01 00:00:00 to 2050 JAN 01 00:00:00. Data from JPL Horizons]], Author = "Zach Shaffer", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = [[ JPL-authored documents are sponsored by NASA under Contract - NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws."]] + 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]] } diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset index d025543087..b62e9140f8 100644 --- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset @@ -27,11 +27,11 @@ asset.export(object) asset.meta = { Name = "Aten Asteroids", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Aten group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + the Aten group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset index fae5b7d6e4..fecc5b8803 100644 --- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset @@ -27,11 +27,11 @@ asset.export(object) asset.meta = { Name = "Atira Asteroids", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Atira group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + the Atira group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws."]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset index 0585efeb5f..d4c4418a65 100644 --- a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset +++ b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset @@ -68,7 +68,7 @@ asset.export(C2019Y4AtlasTrail) asset.meta = { Name = "C/2019 Y4 Atlas", Version = "1.2", - Description = [[ This asset contains the trail and position of C/2019 Y4 Atlas from + Description = [[This asset contains the trail and position of C/2019 Y4 Atlas from 1950 JAN 01 00:00:00 to 2100 JAN 01 00:00:00. Data from JPL Horizons]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset index fdbbde119b..d11e1e925e 100644 --- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset @@ -27,11 +27,11 @@ asset.export(object) asset.meta = { Name = "Centaur Asteroids", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Centaur group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + the Centaur group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset index e8bafdb16b..9513a71d94 100644 --- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset @@ -27,11 +27,11 @@ asset.export(object) asset.meta = { Name = "Chiron-Type Comets", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Chiron-Type group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + the Chiron-Type group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset index 556edaaaea..2e4da53952 100644 --- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset @@ -27,11 +27,11 @@ asset.export(object) asset.meta = { Name = "Encke-Type Comets", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Encke-Type group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + the Encke-Type group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset index 84128cd02f..b86aaa0277 100644 --- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset @@ -26,11 +26,11 @@ asset.export(object) asset.meta = { Name = "Halley-Type Comets", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Halley-Type group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + the Halley-Type group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset index f8de07bb23..9e71e2dccd 100644 --- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset @@ -27,11 +27,11 @@ asset.export(object) asset.meta = { Name = "Inner Main Asteroid Belt", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining the Inner Main Asteroid Belt group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + the Inner Main Asteroid Belt group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/itokawa.asset b/data/assets/scene/solarsystem/sssb/itokawa.asset index fc93ca5932..7e97485226 100644 --- a/data/assets/scene/solarsystem/sssb/itokawa.asset +++ b/data/assets/scene/solarsystem/sssb/itokawa.asset @@ -37,7 +37,7 @@ local ItokawaTrail = { Name = "Itokawa Trail", Path = "/Solar System/SSSB/Itokawa", Description = [[Trail of asteroid 25143 Itokawa from 1950 JAN 1 00:00:00 - to 2050 JAN 1 00:00:00. Data from JPL Horizons.]] + to 2050 JAN 1 00:00:00. Data from JPL Horizons]] } } @@ -54,7 +54,7 @@ local ItokawaPosition = { Name = "Itokawa Position", Path = "/Solar System/SSSB/Itokawa", Description = [[Position of asteroid 25143 Itokawa from 1950 JAN 1 00:00:00 - to 2050 JAN 1 00:00:00. Data from JPL Horizons.]] + to 2050 JAN 1 00:00:00. Data from JPL Horizons]] } } @@ -100,7 +100,7 @@ asset.meta = { Name = "Itokawa Asteroid", Version = "1.0", Description = [[Position, trail and model of asteroid 25143 Itokawa from - 1950 JAN 1 00:00:00 to 2050 JAN 1 00:00:00. Data from JPL Horizons.]], + 1950 JAN 1 00:00:00 to 2050 JAN 1 00:00:00. Data from JPL Horizons]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset index 52aa485761..ab6b0e89b0 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset @@ -27,11 +27,11 @@ asset.export(object) asset.meta = { Name = "Jupiter Family Comets", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Jupiter-family group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + Jupiter-family group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset index 778d815f2f..59d3eec17c 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset @@ -27,11 +27,11 @@ asset.export(object) asset.meta = { Name = "Jupiter Trojan Asteroids", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Jupiter Trojan group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + Jupiter Trojan group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset index 0eff00d9f4..e291b95043 100644 --- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset @@ -28,11 +28,11 @@ asset.export(object) asset.meta = { Name = "Main Asteroid Belt", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Main Asteroid Belt group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + Main Asteroid Belt group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset index e252c81ad9..1ebf5adad6 100644 --- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset @@ -27,11 +27,11 @@ asset.export(object) asset.meta = { Name = "Mars-Crossing Asteroids", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - containing Mars-Crossing group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + Mars-Crossing group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset index e74c9219ad..14b46f2fd6 100644 --- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset @@ -32,11 +32,11 @@ asset.export(object) asset.meta = { Name = "Outer Main Asteroid Belt", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Outer Main Asteroid Belt group.]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + Outer Main Asteroid Belt group]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. - and Foreign Copyright Laws.]] + and Foreign Copyright Laws]] } diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset index f4e07ec1d5..3f90b193b9 100644 --- a/data/assets/scene/solarsystem/sssb/pha.asset +++ b/data/assets/scene/solarsystem/sssb/pha.asset @@ -31,12 +31,12 @@ asset.export(object) asset.meta = { Name = "Potentially-Hazardous Asteroids", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Potentially Hazardous group. ]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + Potentially Hazardous group. ]], Author = [[JPL Small-Body Database hosted by California Institute of Technology]], URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[JPL-authored documents are sponsored by NASA under Contract - NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws.]] + 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]] } diff --git a/data/assets/scene/solarsystem/sssb/sssb_shared.asset b/data/assets/scene/solarsystem/sssb/sssb_shared.asset index 732b70c745..fdc22450d1 100644 --- a/data/assets/scene/solarsystem/sssb/sssb_shared.asset +++ b/data/assets/scene/solarsystem/sssb/sssb_shared.asset @@ -43,7 +43,7 @@ asset.export("createSssbGroupObject", createSssbGroupObject) asset.meta = { Name = "SSSB shared", Version = "1.0", - Description = [[ UTILITY ASSET; This asset is for builders and coders.]], + Description = [[ UTILITY ASSET; This asset is for builders and coders]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/sssb/swifttuttle.asset b/data/assets/scene/solarsystem/sssb/swifttuttle.asset index 60eb5fdd7d..71610aed03 100644 --- a/data/assets/scene/solarsystem/sssb/swifttuttle.asset +++ b/data/assets/scene/solarsystem/sssb/swifttuttle.asset @@ -64,11 +64,11 @@ asset.export(SwiftTuttleTrail) asset.meta = { Name = "Swift Tuttle", Version = "1.2", - Description = [[ Position and Trail of Swift Tuttle from 1879 JUN 27 - to 2050 JAN 01. Data from JPL Horizons]], + Description = [[Position and Trail of Swift Tuttle from 1879 JUN 27 to 2050 JAN 01. Data + from JPL Horizons]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = [[ JPL-authored documents are sponsored by NASA under Contract - NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws."]] + 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]] } diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset index 22db963895..134c86b786 100644 --- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset +++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset @@ -44,7 +44,7 @@ local TeslaPosition = { Name = "Tesla Roadster", Path = "/Solar System/SSSB", Description = [[Position and Trail of Tesla Roadster from 2018 FEB 7 03:00:00 - to 2089 DEC 31 03:00:00. Data from JPL Horizons.]] + to 2089 DEC 31 03:00:00. Data from JPL Horizons]] } } @@ -66,11 +66,11 @@ asset.export(TeslaRoadsterTrail) asset.meta = { Name = "Tesla Roadster", Version = "1.2", - Description = [[ Position and Trail of Tesla Roadster from 2018 FEB 7 03:00:00 - to 2089 DEC 31 03:00:00. Data from JPL Horizons.]], + Description = [[Position and Trail of Tesla Roadster from 2018 FEB 7 03:00:00 to + 2089 DEC 31 03:00:00. Data from JPL Horizons]], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = [[ JPL-authored documents are sponsored by NASA under Contract - NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws.]] + 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]] } diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset index b5d8fcab14..02cf9993db 100644 --- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset @@ -33,12 +33,12 @@ asset.export(object) asset.meta = { Name = "Trans-Neptunian Asteroids", Version = "1.1", - Description = [[ RenderableSmallBody asset with data from from JPL Horizons - contiaining Trans-Neptunian group. ]], + Description = [[RenderableSmallBody asset with data from from JPL Horizons containing + the Trans-Neptunian group]], Author = [[JPL Small-Body Database hosted by California Institute of Technology]], URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = [[ JPL-authored documents are sponsored by NASA under Contract - NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws."]] + 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]] } diff --git a/data/assets/scene/solarsystem/sun.asset b/data/assets/scene/solarsystem/sun.asset index e7ace91216..f3c0e8e6fd 100644 --- a/data/assets/scene/solarsystem/sun.asset +++ b/data/assets/scene/solarsystem/sun.asset @@ -5,7 +5,7 @@ asset.require("./sun/glare") asset.meta = { Name = "Sun", Version = "1.0", - Description = [[ Meta asset for the Sun in our solar system. Contains the Sun globe and + Description = [[Meta asset for the Sun in our solar system. Contains the Sun globe and Sun glare texture]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/sun/default_layers.asset b/data/assets/scene/solarsystem/sun/default_layers.asset index 44fd7a1f3c..33ff7a82ec 100644 --- a/data/assets/scene/solarsystem/sun/default_layers.asset +++ b/data/assets/scene/solarsystem/sun/default_layers.asset @@ -10,7 +10,7 @@ end) asset.meta = { Name = "Default Sun layers", Version = "1.0", - Description = [[ Default Sun layers renderable globe.]], + Description = "Default Sun layers renderable globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset index 73325cafd7..1185d5d456 100644 --- a/data/assets/scene/solarsystem/sun/glare.asset +++ b/data/assets/scene/solarsystem/sun/glare.asset @@ -25,7 +25,7 @@ local SunGlare = { GUI = { Name = "Sun Glare", Path = "/Solar System/Sun", - Description = [[ Sun glare effect. Enabled by default instead of sun orb.]] + Description = "Sun glare effect. Enabled by default instead of sun orb" } } @@ -45,7 +45,7 @@ asset.export(SunGlare) asset.meta = { Name = "Sun Glare", Version = "1.1", - Description = [[ Image plane with sun glare effect.]], + Description = "Image plane with sun glare effect", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/sun/habitablezone.asset b/data/assets/scene/solarsystem/sun/habitablezone.asset index b1363cdc04..2cf9747f1f 100644 --- a/data/assets/scene/solarsystem/sun/habitablezone.asset +++ b/data/assets/scene/solarsystem/sun/habitablezone.asset @@ -16,7 +16,7 @@ local HabitableZone = { GUI = { Name = "Sun Habitable Zone", Path = "/Solar System/Sun", - Description = "Habitable zone for the sun in our solar system." + Description = "Habitable zone for the sun in our solar system" } } @@ -34,7 +34,7 @@ asset.export(HabitableZone) asset.meta = { Name = "Sun Habitable Zone", Version = "1.1", - Description = [[ The habitable zone around our sun, computed using formula and + Description = [[The habitable zone around our sun, computed using formula and coefficients by Kopparapu et al. (2015) https://arxiv.org/abs/1404.5292]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset index 1e9602e912..541deb809d 100644 --- a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset +++ b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset @@ -27,7 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "Sun Texture", Version = "1.0", - Description = [[ Default Sun texture for renderable globe.]], + Description = "Default Sun texture for renderable globe", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset index 10e1bfc251..d2f0ff3a3a 100644 --- a/data/assets/scene/solarsystem/sun/marker.asset +++ b/data/assets/scene/solarsystem/sun/marker.asset @@ -24,7 +24,7 @@ local SunMarker = { GUI = { Name = "Sun Marker", Path = "/Solar System/Sun", - Description = [[ Sun marker with name, sized for Solar System view]] + Description = "Sun marker with name, sized for Solar System view" } } @@ -43,7 +43,7 @@ asset.export(SunMarker) asset.meta = { Name = "Sun marker", Version = "1.1", - Description = [[ Marker for the Sun, with a stick and label.]], + Description = "Marker for the Sun, with a stick and label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset index 23c35428e4..2fe5742c43 100644 --- a/data/assets/scene/solarsystem/sun/sun.asset +++ b/data/assets/scene/solarsystem/sun/sun.asset @@ -16,7 +16,7 @@ local Sun = { GUI = { Name = "Sun", Path = "/Solar System/Sun", - Description = "Globe for the sun in our solar system." + Description = "Globe for the sun in our solar system" } } @@ -41,7 +41,7 @@ local SunLabel = { GUI = { Name = "Sun Label", Path = "/Solar System/Sun", - Description = "Label for the sun in our solar system." + Description = "Label for the sun in our solar system" } } @@ -71,7 +71,7 @@ asset.export("LightSource", LightSource) asset.meta = { Name = "Sun", Version = "1.1", - Description = [[ The Sun and label]], + Description = "The Sun and label", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset index 7e27f2c9fd..cd9f61713c 100644 --- a/data/assets/scene/solarsystem/sun/transforms.asset +++ b/data/assets/scene/solarsystem/sun/transforms.asset @@ -14,7 +14,7 @@ local SolarSystemBarycenter = { GUI = { Name = "Solar System Barycenter", Path = "/Solar System", - Description = [[Barycenter of the solar system, expressed in the Galactic frame]], + Description = "Barycenter of the solar system, expressed in the Galactic frame", Hidden = true } } @@ -32,7 +32,7 @@ local SunCenter = { GUI = { Name = "SUN Center", Path = "/Solar System/Sun", - Description = [[Spice frame for the Sun]], + Description = "Spice frame for the Sun", Hidden = true } } @@ -56,7 +56,7 @@ local SunIAU = { GUI = { Name = "SUN IAU", Path = "/Solar System/Sun", - Description = [[Spice frame for the Sun]], + Description = "Spice frame for the Sun", Hidden = true } } @@ -79,7 +79,7 @@ local SunECLIPJ2000 = { GUI = { Name = "SUN J2000", Path = "/Solar System/Sun", - Description = [[Spice rotation for Mean ecliptic and equinox of J2000]], + Description = "Spice rotation for Mean ecliptic and equinox of J2000", Hidden = true } } @@ -108,8 +108,7 @@ asset.export(SunECLIPJ2000) asset.meta = { Name = "Sun Transforms", Version = "1.1", - Description = [[ Sun transforms: Solar System Barycenter, SUN IAU and - SUN J2000]], + Description = "Sun transforms: Solar System Barycenter, SUN IAU and SUN J2000", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/spice/base.asset b/data/assets/spice/base.asset index 8ecf990ec1..16314c0c6d 100644 --- a/data/assets/spice/base.asset +++ b/data/assets/spice/base.asset @@ -28,8 +28,8 @@ end) asset.meta = { Name = "SPICE Base", Version = "1.0", - Description = [[ This asset contains the spice base kernels. With positions - for Solar System bodies from 1850 to 2150]], + Description = [[This asset contains the spice base kernels. With positions for Solar + System bodies from 1850 to 2150]], Author = "OpenSpace Team", URL = "https://naif.jpl.nasa.gov/naif/data_generic.html", License = "NASA" diff --git a/data/assets/util/asset_helper.asset b/data/assets/util/asset_helper.asset index 551dc5790f..20ada1e52a 100644 --- a/data/assets/util/asset_helper.asset +++ b/data/assets/util/asset_helper.asset @@ -25,7 +25,7 @@ local registerSceneGraphNodes = function (sceneAsset, nodes, override) override = override or false if not override then if tableLength(nodes) == 0 then - openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning.") + openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning") return end end @@ -49,7 +49,7 @@ local registerScreenSpaceRenderables = function (sceneAsset, renderables, overri override = override or false if not override then if tableLength(renderables) == 0 then - openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning.") + openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning") return end end @@ -87,7 +87,7 @@ local registerSceneGraphNodesAndExport = function (sceneAsset, nodes, override) override = override or false if not override then if tableLength(nodes) == 0 then - openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning.") + openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning") return end end diff --git a/data/assets/util/debug_helper.asset b/data/assets/util/debug_helper.asset index 9b10fb04c6..99ebc5db20 100644 --- a/data/assets/util/debug_helper.asset +++ b/data/assets/util/debug_helper.asset @@ -58,7 +58,12 @@ local addCartesianAxes = function (specification) local name = specification.Name or specification.Identifier local parent = specification.Parent or "Root" - local scale = specification.Scale or 1.0 + local scale = specification.Scale or { 1.0, 1.0, 1.0 } + + if type(scale) == "number" then + scale = { scale, scale, scale } + end + local position = specification.Position or { 0.0, 0.0, 0.0 } local rotation = specification.Rotation or { 0.0, 0.0, 0.0 } diff --git a/data/assets/util/default_keybindings.asset b/data/assets/util/default_keybindings.asset index 9420ee7a3d..6fd051350e 100644 --- a/data/assets/util/default_keybindings.asset +++ b/data/assets/util/default_keybindings.asset @@ -15,7 +15,7 @@ local toggle_shutdown = { Identifier = "os_default.toggle_shutdown", Name = "Toggle Shutdown", Command = "openspace.toggleShutdown()", - Documentation = "Toggles the shutdown that will stop OpenSpace after a grace period. Press again to cancel the shutdown during this period.", + Documentation = "Toggles the shutdown that will stop OpenSpace after a grace period. Press again to cancel the shutdown during this period", IsLocal = true, Key = "ESC" @@ -25,7 +25,7 @@ local take_screenshot = { Identifier = "os_default.take_screenshot", Name = "Take Screenshot", Command = "openspace.takeScreenshot()", - Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory.", + Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory", GuiPath = "/System/Rendering", IsLocal = true, @@ -36,7 +36,7 @@ local toggle_pause_interpolated = { Identifier = "os_default.toggle_pause_interpolated", Name = "Toggle Pause (Interpolated)", Command = "openspace.time.pauseToggleViaKeyboard()", - Documentation = "Smoothly starts and stops the simulation time.", + Documentation = "Smoothly starts and stops the simulation time", GuiPath = "/Time/Simulation Speed", IsLocal = true, @@ -47,7 +47,7 @@ local toggle_pause_immediate = { Identifier = "os_default.toggle_pause_immediate", Name = "Toggle Pause (Immediate)", Command = "openspace.time.togglePause()", - Documentation = "Immediately starts and stops the simulation time.", + Documentation = "Immediately starts and stops the simulation time", GuiPath = "/Time/Simulation Speed", IsLocal = true, @@ -58,7 +58,7 @@ local toggle_rotation_friction = { Identifier = "os_default.toggle_rotation_friction", Name = "Toggle Rotation friction", Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RotationalFriction"), - Documentation = "Toggles the rotational friction of the camera. If it is disabled, the camera rotates around the focus object indefinitely.", + Documentation = "Toggles the rotational friction of the camera. If it is disabled, the camera rotates around the focus object indefinitely", GuiPath = "/Navigation", IsLocal = false, @@ -69,7 +69,7 @@ local toggle_zoom_friction = { Identifier = "os_default.toggle_zoom_friction", Name = "Toggle Zoom Friction", Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.ZoomFriction"), - Documentation = "Toggles the zoom friction of the camera. If it is disabled, the camera rises up from or closes in towards the focus object indefinitely.", + Documentation = "Toggles the zoom friction of the camera. If it is disabled, the camera rises up from or closes in towards the focus object indefinitely", GuiPath = "/Navigation", IsLocal = false, @@ -80,7 +80,7 @@ local toggle_roll_friction = { Identifier = "os_default.toggle_roll_friction", Name = "Toggle Roll Friction", Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RollFriction"), - Documentation = "Toggles the roll friction of the camera. If it is disabled, the camera rolls around its own axis indefinitely.", + Documentation = "Toggles the roll friction of the camera. If it is disabled, the camera rolls around its own axis indefinitely", GuiPath = "/Navigation", IsLocal = false, @@ -97,7 +97,7 @@ local fade_to_black = { openspace.setPropertyValueSingle("RenderEngine.BlackoutFactor", 1.0, 3) end ]], - Documentation = "Toggles the fade to black within 3 seconds or shows the rendering after 3 seconds.", + Documentation = "Toggles the fade to black within 3 seconds or shows the rendering after 3 seconds", GuiPath = "/Rendering", IsLocal = false, @@ -146,7 +146,7 @@ local next_delta_step_interpolate = { Identifier = "os_default.next_delta_step_interpolate", Name = "Next Delta Time Step (Interpolate)", Command = "openspace.time.interpolateNextDeltaTimeStep()", - Documentation = "Smoothly interpolates the simulation speed to the next delta time step, if one exists.", + Documentation = "Smoothly interpolates the simulation speed to the next delta time step, if one exists", GuiPath = "/Time/Simulation Speed", IsLocal = true, @@ -157,7 +157,7 @@ local next_delta_step_immediate = { Identifier = "os_default.next_delta_step_immediate", Name = "Next Delta Time Step (Immediate)", Command = "openspace.time.setNextDeltaTimeStep()", - Documentation = "Immediately set the simulation speed to the next delta time step, if one exists.", + Documentation = "Immediately set the simulation speed to the next delta time step, if one exists", GuiPath = "/Time/Simulation Speed", IsLocal = true, @@ -168,7 +168,7 @@ local previous_delta_step_interpolate = { Identifier = "os_default.previous_delta_step_interpolate", Name = "Previous Delta Time Step (Interpolate)", Command = "openspace.time.interpolatePreviousDeltaTimeStep()", - Documentation = "Smoothly interpolates the simulation speed to the previous delta time step, if one exists.", + Documentation = "Smoothly interpolates the simulation speed to the previous delta time step, if one exists", GuiPath = "/Time/Simulation Speed", IsLocal = true, @@ -179,7 +179,7 @@ local previous_delta_step_immediate = { Identifier = "os_default.previous_delta_step_immediate", Name = "Previous Delta Time Step (Immediate)", Command = "openspace.time.setPreviousDeltaTimeStep()", - Documentation = "Immediately set the simulation speed to the previous delta time step, if one exists.", + Documentation = "Immediately set the simulation speed to the previous delta time step, if one exists", GuiPath = "/Time/Simulation Speed", IsLocal = true, diff --git a/data/assets/util/dpiscaling.asset b/data/assets/util/dpiscaling.asset index 11757e3809..1103728a28 100644 --- a/data/assets/util/dpiscaling.asset +++ b/data/assets/util/dpiscaling.asset @@ -28,9 +28,9 @@ end) asset.meta = { Name = "DPI Scaling", Version = "1.0", - Description = [[ Retrieves the DPI scaling from the operating system and applies it to - a few selected places to make them scale better on "large resolution but small size" - monitors ]], + Description = [[Retrieves the DPI scaling from the operating system and applies it to a + few selected places to make them scale better on "large resolution but small size" + monitors]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/util/joysticks/any-joystick.asset b/data/assets/util/joysticks/any-joystick.asset index d53777aff0..c798e3ef4e 100644 --- a/data/assets/util/joysticks/any-joystick.asset +++ b/data/assets/util/joysticks/any-joystick.asset @@ -15,7 +15,7 @@ local function addJoystickAsset(joystick) elseif joystick == "SpaceMouse Enterprise" then openspace.asset.add("./util/joysticks/space-mouse-enterprise") elseif joystick == "3Dconnexion Universal Receiver" then - openspace.printWarning("SpaceMouse in wireless mode cannot be automatically detected and added. Please add the matching asset file manually.") + openspace.printWarning("SpaceMouse in wireless mode cannot be automatically detected and added. Please add the matching asset file manually") else openspace.printWarning("Could not find a matching asset for joystick: " .. joystick) end diff --git a/data/assets/util/property_helper.asset b/data/assets/util/property_helper.asset index 89d6a6f7d2..ef5f984936 100644 --- a/data/assets/util/property_helper.asset +++ b/data/assets/util/property_helper.asset @@ -1,13 +1,13 @@ -- Function that returns the string that inverts the fully qualified boolean property 'property' local invert = function(prop) - local escaped_property = [["]] .. prop .. [["]] + local escaped_property = '"' .. prop .. '"' return "openspace.setPropertyValueSingle(" .. escaped_property .. ", not openspace.getPropertyValue(" .. escaped_property .. "));" end -- Function that returns the string that increments the 'property' by the 'value' local increment = function(prop, value) local v = value or 1 - local escaped_property = [["]] .. prop .. [["]] + local escaped_property = '"' .. prop .. '"' return "openspace.setPropertyValueSingle(" .. escaped_property .. ", openspace.getPropertyValue(" .. escaped_property .. ") + " .. v .. ");" end @@ -20,7 +20,7 @@ local fade = function(prop, value, duration) assert(type(prop) == "string", "prop must be a number") assert(type(duration) == "number", "duration must be a number") - local escaped_property = [["]] .. prop .. [["]] + local escaped_property = '"' .. prop .. '"' return "openspace.setPropertyValueSingle(" .. escaped_property ..", " .. tostring(value) .. ", " .. tostring(duration) .. ")" end @@ -36,7 +36,7 @@ local fadeInOut = function(prop, duration) assert(type(prop) == "string", "prop must be a number") assert(type(duration) == "number", "duration must be a number") - local escaped_property = [["]] .. prop .. [["]] + local escaped_property = '"' .. prop .. '"' -- If the value is > 0.5 fade out, otherwise fade in return "local v = openspace.getPropertyValue(" .. escaped_property .. "); if v <= 0.5 then " .. fadeIn(prop, duration) .. " else " .. fadeOut(prop, duration) .. " end" end diff --git a/data/assets/util/renderable_helper.asset b/data/assets/util/renderable_helper.asset index 987d790768..c9d320f2e4 100644 --- a/data/assets/util/renderable_helper.asset +++ b/data/assets/util/renderable_helper.asset @@ -7,7 +7,7 @@ end -- Function that returns the string that sets the enabled property of to local setEnabled = function(renderable, enabled) - return [[openspace.setPropertyValue("]] .. renderable .. [[.Renderable.Enabled", ]] .. (enabled and "true" or "false") .. ");"; + return 'openspace.setPropertyValue("' .. renderable .. '.Renderable.Enabled", ' .. (enabled and "true" or "false") .. ");"; end diff --git a/data/assets/util/testing_keybindings.asset b/data/assets/util/testing_keybindings.asset index 0cc3529062..48f1991826 100644 --- a/data/assets/util/testing_keybindings.asset +++ b/data/assets/util/testing_keybindings.asset @@ -6,7 +6,7 @@ local take_screenshot = { Identifier = "testing_keyboard.take_screenshot", Name = "Take Screenshot", Command = "openspace.takeScreenshot()", - Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory.", + Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory", GuiPath = "/Rendering", IsLocal = true } diff --git a/data/assets/util/vrt_flipbook_helper.asset b/data/assets/util/vrt_flipbook_helper.asset index 838794a93c..9eb46f8a3c 100644 --- a/data/assets/util/vrt_flipbook_helper.asset +++ b/data/assets/util/vrt_flipbook_helper.asset @@ -9,14 +9,14 @@ end local nextFlipbookPage = function (flipbook) if (flipbook.CurrentFlipIndex >= 0) then - local assetSring = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; - openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", false) + local assetString = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; + openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetString .. ".Enabled", false) end if (flipbook.CurrentFlipIndex < flipbook.TotalCount - 1) then flipbook.CurrentFlipIndex = flipbook.CurrentFlipIndex + 1; - local assetSring = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; - openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", true) + local assetString = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; + openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetString .. ".Enabled", true) end end @@ -27,13 +27,13 @@ local previousFlipbookPage = function (flipbook) return end - local assetSring = flipbook.AssetPrefix .. localIndex; - openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", false) + local assetString = flipbook.AssetPrefix .. localIndex; + openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetString .. ".Enabled", false) localIndex = localIndex - 1; if (localIndex >= 0 ) then - assetSring = flipbook.AssetPrefix .. localIndex; - openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", true) + assetString = flipbook.AssetPrefix .. localIndex; + openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetString .. ".Enabled", true) end if (localIndex < -1) then diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset index 070be0c3f0..440e8f6e93 100644 --- a/data/assets/util/webgui.asset +++ b/data/assets/util/webgui.asset @@ -90,7 +90,7 @@ asset.export("setCefRoute", setCefRoute) asset.meta = { Name = "WebGUI", Version = "0.1", - Description = [[ insert CEF rant ]], + Description = "insert CEF rant", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/profiles/asteroids.profile b/data/profiles/asteroids.profile index 8e6cb40535..764981f458 100644 --- a/data/profiles/asteroids.profile +++ b/data/profiles/asteroids.profile @@ -58,7 +58,7 @@ ], "meta": { "author": "OpenSpace Team", - "description": "This profile shows approximately 936,000 asteroids from the JPL Horizons Small-Body Database (SBDB). Included in this profile (and defined on our wiki): Amor Asteroids, Apollo Asteroids, Aten Asteroids, Atira Asteroids, Centaur Asteroids, Chiron-Type Comets, Encke-Type Comets, Halley-Type Comets, Inner Main Asteroid Belt Asteroids, Jupiter Family Comets, Jupiter Trojan Asteroids, Main Asteroid Belt Asteroids, Mars-Crossing Asteroids, Outer Main Asteroid Belt Asteroids, Potentially Hazardous Asteroids (PHAs), and Trans-Neptunian Asteroids.", + "description": "This profile shows approximately 936,000 asteroids from the JPL Horizons Small-Body Database (SBDB). Included in this profile (and defined on our wiki): Amor Asteroids, Apollo Asteroids, Aten Asteroids, Atira Asteroids, Centaur Asteroids, Chiron-Type Comets, Encke-Type Comets, Halley-Type Comets, Inner Main Asteroid Belt Asteroids, Jupiter Family Comets, Jupiter Trojan Asteroids, Main Asteroid Belt Asteroids, Mars-Crossing Asteroids, Outer Main Asteroid Belt Asteroids, Potentially Hazardous Asteroids (PHAs), and Trans-Neptunian Asteroids", "license": "MIT License", "name": "Asteroids", "url": "https://www.openspaceproject.com", @@ -72,4 +72,4 @@ "major": 1, "minor": 0 } -} \ No newline at end of file +} diff --git a/data/profiles/bastilleday2000.profile b/data/profiles/bastilleday2000.profile index 4d21ebc02a..076287bb40 100644 --- a/data/profiles/bastilleday2000.profile +++ b/data/profiles/bastilleday2000.profile @@ -154,7 +154,7 @@ ], "meta": { "author": "CCMC", - "description": "This profile is showing the Coronal mass ejection of the bastille day 2000-07-14. The profile is data intensive and will require a powerful GPU.", + "description": "This profile is showing the Coronal mass ejection of the bastille day 2000-07-14. The profile is data intensive and will require a powerful GPU", "license": "MIT License", "name": "Bastille day 2000", "url": "https://www.openspaceproject.com", diff --git a/data/profiles/default.profile b/data/profiles/default.profile index 9692384366..c659cd335d 100644 --- a/data/profiles/default.profile +++ b/data/profiles/default.profile @@ -84,7 +84,7 @@ ], "meta": { "author": "OpenSpace Team", - "description": "Default OpenSpace Profile. Adds Earth satellites not contained in other profiles.", + "description": "Default OpenSpace Profile. Adds Earth satellites not contained in other profiles", "license": "MIT License", "name": "Default", "url": "https://www.openspaceproject.com", diff --git a/data/profiles/default_full.profile b/data/profiles/default_full.profile index f2ba7d71bd..12a80c8bf5 100644 --- a/data/profiles/default_full.profile +++ b/data/profiles/default_full.profile @@ -111,7 +111,7 @@ ], "meta": { "author": "OpenSpace Team", - "description": "Default OpenSpace Profile. Adds Earth satellites not contained in other profiles.", + "description": "Default OpenSpace Profile. Adds Earth satellites not contained in other profiles", "license": "MIT License", "name": "Default", "url": "https://www.openspaceproject.com", diff --git a/data/profiles/gaia.profile b/data/profiles/gaia.profile index c03b2d5aff..941db99b3a 100644 --- a/data/profiles/gaia.profile +++ b/data/profiles/gaia.profile @@ -33,7 +33,7 @@ ], "meta": { "author": "OpenSpace Team", - "description": "This scene contains a new rendering method to show the massive ESA Gaia stars dataset. By default, it loads the few million stars of the Gaia DR2 that contain radial velocities.", + "description": "This scene contains a new rendering method to show the massive ESA Gaia stars dataset. By default, it loads the few million stars of the Gaia DR2 that contain radial velocities", "license": "MIT License", "name": "Gaia", "url": "https://www.openspaceproject.com", @@ -61,4 +61,4 @@ "major": 1, "minor": 0 } -} \ No newline at end of file +} diff --git a/data/profiles/juice.profile b/data/profiles/juice.profile index 1f51606e81..947f087d97 100644 --- a/data/profiles/juice.profile +++ b/data/profiles/juice.profile @@ -49,7 +49,7 @@ ], "meta": { "author": "OpenSpace Team", - "description": "Juice profile that visualizes the currently best known trajectory for the JUICE mission the Jupiter and its moons. See https://sci.esa.int/documents/33960/35865/1567260128466-JUICE_Red_Book_i1.0.pdf for more information about the JUICE mission. Currently, only the Janus and NavCam instruments are included in this profile, but the other instruments are available for a custom profile. Some of these are not behaving correctly, which will be addressed later.", + "description": "Juice profile that visualizes the currently best known trajectory for the JUICE mission the Jupiter and its moons. See https://sci.esa.int/documents/33960/35865/1567260128466-JUICE_Red_Book_i1.0.pdf for more information about the JUICE mission. Currently, only the Janus and NavCam instruments are included in this profile, but the other instruments are available for a custom profile. Some of these are not behaving correctly, which will be addressed later", "license": "MIT License", "name": "Juice", "url": "https://www.openspaceproject.com", diff --git a/data/profiles/jwst.profile b/data/profiles/jwst.profile index 66d3406024..38fb91dbd1 100644 --- a/data/profiles/jwst.profile +++ b/data/profiles/jwst.profile @@ -202,7 +202,7 @@ ], "meta": { "author": "OpenSpace Team", - "description": "James Webb Space Telescope Profile. Adds the James Webb Space Telescope model with an estimated trajectery.", + "description": "James Webb Space Telescope Profile. Adds the James Webb Space Telescope model with an estimated trajectery", "license": "MIT License", "name": "James Webb Space Telescope", "url": "https://www.openspaceproject.com", @@ -338,4 +338,4 @@ "major": 1, "minor": 1 } -} \ No newline at end of file +} diff --git a/data/profiles/messenger.profile b/data/profiles/messenger.profile index 16bb260dd0..9401e55fbd 100644 --- a/data/profiles/messenger.profile +++ b/data/profiles/messenger.profile @@ -41,7 +41,7 @@ ], "meta": { "author": "OpenSpace Team", - "description": "This scene contains model and trajectory of the NASA MESSENGER spacecraft with craft pointing data from 2011-03 to 2011-06. In addition, a rendering of Mercury’s magnetosphere based on data recorded by MESSENGER can be enabled and viewed around the planet. Along with the mission data, additional maps were added to Mercury showing mineral abundances on the surface and a multi-color mosaic from the MDIS instrument.", + "description": "This scene contains model and trajectory of the NASA MESSENGER spacecraft with craft pointing data from 2011-03 to 2011-06. In addition, a rendering of Mercury’s magnetosphere based on data recorded by MESSENGER can be enabled and viewed around the planet. Along with the mission data, additional maps were added to Mercury showing mineral abundances on the surface and a multi-color mosaic from the MDIS instrument", "license": "MIT License", "name": "Messenger", "url": "https://www.openspaceproject.com", @@ -55,4 +55,4 @@ "major": 1, "minor": 0 } -} \ No newline at end of file +} diff --git a/data/profiles/newhorizons.profile b/data/profiles/newhorizons.profile index 60bb04c35d..1f354e90ef 100644 --- a/data/profiles/newhorizons.profile +++ b/data/profiles/newhorizons.profile @@ -1,7 +1,7 @@ { "actions": [ { - "documentation": "Sets the focus of the camera on 'NewHorizons'.", + "documentation": "Sets the focus of the camera on 'NewHorizons'", "gui_path": "/Missions/New Horizons", "identifier": "profile.focus.newhorizons", "is_local": false, @@ -25,7 +25,7 @@ "script": "openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'PlutoProjection') ;openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', ''); openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);" }, { - "documentation": "Sets the focus of the camera on 'Charon'.", + "documentation": "Sets the focus of the camera on 'Charon'", "gui_path": "/Missions/New Horizons", "identifier": "profile.focus.charon", "is_local": false, @@ -41,7 +41,7 @@ "script": "local enabled = openspace.getPropertyValue('Scene.PlutoProjection.Renderable.ProjectionComponent.PerformProjection'); openspace.setPropertyValue('Scene.PlutoProjection.Renderable.ProjectionComponent.PerformProjection', not enabled); openspace.setPropertyValue('Scene.CharonProjection.Renderable.ProjectionComponent.PerformProjection', not enabled);" }, { - "documentation": "Removes all image projections from Pluto and Charon.", + "documentation": "Removes all image projections from Pluto and Charon", "gui_path": "/Missions/New Horizons", "identifier": "profile.clear_image_projections", "is_local": false, @@ -49,7 +49,7 @@ "script": "openspace.setPropertyValue('Scene.PlutoProjection.Renderable.ProjectionComponent.ClearAllProjections', true); openspace.setPropertyValue('Scene.CharonProjection.Renderable.ProjectionComponent.ClearAllProjections', true);" }, { - "documentation": "Jumps to the 14th of July 2015 at 0900 UTC and clears all projections.", + "documentation": "Jumps to the 14th of July 2015 at 0900 UTC and clears all projections", "gui_path": "/Missions/New Horizons", "identifier": "profile.setup.approach", "is_local": false, @@ -57,7 +57,7 @@ "script": "openspace.time.setTime('2015-07-14T09:00:00.00');openspace.setPropertyValue('Scene.PlutoProjection.Renderable.ProjectionComponent.ClearAllProjections', true);openspace.setPropertyValue('Scene.CharonProjection.Renderable.ProjectionComponent.ClearAllProjections', true);" }, { - "documentation": "Increases the height map exaggeration on Pluto.", + "documentation": "Increases the height map exaggeration on Pluto", "gui_path": "/Missions/New Horizons", "identifier": "profile.pluto.increase_height_exaggeration", "is_local": false, @@ -65,7 +65,7 @@ "script": "openspace.setPropertyValueSingle(\"Scene.PlutoProjection.Renderable.HeightExaggeration\", openspace.getPropertyValue(\"Scene.PlutoProjection.Renderable.HeightExaggeration\") + 5000);" }, { - "documentation": "Decreases the height map exaggeration on Pluto.", + "documentation": "Decreases the height map exaggeration on Pluto", "gui_path": "/Missions/New Horizons", "identifier": "profile.pluto.decrease_height_exaggeration", "is_local": false, @@ -73,7 +73,7 @@ "script": "openspace.setPropertyValueSingle(\"Scene.PlutoProjection.Renderable.HeightExaggeration\", openspace.getPropertyValue(\"Scene.PlutoProjection.Renderable.HeightExaggeration\") - 5000);" }, { - "documentation": "Increases the height map exaggeration on Charon.", + "documentation": "Increases the height map exaggeration on Charon", "gui_path": "/Missions/New Horizons", "identifier": "profile.charon.increase_height_exaggeration", "is_local": false, @@ -81,7 +81,7 @@ "script": "openspace.setPropertyValueSingle(\"Scene.CharonProjection.Renderable.HeightExaggeration\", openspace.getPropertyValue(\"Scene.CharonProjection.Renderable.HeightExaggeration\") + 5000);" }, { - "documentation": "Decreases the height map exaggeration on Charon.", + "documentation": "Decreases the height map exaggeration on Charon", "gui_path": "/Missions/New Horizons", "identifier": "profile.charon.decrease_height_exaggeration", "is_local": false, @@ -89,7 +89,7 @@ "script": "openspace.setPropertyValueSingle(\"Scene.CharonProjection.Renderable.HeightExaggeration\", openspace.getPropertyValue(\"Scene.CharonProjection.Renderable.HeightExaggeration\") - 5000);" }, { - "documentation": "Toggles the visibility of the trail behind Pluto.", + "documentation": "Toggles the visibility of the trail behind Pluto", "gui_path": "/Missions/New Horizons", "identifier": "profile.toggle.pluto_trail", "is_local": false, @@ -97,7 +97,7 @@ "script": "openspace.setPropertyValueSingle('Scene.PlutoBarycentricTrail.Renderable.Enabled', not openspace.getPropertyValue('Scene.PlutoBarycentricTrail.Renderable.Enabled'));" }, { - "documentation": "Toggles the visibility of the text labels of Pluto, Charon, Hydra, Nix, Kerberos, and Styx.", + "documentation": "Toggles the visibility of the text labels of Pluto, Charon, Hydra, Nix, Kerberos, and Styx", "gui_path": "/Missions/New Horizons", "identifier": "profile.toggle.pluto_labels", "is_local": false, @@ -105,7 +105,7 @@ "script": "local list = {\"Scene.PlutoText.Renderable.Enabled\", \"Scene.CharonText.Renderable.Enabled\", \"Scene.HydraText.Renderable.Enabled\", \"Scene.NixText.Renderable.Enabled\", \"Scene.KerberosText.Renderable.Enabled\", \"Scene.StyxText.Renderable.Enabled\"}; for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end" }, { - "documentation": "Toggles the visibility of the labels for the New Horizons instruments.", + "documentation": "Toggles the visibility of the labels for the New Horizons instruments", "gui_path": "/Missions/New Horizons", "identifier": "profile.toggle_nh_labels", "is_local": false, @@ -113,7 +113,7 @@ "script": "local v = openspace.getPropertyValue(\"Scene.Labels.Renderable.Opacity\"); if v <= 0.5 then openspace.setPropertyValueSingle(\"Scene.Labels.Renderable.Opacity\",1.0,2.0) else openspace.setPropertyValueSingle(\"Scene.Labels.Renderable.Opacity\",0.0,2.0) end" }, { - "documentation": "Toggles the visibility of the shadow visualization of Pluto and Charon.", + "documentation": "Toggles the visibility of the shadow visualization of Pluto and Charon", "gui_path": "/Missions/New Horizons", "identifier": "profile.toggle_shadows", "is_local": false, @@ -254,7 +254,7 @@ ], "meta": { "author": "OpenSpace Team", - "description": "This profile shows the acquisition of NASA New Horizons’ images of the Plutonian system in July 2015. The profile starts at around 10:00 on July 14th, around 10 minutes before a new image campaign starts. By selecting Pluto as the Origin and moving time faster, you can see the imprint of the instrument’s field-of-view on the planetary surface and see the images being projected. A timer on the top left of the screen shows when the next image is being taken.", + "description": "This profile shows the acquisition of NASA New Horizons' images of the Plutonian system in July 2015. The profile starts at around 10:00 on July 14th, around 10 minutes before a new image campaign starts. By selecting Pluto as the Origin and moving time faster, you can see the imprint of the instrument's field-of-view on the planetary surface and see the images being projected. A timer on the top left of the screen shows when the next image is being taken", "license": "MIT License", "name": "New Horizons", "url": "https://www.openspaceproject.com", @@ -290,4 +290,4 @@ "major": 1, "minor": 1 } -} \ No newline at end of file +} diff --git a/data/profiles/osirisrex.profile b/data/profiles/osirisrex.profile index 8f3a080085..12489852e9 100644 --- a/data/profiles/osirisrex.profile +++ b/data/profiles/osirisrex.profile @@ -134,7 +134,7 @@ ], "meta": { "author": "OpenSpace Team", - "description": "This profile demonstrates the entire lifetime of the NASA OSIRIS-REx spacecraft on its way to the asteroid Bennu and its subsequent journey back to Earth. The profile starts at Earth around the time of the spacecraft’s launch and has information throughout the entire mission until its landing back on Earth in Utah. The models of OSIRIS-REx and Bennu are available, as well as a preliminary instrument timing, which uses the same image projection technique as employed in New Horizons and Rosetta.", + "description": "This profile demonstrates the entire lifetime of the NASA OSIRIS-REx spacecraft on its way to the asteroid Bennu and its subsequent journey back to Earth. The profile starts at Earth around the time of the spacecraft's launch and has information throughout the entire mission until its landing back on Earth in Utah. The models of OSIRIS-REx and Bennu are available, as well as a preliminary instrument timing, which uses the same image projection technique as employed in New Horizons and Rosetta", "license": "MIT License", "name": "Osiris-Rex", "url": "https://www.openspaceproject.com", @@ -155,4 +155,4 @@ "major": 1, "minor": 1 } -} \ No newline at end of file +} diff --git a/data/profiles/rosetta.profile b/data/profiles/rosetta.profile index 9004efd649..c2d0b629c7 100644 --- a/data/profiles/rosetta.profile +++ b/data/profiles/rosetta.profile @@ -17,7 +17,7 @@ "script": "openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Rosetta'); openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', ''); openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);" }, { - "documentation": "Jumps to the time when the Philae lander is released.", + "documentation": "Jumps to the time when the Philae lander is released", "gui_path": "/Missions/Rosetta", "identifier": "profile.setup.lander_release", "is_local": false, @@ -25,7 +25,7 @@ "script": "openspace.time.setTime('2014-11-12T08:20:00.00');" }, { - "documentation": "Removes all image projections from 67P.", + "documentation": "Removes all image projections from 67P", "gui_path": "/Missions/Rosetta", "identifier": "profile.67p.clear_projections", "is_local": false, @@ -33,7 +33,7 @@ "script": "openspace.setPropertyValue('Scene.67P.Renderable.ProjectionComponent.ClearAllProjections', true);" }, { - "documentation": "Toggles the visibility of all trails further from the Sun than 67P.", + "documentation": "Toggles the visibility of all trails further from the Sun than 67P", "gui_path": "/Missions/Rosetta", "identifier": "profile.toggle.outerplanet_trails", "is_local": false, @@ -41,7 +41,7 @@ "script": "local list = openspace.getProperty('{planetTrail_giants}.Renderable.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end" }, { - "documentation": "Toggles the visibility of the free floating image plane.", + "documentation": "Toggles the visibility of the free floating image plane", "gui_path": "/Missions/Rosetta", "identifier": "profile.toggle.image_plane", "is_local": false, @@ -49,7 +49,7 @@ "script": "openspace.setPropertyValueSingle('Scene.ImagePlaneRosetta.Renderable.Enabled', not openspace.getPropertyValue('Scene.ImagePlaneRosetta.Renderable.Enabled'));" }, { - "documentation": "Toggles the visibility of Philae's trail.", + "documentation": "Toggles the visibility of Philae's trail", "gui_path": "/Missions/Rosetta", "identifier": "profile.toggle.philae_trail", "is_local": false, @@ -57,7 +57,7 @@ "script": "openspace.setPropertyValueSingle('Scene.PhilaeTrail.Renderable.Enabled', not openspace.getPropertyValue('Scene.PhilaeTrail.Renderable.Enabled'));" }, { - "documentation": "Enables or disables the image projection on 67P.", + "documentation": "Enables or disables the image projection on 67P", "gui_path": "/Missions/Rosetta", "identifier": "profile.toggle.67p_projection", "is_local": false, @@ -150,7 +150,7 @@ ], "meta": { "author": "OpenSpace Team", - "description": "The Rosetta scene shows the entire mission of ESA’s Rosetta spacecraft around comet 67P, also known as Churyumov-Gerasimenko. The spacecraft’s images are projected onto the comet and the separation of the Philae lander is visible as well.", + "description": "The Rosetta scene shows the entire mission of ESA's Rosetta spacecraft around comet 67P, also known as Churyumov-Gerasimenko. The spacecraft's images are projected onto the comet and the separation of the Philae lander is visible as well", "license": "MIT License", "name": "Rosetta", "url": "https://www.openspaceproject.com", @@ -176,4 +176,4 @@ "major": 1, "minor": 1 } -} \ No newline at end of file +} diff --git a/data/profiles/solarstorm2012.profile b/data/profiles/solarstorm2012.profile index d51718ef28..43542d1842 100644 --- a/data/profiles/solarstorm2012.profile +++ b/data/profiles/solarstorm2012.profile @@ -63,7 +63,7 @@ ], "meta": { "author": "Community Coordinated Modeling Center, NASA Goddard", - "description": "This profile is showing several coronal mass ejection (CMEs) during July 2012, where the last one was incredible intense. Its strength was comparable to the most intense CME in recorded history, the Carrington Event of 1859, which caused damage to electric equipment world wide. Luckily this 2012 event missed earth. The event is modeled with ENLIL which spands across the solarsystem, from the Sun to Earth, Batsrus which is showing the interaction of the flow of the solar wind and Earths magnetosphere. There is also one time step of the PFSS model showing the Suns local magnetic structure.", + "description": "This profile is showing several coronal mass ejection (CMEs) during July 2012, where the last one was incredible intense. Its strength was comparable to the most intense CME in recorded history, the Carrington Event of 1859, which caused damage to electric equipment world wide. Luckily this 2012 event missed earth. The event is modeled with ENLIL which spands across the solarsystem, from the Sun to Earth, Batsrus which is showing the interaction of the flow of the solar wind and Earths magnetosphere. There is also one time step of the PFSS model showing the Suns local magnetic structure", "license": "MIT License", "name": "Solar storm 2012", "url": "https://www.openspaceproject.com", @@ -94,4 +94,4 @@ "major": 1, "minor": 1 } -} \ No newline at end of file +} diff --git a/data/profiles/touch.profile b/data/profiles/touch.profile index 50e09f7173..2609bf1582 100644 --- a/data/profiles/touch.profile +++ b/data/profiles/touch.profile @@ -14,7 +14,7 @@ }, "meta": { "author": "OpenSpace Team", - "description": "Profile set up to load /touch path from the gui, which contains an alternate gui with stories for a touch screen.", + "description": "Profile set up to load /touch path from the gui, which contains an alternate gui with stories for a touch screen", "license": "MIT License", "name": "Touch", "url": "https://www.openspaceproject.com", @@ -52,4 +52,4 @@ "major": 1, "minor": 0 } -} \ No newline at end of file +} diff --git a/data/profiles/voyager.profile b/data/profiles/voyager.profile index a21c0fc2f7..28082bbd5f 100644 --- a/data/profiles/voyager.profile +++ b/data/profiles/voyager.profile @@ -134,7 +134,7 @@ ], "meta": { "author": "OpenSpace Team", - "description": "This scene contains the NASA Voyager 1 and Voyager 2 missions as they were launched from Earth in the 1970s and observed the gas giants in the Solar System. The spacecraft models are included and are pointed accurately throughout the mission. Position and orientation information are available until the second half of the 21st century.", + "description": "This scene contains the NASA Voyager 1 and Voyager 2 missions as they were launched from Earth in the 1970s and observed the gas giants in the Solar System. The spacecraft models are included and are pointed accurately throughout the mission. Position and orientation information are available until the second half of the 21st century", "license": "MIT License", "name": "Voyager", "url": "https://www.openspaceproject.com", @@ -155,4 +155,4 @@ "major": 1, "minor": 1 } -} \ No newline at end of file +} diff --git a/ext/ghoul b/ext/ghoul index 026862b1a6..7d53430d8c 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 026862b1a66ce4920da1cb7005776b3228bb2959 +Subproject commit 7d53430d8c0c810baffdb7b636e195957360e812 diff --git a/include/openspace/camera/camera.h b/include/openspace/camera/camera.h index 10360e27cf..a9f398e25d 100644 --- a/include/openspace/camera/camera.h +++ b/include/openspace/camera/camera.h @@ -148,8 +148,10 @@ public: std::vector getSyncables(); // Static constants - static const glm::dvec3 ViewDirectionCameraSpace; - static const glm::dvec3 UpDirectionCameraSpace; + // (2021-07-16, emmbr) Note that this hard coded vector for the view direction is also + // used in a qauternion -> view direction helper function in ghoul/glm.h + static constexpr glm::dvec3 ViewDirectionCameraSpace = glm::dvec3(0.0, 0.0, -1.0); + static constexpr glm::dvec3 UpDirectionCameraSpace = glm::dvec3(0.0, 1.0, 0.0); private: diff --git a/include/openspace/events/event.h b/include/openspace/events/event.h index 083d65a9fb..6334de64a7 100644 --- a/include/openspace/events/event.h +++ b/include/openspace/events/event.h @@ -113,7 +113,7 @@ void logAllEvents(const Event* e); * to the scene. */ struct EventSceneGraphNodeAdded : public Event { - static const Type Type = Event::Type::SceneGraphNodeAdded; + static constexpr Type Type = Event::Type::SceneGraphNodeAdded; /** * Creates an instance of an EventSceneGraphNodeAdded event. @@ -131,7 +131,7 @@ struct EventSceneGraphNodeAdded : public Event { * is signalled, the scene graph node has already been removed. */ struct EventSceneGraphNodeRemoved : public Event { - static const Type Type = Event::Type::SceneGraphNodeRemoved; + static constexpr Type Type = Event::Type::SceneGraphNodeRemoved; /** * Creates an instance of an EventSceneGraphNodeRemoved event. @@ -149,7 +149,7 @@ struct EventSceneGraphNodeRemoved : public Event { * The new state is sent as an argument with this event. */ struct EventParallelConnection : public Event { - static const Type Type = Event::Type::ParallelConnection; + static constexpr Type Type = Event::Type::ParallelConnection; enum class State : uint8_t { Established, @@ -173,7 +173,7 @@ struct EventParallelConnection : public Event { * regardless of whether it is the initial profile, or any subsequent profile is loaded. */ struct EventProfileLoadingFinished : public Event { - static const Type Type = Event::Type::ProfileLoadingFinished; + static constexpr Type Type = Event::Type::ProfileLoadingFinished; /** * Creates an instance of an EventProfileLoadingFinished event. @@ -187,7 +187,7 @@ struct EventProfileLoadingFinished : public Event { * which means that OpenSpace is just about the shutdown. */ struct EventApplicationShutdown : public Event { - static const Type Type = Event::Type::ApplicationShutdown; + static constexpr Type Type = Event::Type::ApplicationShutdown; enum class State : uint8_t { Started, @@ -210,7 +210,7 @@ struct EventApplicationShutdown : public Event { * this event is craeted, the screenspace renderable is already registered and available. */ struct EventScreenSpaceRenderableAdded : public Event { - static const Type Type = Event::Type::ScreenSpaceRenderableAdded; + static constexpr Type Type = Event::Type::ScreenSpaceRenderableAdded; /** * Creates an instance of an EventScreenSpaceRenderableAdded event. @@ -229,7 +229,7 @@ struct EventScreenSpaceRenderableAdded : public Event { * no longer available */ struct EventScreenSpaceRenderableRemoved : public Event { - static const Type Type = Event::Type::ScreenSpaceRenderableRemoved; + static constexpr Type Type = Event::Type::ScreenSpaceRenderableRemoved; /** * Creates an instance of an EventScreenSpaceRenderableRemoved event. @@ -259,7 +259,7 @@ Exiting Receding Reaching Approachi ``` */ struct EventCameraFocusTransition : public Event { - static const Type Type = Event::Type::CameraFocusTransition; + static constexpr Type Type = Event::Type::CameraFocusTransition; enum class Transition { Approaching, @@ -294,7 +294,7 @@ struct EventCameraFocusTransition : public Event { * currently unused. */ struct EventTimeOfInterestReached : public Event { - static const Type Type = Event::Type::TimeOfInterestReached; + static constexpr Type Type = Event::Type::TimeOfInterestReached; /** * Creates an instance of an EventTimeOfInterestReached event. @@ -314,7 +314,7 @@ struct EventTimeOfInterestReached : public Event { * currently unused. */ struct EventMissionEventReached : public Event { - static const Type Type = Event::Type::MissionEventReached; + static constexpr Type Type = Event::Type::MissionEventReached; // Not sure which kind of parameters we want to pass here EventMissionEventReached(); @@ -325,7 +325,7 @@ struct EventMissionEventReached : public Event { * event is currently unused. */ struct EventPlanetEclipsed : public Event { - static const Type Type = Event::Type::PlanetEclipsed; + static constexpr Type Type = Event::Type::PlanetEclipsed; /** * Creates an instance of an EventPlanetEclipsed event. @@ -347,7 +347,7 @@ struct EventPlanetEclipsed : public Event { * interpolation time of a property change is 0s, this event is not fired */ struct EventInterpolationFinished : public Event { - static const Type Type = Event::Type::InterpolationFinished; + static constexpr Type Type = Event::Type::InterpolationFinished; /** * Creates an instance of an EventInterpolationFinished event. @@ -366,7 +366,7 @@ struct EventInterpolationFinished : public Event { * same time. */ struct EventFocusNodeChanged : public Event { - static const Type Type = Event::Type::FocusNodeChanged; + static constexpr Type Type = Event::Type::FocusNodeChanged; /** * Creates an instance of an EventFocusNodeChanged event. @@ -387,7 +387,7 @@ struct EventFocusNodeChanged : public Event { * This event is created when a layer is added to to a globe. */ struct EventLayerAdded : public Event { - static const Type Type = Event::Type::LayerAdded; + static constexpr Type Type = Event::Type::LayerAdded; /** * Creates an instance of an EventLayerAdded event. @@ -412,7 +412,7 @@ struct EventLayerAdded : public Event { * This event is created when a layer is removed from a globe. */ struct EventLayerRemoved : public Event { - static const Type Type = Event::Type::LayerRemoved; + static constexpr Type Type = Event::Type::LayerRemoved; /** * Creates an instance of an EventLayerRemoved event. @@ -438,7 +438,7 @@ struct EventLayerRemoved : public Event { * The event contains information about the new state of the session recording subsystem. */ struct EventSessionRecordingPlayback : public Event { - static const Type Type = Event::Type::SessionRecordingPlayback; + static constexpr Type Type = Event::Type::SessionRecordingPlayback; enum class State { Started, @@ -465,7 +465,7 @@ struct EventSessionRecordingPlayback : public Event { * it should do the pointing. */ struct EventPointSpacecraft : public Event { - static const Type Type = Event::Type::PointSpacecraft; + static constexpr Type Type = Event::Type::PointSpacecraft; /** * Creates an instance of an EventSessionRecordingPlayback event. @@ -487,7 +487,7 @@ struct EventPointSpacecraft : public Event { * signalled, the renderable has already been enabled. */ struct EventRenderableEnabled : public Event { - static const Type Type = Event::Type::RenderableEnabled; + static constexpr Type Type = Event::Type::RenderableEnabled; /** * Creates an instance of an EventRenderableEnabled event. @@ -506,7 +506,7 @@ struct EventRenderableEnabled : public Event { * signalled, the renderable has already been disabled. */ struct EventRenderableDisabled : public Event { - static const Type Type = Event::Type::RenderableDisabled; + static constexpr Type Type = Event::Type::RenderableDisabled; /** * Creates an instance of an EventRenderableDisabled event. @@ -526,7 +526,7 @@ struct EventRenderableDisabled : public Event { * transitioned to a specific event type, if it is deemed to be useful. */ struct CustomEvent : public Event { - static const Type Type = Event::Type::Custom; + static constexpr Type Type = Event::Type::Custom; /** * Creates an instance of a CustomEvent event. diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h index 81640b17c1..b1981a8e3a 100644 --- a/include/openspace/interaction/sessionrecording.h +++ b/include/openspace/interaction/sessionrecording.h @@ -854,7 +854,7 @@ public: //Read string length from file in->read(reinterpret_cast(&strLen), sizeof(strLen)); if (strLen > saveBufferStringSize_max) { - throw ConversionError("Invalid script size for conversion read."); + throw ConversionError("Invalid script size for conversion read"); } //Read back full string std::vector temp(strLen + 1); diff --git a/include/openspace/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h index cb697d9ff8..ed17a81d7d 100644 --- a/include/openspace/navigation/navigationhandler.h +++ b/include/openspace/navigation/navigationhandler.h @@ -159,7 +159,7 @@ private: Camera* _camera = nullptr; std::function _playbackEndCallback; - inline static const double InteractionHystersis = 0.0125; + static constexpr double InteractionHystersis = 0.0125; bool _inAnchorApproachSphere = false; bool _inAnchorReachSphere = false; diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h index 362e888f25..1bb61b0a14 100644 --- a/include/openspace/network/parallelconnection.h +++ b/include/openspace/network/parallelconnection.h @@ -85,7 +85,8 @@ public: ParallelConnection::Message receiveMessage(); - static const uint8_t ProtocolVersion; + // Gonna do some UTF-like magic once we reach 255 to introduce a second byte or so + static constexpr uint8_t ProtocolVersion = 6; private: std::unique_ptr _socket; diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h index ebcfbf8ed5..9dd693fc69 100644 --- a/include/openspace/properties/propertyowner.h +++ b/include/openspace/properties/propertyowner.h @@ -52,7 +52,7 @@ class Property; class PropertyOwner : public DocumentationGenerator { public: /// The separator that is used while accessing the properties and/or sub-owners - static const char URISeparator = '.'; + static constexpr char URISeparator = '.'; struct PropertyOwnerInfo { std::string identifier; diff --git a/include/openspace/util/concurrentjobmanager.inl b/include/openspace/util/concurrentjobmanager.inl index ed43e803b4..aa621debb3 100644 --- a/include/openspace/util/concurrentjobmanager.inl +++ b/include/openspace/util/concurrentjobmanager.inl @@ -48,7 +48,7 @@ void ConcurrentJobManager

::clearEnqueuedJobs() { template std::shared_ptr> ConcurrentJobManager

::popFinishedJob() { - ghoul_assert(!_finishedJobs.empty(), "There is no finished job to pop!"); + ghoul_assert(!_finishedJobs.empty(), "There is no finished job to pop"); std::lock_guard lock(_finishedJobsMutex); return _finishedJobs.pop(); diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp index e472e12a7a..a9adf06243 100644 --- a/modules/atmosphere/rendering/renderableatmosphere.cpp +++ b/modules/atmosphere/rendering/renderableatmosphere.cpp @@ -140,14 +140,14 @@ namespace { constexpr openspace::properties::Property::PropertyInfo AtmosphereDimmingHeightInfo ={ "AtmosphereDimmingHeight", "Atmosphere Dimming Height", - "Percentage of the atmosphere where other objects, such as the stars, are faded." + "Percentage of the atmosphere where other objects, such as the stars, are faded" }; constexpr openspace::properties::Property::PropertyInfo SunsetAngleInfo = { "AtmosphereDimmingSunsetAngle", "Atmosphere Dimming Sunset Angle", "The angle (degrees) between the Camera and the Sun where the sunset starts, and " - "the atmosphere starts to fade in objects such as the stars." + "the atmosphere starts to fade in objects such as the stars" }; struct [[codegen::Dictionary(RenderableAtmosphere)]] Parameters { diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp index ff73c438e7..605cc4b1e0 100644 --- a/modules/base/dashboard/dashboarditemangle.cpp +++ b/modules/base/dashboard/dashboarditemangle.cpp @@ -50,7 +50,7 @@ namespace { "SourceType", "Source Type", "The type of position that is used as the triangle apex used to calculate the " - "angle. The default value is 'Camera'." + "angle. The default value is 'Camera'" }; constexpr openspace::properties::Property::PropertyInfo SourceNodeNameInfo = { @@ -59,7 +59,7 @@ namespace { "If a scene graph node is selected as type, this value specifies the name of the " "node that is to be used as the apex of the triangle used to calculate the " "angle. The computed angle is the incident angle to Source in the triangle (" - "Source, Reference, Destination)." + "Source, Reference, Destination)" }; constexpr openspace::properties::Property::PropertyInfo ReferenceTypeInfo = { @@ -67,14 +67,14 @@ namespace { "Reference Type", "The type of position that is used as the destination of the reference line used " "to calculate the angle. The computed angle is the incident angle to Source in " - "the triangle (Source, Reference, Destination)." + "the triangle (Source, Reference, Destination)" }; constexpr openspace::properties::Property::PropertyInfo ReferenceNodeNameInfo = { "ReferenceNodeName", "Reference Node Name", "If a scene graph node is selected as type, this value specifies the name of the " - "node that is to be used as the reference direction to compute the angle." + "node that is to be used as the reference direction to compute the angle" }; constexpr openspace::properties::Property::PropertyInfo DestinationTypeInfo = { @@ -82,14 +82,14 @@ namespace { "Destination Type", "The type of position that is used as the destination to calculate the angle. " "The computed angle is the incident angle to Source in the triangle (" - "Source, Reference, Destination). The default value for this is 'Focus'." + "Source, Reference, Destination). The default value for this is 'Focus'" }; constexpr openspace::properties::Property::PropertyInfo DestinationNodeNameInfo = { "DestinationNodeName", "Destination Node Name", "If a scene graph node is selected as type, this value specifies the name of the " - "node that is to be used as the destination for computing the angle." + "node that is to be used as the destination for computing the angle" }; struct [[codegen::Dictionary(DashboardItemAngle)]] Parameters { @@ -211,7 +211,7 @@ DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary) ); } } - addProperty(_source.nodeName); + addProperty(_reference.nodeName); _destination.type.addOptions({ { Type::Node, "Node" }, diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp index 0772e8a5f8..fcb2ace1d4 100644 --- a/modules/base/dashboard/dashboarditemdistance.cpp +++ b/modules/base/dashboard/dashboarditemdistance.cpp @@ -52,28 +52,28 @@ namespace { "SourceType", "Source Type", "The type of position that is used as the source to calculate the distance. The " - "default value is 'Camera'." + "default value is 'Camera'" }; constexpr openspace::properties::Property::PropertyInfo SourceNodeNameInfo = { "SourceNodeName", "Source Node Name", "If a scene graph node is selected as type, this value specifies the name of the " - "node that is to be used as the source for computing the distance." + "node that is to be used as the source for computing the distance" }; constexpr openspace::properties::Property::PropertyInfo DestinationTypeInfo = { "DestinationType", "Destination Type", "The type of position that is used as the destination to calculate the distance. " - "The default value for this is 'Focus'." + "The default value for this is 'Focus'" }; constexpr openspace::properties::Property::PropertyInfo DestinationNodeNameInfo = { "DestinationNodeName", "Destination Node Name", "If a scene graph node is selected as type, this value specifies the name of the " - "node that is to be used as the destination for computing the distance." + "node that is to be used as the destination for computing the distance" }; constexpr openspace::properties::Property::PropertyInfo SimplificationInfo = { @@ -81,14 +81,14 @@ namespace { "Simplification", "If this value is enabled, the distance is displayed in nuanced units, such as " "km, AU, light years, parsecs, etc. If this value is disabled, the unit can be " - "explicitly requested." + "explicitly requested" }; constexpr openspace::properties::Property::PropertyInfo RequestedUnitInfo = { "RequestedUnit", "Requested Unit", "If the simplification is disabled, this distance unit is used as a destination " - "to convert the meters into." + "to convert the meters into" }; constexpr openspace::properties::Property::PropertyInfo FormatStringInfo = { diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp index 62df3ba45f..e673f6b705 100644 --- a/modules/base/dashboard/dashboarditemframerate.cpp +++ b/modules/base/dashboard/dashboarditemframerate.cpp @@ -48,14 +48,14 @@ namespace { constexpr openspace::properties::Property::PropertyInfo FrametimeInfo = { "FrametimeType", "Type of the frame time display", - "This value determines the units in which the frame time is displayed." + "This value determines the units in which the frame time is displayed" }; constexpr openspace::properties::Property::PropertyInfo ClearCacheInfo = { "ClearCache", "Clear Cache", "Clears the cache of this DashboardItemFramerate item. If the selected option " - "does not use any caching, this trigger does not do anything." + "does not use any caching, this trigger does not do anything" }; [[ nodiscard ]] char* formatDt(std::vector& buffer) { diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp index 0b663b6162..0005051b90 100644 --- a/modules/base/dashboard/dashboarditemmission.cpp +++ b/modules/base/dashboard/dashboarditemmission.cpp @@ -78,10 +78,10 @@ void DashboardItemMission::render(glm::vec2& penPosition) { if (mission.phases().empty()) { return; } - static const glm::vec4 nextMissionColor(0.7f, 0.3f, 0.3f, 1.f); - static const glm::vec4 currentMissionColor(0.f, 0.5f, 0.5f, 1.f); - static const glm::vec4 missionProgressColor = currentMissionColor; - static const glm::vec4 nonCurrentMissionColor(0.3f, 0.3f, 0.3f, 1.f); + static constexpr glm::vec4 nextMissionColor = glm::vec4(0.7f, 0.3f, 0.3f, 1.f); + static constexpr glm::vec4 currentMissionColor = glm::vec4(0.f, 0.5f, 0.5f, 1.f); + static constexpr glm::vec4 missionProgressColor = currentMissionColor; + static constexpr glm::vec4 nonCurrentMissionColor = glm::vec4(0.3f, 0.3f, 0.3f, 1.f); // Add spacing RenderFont( diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp index 318fafacda..281b700eee 100644 --- a/modules/base/dashboard/dashboarditempropertyvalue.cpp +++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp @@ -46,7 +46,7 @@ namespace { "Display String", "The String that is being displayed. It must either be empty (in which case only " "the value itself will be displayed), or it must contain extact one instance of " - "{}, which will be replaced with the value of the property during rendering." + "{}, which will be replaced with the value of the property during rendering" }; struct [[codegen::Dictionary(DashboardItemPropertyValue)]] Parameters { diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp index d76ff71a19..6713b47ec9 100644 --- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp +++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp @@ -41,14 +41,14 @@ namespace { "Time Simplification", "If this value is enabled, the time is displayed in nuanced units, such as " "minutes, hours, days, years, etc. If this value is disabled, it is always " - "displayed in seconds." + "displayed in seconds" }; constexpr openspace::properties::Property::PropertyInfo RequestedUnitInfo = { "RequestedUnit", "Requested Unit", "If the simplification is disabled, this time unit is used as a destination to " - "convert the seconds into." + "convert the seconds into" }; constexpr openspace::properties::Property::PropertyInfo TransitionFormatInfo = { diff --git a/modules/base/dashboard/dashboarditemspacing.cpp b/modules/base/dashboard/dashboarditemspacing.cpp index a4a1078270..7d5f5b2df7 100644 --- a/modules/base/dashboard/dashboarditemspacing.cpp +++ b/modules/base/dashboard/dashboarditemspacing.cpp @@ -33,7 +33,7 @@ namespace { "Spacing", "Spacing", "This value determines the spacing (in pixels) that this item represents. The " - "default value is 15." + "default value is 15" }; struct [[codegen::Dictionary(DashboardItemSpacing)]] Parameters { diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp index 57cb925d6d..1c848baabd 100644 --- a/modules/base/dashboard/dashboarditemvelocity.cpp +++ b/modules/base/dashboard/dashboarditemvelocity.cpp @@ -45,14 +45,14 @@ namespace { "Simplification", "If this value is enabled, the velocity is displayed in nuanced units, such as " "m/s, AU/s, light years / s etc. If this value is disabled, the unit can be " - "explicitly requested." + "explicitly requested" }; constexpr openspace::properties::Property::PropertyInfo RequestedUnitInfo = { "RequestedUnit", "Requested Unit", "If the simplification is disabled, this distance unit is used for the velocity " - "display." + "display" }; std::vector unitList() { diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp index 09b8e573c0..35a173e45e 100644 --- a/modules/base/rendering/grids/renderableboxgrid.cpp +++ b/modules/base/rendering/grids/renderableboxgrid.cpp @@ -39,13 +39,13 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", - "This value determines the color of the grid lines that are rendered." + "This value determines the color of the grid lines that are rendered" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", "Line Width", - "This value specifies the line width of the spherical grid." + "This value specifies the line width of the spherical grid" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp index 5e6009aecd..eb472e597f 100644 --- a/modules/base/rendering/grids/renderablegrid.cpp +++ b/modules/base/rendering/grids/renderablegrid.cpp @@ -39,20 +39,20 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", - "This value determines the color of the grid lines that are rendered." + "This value determines the color of the grid lines that are rendered" }; constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = { "Segments", "Number of Segments", "This value specifies the number of segments that are used to render the " - "grid in each direction." + "grid in each direction" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", "Line Width", - "This value specifies the line width of the grid." + "This value specifies the line width of the grid" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp index 2115eb7d11..aef8bc8609 100644 --- a/modules/base/rendering/grids/renderableradialgrid.cpp +++ b/modules/base/rendering/grids/renderableradialgrid.cpp @@ -40,7 +40,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", - "This value determines the color of the grid lines that are rendered." + "This value determines the color of the grid lines that are rendered" }; constexpr openspace::properties::Property::PropertyInfo GridSegmentsInfo = { @@ -60,7 +60,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", "Line Width", - "This value specifies the line width of the spherical grid." + "This value specifies the line width of the spherical grid" }; constexpr openspace::properties::Property::PropertyInfo RadiiInfo = { @@ -68,7 +68,7 @@ namespace { "Inner and Outer Radius", "The radii values that determine the size of the circular grid. The first value " "is the radius of the inmost ring and the second is the radius of the outmost " - "ring." + "ring" }; struct [[codegen::Dictionary(RenderableRadialGrid)]] Parameters { diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp index a9fa2f6463..4b58b488dd 100644 --- a/modules/base/rendering/grids/renderablesphericalgrid.cpp +++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp @@ -39,20 +39,20 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", - "This value determines the color of the grid lines that are rendered." + "This value determines the color of the grid lines that are rendered" }; constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = { "Segments", "Number of Segments", "This value specifies the number of segments that are used to render the " - "surrounding sphere." + "surrounding sphere" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", "Line Width", - "This value specifies the line width of the spherical grid." + "This value specifies the line width of the spherical grid" }; struct [[codegen::Dictionary(RenderableSphericalGrid)]] Parameters { diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp index 6fbadf071b..366258d727 100644 --- a/modules/base/rendering/renderablecartesianaxes.cpp +++ b/modules/base/rendering/renderablecartesianaxes.cpp @@ -40,19 +40,19 @@ namespace { constexpr openspace::properties::Property::PropertyInfo XColorInfo = { "XColor", "X Color", - "This value determines the color of the x axis." + "This value determines the color of the x axis" }; constexpr openspace::properties::Property::PropertyInfo YColorInfo = { "YColor", "Y Color", - "This value determines the color of the y axis." + "This value determines the color of the y axis" }; constexpr openspace::properties::Property::PropertyInfo ZColorInfo = { "ZColor", "Z Color", - "This value determines the color of the z axis." + "This value determines the color of the z axis" }; struct [[codegen::Dictionary(RenderableCartesianAxes)]] Parameters { diff --git a/modules/base/rendering/renderabledisc.cpp b/modules/base/rendering/renderabledisc.cpp index c6bd724897..b6be5e657e 100644 --- a/modules/base/rendering/renderabledisc.cpp +++ b/modules/base/rendering/renderabledisc.cpp @@ -47,13 +47,13 @@ namespace { "Texture", "Texture", "This value is the path to a texture on disk that contains a one-dimensional " - "texture to be used for the color." + "texture to be used for the color" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size", - "This value specifies the outer radius of the disc in meter." + "This value specifies the outer radius of the disc in meter" }; constexpr openspace::properties::Property::PropertyInfo WidthInfo = { @@ -61,7 +61,7 @@ namespace { "Width", "This value is used to set the width of the disc. The actual width is set " "based on the given size and this value should be set between 0 and 1. A value " - "of 1 results in a full circle and 0.5 a disc with an inner radius of 0.5*size." + "of 1 results in a full circle and 0.5 a disc with an inner radius of 0.5*size" }; struct [[codegen::Dictionary(RenderableDisc)]] Parameters { diff --git a/modules/base/rendering/renderablelabels.cpp b/modules/base/rendering/renderablelabels.cpp index cc3a9bee8a..9a0b556b73 100644 --- a/modules/base/rendering/renderablelabels.cpp +++ b/modules/base/rendering/renderablelabels.cpp @@ -92,55 +92,55 @@ namespace { constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = { "BlendMode", "Blending Mode", - "This determines the blending mode that is applied to the renderable." + "This determines the blending mode that is applied to the renderable" }; constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", - "The label text color." + "The label text color" }; constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", - "The font size (in points) for the label." + "The font size (in points) for the label" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size", - "This value affects the size scale of the label." + "This value affects the size scale of the label" }; constexpr openspace::properties::Property::PropertyInfo TextInfo = { "Text", "Text", - "The text that will be displayed on screen." + "The text that will be displayed on screen" }; constexpr openspace::properties::Property::PropertyInfo MinMaxSizeInfo = { "MinMaxSize", "Min and Max Size", - "The minimum and maximum size (in pixels) of the label." + "The minimum and maximum size (in pixels) of the label" }; constexpr openspace::properties::Property::PropertyInfo TransformationMatrixInfo = { "TransformationMatrix", "Transformation Matrix", - "Transformation matrix to be applied to the label." + "Transformation matrix to be applied to the label" }; constexpr openspace::properties::Property::PropertyInfo OrientationOptionInfo = { "OrientationOption", "Orientation Option", - "Label orientation rendering mode." + "Label orientation rendering mode" }; constexpr openspace::properties::Property::PropertyInfo EnableFadingEffectInfo = { "EnableFading", "Enable/Disable Fade-in Effect", - "Enable/Disable the Fade-in effect." + "Enable/Disable the Fade-in effect" }; constexpr openspace::properties::Property::PropertyInfo FadeWidthsInfo = { @@ -150,20 +150,20 @@ namespace { "The first value is the distance before the closest distance and the second " "the one after the furthest distance. For example, with the unit Parsec (pc), " "a value of {1, 2} will make the label being fully faded out 1 Parsec before " - "the closest distance and 2 Parsec away from the furthest distance." + "the closest distance and 2 Parsec away from the furthest distance" }; constexpr openspace::properties::Property::PropertyInfo FadeDistancesInfo = { "FadeDistances", "Fade Distances", "The distance range in which the labels should be fully opaque, specified in " - "the chosen unit. The distance from the position of the label to the camera." + "the chosen unit. The distance from the position of the label to the camera" }; constexpr openspace::properties::Property::PropertyInfo FadeUnitOptionInfo = { "FadeUnit", "Fade Distance Unit", - "Distance unit for fade-in/-out distance calculations. Defaults to \"au\"." + "Distance unit for fade-in/-out distance calculations. Defaults to \"au\"" }; struct [[codegen::Dictionary(RenderableLabels)]] Parameters { diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index 0f2e58eb2d..1a6fa4ffdd 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -78,39 +78,39 @@ namespace { constexpr openspace::properties::Property::PropertyInfo AmbientIntensityInfo = { "AmbientIntensity", "Ambient Intensity", - "A multiplier for ambient lighting." + "A multiplier for ambient lighting" }; constexpr openspace::properties::Property::PropertyInfo DiffuseIntensityInfo = { "DiffuseIntensity", "Diffuse Intensity", - "A multiplier for diffuse lighting." + "A multiplier for diffuse lighting" }; constexpr openspace::properties::Property::PropertyInfo SpecularIntensityInfo = { "SpecularIntensity", "Specular Intensity", - "A multiplier for specular lighting." + "A multiplier for specular lighting" }; constexpr openspace::properties::Property::PropertyInfo ShadingInfo = { "PerformShading", "Perform Shading", "This value determines whether this model should be shaded by using the position " - "of the Sun." + "of the Sun" }; constexpr openspace::properties::Property::PropertyInfo DisableFaceCullingInfo = { "DisableFaceCulling", "Disable Face Culling", - "Disable OpenGL automatic face culling optimization." + "Disable OpenGL automatic face culling optimization" }; constexpr openspace::properties::Property::PropertyInfo ModelTransformInfo = { "ModelTransform", "Model Transform", "This value specifies the model transform that is applied to the model before " - "all other transformations are applied." + "all other transformations are applied" }; constexpr openspace::properties::Property::PropertyInfo RotationVecInfo = { @@ -122,26 +122,26 @@ namespace { constexpr openspace::properties::Property::PropertyInfo LightSourcesInfo = { "LightSources", "Light Sources", - "A list of light sources that this model should accept light from." + "A list of light sources that this model should accept light from" }; constexpr openspace::properties::Property::PropertyInfo DisableDepthTestInfo = { "DisableDepthTest", "Disable Depth Test", - "Disable Depth Testing for the Model." + "Disable Depth Testing for the Model" }; constexpr openspace::properties::Property::PropertyInfo BlendingOptionInfo = { "BlendingOption", "Blending Options", "Changes the blending function used to calculate the colors of the model with " - "respect to the opacity." + "respect to the opacity" }; constexpr openspace::properties::Property::PropertyInfo EnableOpacityBlendingInfo = { "EnableOpacityBlending", "Enable Opacity Blending", - "Enable Opacity Blending." + "Enable Opacity Blending" }; struct [[codegen::Dictionary(RenderableModel)]] Parameters { diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp index 0c798ba9dc..24d140a670 100644 --- a/modules/base/rendering/renderablenodeline.cpp +++ b/modules/base/rendering/renderablenodeline.cpp @@ -56,13 +56,13 @@ namespace { constexpr openspace::properties::Property::PropertyInfo LineColorInfo = { "Color", "Color", - "This value determines the RGB color for the line." + "This value determines the RGB color for the line" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", "Line Width", - "This value specifies the line width." + "This value specifies the line width" }; // Returns a position that is relative to the current anchor node. This is a method to diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp index a2d253e849..67684d1298 100644 --- a/modules/base/rendering/renderableplane.cpp +++ b/modules/base/rendering/renderableplane.cpp @@ -53,7 +53,7 @@ namespace { "Billboard mode", "This value specifies whether the plane is a billboard, which means that it is " "always facing the camera. If this is false, it can be oriented using other " - "transformations." + "transformations" }; constexpr openspace::properties::Property::PropertyInfo MirrorBacksideInfo = { @@ -61,26 +61,26 @@ namespace { "Mirror backside of image plane", "If this value is set to false, the image plane will not be mirrored when " "looking from the backside. This is usually desirable when the image shows " - "data at a specific location, but not if it is displaying text for example." + "data at a specific location, but not if it is displaying text for example" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size (in meters)", - "This value specifies the size of the plane in meters." + "This value specifies the size of the plane in meters" }; constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = { "BlendMode", "Blending Mode", - "This determines the blending mode that is applied to this plane." + "This determines the blending mode that is applied to this plane" }; constexpr openspace::properties::Property::PropertyInfo MultiplyColorInfo = { "MultiplyColor", "Multiply Color", "If set, the plane's texture is multiplied with this color. " - "Useful for applying a color grayscale images." + "Useful for applying a color grayscale images" }; struct [[codegen::Dictionary(RenderablePlane)]] Parameters { diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp index 5269ba77a3..e7e696a378 100644 --- a/modules/base/rendering/renderableplaneimagelocal.cpp +++ b/modules/base/rendering/renderableplaneimagelocal.cpp @@ -42,7 +42,7 @@ namespace { "Texture", "Texture", "This value specifies an image that is loaded from disk and is used as a texture " - "that is applied to this plane. This image has to be square." + "that is applied to this plane. This image has to be square" }; struct [[codegen::Dictionary(RenderablePlaneImageLocal)]] Parameters { diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp index bbbe18d4b1..638b79ffe0 100644 --- a/modules/base/rendering/renderableplaneimageonline.cpp +++ b/modules/base/rendering/renderableplaneimageonline.cpp @@ -39,7 +39,7 @@ namespace { "Image URL", "Sets the URL of the texture that is displayed on this screen space plane. If " "this value is changed, the image at the new path will automatically be loaded " - "and displayed." + "and displayed" }; struct [[codegen::Dictionary(RenderablePlaneImageOnline)]] Parameters { diff --git a/modules/base/rendering/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp index b95ba1581b..97a86b3627 100644 --- a/modules/base/rendering/renderableplanetimevaryingimage.cpp +++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp @@ -45,14 +45,14 @@ namespace { "SourceFolder", "Source Folder", "This value specifies the image directory that is loaded from disk and " - "is used as a texture that is applied to this plane." + "is used as a texture that is applied to this plane" }; constexpr openspace::properties::Property::PropertyInfo RenderTypeInfo = { "RenderType", "Render Type", "This value specifies if the plane should be rendered in the Background, " - "Opaque, Transparent, or Overlay rendering step." + "Opaque, Transparent, or Overlay rendering step" }; struct [[codegen::Dictionary(RenderablePlaneTimeVaryingImage)]] Parameters { diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp index 4cd42a714b..21ae908099 100644 --- a/modules/base/rendering/renderableprism.cpp +++ b/modules/base/rendering/renderableprism.cpp @@ -43,7 +43,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = { "Segments", "Segments", - "The number of segments the shape of the prism should have." + "The number of segments the shape of the prism should have" }; constexpr openspace::properties::Property::PropertyInfo LinesInfo = { @@ -51,38 +51,38 @@ namespace { "Number of Lines", "The number of lines connecting the two shapes of the prism. " "They will be evenly distributed around the bounding circle that makes " - "up the shape of the prism." + "up the shape of the prism" }; constexpr openspace::properties::Property::PropertyInfo RadiusInfo = { "Radius", "Radius", - "The radius of the prism's shape in meters." + "The radius of the prism's shape in meters" }; constexpr openspace::properties::Property::PropertyInfo BaseRadiusInfo = { "BaseRadius", "Base Radius", "The radius of the base of the prism's shape, in meters. By default it is " - "given the same radius as the outer shape." + "given the same radius as the outer shape" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", "Line Width", - "This value specifies the line width." + "This value specifies the line width" }; constexpr openspace::properties::Property::PropertyInfo LineColorInfo = { "Color", "Color", - "This value determines the RGB color for the line." + "This value determines the RGB color for the line" }; constexpr openspace::properties::Property::PropertyInfo LengthInfo = { "Length", "Length", - "The length of the prism in meters." + "The length of the prism in meters" }; // Generate vertices around the unit circle on the XY-plane diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp index d058a1d125..10ab0a744a 100644 --- a/modules/base/rendering/renderablesphere.cpp +++ b/modules/base/rendering/renderablesphere.cpp @@ -57,52 +57,52 @@ namespace { "Texture", "This value specifies an image that is loaded from disk and is used as a texture " "that is applied to this sphere. This image is expected to be an equirectangular " - "projection." + "projection" }; constexpr openspace::properties::Property::PropertyInfo MirrorTextureInfo = { "MirrorTexture", "Mirror Texture", - "Mirror the texture along the x-axis." + "Mirror the texture along the x-axis" }; constexpr openspace::properties::Property::PropertyInfo OrientationInfo = { "Orientation", "Orientation", "Specifies whether the texture is applied to the inside of the sphere, the " - "outside of the sphere, or both." + "outside of the sphere, or both" }; constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = { "Segments", "Number of Segments", - "This value specifies the number of segments that the sphere is separated in." + "This value specifies the number of segments that the sphere is separated in" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size (in meters)", - "This value specifies the radius of the sphere in meters." + "This value specifies the radius of the sphere in meters" }; constexpr openspace::properties::Property::PropertyInfo FadeOutThresholdInfo = { "FadeOutThreshold", "Fade-Out Threshold", "This value determines percentage of the sphere is visible before starting " - "fading-out it." + "fading-out it" }; constexpr openspace::properties::Property::PropertyInfo FadeInThresholdInfo = { "FadeInThreshold", "Fade-In Threshold", "Distance from center of MilkyWay from where the astronomical object starts to " - "fade in." + "fade in" }; constexpr openspace::properties::Property::PropertyInfo DisableFadeInOutInfo = { "DisableFadeInOut", "Disable Fade-In/Fade-Out effects", - "Enables/Disables the Fade-In/Out effects." + "Enables/Disables the Fade-In/Out effects" }; struct [[codegen::Dictionary(RenderableSphere)]] Parameters { diff --git a/modules/base/rendering/renderabletimevaryingsphere.cpp b/modules/base/rendering/renderabletimevaryingsphere.cpp index 8ee3ded806..4ea8525b14 100644 --- a/modules/base/rendering/renderabletimevaryingsphere.cpp +++ b/modules/base/rendering/renderabletimevaryingsphere.cpp @@ -59,52 +59,52 @@ namespace { "Texture Source", "This value specifies a directory of images that are loaded from disk and is " "used as a texture that is applied to this sphere. The images are expected to " - "be an equirectangular projection." + "be an equirectangular projection" }; constexpr openspace::properties::Property::PropertyInfo MirrorTextureInfo = { "MirrorTexture", "Mirror Texture", - "Mirror the texture along the x-axis." + "Mirror the texture along the x-axis" }; constexpr openspace::properties::Property::PropertyInfo OrientationInfo = { "Orientation", "Orientation", "Specifies whether the texture is applied to the inside of the sphere, the " - "outside of the sphere, or both." + "outside of the sphere, or both" }; constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = { "Segments", "Number of Segments", - "This value specifies the number of segments that the sphere is separated in." + "This value specifies the number of segments that the sphere is separated in" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size (in meters)", - "This value specifies the radius of the sphere in meters." + "This value specifies the radius of the sphere in meters" }; constexpr openspace::properties::Property::PropertyInfo FadeOutThresholdInfo = { "FadeOutThreshold", "Fade-Out Threshold", "This value determines percentage of the sphere is visible before starting " - "fading-out it." + "fading-out it" }; constexpr openspace::properties::Property::PropertyInfo FadeInThresholdInfo = { "FadeInThreshold", "Fade-In Threshold", "Distance from center of MilkyWay from where the astronomical object starts to " - "fade in." + "fade in" }; constexpr openspace::properties::Property::PropertyInfo DisableFadeInOutInfo = { "DisableFadeInOut", "Disable Fade-In/Fade-Out effects", - "Enables/Disables the Fade-In/Out effects." + "Enables/Disables the Fade-In/Out effects" }; struct [[codegen::Dictionary(RenerableTimeVaryingSphere)]] Parameters { diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp index 5129ca2f28..ba22961092 100644 --- a/modules/base/rendering/renderabletrail.cpp +++ b/modules/base/rendering/renderabletrail.cpp @@ -68,17 +68,17 @@ namespace { { "Points+Lines", RenderingModeLinesPoints } }; - static const openspace::properties::PropertyOwner::PropertyOwnerInfo - AppearanceInfo = { - "Appearance", - "Appearance", - "The appearance of the trail." + static const openspace::properties::PropertyOwner::PropertyOwnerInfo AppearanceInfo = + { + "Appearance", + "Appearance", + "The appearance of the trail" }; constexpr openspace::properties::Property::PropertyInfo LineColorInfo = { "Color", "Color", - "This value determines the RGB main color for the lines and points of the trail." + "This value determines the RGB main color for the lines and points of the trail" }; constexpr openspace::properties::Property::PropertyInfo EnableFadeInfo = { @@ -86,7 +86,7 @@ namespace { "Enable line fading of old points", "Toggles whether the trail should fade older points out. If this value is " "'true', the 'Fade' parameter determines the speed of fading. If this value is " - "'false', the entire trail is rendered at full opacity and color." + "'false', the entire trail is rendered at full opacity and color" }; constexpr openspace::properties::Property::PropertyInfo FadeInfo = { @@ -94,7 +94,7 @@ namespace { "Line fade", "The fading factor that is applied to the trail if the 'EnableFade' value is " "'true'. If it is 'false', this setting has no effect. The higher the number, " - "the less fading is applied." + "the less fading is applied" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { @@ -102,7 +102,7 @@ namespace { "Line Width", "This value specifies the line width of the trail if the selected rendering " "method includes lines. If the rendering mode is set to Points, this value is " - "ignored." + "ignored" }; constexpr openspace::properties::Property::PropertyInfo PointSizeInfo = { @@ -111,7 +111,7 @@ namespace { "This value specifies the base size of the points along the line if the selected " "rendering method includes points. If the rendering mode is set the Lines, this " "value is ignored. If a subsampling of the values is performed, the subsampled " - "values are half this size." + "values are half this size" }; constexpr openspace::properties::Property::PropertyInfo RenderingModeInfo = { @@ -119,7 +119,7 @@ namespace { "Rendering Mode", "Determines how the trail should be rendered to the screen.If 'Lines' is " "selected, only the line part is visible, if 'Points' is selected, only the " - "corresponding points (and subpoints) are shown. 'Lines+Points' shows both parts." + "corresponding points (and subpoints) are shown. 'Lines+Points' shows both parts" }; struct [[codegen::Dictionary(RenderableTrail)]] Parameters { diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp index 8188342baf..82774fe759 100644 --- a/modules/base/rendering/renderabletrailorbit.cpp +++ b/modules/base/rendering/renderabletrailorbit.cpp @@ -93,7 +93,7 @@ namespace { "The objects period, i.e. the length of its orbit around the parent object given " "in (Earth) days. In the case of Earth, this would be a sidereal year " "(=365.242 days). If this values is specified as multiples of the period, it is " - "possible to show the effects of precession." + "possible to show the effects of precession" }; constexpr openspace::properties::Property::PropertyInfo ResolutionInfo = { @@ -102,14 +102,14 @@ namespace { "The number of samples along the orbit. This determines the resolution of the " "trail; the tradeoff being that a higher resolution is able to resolve more " "detail, but will take more resources while rendering, too. The higher, the " - "smoother the trail, but also more memory will be used." + "smoother the trail, but also more memory will be used" }; constexpr openspace::properties::Property::PropertyInfo RenderableTypeInfo = { "RenderableType", "RenderableType", "This value specifies if the orbit should be rendered in the Background," - "Opaque, Transparent, or Overlay rendering step. Default is Transparent." + "Opaque, Transparent, or Overlay rendering step. Default is Transparent" }; struct [[codegen::Dictionary(RenderableTrailOrbit)]] Parameters { diff --git a/modules/base/rendering/renderabletrailorbit.h b/modules/base/rendering/renderabletrailorbit.h index 9420d4eeda..dbb0adfdc2 100644 --- a/modules/base/rendering/renderabletrailorbit.h +++ b/modules/base/rendering/renderabletrailorbit.h @@ -65,11 +65,14 @@ private: /// This structure is returned from the #updateTrails method and gives information /// about which parts of the vertex array to update struct UpdateReport { - static const int All = 0; ///< The entire array was touched in the update + static constexpr int All = 0; ///< The entire array was touched in the update + /// If \c true the floating point needs to be updated bool floatingPointNeedsUpdate; + /// If \c true at least one of their permanent point were touched bool permanentPointsNeedUpdate; + /// Returns the number of fixed points that were touched in the update method /// If this value is negative, the newest values were replaced, if positive the /// oldest diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp index 1f38c38d7f..e90809428f 100644 --- a/modules/base/rendering/renderabletrailtrajectory.cpp +++ b/modules/base/rendering/renderabletrailtrajectory.cpp @@ -48,14 +48,14 @@ namespace { "StartTime", "Start Time", "The start time for the range of this trajectory. The date must be in ISO 8601 " - "format: YYYY MM DD HH:mm:ss.xxx." + "format: YYYY MM DD HH:mm:ss.xxx" }; constexpr openspace::properties::Property::PropertyInfo EndTimeInfo = { "EndTime", "End Time", "The end time for the range of this trajectory. The date must be in ISO 8601 " - "format: YYYY MM DD HH:mm:ss.xxx." + "format: YYYY MM DD HH:mm:ss.xxx" }; constexpr openspace::properties::Property::PropertyInfo SampleIntervalInfo = { @@ -64,7 +64,7 @@ namespace { "The interval between samples of the trajectory. This value (together with " "'TimeStampSubsampleFactor') determines how far apart (in time) the samples are " "spaced along the trajectory. The time interval between 'StartTime' and " - "'EndTime' is split into 'SampleInterval' * 'TimeStampSubsampleFactor' segments." + "'EndTime' is split into 'SampleInterval' * 'TimeStampSubsampleFactor' segments" }; constexpr openspace::properties::Property::PropertyInfo TimeSubSampleInfo = { @@ -73,14 +73,14 @@ namespace { "The factor that is used to create subsamples along the trajectory. This value " "(together with 'SampleInterval') determines how far apart (in time) the samples " "are spaced along the trajectory. The time interval between 'StartTime' and " - "'EndTime' is split into 'SampleInterval' * 'TimeStampSubsampleFactor' segments." + "'EndTime' is split into 'SampleInterval' * 'TimeStampSubsampleFactor' segments" }; constexpr openspace::properties::Property::PropertyInfo RenderFullPathInfo = { "ShowFullTrail", "Render Full Trail", "If this value is set to 'true', the entire trail will be rendered; if it is " - "'false', only the trail until the current time in the application will be shown." + "'false', only the trail until the current time in the application will be shown" }; struct [[codegen::Dictionary(RenderableTrailTrajectory)]] Parameters { diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp index 2da0441de9..6fa76d1a1d 100644 --- a/modules/base/rendering/screenspacedashboard.cpp +++ b/modules/base/rendering/screenspacedashboard.cpp @@ -41,7 +41,7 @@ namespace { "UseMainDashboard", "Use main dashboard", "If this value is set to 'true', this ScreenSpaceDashboard will use the " - "main dashboard instead of creating an independent one." + "main dashboard instead of creating an independent one" }; struct [[codegen::Dictionary(ScreenSpaceDashboard)]] Parameters { diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp index 3ff887cbca..17b7f0d869 100644 --- a/modules/base/rendering/screenspaceframebuffer.cpp +++ b/modules/base/rendering/screenspaceframebuffer.cpp @@ -36,7 +36,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size", - "This value explicitly specifies the size of the screen space plane." + "This value explicitly specifies the size of the screen space plane" }; } // namespace diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp index d9c3891c71..5d0c092840 100644 --- a/modules/base/rendering/screenspaceimagelocal.cpp +++ b/modules/base/rendering/screenspaceimagelocal.cpp @@ -42,7 +42,7 @@ namespace { "Sets the path of the texture that is displayed on this screen space plane. If " "this value is changed, the image at the new path will automatically be loaded " "and displayed. The size of the image will also automatically set the default " - "size of this plane." + "size of this plane" }; struct [[codegen::Dictionary(ScreenSpaceImageLocal)]] Parameters { diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp index d07e39bb6b..afc25f1ba3 100644 --- a/modules/base/rendering/screenspaceimageonline.cpp +++ b/modules/base/rendering/screenspaceimageonline.cpp @@ -42,7 +42,7 @@ namespace { "Sets the URL of the texture that is displayed on this screen space plane. If " "this value is changed, the image at the new path will automatically be loaded " "and displayed. The size of the image will also automatically set the default " - "size of this plane." + "size of this plane" }; struct [[codegen::Dictionary(ScreenSpaceImageOnline)]] Parameters { diff --git a/modules/base/rotation/constantrotation.cpp b/modules/base/rotation/constantrotation.cpp index 4d9177adfb..2ff11a20a2 100644 --- a/modules/base/rotation/constantrotation.cpp +++ b/modules/base/rotation/constantrotation.cpp @@ -34,7 +34,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo RotationInfo = { "RotationAxis", "Rotation Axis", - "This value is the rotation axis around which the object will rotate." + "This value is the rotation axis around which the object will rotate" }; constexpr openspace::properties::Property::PropertyInfo RotationRateInfo = { diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp index 0c6fc5428e..44a22b21ce 100644 --- a/modules/base/rotation/fixedrotation.cpp +++ b/modules/base/rotation/fixedrotation.cpp @@ -42,7 +42,7 @@ namespace { "Enabled", "If this value is 'true', all the machinery of this rotation is used, of it is " "'false', it provides the ability to change its attributes without risking some " - "undefined behavior." + "undefined behavior" }; constexpr openspace::properties::Property::PropertyInfo XAxisTypeInfo = { @@ -51,7 +51,7 @@ namespace { "This value specifies how this axis is being specified, that is whether it is " "referencing another object, specifying an absolute vector, or whether it is " "using the right handed coordinate system completion based off the other two " - "vectors." + "vectors" }; constexpr openspace::properties::Property::PropertyInfo YAxisTypeInfo = { @@ -60,7 +60,7 @@ namespace { "This value specifies how this axis is being specified, that is whether it is " "referencing another object, specifying an absolute vector, or whether it is " "using the right handed coordinate system completion based off the other two " - "vectors." + "vectors" }; constexpr openspace::properties::Property::PropertyInfo ZAxisTypeInfo = { @@ -69,7 +69,7 @@ namespace { "This value specifies how this axis is being specified, that is whether it is " "referencing another object, specifying an absolute vector, or whether it is " "using the right handed coordinate system completion based off the other two " - "vectors." + "vectors" }; constexpr openspace::properties::Property::PropertyInfo XAxisObjectInfo = { @@ -77,7 +77,7 @@ namespace { "xAxis: Focus Object", "This is the object that the axis will focus on. This object must name an " "existing scene graph node in the currently loaded scene and the rotation will " - "stay fixed to the current position of that object." + "stay fixed to the current position of that object" }; constexpr openspace::properties::Property::PropertyInfo YAxisObjectInfo = { @@ -85,7 +85,7 @@ namespace { "yAxis: Focus Object", "This is the object that the axis will focus on. This object must name an " "existing scene graph node in the currently loaded scene and the rotation will " - "stay fixed to the current position of that object." + "stay fixed to the current position of that object" }; constexpr openspace::properties::Property::PropertyInfo ZAxisObjectInfo = { @@ -93,7 +93,7 @@ namespace { "zAxis: Focus Object", "This is the object that the axis will focus on. This object must name an " "existing scene graph node in the currently loaded scene and the rotation will " - "stay fixed to the current position of that object." + "stay fixed to the current position of that object" }; constexpr openspace::properties::Property::PropertyInfo XAxisInvertObjectInfo = { @@ -101,7 +101,7 @@ namespace { "xAxis: Invert Object Point Direction", "If this value is set to 'true', and the type is set to 'Object', the inverse of " "the pointing direction is used, causing the object to point away from the " - "referenced object." + "referenced object" }; constexpr openspace::properties::Property::PropertyInfo YAxisInvertObjectInfo = { @@ -109,7 +109,7 @@ namespace { "yAxis: Invert Object Point Direction", "If this value is set to 'true', and the type is set to 'Object', the inverse of " "the pointing direction is used, causing the object to point away from the " - "referenced object." + "referenced object" }; constexpr openspace::properties::Property::PropertyInfo ZAxisInvertObjectInfo = { @@ -117,28 +117,25 @@ namespace { "zAxis: Invert Object Point Direction", "If this value is set to 'true', and the type is set to 'Object', the inverse of " "the pointing direction is used, causing the object to point away from the " - "referenced object." + "referenced object" }; constexpr openspace::properties::Property::PropertyInfo XAxisVectorInfo = { "xAxisVector", "xAxis: Direction vector", - "This value specifies a static direction vector that is used for a fixed " - "rotation." + "This value specifies a static direction vector that is used for a fixed rotation" }; constexpr openspace::properties::Property::PropertyInfo YAxisVectorInfo = { "yAxisVector", "yAxis: Direction vector", - "This value specifies a static direction vector that is used for a fixed " - "rotation." + "This value specifies a static direction vector that is used for a fixed rotation" }; constexpr openspace::properties::Property::PropertyInfo ZAxisVectorInfo = { "zAxisVector", "zAxis: Direction vector", - "This value specifies a static direction vector that is used for a fixed " - "rotation." + "This value specifies a static direction vector that is used for a fixed rotation" }; constexpr openspace::properties::Property::PropertyInfo XAxisOrthogonalVectorInfo = { @@ -146,7 +143,7 @@ namespace { "xAxis: Vector is orthogonal", "This value determines whether the vector specified is used directly, or whether " "it is used together with another non-coordinate system completion vector to " - "construct an orthogonal vector instead." + "construct an orthogonal vector instead" }; constexpr openspace::properties::Property::PropertyInfo YAxisOrthogonalVectorInfo = { @@ -154,7 +151,7 @@ namespace { "yAxis: Vector is orthogonal", "This value determines whether the vector specified is used directly, or whether " "it is used together with another non-coordinate system completion vector to " - "construct an orthogonal vector instead." + "construct an orthogonal vector instead" }; constexpr openspace::properties::Property::PropertyInfo ZAxisOrthogonalVectorInfo = { @@ -162,7 +159,7 @@ namespace { "zAxis: Vector is orthogonal", "This value determines whether the vector specified is used directly, or whether " "it is used together with another non-coordinate system completion vector to " - "construct an orthogonal vector instead." + "construct an orthogonal vector instead" }; constexpr openspace::properties::Property::PropertyInfo AttachedInfo = { @@ -170,7 +167,7 @@ namespace { "Attached Node", "This is the name of the node that this rotation is attached to, this value is " "only needed if any of the three axis uses the Object type. In this case, the " - "location of the attached node is required to compute the relative direction." + "location of the attached node is required to compute the relative direction" }; struct [[codegen::Dictionary(FixedRotation)]] Parameters { diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp index c4859645f9..026d55c59d 100644 --- a/modules/base/rotation/luarotation.cpp +++ b/modules/base/rotation/luarotation.cpp @@ -43,7 +43,7 @@ namespace { "'rotation' that takes the current simulation time in seconds past the J2000 " "epoch as the first argument, the current wall time as milliseconds past the " "J2000 epoch as the second argument and computes the rotation returned as 9 " - "values." + "values" }; struct [[codegen::Dictionary(LuaRotation)]] Parameters { diff --git a/modules/base/rotation/staticrotation.cpp b/modules/base/rotation/staticrotation.cpp index 4d1844815f..a4f0b03f11 100644 --- a/modules/base/rotation/staticrotation.cpp +++ b/modules/base/rotation/staticrotation.cpp @@ -32,7 +32,7 @@ namespace { "Rotation", "Rotation", "This value is the used as a 3x3 rotation matrix that is applied to the scene " - "graph node that this transformation is attached to relative to its parent." + "graph node that this transformation is attached to relative to its parent" }; // Conversion from rotation matrix to euler angles, given that the rotation is a pure diff --git a/modules/base/rotation/timelinerotation.cpp b/modules/base/rotation/timelinerotation.cpp index 12302a6ea8..b58a7b0730 100644 --- a/modules/base/rotation/timelinerotation.cpp +++ b/modules/base/rotation/timelinerotation.cpp @@ -35,7 +35,7 @@ namespace { "ShouldInterpolate", "Should Interpolate", "If this value is set to 'true', an interpolation is applied between the given " - "keyframes. If this value is set to 'false', the interpolation is not applied." + "keyframes. If this value is set to 'false', the interpolation is not applied" }; struct [[codegen::Dictionary(TimelineRotation)]] Parameters { diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp index 0073e8bed6..8557503f96 100644 --- a/modules/base/scale/luascale.cpp +++ b/modules/base/scale/luascale.cpp @@ -42,7 +42,7 @@ namespace { "scaling factor for this transformation. The script needs to define a function " "'scale' that takes the current simulation time in seconds past the J2000 epoch " "as the first argument, the current wall time as milliseconds past the J2000 " - "epoch the second argument and computes the three scaling factors." + "epoch the second argument and computes the three scaling factors" }; struct [[codegen::Dictionary(LuaScale)]] Parameters { diff --git a/modules/base/scale/nonuniformstaticscale.cpp b/modules/base/scale/nonuniformstaticscale.cpp index c77234ba86..8bd0618f31 100644 --- a/modules/base/scale/nonuniformstaticscale.cpp +++ b/modules/base/scale/nonuniformstaticscale.cpp @@ -32,7 +32,7 @@ namespace { "Scale", "Scale", "These values are used as scaling factors for the scene graph node that this " - "transformation is attached to relative to its parent." + "transformation is attached to relative to its parent" }; struct [[codegen::Dictionary(NonUniformStaticScale)]] Parameters { diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp index 27937f1ba5..655277831d 100644 --- a/modules/base/scale/staticscale.cpp +++ b/modules/base/scale/staticscale.cpp @@ -32,7 +32,7 @@ namespace { "Scale", "Scale", "This value is used as a scaling factor for the scene graph node that this " - "transformation is attached to relative to its parent." + "transformation is attached to relative to its parent" }; struct [[codegen::Dictionary(StaticScale)]] Parameters { diff --git a/modules/base/scale/timedependentscale.cpp b/modules/base/scale/timedependentscale.cpp index d3813ab806..840d8e2a89 100644 --- a/modules/base/scale/timedependentscale.cpp +++ b/modules/base/scale/timedependentscale.cpp @@ -37,14 +37,14 @@ namespace { "The date at which this scale will be 0. The current value of the scale is " "computed by taking the difference between the current time and the reference " "date and multiplying it by the speed. This field must be formatted as: " - "YYYY-MM-DDThh:mm:ss.uuu where h is a 24h clock and u microseconds." + "YYYY-MM-DDThh:mm:ss.uuu where h is a 24h clock and u microseconds" }; constexpr openspace::properties::Property::PropertyInfo SpeedInfo = { "Speed", "Speed", "The speed at which the value grows or shrinks. The units for this are meters " - "per second. The default value is 1 m/s." + "per second. The default value is 1 m/s" }; constexpr openspace::properties::Property::PropertyInfo ClampToPositiveInfo = { @@ -52,7 +52,7 @@ namespace { "Clamp to Positive", "If this value is true, the velocity computation will never result in any " "negative values. This is useful for instantaneous events that only propagate " - "forwards. The default value is 'true'." + "forwards. The default value is 'true'" }; struct [[codegen::Dictionary(TimeDependentScale)]] Parameters { diff --git a/modules/base/timeframe/timeframeunion.cpp b/modules/base/timeframe/timeframeunion.cpp index 1583e9c49e..7c8548f0e9 100644 --- a/modules/base/timeframe/timeframeunion.cpp +++ b/modules/base/timeframe/timeframeunion.cpp @@ -36,7 +36,7 @@ namespace { "Time Frames", "A vector of time frames to combine into one. " "The time frame is active when any of the contained time frames are, " - "but not in gaps between contained time frames." + "but not in gaps between contained time frames" }; struct [[codegen::Dictionary(TimeFrameUnion)]] Parameters { diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp index 816dd1c891..07e195cf39 100644 --- a/modules/base/translation/luatranslation.cpp +++ b/modules/base/translation/luatranslation.cpp @@ -43,7 +43,7 @@ namespace { "translation for this transformation. The script needs to define a function " "'translate' that takes the current simulation time in seconds past the J2000 " "epoch as the first argument, the current wall time as milliseconds past the " - "J2000 epoch as the second argument and computes the translation." + "J2000 epoch as the second argument and computes the translation" }; struct [[codegen::Dictionary(LuaTranslation)]] Parameters { diff --git a/modules/base/translation/statictranslation.cpp b/modules/base/translation/statictranslation.cpp index 88cf94e7f5..a7409eea11 100644 --- a/modules/base/translation/statictranslation.cpp +++ b/modules/base/translation/statictranslation.cpp @@ -32,7 +32,7 @@ namespace { "Position", "Position", "This value is used as a static offset (in meters) that is applied to the scene " - "graph node that this transformation is attached to relative to its parent." + "graph node that this transformation is attached to relative to its parent" }; struct [[codegen::Dictionary(StaticTranslation)]] Parameters { diff --git a/modules/base/translation/timelinetranslation.cpp b/modules/base/translation/timelinetranslation.cpp index b6be88a52d..325b6d034e 100644 --- a/modules/base/translation/timelinetranslation.cpp +++ b/modules/base/translation/timelinetranslation.cpp @@ -35,7 +35,7 @@ namespace { "ShouldInterpolate", "Should Interpolate", "If this value is set to 'true', an interpolation is applied between the given " - "keyframes. If this value is set to 'false', the interpolation is not applied." + "keyframes. If this value is set to 'false', the interpolation is not applied" }; struct [[codegen::Dictionary(TimelineTranslation)]] Parameters { diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp index c9c8537350..7eb3583839 100644 --- a/modules/cefwebgui/cefwebguimodule.cpp +++ b/modules/cefwebgui/cefwebguimodule.cpp @@ -41,31 +41,31 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Is Enabled", - "This setting determines whether the browser should be enabled or not." + "This setting determines whether the browser should be enabled or not" }; constexpr openspace::properties::Property::PropertyInfo ReloadInfo = { "Reload", "Reload", - "Trigger this property to reload the browser." + "Trigger this property to reload the browser" }; constexpr openspace::properties::Property::PropertyInfo VisibleInfo = { "Visible", "Is Visible", - "This setting determines whether the browser should be visible or not." + "This setting determines whether the browser should be visible or not" }; constexpr openspace::properties::Property::PropertyInfo GuiUrlInfo = { "GuiUrl", "GUI URL", - "The URL of the webpage that is used to load the WebGUI from." + "The URL of the webpage that is used to load the WebGUI from" }; constexpr openspace::properties::Property::PropertyInfo GuiScaleInfo = { "GuiScale", "Gui Scale", - "GUI scale multiplier." + "GUI scale multiplier" }; } // namespace diff --git a/modules/cefwebgui/src/guirenderhandler.cpp b/modules/cefwebgui/src/guirenderhandler.cpp index 5fa8cf9efe..36b2456e87 100644 --- a/modules/cefwebgui/src/guirenderhandler.cpp +++ b/modules/cefwebgui/src/guirenderhandler.cpp @@ -59,7 +59,7 @@ GUIRenderHandler::GUIRenderHandler() { glEnableVertexAttribArray(0); glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr); glBindVertexArray(0); - LDEBUG("Initializing CEF GL environment... done!"); + LDEBUG("Initializing CEF GL environment... done"); } GUIRenderHandler::~GUIRenderHandler() { diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp index b87a695bee..e6e517709c 100644 --- a/modules/debugging/rendering/renderabledebugplane.cpp +++ b/modules/debugging/rendering/renderabledebugplane.cpp @@ -51,7 +51,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo TextureInfo = { "Texture", "Texture", - "The OpenGL name of the texture that is displayed on this plane." + "The OpenGL name of the texture that is displayed on this plane" }; constexpr openspace::properties::Property::PropertyInfo BillboardInfo = { @@ -59,19 +59,19 @@ namespace { "Billboard mode", "This value specifies whether the plane is a billboard, which means that it is " "always facing the camera. If this is false, it can be oriented using other " - "transformations." + "transformations" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size (in meters)", - "This value specifies the size of the plane in meters." + "This value specifies the size of the plane in meters" }; constexpr openspace::properties::Property::PropertyInfo OriginInfo = { "Origin", "Texture Coordinate Origin", - "The origin of the texture coorinate system." + "The origin of the texture coorinate system" }; struct [[codegen::Dictionary(RenderableDebugPlane)]] Parameters { diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp index d47f6918df..33850c8bc3 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp @@ -72,14 +72,14 @@ namespace { constexpr openspace::properties::Property::PropertyInfo SpriteTextureInfo = { "Texture", "Point Sprite Texture", - "The path to the texture that should be used as the point sprite." + "The path to the texture that should be used as the point sprite" }; constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = { "ScaleFactor", "Scale Factor", "This value is used as a multiplicative factor that is applied to the apparent " - "size of each point." + "size of each point" }; constexpr openspace::properties::Property::PropertyInfo UseColorMapInfo = { @@ -87,83 +87,83 @@ namespace { "Use Color Map", "If this value is set to 'true', the provided color map is used (if one was " "provided in the configuration). If no color map was provided, changing this " - "setting does not do anything." + "setting does not do anything" }; constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", - "This value is used to define the color of the astronomical object." + "This value is used to define the color of the astronomical object" }; constexpr openspace::properties::Property::PropertyInfo ColorMapInfo = { "ColorMap", "Color Map File", - "The path to the color map file of the astronomical object." + "The path to the color map file of the astronomical object" }; constexpr openspace::properties::Property::PropertyInfo TextColorInfo = { "TextColor", "Text Color", - "The text color for the astronomical object." + "The text color for the astronomical object" }; constexpr openspace::properties::Property::PropertyInfo TextOpacityInfo = { "TextOpacity", "Text Opacity", "Determines the transparency of the text label, where 1 is completely opaque " - "and 0 fully transparent." + "and 0 fully transparent" }; constexpr openspace::properties::Property::PropertyInfo TextSizeInfo = { "TextSize", "Text Size", - "The text size for the astronomical object labels." + "The text size for the astronomical object labels" }; constexpr openspace::properties::Property::PropertyInfo LabelMinMaxSizeInfo = { "TextMinMaxSize", "Text Min/Max Size", "The minimal and maximal size (in pixels) of the text for the labels for the " - "astronomical objects being rendered." + "astronomical objects being rendered" }; constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = { "DrawElements", "Draw Elements", - "Enables/Disables the drawing of the astronomical objects." + "Enables/Disables the drawing of the astronomical objects" }; constexpr openspace::properties::Property::PropertyInfo DrawLabelInfo = { "DrawLabels", "Draw Labels", - "Determines whether labels should be drawn or hidden." + "Determines whether labels should be drawn or hidden" }; constexpr openspace::properties::Property::PropertyInfo ColorOptionInfo = { "ColorOption", "Color Option", "This value determines which paramenter is used for default color of the " - "astronomical objects." + "astronomical objects" }; constexpr openspace::properties::Property::PropertyInfo OptionColorRangeInfo = { "OptionColorRange", "Option Color Range", - "This value changes the range of values to be mapped with the current color map." + "This value changes the range of values to be mapped with the current color map" }; constexpr openspace::properties::Property::PropertyInfo SizeOptionInfo = { "SizeOption", "Size Option Variable", "This value determines which paramenter (datavar) is used for scaling " - "of the astronomical objects." + "of the astronomical objects" }; constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = { "RenderOption", "Render Option", - "Debug option for rendering of billboards and texts." + "Debug option for rendering of billboards and texts" }; constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = { @@ -171,27 +171,27 @@ namespace { "Fade-In Start and End Distances", "These values determine the initial and final distances from the center of " "our galaxy from which the astronomical object will start and end " - "fading-in." + "fading-in" }; constexpr openspace::properties::Property::PropertyInfo DisableFadeInInfo = { "DisableFadeIn", "Disable Fade-in Effect", - "Enables/Disables the Fade-in effect." + "Enables/Disables the Fade-in effect" }; constexpr openspace::properties::Property::PropertyInfo PixelSizeControlInfo = { "EnablePixelSizeControl", "Enable Pixel Size Control", "Enable pixel size control for rectangular projections. If set to true, the " - "billboard size is restricted by the min/max size in pixels property." + "billboard size is restricted by the min/max size in pixels property" }; constexpr openspace::properties::Property::PropertyInfo BillboardMinMaxSizeInfo = { "BillboardMinMaxSize", "Billboard Min/Max Size in Pixels", "The minimum and maximum size (in pixels) for the billboard representing the " - "astronomical object." + "astronomical object" }; constexpr openspace::properties::Property::PropertyInfo @@ -199,7 +199,7 @@ namespace { { "CorrectionSizeEndDistance", "Distance in 10^X meters where correction size stops acting", - "Distance in 10^X meters where correction size stops acting." + "Distance in 10^X meters where correction size stops acting" }; constexpr openspace::properties::Property::PropertyInfo CorrectionSizeFactorInfo = { diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp index 7a7094f55b..1ac9ebdf62 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp +++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp @@ -61,34 +61,34 @@ namespace { constexpr openspace::properties::Property::PropertyInfo TextColorInfo = { "TextColor", "Text Color", - "The text color for the astronomical object." + "The text color for the astronomical object" }; constexpr openspace::properties::Property::PropertyInfo TextOpacityInfo = { "TextOpacity", "Text Opacity", "Determines the transparency of the text label, where 1 is completely opaque " - "and 0 fully transparent." + "and 0 fully transparent" }; constexpr openspace::properties::Property::PropertyInfo TextSizeInfo = { "TextSize", "Text Size", - "The text size for the astronomical object labels." + "The text size for the astronomical object labels" }; constexpr openspace::properties::Property::PropertyInfo LabelFileInfo = { "LabelFile", "Label File", "The path to the label file that contains information about the astronomical " - "objects being rendered." + "objects being rendered" }; constexpr openspace::properties::Property::PropertyInfo LabelMinMaxSizeInfo = { "TextMinMaxSize", "Text Min/Max Size", "The minimum and maximum size (in pixels) of the text for the labels for the " - "astronomical objects being rendered." + "astronomical objects being rendered" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { @@ -100,25 +100,25 @@ namespace { constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = { "DrawElements", "Draw Elements", - "Enables/Disables the drawing of the astronomical objects." + "Enables/Disables the drawing of the astronomical objects" }; constexpr openspace::properties::Property::PropertyInfo DrawLabelInfo = { "DrawLabels", "Draw Labels", - "Determines whether labels should be drawn or hidden." + "Determines whether labels should be drawn or hidden" }; constexpr openspace::properties::Property::PropertyInfo MeshColorInfo = { "MeshColor", "Meshes colors", - "The defined colors for the meshes to be rendered." + "The defined colors for the meshes to be rendered" }; constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = { "RenderOption", "Render Option", - "Debug option for rendering of billboards and texts." + "Debug option for rendering of billboards and texts" }; struct [[codegen::Dictionary(RenderableDUMeshes)]] Parameters { diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.h b/modules/digitaluniverse/rendering/renderabledumeshes.h index bdfc67c42c..5c6222abeb 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.h +++ b/modules/digitaluniverse/rendering/renderabledumeshes.h @@ -77,10 +77,10 @@ private: int meshIndex; int colorIndex; int textureIndex; - // From: Partiview User’s Guide + // From: Partiview User's Guide // Brian Abbott // Hayden Planetarium American Museum of Natural History New York, USA - // "Specifies the dimensions of the mesh." + // "Specifies the dimensions of the mesh" // "If you wish to draw a line between points, then numU will be 1 while // numV will equal the number of points to connect. // If you want a square, 4000×4000 grid with lines every 200 units, diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp index 2dca6a7189..390a9d9733 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp +++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp @@ -64,110 +64,108 @@ namespace { "ScaleFactor", "Scale Factor", "This value is used as a multiplicative factor that is applied to the apparent " - "size of each point." + "size of each point" }; constexpr openspace::properties::Property::PropertyInfo TextColorInfo = { "TextColor", "Text Color", - "The text color for the astronomical object." + "The text color for the astronomical object" }; constexpr openspace::properties::Property::PropertyInfo TextOpacityInfo = { "TextOpacity", "Text Opacity", "Determines the transparency of the text label, where 1 is completely opaque " - "and 0 fully transparent." + "and 0 fully transparent" }; constexpr openspace::properties::Property::PropertyInfo TextSizeInfo = { "TextSize", "Text Size", - "The text size for the astronomical object labels." + "The text size for the astronomical object labels" }; constexpr openspace::properties::Property::PropertyInfo LabelFileInfo = { "LabelFile", "Label File", "The path to the label file that contains information about the astronomical " - "objects being rendered." + "objects being rendered" }; constexpr openspace::properties::Property::PropertyInfo LabelMinSizeInfo = { "TextMinSize", "Text Min Size", "The minimal size (in pixels) of the text for the labels for the astronomical " - "objects being rendered." + "objects being rendered" }; constexpr openspace::properties::Property::PropertyInfo LabelMaxSizeInfo = { "TextMaxSize", "Text Max Size", "The maximum size (in pixels) of the text for the labels for the astronomical " - "objects being rendered." + "objects being rendered" }; constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = { "DrawElements", "Draw Elements", - "Enables/Disables the drawing of the astronomical objects." + "Enables/Disables the drawing of the astronomical objects" }; constexpr openspace::properties::Property::PropertyInfo TransformationMatrixInfo = { "TransformationMatrix", "Transformation Matrix", - "Transformation matrix to be applied to each astronomical object." + "Transformation matrix to be applied to each astronomical object" }; constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = { "BlendMode", "Blending Mode", - "This determines the blending mode that is applied to this plane." + "This determines the blending mode that is applied to this plane" }; constexpr openspace::properties::Property::PropertyInfo TexturePathInfo = { "TexturePath", "Texture Path", - "This value specifies the path for the textures in disk." + "This value specifies the path for the textures in disk" }; constexpr openspace::properties::Property::PropertyInfo LuminosityInfo = { "Luminosity", "Luminosity variable", - "Datavar variable to control the luminosity/size of the astronomical objects." + "Datavar variable to control the luminosity/size of the astronomical objects" }; constexpr openspace::properties::Property::PropertyInfo ScaleLuminosityInfo = { "ScaleLuminosity", "ScaleLuminosity variable", - "Scaling control for the luminosity/size of the astronomical objects." + "Scaling control for the luminosity/size of the astronomical objects" }; constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = { "RenderOption", "Render Option", - "Debug option for rendering of billboards and texts." + "Debug option for rendering of billboards and texts" }; constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = { "FadeInDistances", "Fade-In Start and End Distances", "These values determine the initial and final distances from the center of " - "our galaxy from which the astronomical object will start and end " - "fading-in." + "our galaxy from which the astronomical object will start and end fading-in" }; constexpr openspace::properties::Property::PropertyInfo DisableFadeInInfo = { "DisableFadeIn", "Disable Fade-in effect", - "Enables/Disables the Fade-in effect." + "Enables/Disables the Fade-in effect" }; constexpr openspace::properties::Property::PropertyInfo PlaneMinSizeInfo = { "PlaneMinSize", "Plane Min Size in Pixels", - "The min size (in pixels) for the plane representing the astronomical " - "object." + "The min size (in pixels) for the plane representing the astronomical object" }; struct [[codegen::Dictionary(RenderablePlanesCloud)]] Parameters { diff --git a/modules/digitaluniverse/rendering/renderablepoints.cpp b/modules/digitaluniverse/rendering/renderablepoints.cpp index 5d1bf4a373..07b6f6d742 100644 --- a/modules/digitaluniverse/rendering/renderablepoints.cpp +++ b/modules/digitaluniverse/rendering/renderablepoints.cpp @@ -57,26 +57,26 @@ namespace { constexpr openspace::properties::Property::PropertyInfo SpriteTextureInfo = { "Texture", "Point Sprite Texture", - "The path to the texture that should be used as the point sprite." + "The path to the texture that should be used as the point sprite" }; constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = { "ScaleFactor", "Scale Factor", "This value is used as a multiplicative factor that is applied to the apparent " - "size of each point." + "size of each point" }; constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", - "This value is used to define the color of the astronomical object." + "This value is used to define the color of the astronomical object" }; constexpr openspace::properties::Property::PropertyInfo ColorMapInfo = { "ColorMap", "Color Map File", - "The path to the color map file of the astronomical object." + "The path to the color map file of the astronomical object" }; struct [[codegen::Dictionary(RenderablePoints)]] Parameters { diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp index 42571dbe80..598d2f98c7 100644 --- a/modules/exoplanets/exoplanetsmodule.cpp +++ b/modules/exoplanets/exoplanetsmodule.cpp @@ -54,7 +54,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Enabled", - "Decides if the GUI for this module should be enabled." + "Decides if the GUI for this module should be enabled" }; constexpr openspace::properties::Property::PropertyInfo DataFolderInfo = { diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl index e957d71f74..bb1fde8d1a 100644 --- a/modules/exoplanets/exoplanetsmodule_lua.inl +++ b/modules/exoplanets/exoplanetsmodule_lua.inl @@ -453,7 +453,7 @@ void createExoplanetSystem(const std::string& starName) { "would trap any incoming infrared radiation, leading to the planet " "surface becoming so hot that water boils away. The outer boundary is where " "the greenhouse effect would not be able to maintain surface temperature " - "above freezing anywhere on the planet."; + "above freezing anywhere on the planet"; const std::string hzTexture = module->habitableZoneTexturePath(); diff --git a/modules/exoplanets/rendering/renderableorbitdisc.cpp b/modules/exoplanets/rendering/renderableorbitdisc.cpp index b0279d4364..c244d82654 100644 --- a/modules/exoplanets/rendering/renderableorbitdisc.cpp +++ b/modules/exoplanets/rendering/renderableorbitdisc.cpp @@ -49,20 +49,20 @@ namespace { "Texture", "Texture", "This value is the path to a texture on disk that contains a one-dimensional " - "texture which is used for the color." + "texture which is used for the color" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size", - "This value specifies the semi-major axis of the orbit, in meter." + "This value specifies the semi-major axis of the orbit, in meter" }; constexpr openspace::properties::Property::PropertyInfo EccentricityInfo = { "Eccentricity", "Eccentricity", "This value determines the eccentricity, that is the deviation from a perfect " - "sphere, for this orbit." + "sphere, for this orbit" }; constexpr openspace::properties::Property::PropertyInfo OffsetInfo = { @@ -71,7 +71,7 @@ namespace { "This property determines the width of the disc. The values specify the lower " "and upper deviation from the semi major axis, respectively. The values are " "relative to the size of the semi-major axis. That is, 0 means no deviation " - "from the semi-major axis and 1 is a whole semi-major axis's worth of deviation." + "from the semi-major axis and 1 is a whole semi-major axis's worth of deviation" }; struct [[codegen::Dictionary(RenderableOrbitDisc)]] Parameters { diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp index d0e6c8ef8a..714d6f968d 100644 --- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp +++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp @@ -82,7 +82,7 @@ std::string ExoplanetsDataPreparationTask::description() { return fmt::format( "Extract data about exoplanets from file {} and write as bin to {}. The data " "file should be a csv version of the Planetary Systems Composite Data from the " - "NASA exoplanets archive (https://exoplanetarchive.ipac.caltech.edu/).", + "NASA exoplanets archive (https://exoplanetarchive.ipac.caltech.edu/)", _inputDataPath, _outputBinPath ); } diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp index 6c4a8f5dae..a1af7aed94 100644 --- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp +++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp @@ -52,32 +52,32 @@ namespace { "ColorMethod", "Color Method", "Color lines uniformly or using color tables based on extra quantities like, for " - "examples, temperature or particle density." + "examples, temperature or particle density" }; constexpr openspace::properties::Property::PropertyInfo ColorQuantityInfo = { "ColorQuantity", "Quantity to Color By", - "Quantity used to color lines if the 'By Quantity' color method is selected." + "Quantity used to color lines if the 'By Quantity' color method is selected" }; constexpr openspace::properties::Property::PropertyInfo ColorMinMaxInfo = { "ColorQuantityMinMax", "ColorTable Min Value", - "Value to map to the lowest and highest end of the color table." + "Value to map to the lowest and highest end of the color table" }; constexpr openspace::properties::Property::PropertyInfo ColorTablePathInfo = { "ColorTablePath", "Path to Color Table", - "Color Table/Transfer Function to use for 'By Quantity' coloring." + "Color Table/Transfer Function to use for 'By Quantity' coloring" }; constexpr openspace::properties::Property::PropertyInfo ColorUniformInfo = { "Color", "Uniform Line Color", - "The uniform color of lines shown when 'Color Method' is set to 'Uniform'." + "The uniform color of lines shown when 'Color Method' is set to 'Uniform'" }; constexpr openspace::properties::Property::PropertyInfo ColorUseABlendingInfo = { "ABlendingEnabled", "Additive Blending", - "Activate/deactivate additive blending." + "Activate/deactivate additive blending" }; constexpr openspace::properties::Property::PropertyInfo DomainEnabledInfo = { "DomainEnabled", @@ -107,33 +107,33 @@ namespace { constexpr openspace::properties::Property::PropertyInfo FlowColorInfo = { "FlowColor", "Flow Color", - "Color of particles flow direction indication." + "Color of particles flow direction indication" }; constexpr openspace::properties::Property::PropertyInfo FlowEnabledInfo = { "FlowEnabled", "Flow Direction", "Toggles the rendering of moving particles along the lines. Can, for example, " - "illustrate magnetic flow." + "illustrate magnetic flow" }; constexpr openspace::properties::Property::PropertyInfo FlowReversedInfo = { "Reversed", "Reversed Flow", - "Toggle to make the flow move in the opposite direction." + "Toggle to make the flow move in the opposite direction" }; constexpr openspace::properties::Property::PropertyInfo FlowParticleSizeInfo = { "ParticleSize", "Particle Size", - "Size of the particles." + "Size of the particles" }; constexpr openspace::properties::Property::PropertyInfo FlowParticleSpacingInfo = { "ParticleSpacing", "Particle Spacing", - "Spacing inbetween particles." + "Spacing inbetween particles" }; constexpr openspace::properties::Property::PropertyInfo FlowSpeedInfo = { "Speed", "Speed", - "Speed of the flow." + "Speed of the flow" }; constexpr openspace::properties::Property::PropertyInfo MaskingEnabledInfo = { "MaskingEnabled", @@ -141,7 +141,7 @@ namespace { "Enable/disable masking. Use masking to show lines where a given quantity is " "within a given range, for example, if you only want to see where the " "temperature is between 10 and 20 degrees. Also used for masking out line " - "topologies like solar wind & closed lines." + "topologies like solar wind & closed lines" }; constexpr openspace::properties::Property::PropertyInfo MaskingMinMaxInfo = { "MaskingMinLimit", @@ -151,7 +151,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo MaskingQuantityInfo = { "MaskingQuantity", "Quantity used for Masking", - "Quantity used for masking." + "Quantity used for masking" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", @@ -161,7 +161,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo TimeJumpButtonInfo = { "TimeJumpToStart", "Jump to Start Of Sequence", - "Performs a time jump to the start of the sequence." + "Performs a time jump to the start of the sequence" }; struct [[codegen::Dictionary(RenderableFieldlinesSequence)]] Parameters { diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp index ca1548b132..d1e97dc51a 100644 --- a/modules/fieldlinessequence/util/fieldlinesstate.cpp +++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp @@ -76,7 +76,7 @@ bool FieldlinesState::loadStateFromOsfls(const std::string& pathToOsflsFile) { // No need to put everything in this scope now, as only version 0 exists! break; default: - LERROR("VERSION OF BINARY FILE WAS NOT RECOGNIZED!"); + LERROR("VERSION OF BINARY FILE WAS NOT RECOGNIZED"); return false; } @@ -167,7 +167,7 @@ bool FieldlinesState::loadStateFromJson(const std::string& pathToJsonFile, if (nVariables < nPosComponents) { LERROR( pathToJsonFile + ": Each field '" + sColumns + - "' must contain the variables: 'x', 'y' and 'z' (order is important)." + "' must contain the variables: 'x', 'y' and 'z' (order is important)" ); return false; } @@ -392,7 +392,7 @@ std::vector FieldlinesState::extraQuantity(size_t index, bool& isSuccessf } else { isSuccessful = false; - LERROR("Provided Index was out of scope!"); + LERROR("Provided Index was out of scope"); return {}; } } diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp index 8ae2704a84..c7c8fe9a5e 100644 --- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp +++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp @@ -162,7 +162,7 @@ bool addLinesToState(ccmc::Kameleon* kameleon, const std::vector& see default: LERROR( "OpenSpace's fieldlines sequence currently only supports CDFs from the " - "BATSRUS and ENLIL models!" + "BATSRUS and ENLIL models" ); return false; } @@ -174,7 +174,7 @@ bool addLinesToState(ccmc::Kameleon* kameleon, const std::vector& see } bool success = false; - LINFO("Tracing field lines!"); + LINFO("Tracing field lines"); // LOOP THROUGH THE SEED POINTS, TRACE LINES, CONVERT POINTS TO glm::vec3 AND STORE // for (const glm::vec3& seed : seedPoints) { //--------------------------------------------------------------------------// diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp index 27c601cb4d..e4215175ed 100644 --- a/modules/fitsfilereader/src/fitsfilereader.cpp +++ b/modules/fitsfilereader/src/fitsfilereader.cpp @@ -185,7 +185,7 @@ std::shared_ptr> FitsFileReader::readTable(const std::filesystem::p } catch (FitsException& e) { LERROR(fmt::format( - "Could not read FITS table from file '{}'. Make sure it's not an image file.", + "Could not read FITS table from file '{}'. Make sure it's not an image file", e.message() )); } @@ -257,7 +257,7 @@ std::vector FitsFileReader::readFitsFile(std::filesystem::path filePath, int defaultCols = 17; // Number of columns that are copied by predefined code. if (nColumnsRead != defaultCols) { LINFO("Additional columns will be read! Consider add column in code for " - "significant speedup!"); + "significant speedup"); } // Declare how many values to save per star nValuesPerStar = nColumnsRead + 1; // +1 for B-V color value. @@ -394,7 +394,7 @@ std::vector FitsFileReader::readFitsFile(std::filesystem::path filePath, size_t defaultCols = 9; // Number of columns that are copied by predefined code. if (nColumnsRead != defaultCols) { LINFO("Additional columns will be read! Consider add column in code for " - "significant speedup!"); + "significant speedup"); } // Declare how many values to save per star nValuesPerStar = 8; diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp index 92d83b44e4..e201cb0c7e 100644 --- a/modules/gaia/rendering/octreemanager.cpp +++ b/modules/gaia/rendering/octreemanager.cpp @@ -627,7 +627,7 @@ int OctreeManager::readFromFile(std::ifstream& inFileStream, bool readData, } if (_valuesPerStar != (POS_SIZE + COL_SIZE + VEL_SIZE)) { - LERROR("Read file doesn't have the same structure of render parameters!"); + LERROR("Read file doesn't have the same structure of render parameters"); } // Use the same technique to construct octree from file. @@ -723,7 +723,7 @@ void OctreeManager::writeNodeToMultipleFiles(const std::string& outFilePrefix, outFileStream.close(); } else { - LERROR(fmt::format("Error opening file: {} as output data file.", outPath)); + LERROR(fmt::format("Error opening file: {} as output data file", outPath)); } } @@ -825,7 +825,7 @@ void OctreeManager::fetchNodeDataFromFile(OctreeNode& node) { void OctreeManager::removeNodesFromRam( const std::vector& nodesToRemove) { - // LINFO("Removed " + std::to_string(nodesToRemove.size()) + " nodes from RAM."); + // LINFO("Removed " + std::to_string(nodesToRemove.size()) + " nodes from RAM"); for (unsigned long long nodePosIndex : nodesToRemove) { std::stack indexStack; diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp index 8c0eb5bd76..4533182253 100644 --- a/modules/gaia/rendering/renderablegaiastars.cpp +++ b/modules/gaia/rendering/renderablegaiastars.cpp @@ -57,7 +57,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo FilePathInfo = { "File", "File Path", - "The path to the file with data for the stars to be rendered." + "The path to the file with data for the stars to be rendered" }; constexpr openspace::properties::Property::PropertyInfo FileReaderOptionInfo = { @@ -70,7 +70,7 @@ namespace { "data, construct an Octree and render it. 'BinaryOctree' will read a constructed " "Octree from binary file and render full data. 'StreamOctree' will read an index " "file with full Octree structure and then stream nodes during runtime. (This " - "option is suited for bigger datasets.)" + "option is suited for bigger datasets)" }; constexpr openspace::properties::Property::PropertyInfo RenderModeInfo = { @@ -78,7 +78,7 @@ namespace { "Render Mode", "This value determines which predefined columns to use in rendering. If " "'Static' only the position of the stars is used. 'Color' uses position + color " - "parameters and 'Motion' uses pos, color as well as velocity for the stars." + "parameters and 'Motion' uses pos, color as well as velocity for the stars" }; constexpr openspace::properties::Property::PropertyInfo ShaderOptionInfo = { @@ -89,14 +89,14 @@ namespace { "filter. If 'Billboard_*' is chosen then the geometry shaders will generate " "screen-faced billboards for all stars. For '*_SSBO' the data will be stored in " "Shader Storage Buffer Objects while '*_VBO' uses Vertex Buffer Objects for the " - "streaming. OBS! SSBO won't work on APPLE!" + "streaming. OBS! SSBO won't work on Apple" }; constexpr openspace::properties::Property::PropertyInfo PsfTextureInfo = { "Texture", "Point Spread Function Texture", "The path to the texture that should be used as a point spread function for the " - "stars." + "stars" }; constexpr openspace::properties::Property::PropertyInfo LuminosityMultiplierInfo = { @@ -118,7 +118,7 @@ namespace { "Cut Off Threshold", "Set threshold for when to cut off star rendering. " "Stars closer than this threshold are given full opacity. " - "Farther away, stars dim proportionally to the 4-logarithm of their distance." + "Farther away, stars dim proportionally to the 4-logarithm of their distance" }; constexpr openspace::properties::Property::PropertyInfo SharpnessInfo = { @@ -136,14 +136,14 @@ namespace { constexpr openspace::properties::Property::PropertyInfo CloseUpBoostDistInfo = { "CloseUpBoostDist", "Close-Up Boost Distance [pc]", - "Set the distance where stars starts to increase in size. Unit is Parsec." + "Set the distance where stars starts to increase in size. Unit is Parsec" "[Works only with billboards]" }; constexpr openspace::properties::Property::PropertyInfo TmPointFilterSizeInfo = { "FilterSize", "Filter Size [px]", - "Set the filter size in pixels used in tonemapping for point splatting rendering." + "Set the filter size in pixels used in tonemapping for point splatting rendering" "[Works only with points]" }; @@ -160,7 +160,7 @@ namespace { "Determines how many additional nodes around the camera that will be fetched " "from disk. The first value determines how many additional layers of parents " "that will be fetched. The second value determines how many layers of descendant " - "that will be fetched from the found parents." + "that will be fetched from the found parents" }; constexpr openspace::properties::Property::PropertyInfo TmPointPxThresholdInfo = { @@ -169,31 +169,30 @@ namespace { "Set the threshold for how big the elliptic weight of a pixel has to be to " "contribute to the final elliptic shape. A smaller value gives a more visually " "pleasing result while a bigger value will speed up the rendering on skewed " - "frustums (aka Domes)." + "frustums (aka Domes)" }; constexpr openspace::properties::Property::PropertyInfo ColorTextureInfo = { "ColorMap", "Color Texture", "The path to the texture that is used to convert from the magnitude of the star " - "to its color. The texture is used as a one dimensional lookup function." + "to its color. The texture is used as a one dimensional lookup function" }; constexpr openspace::properties::Property::PropertyInfo FirstRowInfo = { "FirstRow", "First Row to Read", - "Defines the first row that will be read from the specified FITS file." - "No need to define if data already has been processed." - "[Works only with FileReaderOption::Fits]" + "Defines the first row that will be read from the specified FITS file" + "No need to define if data already has been processed. [Works only with " + "FileReaderOption::Fits]" }; constexpr openspace::properties::Property::PropertyInfo LastRowInfo = { "LastRow", "Last Row to Read", - "Defines the last row that will be read from the specified FITS file." - "Has to be equal to or greater than FirstRow. No need to define if " - "data already has been processed." - "[Works only with FileReaderOption::Fits]" + "Defines the last row that will be read from the specified FITS file; has to be " + "equal to or greater than FirstRow. No need to define if data already has been " + "processed. [Works only with FileReaderOption::Fits]" }; constexpr openspace::properties::Property::PropertyInfo ColumnNamesInfo = { @@ -201,48 +200,47 @@ namespace { "Column Names", "A list of strings with the names of all the columns that are to be " "read from the specified FITS file. No need to define if data already " - "has been processed." - "[Works only with FileReaderOption::Fits]" + "has been processed. [Works only with FileReaderOption::Fits]" }; constexpr openspace::properties::Property::PropertyInfo NumRenderedStarsInfo = { "NumRenderedStars", "Rendered Stars", - "The number of rendered stars in the current frame." + "The number of rendered stars in the current frame" }; constexpr openspace::properties::Property::PropertyInfo CpuRamBudgetInfo = { "CpuRamBudget", "CPU RAM Budget", "Current remaining budget (bytes) on the CPU RAM for loading more node data " - "files." + "files" }; constexpr openspace::properties::Property::PropertyInfo GpuStreamBudgetInfo = { "GpuStreamBudget", "GPU Stream Budget", "Current remaining memory budget [in number of chunks] on the GPU for streaming " - "additional stars." + "additional stars" }; constexpr openspace::properties::Property::PropertyInfo LodPixelThresholdInfo = { "LodPixelThreshold", "LOD Pixel Threshold", "The number of total pixels a nodes AABB can have in clipping space before its " - "parent is fetched as LOD cache." + "parent is fetched as LOD cache" }; constexpr openspace::properties::Property::PropertyInfo MaxGpuMemoryPercentInfo = { "MaxGpuMemoryPercent", "Max GPU Memory", - "Sets the max percent of existing GPU memory budget that the streaming will use." + "Sets the max percent of existing GPU memory budget that the streaming will use" }; constexpr openspace::properties::Property::PropertyInfo MaxCpuMemoryPercentInfo = { "MaxCpuMemoryPercent", "Max CPU Memory", "Sets the max percent of existing CPU memory budget that the streaming of files " - "will use." + "will use" }; constexpr openspace::properties::Property::PropertyInfo FilterPosXInfo = { @@ -250,7 +248,7 @@ namespace { "PosX Threshold", "If defined then only stars with Position X values between [min, max] " "will be rendered (if min is set to 0.0 it is read as -Inf, " - "if max is set to 0.0 it is read as +Inf). Measured in kiloParsec." + "if max is set to 0.0 it is read as +Inf). Measured in kiloParsec" }; constexpr openspace::properties::Property::PropertyInfo FilterPosYInfo = { @@ -258,7 +256,7 @@ namespace { "PosY Threshold", "If defined then only stars with Position Y values between [min, max] " "will be rendered (if min is set to 0.0 it is read as -Inf, " - "if max is set to 0.0 it is read as +Inf). Measured in kiloParsec." + "if max is set to 0.0 it is read as +Inf). Measured in kiloParsec" }; constexpr openspace::properties::Property::PropertyInfo FilterPosZInfo = { @@ -266,7 +264,7 @@ namespace { "PosZ Threshold", "If defined then only stars with Position Z values between [min, max] " "will be rendered (if min is set to 0.0 it is read as -Inf, " - "if max is set to 0.0 it is read as +Inf). Measured in kiloParsec." + "if max is set to 0.0 it is read as +Inf). Measured in kiloParsec" }; constexpr openspace::properties::Property::PropertyInfo FilterGMagInfo = { @@ -275,7 +273,7 @@ namespace { "If defined then only stars with G mean magnitude values between [min, max] " "will be rendered (if min is set to 20.0 it is read as -Inf, " "if max is set to 20.0 it is read as +Inf). If min = max then all values " - "equal min|max will be filtered away." + "equal min|max will be filtered away" }; constexpr openspace::properties::Property::PropertyInfo FilterBpRpInfo = { @@ -284,7 +282,7 @@ namespace { "If defined then only stars with Bp-Rp color values between [min, max] " "will be rendered (if min is set to 0.0 it is read as -Inf, " "if max is set to 0.0 it is read as +Inf). If min = max then all values " - "equal min|max will be filtered away." + "equal min|max will be filtered away" }; constexpr openspace::properties::Property::PropertyInfo FilterDistInfo = { @@ -292,7 +290,7 @@ namespace { "Dist Threshold", "If defined then only stars with Distances values between [min, max] " "will be rendered (if min is set to 0.0 it is read as -Inf, " - "if max is set to 0.0 it is read as +Inf). Measured in kParsec." + "if max is set to 0.0 it is read as +Inf). Measured in kParsec" }; constexpr openspace::properties::Property::PropertyInfo ReportGlErrorsInfo = { @@ -662,7 +660,7 @@ void RenderableGaiaStars::initializeGL() { // Construct shader program depending on user-defined shader option. const int option = _shaderOption; switch (option) { - case gaia::ShaderOption::PointSSBO: { + case gaia::ShaderOption::PointSSBO: _program = ghoul::opengl::ProgramObject::Build( "GaiaStar", absPath("${MODULE_GAIA}/shaders/gaia_ssbo_vs.glsl"), @@ -689,8 +687,7 @@ void RenderableGaiaStars::initializeGL() { addProperty(_tmPointSigma); addProperty(_tmPointPixelWeightThreshold); break; - } - case gaia::ShaderOption::PointVBO: { + case gaia::ShaderOption::PointVBO: _program = ghoul::opengl::ProgramObject::Build( "GaiaStar", absPath("${MODULE_GAIA}/shaders/gaia_vbo_vs.glsl"), @@ -713,8 +710,7 @@ void RenderableGaiaStars::initializeGL() { addProperty(_tmPointSigma); addProperty(_tmPointPixelWeightThreshold); break; - } - case gaia::ShaderOption::BillboardSSBO: { + case gaia::ShaderOption::BillboardSSBO: _program = ghoul::opengl::ProgramObject::Build( "GaiaStar", absPath("${MODULE_GAIA}/shaders/gaia_ssbo_vs.glsl"), @@ -747,8 +743,7 @@ void RenderableGaiaStars::initializeGL() { addProperty(_closeUpBoostDist); //addProperty(_pointSpreadFunctionTexturePath); break; - } - case gaia::ShaderOption::BillboardSSBONoFBO: { + case gaia::ShaderOption::BillboardSSBONoFBO: _program = global::renderEngine->buildRenderProgram("GaiaStar", absPath("${MODULE_GAIA}/shaders/gaia_ssbo_vs.glsl"), absPath("${MODULE_GAIA}/shaders/gaia_billboard_nofbo_fs.glsl"), @@ -773,8 +768,7 @@ void RenderableGaiaStars::initializeGL() { addProperty(_billboardSize); addProperty(_closeUpBoostDist); break; - } - case gaia::ShaderOption::BillboardVBO: { + case gaia::ShaderOption::BillboardVBO: _program = ghoul::opengl::ProgramObject::Build( "GaiaStar", absPath("${MODULE_GAIA}/shaders/gaia_vbo_vs.glsl"), @@ -802,7 +796,6 @@ void RenderableGaiaStars::initializeGL() { addProperty(_closeUpBoostDist); //addProperty(_pointSpreadFunctionTexturePath); break; - } } // Common uniforms for all shaders: @@ -1195,19 +1188,17 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) { ghoul::opengl::TextureUnit psfUnit; switch (shaderOption) { - case gaia::ShaderOption::PointSSBO: { + case gaia::ShaderOption::PointSSBO: _program->setUniform(_uniformCache.maxStarsPerNode, maxStarsPerNode); _program->setUniform(_uniformCache.valuesPerStar, valuesPerStar); _program->setUniform(_uniformCache.nChunksToRender, nChunksToRender); break; - } - case gaia::ShaderOption::PointVBO: { + case gaia::ShaderOption::PointVBO: // Specify how many potential stars we have to render. nShaderCalls = maxStarsPerNode * nChunksToRender; break; - } case gaia::ShaderOption::BillboardSSBO: - case gaia::ShaderOption::BillboardSSBONoFBO: { + case gaia::ShaderOption::BillboardSSBONoFBO: _program->setUniform( _uniformCache.cameraPos, data.camera.positionVec3() @@ -1231,8 +1222,7 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) { _pointSpreadFunctionTexture->bind(); _program->setUniform(_uniformCache.psfTexture, psfUnit); break; - } - case gaia::ShaderOption::BillboardVBO: { + case gaia::ShaderOption::BillboardVBO: _program->setUniform( _uniformCache.cameraPos, data.camera.positionVec3() @@ -1255,7 +1245,6 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) { // Specify how many potential stars we have to render. nShaderCalls = maxStarsPerNode * nChunksToRender; break; - } } if (shaderOption != gaia::ShaderOption::BillboardSSBONoFBO) { @@ -1983,7 +1972,7 @@ void RenderableGaiaStars::update(const UpdateData&) { glBindBuffer(GL_ARRAY_BUFFER, _vboQuad); // Quad for fullscreen. - static const GLfloat vbo_quad_data[] = { + static constexpr GLfloat vbo_quad_data[] = { -1.0f, -1.0f, 0.0f, 1.0f, -1.0f, 0.0f, -1.0f, 1.0f, 0.0f, @@ -2030,7 +2019,7 @@ void RenderableGaiaStars::update(const UpdateData&) { GL_FLOAT ); _fboTexture->uploadTexture(); - LDEBUG("Generating Framebuffer Texture!"); + LDEBUG("Generating Framebuffer Texture"); } // Bind render texture to FBO. glBindFramebuffer(GL_FRAMEBUFFER, _fbo); @@ -2046,7 +2035,7 @@ void RenderableGaiaStars::update(const UpdateData&) { // Check that our framebuffer is ok. if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) { - LERROR("Error when generating GaiaStar Framebuffer."); + LERROR("Error when generating GaiaStar Framebuffer"); } glBindFramebuffer(GL_FRAMEBUFFER, 0); @@ -2119,7 +2108,7 @@ void RenderableGaiaStars::update(const UpdateData&) { GL_FLOAT ); _fboTexture->uploadTexture(); - LDEBUG("Re-Generating Gaia Framebuffer Texture!"); + LDEBUG("Re-Generating Gaia Framebuffer Texture"); glBindFramebuffer(GL_FRAMEBUFFER, _fbo); glBindTexture(GL_TEXTURE_2D, *_fboTexture); @@ -2134,7 +2123,7 @@ void RenderableGaiaStars::update(const UpdateData&) { // Check that our framebuffer is ok. if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) { - LERROR("Error when re-generating GaiaStar Framebuffer."); + LERROR("Error when re-generating GaiaStar Framebuffer"); } glBindFramebuffer(GL_FRAMEBUFFER, 0); } @@ -2172,7 +2161,7 @@ bool RenderableGaiaStars::readDataFile() { nReadStars = readBinaryOctreeStructureFile(file.string()); break; default: - LERROR("Wrong FileReaderOption - no data file loaded!"); + LERROR("Wrong FileReaderOption - no data file loaded"); break; } diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp index fb3416742a..0a844af6ae 100644 --- a/modules/gaia/tasks/constructoctreetask.cpp +++ b/modules/gaia/tasks/constructoctreetask.cpp @@ -384,7 +384,7 @@ void ConstructOctreeTask::constructOctreeFromSingleFile( nTotalStars = nValues / nValuesPerStar; progressCallback(0.3f); - LINFO("Constructing Octree."); + LINFO("Constructing Octree"); // Insert star into octree. We assume the data already is in correct order. for (size_t i = 0; i < fullData.size(); i += nValuesPerStar) { @@ -418,7 +418,7 @@ void ConstructOctreeTask::constructOctreeFromSingleFile( std::ofstream outFileStream(_outFileOrFolderPath, std::ofstream::binary); if (outFileStream.good()) { if (nValues == 0) { - LERROR("Error writing file - No values were read from file."); + LERROR("Error writing file - No values were read from file"); } _octreeManager->writeToFile(outFileStream, true); @@ -537,18 +537,18 @@ void ConstructOctreeTask::constructOctreeFromFolder( } else { LERROR(fmt::format( - "Error opening file {} for loading preprocessed file!", inFilePath + "Error opening file {} for loading preprocessed file", inFilePath )); } // Slice LOD data. - LINFO("Slicing LOD data!"); + LINFO("Slicing LOD data"); _indexOctreeManager->sliceLodData(idx); progressCallback((idx + 1) * processOneFile); nStars += nStarsInfile; - LINFO(fmt::format("Writing {} stars to octree files!", nStarsInfile)); + LINFO(fmt::format("Writing {} stars to octree files", nStarsInfile)); LINFO(fmt::format( "Number leaf nodes: {}\n Number inner nodes: {}\n Total depth of tree: {}", _indexOctreeManager->numLeafNodes(), diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp index aeaabd2125..3e1ea196ab 100644 --- a/modules/gaia/tasks/readfilejob.cpp +++ b/modules/gaia/tasks/readfilejob.cpp @@ -261,8 +261,7 @@ void ReadFileJob::execute() { _octants[index].insert(_octants[index].end(), values.begin(), values.end()); } - /*LINFO(std::to_string(nNullArr) + " out of " + - std::to_string(nStars) + " read stars were nullArrays.");*/ + // LINFO(fmt::format("{} out of {} read stars were nullArrays", nNullArr, nStars)); } std::vector> ReadFileJob::product() { diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp index 3d07a54e34..20d99e18e0 100644 --- a/modules/gaia/tasks/readfitstask.cpp +++ b/modules/gaia/tasks/readfitstask.cpp @@ -109,7 +109,7 @@ std::string ReadFitsTask::description() { "Read the specified fits file (or all fits files in specified folder): {}\n and " "write raw star data into: {}\nAll columns required for default rendering and " "filtering parameters will always be read but user can define additional filter " - "columns to read.", _inFileOrFolderPath, _outFileOrFolderPath + "columns to read", _inFileOrFolderPath, _outFileOrFolderPath ); } @@ -147,7 +147,7 @@ void ReadFitsTask::readSingleFitsFile(const Task::ProgressCallback& progressCall LINFO("Number of values per star: " + std::to_string(nValuesPerStar)); if (nValues == 0) { - LERROR("Error writing file - No values were read from file."); + LERROR("Error writing file - No values were read from file"); } outFileStream.write( reinterpret_cast(&nValues), @@ -261,7 +261,7 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) { jobManager.enqueueJob(readFileJob); } - LINFO("All files added to queue!"); + LINFO("All files added to queue"); // Check for finished jobs. while (finishedJobs < nInputFiles) { @@ -295,7 +295,7 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) { } } } - LINFO(fmt::format("A total of {} stars were written to binary files.", totalStars)); + LINFO(fmt::format("A total of {} stars were written to binary files", totalStars)); } int ReadFitsTask::writeOctantToFile(const std::vector& octantData, int index, @@ -310,7 +310,7 @@ int ReadFitsTask::writeOctantToFile(const std::vector& octantData, int in LINFO("Write " + std::to_string(nValues) + " values to " + outPath); if (nValues == 0) { - LERROR("Error writing file - No values were read from file."); + LERROR("Error writing file - No values were read from file"); } // If this is the first write then write number of values per star! if (isFirstWrite[index]) { @@ -331,7 +331,7 @@ int ReadFitsTask::writeOctantToFile(const std::vector& octantData, int in return nValues / nValuesPerStar; } else { - LERROR(fmt::format("Error opening file: {} as output data file.", outPath)); + LERROR(fmt::format("Error opening file: {} as output data file", outPath)); return 0; } } diff --git a/modules/gaia/tasks/readspecktask.cpp b/modules/gaia/tasks/readspecktask.cpp index 81f686e3c0..25e5da822a 100644 --- a/modules/gaia/tasks/readspecktask.cpp +++ b/modules/gaia/tasks/readspecktask.cpp @@ -83,7 +83,7 @@ void ReadSpeckTask::perform(const Task::ProgressCallback& onProgress) { LINFO("nValues: " + std::to_string(nValues)); if (nValues == 0) { - LERROR("Error writing file - No values were read from file."); + LERROR("Error writing file - No values were read from file"); } fileStream.write(reinterpret_cast(&nValues), sizeof(int32_t)); fileStream.write(reinterpret_cast(&nRenderValues), sizeof(int32_t)); @@ -94,7 +94,7 @@ void ReadSpeckTask::perform(const Task::ProgressCallback& onProgress) { fileStream.close(); } else { - LERROR(fmt::format("Error opening file: {} as output data file.", _outFilePath)); + LERROR(fmt::format("Error opening file: {} as output data file", _outFilePath)); } onProgress(1.f); diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp index eb0bcc767e..35c6074153 100644 --- a/modules/galaxy/rendering/renderablegalaxy.cpp +++ b/modules/galaxy/rendering/renderablegalaxy.cpp @@ -107,7 +107,7 @@ namespace { "EmissionMultiply", "Emission Multiplier", "A unit-less scale factor for the amount of light being emitted by dust in the " - "galaxy." + "galaxy" }; constexpr openspace::properties::Property::PropertyInfo RotationInfo = { @@ -121,7 +121,7 @@ namespace { "StarRenderingMethod", "Star Rendering Method", "This value determines which rendering method is used for visualization of the " - "stars." + "stars" }; constexpr openspace::properties::Property::PropertyInfo EnabledPointsRatioInfo = { @@ -130,21 +130,21 @@ namespace { "The ratio of point-like stars that are rendered to produce the overall galaxy " "image. At a value of 0, no stars are rendered, at a value of 1 all points " "contained in the dataset are rendered. The specific value chosen is a " - "compromise between image fidelity and rendering performance." + "compromise between image fidelity and rendering performance" }; constexpr openspace::properties::Property::PropertyInfo DownscaleVolumeRenderingInfo = { "Downscale", "Downscale Factor Volume Rendering", - "This value sets the downscaling factor when rendering the current volume." + "This value sets the downscaling factor when rendering the current volume" }; constexpr openspace::properties::Property::PropertyInfo NumberOfRayCastingStepsInfo = { "Steps", "Number of RayCasting Steps", - "This value set the number of integration steps during the raycasting procedure." + "This value set the number of integration steps during the raycasting procedure" }; struct [[codegen::Dictionary(RenderableGalaxy)]] Parameters { diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp index 9322d62b57..4166a81aa9 100644 --- a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp +++ b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp @@ -78,7 +78,7 @@ void MilkywayPointsConversionTask::perform(const Task::ProgressCallback& progres progressCallback(static_cast(i + 1) / nPoints); } else { - std::cout << "Failed to convert point data."; + std::cout << "Failed to convert point data"; return; } } diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp index 0977354ad2..2181b3ab1d 100644 --- a/modules/globebrowsing/globebrowsingmodule.cpp +++ b/modules/globebrowsing/globebrowsingmodule.cpp @@ -95,7 +95,7 @@ namespace { "WMSCacheEnabled", "WMS Cache Enabled", "Determines whether automatic caching of WMS servers is enabled. Changing the " - "value of this property will not affect already created WMS datasets." + "value of this property will not affect already created WMS datasets" }; constexpr openspace::properties::Property::PropertyInfo OfflineModeInfo = { @@ -105,27 +105,27 @@ namespace { "not even try to retrieve images through an internet connection. Please note " "that this setting is only reasonable, if the caching is enabled and there is " "available cached data. Changing the value of this property will not affect " - "already created WMS datasets." + "already created WMS datasets" }; constexpr openspace::properties::Property::PropertyInfo WMSCacheLocationInfo = { "WMSCacheLocation", "WMS Cache Location", "The location of the cache folder for WMS servers. Changing the value of this " - "property will not affect already created WMS datasets." + "property will not affect already created WMS datasets" }; constexpr openspace::properties::Property::PropertyInfo WMSCacheSizeInfo = { "WMSCacheSize", "WMS Cache Size", "The maximum size of the cache for each WMS server. Changing the value of this " - "property will not affect already created WMS datasets." + "property will not affect already created WMS datasets" }; constexpr openspace::properties::Property::PropertyInfo TileCacheSizeInfo = { "TileCacheSize", "Tile Cache Size", - "The maximum size of the MemoryAwareTileCache, on the CPU and GPU." + "The maximum size of the MemoryAwareTileCache, on the CPU and GPU" }; @@ -243,7 +243,7 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) { "WMS caching is disabled, but offline mode is enabled. Unless you know " "what you are doing, this will probably cause many servers to stop working. " "If you want to silence this warning, set the 'NoWarning' parameter to " - "'true'." + "'true'" ); } @@ -460,9 +460,7 @@ void GlobeBrowsingModule::goToChunk(const globebrowsing::RenderableGlobe& globe, const glm::dvec3 cameraPosition = global::navigationHandler->camera()->positionVec3(); SceneGraphNode* globeSceneGraphNode = dynamic_cast(globe.owner()); if (!globeSceneGraphNode) { - LERROR( - "Cannot go to chunk. The renderable is not attached to a scene graph node." - ); + LERROR("Cannot go to chunk. The renderable is not attached to scene graph node"); return; } const glm::dmat4 inverseModelTransform = glm::inverse( diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl index 652de10129..a043f53a0a 100644 --- a/modules/globebrowsing/globebrowsingmodule_lua.inl +++ b/modules/globebrowsing/globebrowsingmodule_lua.inl @@ -230,7 +230,7 @@ namespace { else { n = global::navigationHandler->orbitalNavigator().anchorNode(); if (!n) { - throw ghoul::lua::LuaError("No anchor node is set."); + throw ghoul::lua::LuaError("No anchor node is set"); } } @@ -286,7 +286,7 @@ namespace { else { n = global::navigationHandler->orbitalNavigator().anchorNode(); if (!n) { - throw ghoul::lua::LuaError("No anchor node is set."); + throw ghoul::lua::LuaError("No anchor node is set"); } } diff --git a/modules/globebrowsing/src/asynctiledataprovider.cpp b/modules/globebrowsing/src/asynctiledataprovider.cpp index 5bb35997e0..07731ec592 100644 --- a/modules/globebrowsing/src/asynctiledataprovider.cpp +++ b/modules/globebrowsing/src/asynctiledataprovider.cpp @@ -135,7 +135,7 @@ void AsyncTileDataProvider::update() { // May reset switch (_resetMode) { - case ResetMode::ShouldResetAll: { + case ResetMode::ShouldResetAll: // Clean all finished jobs clearTiles(); // Only allow resetting if there are no jobs currently running @@ -144,8 +144,7 @@ void AsyncTileDataProvider::update() { LINFO(fmt::format("Tile data reader '{}' reset successfully", _name)); } break; - } - case ResetMode::ShouldResetAllButRawTileDataReader: { + case ResetMode::ShouldResetAllButRawTileDataReader: // Clean all finished jobs clearTiles(); // Only allow resetting if there are no jobs currently running @@ -154,8 +153,7 @@ void AsyncTileDataProvider::update() { LINFO(fmt::format("Tile data reader '{}' reset successfully", _name)); } break; - } - case ResetMode::ShouldBeDeleted: { + case ResetMode::ShouldBeDeleted: // Clean all finished jobs clearTiles(); // Only allow resetting if there are no jobs currently running @@ -163,10 +161,7 @@ void AsyncTileDataProvider::update() { _shouldBeDeleted = true; } break; - } - case ResetMode::ShouldNotReset: { - break; - } + case ResetMode::ShouldNotReset: default: break; } diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp index 92d56686b6..36bbe07356 100644 --- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp +++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp @@ -46,13 +46,13 @@ namespace { "FontName", "Font Name", "This value is the name of the font that is used. It can either refer to an " - "internal name registered previously, or it can refer to a path that is used." + "internal name registered previously, or it can refer to a path that is used" }; constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", - "This value determines the size of the font that is used to render the date." + "This value determines the size of the font that is used to render the date" }; constexpr openspace::properties::Property::PropertyInfo DisplayFormatInfo = { @@ -64,7 +64,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo SignificantDigitsInfo = { "SignificantDigits", "Significant Digits", - "Determines the number of significant digits that are shown in the location text." + "Determines the number of significant digits that are shown in the location text" }; struct [[codegen::Dictionary(DashboardItemGlobeLocation)]] Parameters { diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp index 6d480ea57c..0abe41e8ab 100644 --- a/modules/globebrowsing/src/gdalwrapper.cpp +++ b/modules/globebrowsing/src/gdalwrapper.cpp @@ -41,14 +41,14 @@ namespace { "LogGdalErrors", "Log GDAL errors", "If this value is enabled, any error that is raised by GDAL will be logged using " - "the logmanager. If this value is disabled, any error will be ignored." + "the logmanager. If this value is disabled, any error will be ignored" }; constexpr openspace::properties::Property::PropertyInfo GdalMaximumCacheInfo = { "GdalMaximumCacheSize", "GDAL maximum cache size", "This function sets the maximum amount of RAM memory in MB that GDAL is " - "permitted to use for caching." + "permitted to use for caching" }; void gdalErrorHandler(CPLErr eErrClass, int, const char* msg) { diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp index 5b2bc735ac..6c53601a33 100644 --- a/modules/globebrowsing/src/globelabelscomponent.cpp +++ b/modules/globebrowsing/src/globelabelscomponent.cpp @@ -63,44 +63,44 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Enabled", - "Enables and disables labels' rendering." + "Enables and disables labels' rendering" }; constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", - "Font size for the rendering labels. This is different fromt text size." + "Font size for the rendering labels. This is different fromt text size" }; constexpr openspace::properties::Property::PropertyInfo MinMaxSizeInfo = { "MinMaxSize", "Min/Max Text Size", - "Minimum and maximum label size, in pixels." + "Minimum and maximum label size, in pixels" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "LabelsSize", "Labels Size", - "This value affects the size scale of the labels." + "This value affects the size scale of the labels" }; constexpr openspace::properties::Property::PropertyInfo HeightOffsetInfo = { "HeightOffset", "Height Offset", "This value moves the label away from the globe surface by the specified " - "distance (in meters)." + "distance (in meters)" }; constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", - "The text color of the labels." + "The text color of the labels" }; constexpr openspace::properties::Property::PropertyInfo OpacityInfo = { "Opacity", "Opacity", - "The opacity of the labels." + "The opacity of the labels" }; constexpr openspace::properties::Property::PropertyInfo FadeDistancesInfo = { @@ -108,39 +108,39 @@ namespace { "Fade-In Distances", "The distances above the globe's surface at which the labels start fading in or " "out, given in meters. The final distances are also adjusted by the specified " - "height offset." + "height offset" }; constexpr openspace::properties::Property::PropertyInfo FadeInEnabledInfo = { "FadeInEnabled", "Fade In Enabled", "Sets whether the labels fade in when approaching the globe from a distance. If " - "false, no fading happens and the labels immediately has full opacity." + "false, no fading happens and the labels immediately has full opacity" }; constexpr openspace::properties::Property::PropertyInfo FadeOutEnabledInfo = { "FadeOutEnabled", "Fade Out Enabled", "Sets whether the labels fade out when approaching the surface of the globe. If " - "false, no fading happens and the labels stays in full opacity." + "false, no fading happens and the labels stays in full opacity" }; constexpr openspace::properties::Property::PropertyInfo DisableCullingInfo = { "DisableCulling", "Culling Disabled", - "Labels culling disabled." + "Labels culling disabled" }; constexpr openspace::properties::Property::PropertyInfo DistanceEPSInfo = { "DistanceEPS", "Culling Distance", - "Labels culling distance from globe's center." + "Labels culling distance from globe's center" }; constexpr openspace::properties::Property::PropertyInfo AlignmentOptionInfo = { "AlignmentOption", "Alignment Option", - "Labels are aligned horizontally or circularly related to the planet." + "Labels are aligned horizontally or circularly related to the planet" }; struct [[codegen::Dictionary(GlobeLabelsComponent)]] Parameters { diff --git a/modules/globebrowsing/src/globerotation.cpp b/modules/globebrowsing/src/globerotation.cpp index 3f759b6ed5..d393089ab8 100644 --- a/modules/globebrowsing/src/globerotation.cpp +++ b/modules/globebrowsing/src/globerotation.cpp @@ -48,7 +48,7 @@ namespace { "Latitude", "The latitude of the location on the globe's surface. The value can range from " "-90 to 90, with negative values representing the southern hemisphere of the " - "globe. The default value is 0.0." + "globe. The default value is 0.0" }; constexpr openspace::properties::Property::PropertyInfo LongitudeInfo = { @@ -56,14 +56,14 @@ namespace { "Longitude", "The longitude of the location on the globe's surface. The value can range from " "-180 to 180, with negative values representing the western hemisphere of the " - "globe. The default value is 0.0." + "globe. The default value is 0.0" }; constexpr openspace::properties::Property::PropertyInfo AngleInfo = { "Angle", "Angle", "A rotation angle that can be used to rotate the object around its own y-axis, " - "which will be pointing out of the globe's surface." + "which will be pointing out of the globe's surface" }; constexpr openspace::properties::Property::PropertyInfo UseHeightmapInfo = { @@ -71,7 +71,7 @@ namespace { "Use Heightmap", "If set to true, the heightmap will be used when computing the surface normal. " "This means that the object will be rotated to lay flat on the surface at the " - "given coordinate and follow the shape of the landscape." + "given coordinate and follow the shape of the landscape" }; struct [[codegen::Dictionary(GlobeRotation)]] Parameters { diff --git a/modules/globebrowsing/src/globetranslation.cpp b/modules/globebrowsing/src/globetranslation.cpp index c6b457e5b6..48436700c5 100644 --- a/modules/globebrowsing/src/globetranslation.cpp +++ b/modules/globebrowsing/src/globetranslation.cpp @@ -72,7 +72,7 @@ namespace { "Use Heightmap", "If this value is 'true', the altitude specified in 'Altitude' will be treated " "as an offset from the heightmap. Otherwise, it will be an offset from the " - "globe's reference ellipsoid. The default value is 'false'." + "globe's reference ellipsoid. The default value is 'false'" }; struct [[codegen::Dictionary(GlobeTranslation)]] Parameters { diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp index ed4d2f38a9..7b74bc641b 100644 --- a/modules/globebrowsing/src/gpulayergroup.cpp +++ b/modules/globebrowsing/src/gpulayergroup.cpp @@ -39,7 +39,7 @@ void GPULayerGroup::setValue(ghoul::opengl::ProgramObject& program, ghoul_assert( layerGroup.activeLayers().size() == _gpuActiveLayers.size(), - "GPU and CPU active layers must have same size!" + "GPU and CPU active layers must have same size" ); const std::vector& activeLayers = layerGroup.activeLayers(); diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp index 56f28d0210..baee723ec4 100644 --- a/modules/globebrowsing/src/layer.cpp +++ b/modules/globebrowsing/src/layer.cpp @@ -48,14 +48,14 @@ namespace { "Type", "Type", "The type of this Layer. This value is a read-only property and thus cannot be " - "changed." + "changed" }; constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = { "BlendMode", "Blend Mode", "This value specifies the blend mode that is applied to this layer. The blend " - "mode determines how this layer is added to the underlying layers beneath." + "mode determines how this layer is added to the underlying layers beneath" }; constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { @@ -63,28 +63,28 @@ namespace { "Enabled", "If this value is enabled, the layer will be used for the final composition of " "the planet. If this value is disabled, the layer will be ignored in the " - "composition." + "composition" }; constexpr openspace::properties::Property::PropertyInfo ResetInfo = { "Reset", "Reset", "If this value is triggered, this layer will be reset. This will delete the " - "local cache for this layer and will trigger a fresh load of all tiles." + "local cache for this layer and will trigger a fresh load of all tiles" }; constexpr openspace::properties::Property::PropertyInfo RemoveInfo = { "Remove", "Remove", "If this value is triggered, a script will be executed that will remove this " - "layer before the next frame." + "layer before the next frame" }; constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", "If the 'Type' of this layer is a solid color, this value determines what this " - "solid color is." + "solid color is" }; constexpr openspace::properties::Property::PropertyInfo GuiDescriptionInfo = { @@ -206,7 +206,7 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou if (p.type.has_value()) { typeID = ghoul::from_string(*p.type); if (typeID == layers::Layer::ID::Unknown) { - throw ghoul::RuntimeError("Unknown layer type!"); + throw ghoul::RuntimeError("Unknown layer type"); } } else { @@ -515,10 +515,9 @@ void Layer::addVisibleProperties() { addPropertySubOwner(*_tileProvider); } break; - case layers::Layer::ID::SolidColor: { + case layers::Layer::ID::SolidColor: addProperty(_solidColor); break; - } default: throw ghoul::MissingCaseException(); } diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp index 8d54e770e0..2a875f7117 100644 --- a/modules/globebrowsing/src/layeradjustment.cpp +++ b/modules/globebrowsing/src/layeradjustment.cpp @@ -32,20 +32,20 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ChromaKeyColorInfo = { "ChromaKeyColor", "Chroma Key Color", - "This color is used as the chroma key for the layer that is adjusted." + "This color is used as the chroma key for the layer that is adjusted" }; constexpr openspace::properties::Property::PropertyInfo ChromaKeyToleranceInfo = { "ChromaKeyTolerance", "Chroma Key Tolerance", "This value determines the tolerance that is used to determine whether a color " - "is matching the selected Chroma key." + "is matching the selected Chroma key" }; constexpr openspace::properties::Property::PropertyInfo TypeInfo = { "Type", "Type", - "The type of layer adjustment that is applied to the underlying layer." + "The type of layer adjustment that is applied to the underlying layer" }; struct [[codegen::Dictionary(LayerAdjustment)]] Parameters { diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp index 68ea55c8cc..41aaaa7aac 100644 --- a/modules/globebrowsing/src/layergroup.cpp +++ b/modules/globebrowsing/src/layergroup.cpp @@ -40,7 +40,7 @@ namespace { "Blend between levels", "If this value is enabled, images between different levels are interpolated, " "rather than switching between levels abruptly. This makes transitions smoother " - "and more visually pleasing.", + "and more visually pleasing", openspace::properties::Property::Visibility::Hidden }; } // namespace diff --git a/modules/globebrowsing/src/layerrendersettings.cpp b/modules/globebrowsing/src/layerrendersettings.cpp index d5a87b4702..1147900c9c 100644 --- a/modules/globebrowsing/src/layerrendersettings.cpp +++ b/modules/globebrowsing/src/layerrendersettings.cpp @@ -29,7 +29,7 @@ namespace { "SetDefault", "Set Default", "If this value is triggered it will reset all of these values to their default " - "values." + "values" }; constexpr openspace::properties::Property::PropertyInfo OpacityInfo = { @@ -37,27 +37,27 @@ namespace { "Opacity", "This value sets the transparency of this layer. If this value is equal to '1', " "the layer is completely opaque. If this value is equal to '0', the layer is " - "completely transparent." + "completely transparent" }; constexpr openspace::properties::Property::PropertyInfo GammaInfo = { "Gamma", "Gamma", - "This value is used as an exponent to adjust the color for each tile." + "This value is used as an exponent to adjust the color for each tile" }; constexpr openspace::properties::Property::PropertyInfo MultiplierInfo = { "Multiplier", "Multiplier", "This value is used as a multiplier to adjust the color applied after taking the " - "gamma value as an exponent." + "gamma value as an exponent" }; constexpr openspace::properties::Property::PropertyInfo OffsetInfo = { "Offset", "Offset", "This value is used as an additive modifier to adjust the color applied after " - "the gamma exponent and the multiplier has been performed." + "the gamma exponent and the multiplier has been performed" }; } // namespace diff --git a/modules/globebrowsing/src/lrucache.inl b/modules/globebrowsing/src/lrucache.inl index 5ea4ebdcf0..2bd2eb824e 100644 --- a/modules/globebrowsing/src/lrucache.inl +++ b/modules/globebrowsing/src/lrucache.inl @@ -100,7 +100,7 @@ ValueType LRUCache::get(const KeyType& key) { template std::pair LRUCache::popMRU() { - ghoul_assert(!_itemList.empty(), "Cannot pop LRU cache. Ensure cache is not empty."); + ghoul_assert(!_itemList.empty(), "Cannot pop LRU cache. Ensure cache is not empty"); auto first_it = _itemList.begin(); _itemMap.erase(first_it->first); @@ -111,7 +111,7 @@ std::pair LRUCache::popMRU() template std::pair LRUCache::popLRU() { - ghoul_assert(!_itemList.empty(), "Cannot pop LRU cache. Ensure cache is not empty."); + ghoul_assert(!_itemList.empty(), "Cannot pop LRU cache. Ensure cache is not empty"); auto lastIt = _itemList.end(); lastIt--; diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp index 972afadf67..65f77d8d0d 100644 --- a/modules/globebrowsing/src/memoryawaretilecache.cpp +++ b/modules/globebrowsing/src/memoryawaretilecache.cpp @@ -38,14 +38,14 @@ namespace { "CpuAllocatedTileData", "CPU allocated tile data (MB)", "This value denotes the amount of RAM memory (in MB) that this tile cache is " - "utilizing." + "utilizing" }; constexpr openspace::properties::Property::PropertyInfo GpuAllocatedDataInfo = { "GpuAllocatedTileData", "GPU allocated tile data (MB)", "This value denotes the amount of GPU memory (in MB) that this tile cache is " - "utilizing." + "utilizing" }; constexpr openspace::properties::Property::PropertyInfo TileCacheSizeInfo = { @@ -340,7 +340,7 @@ void MemoryAwareTileCache::assureTextureContainerExists( void MemoryAwareTileCache::setSizeEstimated(size_t estimatedSize) { ZoneScoped - ghoul_assert(!_textureContainerMap.empty(), "Texture containers must exist."); + ghoul_assert(!_textureContainerMap.empty(), "Texture containers must exist"); LDEBUG("Resetting tile cache size"); diff --git a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl index 064614818e..6aaf619a0e 100644 --- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl +++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl @@ -67,7 +67,7 @@ void PrioritizingConcurrentJobManager::clearEnqueuedJobs() { template std::shared_ptr> PrioritizingConcurrentJobManager::popFinishedJob() { - ghoul_assert(!_finishedJobs.empty(), "There is no finished job to pop!"); + ghoul_assert(!_finishedJobs.empty(), "There is no finished job to pop"); std::lock_guard lock(_finishedJobsMutex); std::shared_ptr> result = _finishedJobs.pop(); diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp index eb03db04ce..2c7e1f8114 100644 --- a/modules/globebrowsing/src/rawtiledatareader.cpp +++ b/modules/globebrowsing/src/rawtiledatareader.cpp @@ -361,7 +361,7 @@ glm::ivec2 geodeticToPixel(const Geodetic2& geo, const double X = glm::degrees(geo.lon); const double divisor = t[2] * t[4] - t[1] * t[5]; - ghoul_assert(divisor != 0.0, "Division by zero!"); + ghoul_assert(divisor != 0.0, "Division by zero"); const double P = (t[0] * t[5] - t[2] * t[3] + t[2] * Y - t[5] * X) / divisor; const double L = (-t[0] * t[4] + t[1] * t[3] - t[1] * Y + t[4] * X) / divisor; @@ -589,7 +589,7 @@ RawTile::ReadError RawTileDataReader::rasterRead(int rasterBand, const IODescription& io, char* dataDestination) const { - ghoul_assert(isInside(io.read.region, io.read.fullRegion), "write region of bounds!"); + ghoul_assert(isInside(io.read.region, io.read.fullRegion), "write region of bounds"); ghoul_assert( io.write.region.start.x >= 0 && io.write.region.start.y >= 0, "Invalid write region" @@ -807,7 +807,7 @@ IODescription RawTileDataReader::ioDescription(const TileIndex& tileIndex) const ); ghoul_assert( io.write.region.numPixels.x == _initData.dimensions.x, - "Write region must match tile it writes to." + "Write region must match tile it writes to" ); return io; diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp index 0d0a67e34e..2570f96c3c 100644 --- a/modules/globebrowsing/src/renderableglobe.cpp +++ b/modules/globebrowsing/src/renderableglobe.cpp @@ -117,14 +117,14 @@ namespace { "Level by projected area (else distance)", "If this value is set to 'true', the tile level is determined by the area " "projected on screen. If it is 'false', the distance to the center of the tile " - "is used instead." + "is used instead" }; constexpr openspace::properties::Property::PropertyInfo ResetTileProviderInfo = { "ResetTileProviders", "Reset tile providers", "If this property is triggered, all tile provides for the globe are reset and " - "data is reloaded from scratch." + "data is reloaded from scratch" }; constexpr openspace::properties::Property::PropertyInfo ModelSpaceRenderingInfo = { @@ -133,7 +133,7 @@ namespace { "This value determines the tile level that is used as the cut off between " "rendering tiles using the globe model rendering vs the flat in-game rendering " "method. This value is a tradeoff between not having precision errors in the " - "rendering and represting a tile as flat or curved." + "rendering and represting a tile as flat or curved" }; constexpr openspace::properties::Property::PropertyInfo DynamicLodIterationCountInfo = @@ -150,7 +150,7 @@ namespace { "Perform shading", "This value determines whether there should be lighting applied to the surface " "of the globe. Note that if there is an atmosphere attached to the planet, there " - "is a separate setting to control the shadowing induced by the atmosphere part." + "is a separate setting to control the shadowing induced by the atmosphere part" }; constexpr openspace::properties::Property::PropertyInfo AccurateNormalsInfo = { @@ -176,7 +176,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ShadowMappingInfo = { "ShadowMapping", "Shadow Mapping", - "Enables shadow mapping algorithm. Used by renderable rings too." + "Enables shadow mapping algorithm. Used by renderable rings too" }; constexpr openspace::properties::Property::PropertyInfo RenderAtDistanceInfo = { @@ -184,7 +184,7 @@ namespace { "Render at Distance", "Tells the rendering engine not to perform distance based performance culling " "for this globe. Turning this property on will let the globe to be seen at far " - "away distances when normally it would be hidden." + "away distances when normally it would be hidden" }; constexpr openspace::properties::Property::PropertyInfo ZFightingPercentageInfo = { @@ -198,7 +198,7 @@ namespace { "NumberShadowSamples", "Number of Shadow Samples", "The number of samples used during shadow mapping calculation " - "(Percentage Closer Filtering)." + "(Percentage Closer Filtering)" }; constexpr openspace::properties::Property::PropertyInfo TargetLodScaleFactorInfo = { @@ -206,14 +206,14 @@ namespace { "Target Level of Detail Scale Factor", "Determines the targeted level-of-detail of the tiles for this globe. A higher " "value means that the tiles rendered are a higher resolution for the same " - "distance of the camera to the planet." + "distance of the camera to the planet" }; constexpr openspace::properties::Property::PropertyInfo CurrentLodScaleFactorInfo = { "CurrentLodScaleFactor", "Current Level of Detail Scale Factor (Read Only)", "The currently used scale factor whose target value is deteremined by " - "'TargetLodScaleFactor'." + "'TargetLodScaleFactor'" }; constexpr openspace::properties::Property::PropertyInfo OrenNayarRoughnessInfo = { @@ -226,7 +226,7 @@ namespace { "NActiveLayers", "Number of active layers", "This is the number of currently active layers, if this value reaches the " - "maximum, bad things will happen." + "maximum, bad things will happen" }; struct [[codegen::Dictionary(RenderableGlobe)]] Parameters { @@ -1730,7 +1730,7 @@ void RenderableGlobe::recompileShaders() { absPath("${MODULE_GLOBEBROWSING}/shaders/renderer_fs.glsl"), shaderDictionary ); - ghoul_assert(_localRenderer.program, "Failed to initialize programObject!"); + ghoul_assert(_localRenderer.program, "Failed to initialize programObject"); _localRenderer.updatedSinceLastCall = true; _localRenderer.program->setUniform("xSegments", _grid.xSegments); @@ -1752,7 +1752,7 @@ void RenderableGlobe::recompileShaders() { absPath("${MODULE_GLOBEBROWSING}/shaders/renderer_fs.glsl"), shaderDictionary ); - ghoul_assert(_globalRenderer.program, "Failed to initialize programObject!"); + ghoul_assert(_globalRenderer.program, "Failed to initialize programObject"); _globalRenderer.program->setUniform("xSegments", _grid.xSegments); @@ -2034,7 +2034,7 @@ void RenderableGlobe::calculateEclipseShadows(ghoul::opengl::ProgramObject& prog if ((sourceNode == nullptr) || (casterNode == nullptr)) { LERRORC( "Renderableglobe", - "Invalid scenegraph node for the shadow's caster or shadow's receiver." + "Invalid scenegraph node for the shadow's caster or shadow's receiver" ); return; } diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h index 2a7666a53f..e25ecae39d 100644 --- a/modules/globebrowsing/src/renderableglobe.h +++ b/modules/globebrowsing/src/renderableglobe.h @@ -118,8 +118,8 @@ public: static documentation::Documentation Documentation(); private: - constexpr static const int MinSplitDepth = 2; - constexpr static const int MaxSplitDepth = 22; + static constexpr int MinSplitDepth = 2; + static constexpr int MaxSplitDepth = 22; struct { properties::BoolProperty showChunkEdges; diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp index 5d54bae963..1093d89cb4 100644 --- a/modules/globebrowsing/src/ringscomponent.cpp +++ b/modules/globebrowsing/src/ringscomponent.cpp @@ -75,48 +75,48 @@ namespace { "Texture", "Texture", "This value is the path to a texture on disk that contains a one-dimensional " - "texture which is used for these rings." + "texture which is used for these rings" }; constexpr openspace::properties::Property::PropertyInfo TextureFwrdInfo = { "TextureFwrd", "TextureFwrd", "This value is the path to a texture on disk that contains a one-dimensional " - "texture which is used for forward scattering light in these rings." + "texture which is used for forward scattering light in these rings" }; constexpr openspace::properties::Property::PropertyInfo TextureBckwrdInfo = { "TextureBckwrd", "TextureBckwrd", "This value is the path to a texture on disk that contains a one-dimensional " - "texture which is used for backward scattering light in these rings." + "texture which is used for backward scattering light in these rings" }; constexpr openspace::properties::Property::PropertyInfo TextureUnlitInfo = { "TextureUnlit", "TextureUnlit", "This value is the path to a texture on disk that contains a one-dimensional " - "texture which is used for unlit part in these rings." + "texture which is used for unlit part in these rings" }; constexpr openspace::properties::Property::PropertyInfo TextureColorInfo = { "TextureColor", "TextureColor", "This value is the path to a texture on disk that contains a one-dimensional " - "texture color which is used for unlit part in these rings." + "texture color which is used for unlit part in these rings" }; constexpr openspace::properties::Property::PropertyInfo TextureTransparencyInfo = { "TextureTransparency", "TextureTransparency", "This value is the path to a texture on disk that contains a one-dimensional " - "texture transparency which is used for unlit part in these rings." + "texture transparency which is used for unlit part in these rings" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size", - "This value specifies the radius of the rings in meter." + "This value specifies the radius of the rings in meter" }; constexpr openspace::properties::Property::PropertyInfo OffsetInfo = { @@ -125,7 +125,7 @@ namespace { "This value is used to limit the width of the rings. Each of the two values is " "a value between 0 and 1, where 0 is the center of the ring and 1 is the " "maximum extent at the radius. For example, if the value is {0.5, 1.0}, the " - "ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}." + "ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}" }; constexpr openspace::properties::Property::PropertyInfo NightFactorInfo = { @@ -133,14 +133,14 @@ namespace { "Night Factor", "This value is a multiplicative factor that is applied to the side of the rings " "that is facing away from the Sun. If this value is equal to '1', no darkening " - "of the night side occurs." + "of the night side occurs" }; constexpr openspace::properties::Property::PropertyInfo ColorFilterInfo = { "ColorFilter", "Color Filter", "This value affects the filtering out of part of the rings depending on the " - "color values of the texture. The higher value, the more rings are filtered out." + "color values of the texture. The higher value, the more rings are filtered out" }; constexpr openspace::properties::Property::PropertyInfo ZFightingPercentageInfo = { @@ -154,7 +154,7 @@ namespace { "NumberShadowSamples", "Number of Shadow Samples", "The number of samples used during shadow mapping calculation " - "(Percentage Closer Filtering)." + "(Percentage Closer Filtering)" }; struct [[codegen::Dictionary(RingsComponent)]] Parameters { diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp index 85c610a305..ccff3cb64d 100644 --- a/modules/globebrowsing/src/shadowcomponent.cpp +++ b/modules/globebrowsing/src/shadowcomponent.cpp @@ -64,13 +64,13 @@ namespace { "DistanceFraction", "Distance Fraction", "Distance fraction of original distance from light source to the globe to be " - "considered as the new light source distance." + "considered as the new light source distance" }; constexpr openspace::properties::Property::PropertyInfo DepthMapSizeInfo = { "DepthMapSize", "Depth Map Size", - "The depth map size in pixels. You must entry the width and height values." + "The depth map size in pixels. You must entry the width and height values" }; constexpr GLfloat ShadowBorder[] = { 1.f, 1.f, 1.f, 1.f }; @@ -81,30 +81,30 @@ namespace { GLenum fbErr = glCheckFramebufferStatus(GL_FRAMEBUFFER); switch (fbErr) { case GL_FRAMEBUFFER_UNDEFINED: - LERROR("Indefined framebuffer."); + LERROR("Indefined framebuffer"); break; case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT: - LERROR("Incomplete, missing attachement."); + LERROR("Incomplete, missing attachement"); break; case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: - LERROR("Framebuffer doesn't have at least one image attached to it."); + LERROR("Framebuffer doesn't have at least one image attached to it"); break; case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER: LERROR( "Returned if the value of GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is " - "GL_NONE for any color attachment point(s) named by GL_DRAW_BUFFERi." + "GL_NONE for any color attachment point(s) named by GL_DRAW_BUFFERi" ); break; case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER: LERROR( "Returned if GL_READ_BUFFER is not GL_NONE and the value of " "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is GL_NONE for the color " - "attachment point named by GL_READ_BUFFER."); + "attachment point named by GL_READ_BUFFER"); break; case GL_FRAMEBUFFER_UNSUPPORTED: LERROR( "Returned if the combination of internal formats of the attached " - "images violates an implementation - dependent set of restrictions." + "images violates an implementation - dependent set of restrictions" ); break; case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE: @@ -114,21 +114,21 @@ namespace { "is the not same for all attached textures; or , if the attached " "images are a mix of renderbuffers and textures, the value of " "GL_RENDERBUFFE_r_samples does not match the value of " - "GL_TEXTURE_SAMPLES." + "GL_TEXTURE_SAMPLES" ); LERROR( "Returned if the value of GL_TEXTURE_FIXED_SAMPLE_LOCATIONS is not " "the same for all attached textures; or , if the attached images are " "a mix of renderbuffers and textures, the value of " "GL_TEXTURE_FIXED_SAMPLE_LOCATIONS is not GL_TRUE for all attached " - "textures." + "textures" ); break; case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS: LERROR( "Returned if any framebuffer attachment is layered, and any " "populated attachment is not layered, or if all populated color " - "attachments are not from textures of the same target." + "attachments are not from textures of the same target" ); break; default: diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp index b30a280389..9d141512b6 100644 --- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp @@ -36,7 +36,7 @@ namespace { "FilePath", "File Path", "The path of the GDAL file or the image file that is to be used in this tile " - "provider." + "provider" }; constexpr openspace::properties::Property::PropertyInfo TilePixelSizeInfo = { @@ -45,7 +45,7 @@ namespace { "This value is the preferred size (in pixels) for each tile. Choosing the right " "value is a tradeoff between more efficiency (larger images) and better quality " "(smaller images). The tile pixel size has to be smaller than the size of the " - "complete image if a single image is used." + "complete image if a single image is used" }; struct [[codegen::Dictionary(DefaultTileProvider)]] Parameters { diff --git a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp index abb1a39454..7dca0a0fef 100644 --- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp @@ -32,7 +32,7 @@ namespace { "FilePath", "File Path", "The file path that is used for this image provider. The file must point to an " - "image that is then loaded and used for all tiles." + "image that is then loaded and used for all tiles" }; struct [[codegen::Dictionary(SingleImageProvider)]] Parameters { diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp index 25cf88da91..1f4a3e1a43 100644 --- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp @@ -58,7 +58,7 @@ namespace { "FixedTime", "Fixed Time", "If the 'UseFixedTime' is enabled, this time will be used instead of the actual " - "time taken from OpenSpace for the displayed tiles." + "time taken from OpenSpace for the displayed tiles" }; struct [[codegen::Dictionary(TemporalTileProvider)]] Parameters { @@ -414,10 +414,9 @@ DefaultTileProvider TemporalTileProvider::createTileProvider( value = FileSys.expandPathTokens(std::move(value), IgnoredTokens).string(); break; } - case Mode::Folder: { + case Mode::Folder: value = std::string(timekey); break; - } } ghoul::Dictionary dict = _initDict; diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileprovider.cpp index cf5293bff0..26070ed28e 100644 --- a/modules/globebrowsing/src/tileprovider/tileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/tileprovider.cpp @@ -123,7 +123,7 @@ TileProvider::TileProvider() : properties::PropertyOwner({ "TileProvider" }) {} void TileProvider::initialize() { ZoneScoped - ghoul_assert(!isInitialized, "TileProvider can only be initialized once."); + ghoul_assert(!isInitialized, "TileProvider can only be initialized once"); if (TileProvider::NumTileProviders > static_cast(std::numeric_limits::max()) - 1) @@ -156,7 +156,7 @@ void TileProvider::internalDeinitialize() {} ChunkTile TileProvider::chunkTile(TileIndex tileIndex, int parents, int maxParents) { ZoneScoped - ghoul_assert(isInitialized, "TileProvider was not initialized."); + ghoul_assert(isInitialized, "TileProvider was not initialized"); auto ascendToParent = [](TileIndex& ti, TileUvTransform& uv) { uv.uvOffset *= 0.5; @@ -210,7 +210,7 @@ ChunkTile TileProvider::chunkTile(TileIndex tileIndex, int parents, int maxParen ChunkTilePile TileProvider::chunkTilePile(TileIndex tileIndex, int pileSize) { ZoneScoped - ghoul_assert(isInitialized, "TileProvider was not initialized."); + ghoul_assert(isInitialized, "TileProvider was not initialized"); ghoul_assert(pileSize >= 0, "pileSize must be positive"); ChunkTilePile chunkTilePile; diff --git a/modules/globebrowsing/src/tiletextureinitdata.cpp b/modules/globebrowsing/src/tiletextureinitdata.cpp index a91f4c2fb3..8323b9d7c5 100644 --- a/modules/globebrowsing/src/tiletextureinitdata.cpp +++ b/modules/globebrowsing/src/tiletextureinitdata.cpp @@ -41,10 +41,9 @@ size_t numberOfRasters(ghoul::opengl::Texture::Format format) { case ghoul::opengl::Texture::Format::RGBA: case ghoul::opengl::Texture::Format::BGRA: return 4; - default: { + default: ghoul_assert(false, "Unknown format"); throw ghoul::MissingCaseException(); - } } } diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp index 61d9406430..d9b9a36351 100644 --- a/modules/globebrowsing/src/timequantizer.cpp +++ b/modules/globebrowsing/src/timequantizer.cpp @@ -277,7 +277,7 @@ void DateTime::decrementOnce(int value, char unit) { default: throw ghoul::RuntimeError( "Invalid unit format in TQ decrementOnce '" + std::to_string(unit) + - "'. Expected 'y', 'M', 'd', 'h', or 'm'." + "'. Expected 'y', 'M', 'd', 'h', or 'm'" ); } } diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp index a697c10fa7..fd94491b86 100644 --- a/modules/imgui/imguimodule.cpp +++ b/modules/imgui/imguimodule.cpp @@ -55,26 +55,26 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Is Enabled", - "This setting determines whether this object will be visible or not." + "This setting determines whether this object will be visible or not" }; constexpr openspace::properties::Property::PropertyInfo CollapsedInfo = { "Collapsed", "Is Collapsed", - "This setting determines whether this window is collapsed or not." + "This setting determines whether this window is collapsed or not" }; constexpr openspace::properties::Property::PropertyInfo ShowHelpInfo = { "ShowHelpText", "Show tooltip help", "If this value is enabled these kinds of tooltips are shown for most properties " - "explaining what impact they have on the visuals." + "explaining what impact they have on the visuals" }; constexpr openspace::properties::Property::PropertyInfo HelpTextDelayInfo = { "HelpTextDelay", "Tooltip Delay (in s)", - "This value determines the delay in seconds after which the tooltip is shown." + "This value determines the delay in seconds after which the tooltip is shown" }; } // namespace diff --git a/modules/imgui/src/guicomponent.cpp b/modules/imgui/src/guicomponent.cpp index 112913607f..cfc03c1a9e 100644 --- a/modules/imgui/src/guicomponent.cpp +++ b/modules/imgui/src/guicomponent.cpp @@ -28,13 +28,13 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Is Enabled", - "This setting determines whether this object will be visible or not." + "This setting determines whether this object will be visible or not" }; constexpr openspace::properties::Property::PropertyInfo CollapsedInfo = { "Collapsed", "Is Collapsed", - "This setting determines whether this window is collapsed or not." + "This setting determines whether this window is collapsed or not" }; } // namespace diff --git a/modules/imgui/src/guifilepathcomponent.cpp b/modules/imgui/src/guifilepathcomponent.cpp index c6a42f5e67..5ef1253dbc 100644 --- a/modules/imgui/src/guifilepathcomponent.cpp +++ b/modules/imgui/src/guifilepathcomponent.cpp @@ -41,7 +41,7 @@ void GuiFilePathComponent::render() { ImGui::Text( "%s", - "These are file paths registered in the current OpenSpace instance." + "These are file paths registered in the current OpenSpace instance" ); ImGui::Separator(); diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp index acc38646f0..c4454cb2f9 100644 --- a/modules/imgui/src/guipropertycomponent.cpp +++ b/modules/imgui/src/guipropertycomponent.cpp @@ -42,7 +42,7 @@ namespace { "Use Tree Layout", "If this value is checked, this component will display the properties using a " "tree layout, rather than using a flat map. This value should only be set on " - "property windows that display SceneGraphNodes, or the application might crash." + "property windows that display SceneGraphNodes, or the application might crash" }; constexpr openspace::properties::Property::PropertyInfo OrderingInfo = { @@ -50,7 +50,7 @@ namespace { "Tree Ordering", "This list determines the order of the first tree layer if it is used. Elements " "present in this list will be shown first, with an alphabetical ordering for " - "elements not listed." + "elements not listed" }; constexpr openspace::properties::Property::PropertyInfo IgnoreHiddenInfo = { @@ -58,7 +58,7 @@ namespace { "Ignore Hidden Hint", "If this value is 'true', all 'Hidden' hints passed into the SceneGraphNodes are " "ignored and thus all SceneGraphNodes are displayed. If this value is 'false', " - "the hidden hints are followed." + "the hidden hints are followed" }; int nVisibleProperties(const std::vector& props) diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp index 3a2c4f5b67..9b4c47f2cd 100644 --- a/modules/imgui/src/guispacetimecomponent.cpp +++ b/modules/imgui/src/guispacetimecomponent.cpp @@ -233,7 +233,7 @@ void GuiSpaceTimeComponent::render() { "Entering a date here and confirming with ENTER sets the current simulation time " "to the entered date. The format of the date has to be either ISO 8601 " "YYYY-MM-DDThh:mm:ss (2017-08-27T04:00:00) or YYYY MMM DD hh:mm:ss " - "(2017 MAY 01 12:00:00). The hours are in 24h and specified as UTC.", + "(2017 MAY 01 12:00:00). The hours are in 24h and specified as UTC", _tooltipDelay ); @@ -271,7 +271,7 @@ void GuiSpaceTimeComponent::render() { }; const bool minusMonth = ImGui::Button("-Month"); - showTooltip("OBS: A month here equals 30 days.", _tooltipDelay); + showTooltip("OBS: A month here equals 30 days", _tooltipDelay); if (minusMonth) { incrementTime(-30); } @@ -332,7 +332,7 @@ void GuiSpaceTimeComponent::render() { if (plusMonth) { incrementTime(30); } - showTooltip("OBS: A month here equals 30 days.", _tooltipDelay); + showTooltip("OBS: A month here equals 30 days", _tooltipDelay); ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 20.f); // diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp index 4ff6dda360..53193a5764 100644 --- a/modules/imgui/src/renderproperties.cpp +++ b/modules/imgui/src/renderproperties.cpp @@ -115,7 +115,7 @@ void renderOptionProperty(Property* prop, const std::string& ownerName, int value = *p; const std::vector& options = p->options(); switch (p->displayType()) { - case OptionProperty::DisplayType::Radio: { + case OptionProperty::DisplayType::Radio: ImGui::Text("%s", name.c_str()); ImGui::Separator(); for (const OptionProperty::Option& o : options) { @@ -126,7 +126,6 @@ void renderOptionProperty(Property* prop, const std::string& ownerName, } ImGui::Separator(); break; - } case OptionProperty::DisplayType::Dropdown: { // The order of the options does not have to correspond with the value of the // option @@ -218,7 +217,7 @@ void renderStringProperty(Property* prop, const std::string& ownerName, const std::string value = p->value(); - static const int bufferSize = 256; + static constexpr int bufferSize = 256; static char buffer[bufferSize]; #ifdef _MSC_VER strcpy_s(buffer, value.length() + 1, value.c_str()); diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index 2da4b073bf..dc7440f1f8 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -714,7 +714,7 @@ void IswaManager::addCdfFiles(std::string cdfpath) { std::string fieldlineSeedsIndexFile = cdfGroup["fieldlinefile"]; if (_cdfInformation.find(groupName) != _cdfInformation.end()) { - LWARNING("CdfGroup with name" + groupName + " already exists."); + LWARNING("CdfGroup with name" + groupName + " already exists"); return; } diff --git a/modules/kameleon/src/kameleonhelper.cpp b/modules/kameleon/src/kameleonhelper.cpp index aaa8659e97..95ca9bf3f2 100644 --- a/modules/kameleon/src/kameleonhelper.cpp +++ b/modules/kameleon/src/kameleonhelper.cpp @@ -123,7 +123,7 @@ double getTime(ccmc::Kameleon* kameleon, double manualOffset) { else { LWARNING( "No starting time attribute could be found in the .cdf file. Starting " - "time is set to 01.JAN.2000 12:00." + "time is set to 01.JAN.2000 12:00" ); } @@ -138,8 +138,10 @@ double getTime(ccmc::Kameleon* kameleon, double manualOffset) { ); } else { - LWARNING("No starting time attribute could be found in the .cdf file." - "Starting time is set to 01.JAN.2000 12:00."); + LWARNING( + "No starting time attribute could be found in the .cdf file. Starting time " + "is set to 01.JAN.2000 12:00" + ); seqStartDbl = 0.0; } @@ -155,8 +157,10 @@ double getTime(ccmc::Kameleon* kameleon, double manualOffset) { } else { stateStartOffset = 0.0; - LWARNING("No time offset attribute could be found in the .cdf file." - "The current state starts the same time as the sequence!"); + LWARNING( + "No time offset attribute could be found in the .cdf file. The current state " + "starts the same time as the sequence" + ); } return seqStartDbl + stateStartOffset + manualOffset; diff --git a/modules/multiresvolume/rendering/tfbrickselector.cpp b/modules/multiresvolume/rendering/tfbrickselector.cpp index dcefe6fe68..a9f6583692 100644 --- a/modules/multiresvolume/rendering/tfbrickselector.cpp +++ b/modules/multiresvolume/rendering/tfbrickselector.cpp @@ -185,7 +185,7 @@ void TfBrickSelector::selectBricks(int timestep, std::vector& bricks) { BrickSelection::SplitType childSplitType; float childSplitPoints = splitPoints(childBrickIndex, childSplitType); - //std::cout << "Splitting spatially." << std::endl; + //std::cout << "Splitting spatially" << std::endl; BrickSelection childSelection = bs.splitSpatially( i % 2, (i / 2) % 2, // abock: isn't this always 0? diff --git a/modules/server/include/topics/enginemodetopic.h b/modules/server/include/topics/enginemodetopic.h index 4ac64e12cc..72b03e9d7f 100644 --- a/modules/server/include/topics/enginemodetopic.h +++ b/modules/server/include/topics/enginemodetopic.h @@ -40,7 +40,7 @@ public: bool isDone() const override; private: - static const int UnsetOnChangeHandle = -1; + static constexpr int UnsetOnChangeHandle = -1; // Provides the mode int value in json message void sendJsonData(); diff --git a/modules/server/include/topics/sessionrecordingtopic.h b/modules/server/include/topics/sessionrecordingtopic.h index 21e4d7813a..c6baef62f3 100644 --- a/modules/server/include/topics/sessionrecordingtopic.h +++ b/modules/server/include/topics/sessionrecordingtopic.h @@ -40,7 +40,7 @@ public: bool isDone() const override; private: - static const int UnsetOnChangeHandle = -1; + static constexpr int UnsetOnChangeHandle = -1; bool _sendState; bool _sendFiles; diff --git a/modules/server/include/topics/topic.h b/modules/server/include/topics/topic.h index 067f97b952..12e79bd6cc 100644 --- a/modules/server/include/topics/topic.h +++ b/modules/server/include/topics/topic.h @@ -37,7 +37,7 @@ public: void initialize(std::shared_ptr connection, size_t topicId); nlohmann::json wrappedPayload(const nlohmann::json& payload) const; - nlohmann::json wrappedError(std::string message = "Could not complete request.", + nlohmann::json wrappedError(std::string message = "Could not complete request", int code = 500); virtual void handleJson(const nlohmann::json& json) = 0; virtual bool isDone() const = 0; diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp index b12f0f77c1..b3cbed8516 100644 --- a/modules/server/src/connection.cpp +++ b/modules/server/src/connection.cpp @@ -119,7 +119,7 @@ void Connection::handleMessage(const std::string& message) { if (!isAuthorized()) { _socket->disconnect(); LERROR(fmt::format( - "Could not parse JSON: '{}'. Connection is unauthorized. Disconnecting.", + "Could not parse JSON: '{}'. Connection is unauthorized. Disconnecting", message )); return; @@ -182,7 +182,7 @@ void Connection::handleJson(const nlohmann::json& json) { } else { if (!isAuthorized()) { - LERROR("Connection isn't authorized."); + LERROR("Connection is not authorized"); return; } diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp index 49f3d39bf1..65c6fcb887 100644 --- a/modules/server/src/serverinterface.cpp +++ b/modules/server/src/serverinterface.cpp @@ -40,7 +40,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Is Enabled", - "This setting determines whether this server interface is enabled or not." + "This setting determines whether this server interface is enabled or not" }; constexpr openspace::properties::Property::PropertyInfo TypeInfo = { diff --git a/modules/server/src/topics/authorizationtopic.cpp b/modules/server/src/topics/authorizationtopic.cpp index 1dfe01e2ba..ea9feda0f7 100644 --- a/modules/server/src/topics/authorizationtopic.cpp +++ b/modules/server/src/topics/authorizationtopic.cpp @@ -58,7 +58,7 @@ void AuthorizationTopic::handleJson(const nlohmann::json& json) { if (authorize(providedKey)) { _connection->setAuthorized(true); _connection->sendJson(wrappedPayload({ KeyStatus, Authorized })); - LINFO("Client successfully authorized."); + LINFO("Client successfully authorized"); } else { _connection->sendJson(wrappedPayload({ KeyStatus, IncorrectKey })); diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp index baca686f1b..bb2cd68917 100644 --- a/modules/server/src/topics/luascripttopic.cpp +++ b/modules/server/src/topics/luascripttopic.cpp @@ -112,7 +112,7 @@ namespace { if (it->is_null()) { return "nil"; } - throw ghoul::lua::LuaFormatException("Format error."); + throw ghoul::lua::LuaFormatException("Format error"); } std::string generateScript(const std::string& function, diff --git a/modules/server/src/topics/sessionrecordingtopic.cpp b/modules/server/src/topics/sessionrecordingtopic.cpp index b973aa6e15..2600eff2d7 100644 --- a/modules/server/src/topics/sessionrecordingtopic.cpp +++ b/modules/server/src/topics/sessionrecordingtopic.cpp @@ -76,13 +76,13 @@ void SessionRecordingTopic::handleJson(const nlohmann::json& json) { if (json.find(PropertiesKey) != json.end()) { if (!json.at(PropertiesKey).is_array()) { - LERROR("Properties must be an array of strings."); + LERROR("Properties must be an array of strings"); } nlohmann::json requestedProperties = json.at(PropertiesKey).get(); for (const auto& p : requestedProperties) { if (!p.is_string()) { _isDone = true; - LERROR("Properties must be an array of strings."); + LERROR("Properties must be an array of strings"); return; } const std::string v = p.get(); diff --git a/modules/skybrowser/include/wwtcommunicator.h b/modules/skybrowser/include/wwtcommunicator.h index eed5441892..7e40e116df 100644 --- a/modules/skybrowser/include/wwtcommunicator.h +++ b/modules/skybrowser/include/wwtcommunicator.h @@ -102,7 +102,7 @@ private: // Time variables // For capping the message passing to WWT - constexpr static const std::chrono::milliseconds TimeUpdateInterval = + static constexpr std::chrono::milliseconds TimeUpdateInterval = std::chrono::milliseconds(10); std::chrono::system_clock::time_point _lastUpdateTime; }; diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp index 3363a916d7..7fdb129768 100644 --- a/modules/skybrowser/skybrowsermodule.cpp +++ b/modules/skybrowser/skybrowsermodule.cpp @@ -42,67 +42,67 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Enabled", - "Decides if the GUI for this module should be enabled." + "Decides if the GUI for this module should be enabled" }; constexpr openspace::properties::Property::PropertyInfo ShowTitleInGuiBrowserInfo = { "ShowTitleInGuiBrowser", "Show Title in Gui Browser", "If true, the name of the currently selected sky browser is shown in the WebGUI " - "browser." + "browser" }; constexpr openspace::properties::Property::PropertyInfo AllowRotationInfo = { "AllowCameraRotation", "Allow Camera Rotation", "Toggles if the camera should rotate to look at the sky target if it is going " - "outside of the current field of view." + "outside of the current field of view" }; constexpr openspace::properties::Property::PropertyInfo CameraRotSpeedInfo = { "CameraRotationSpeed", "Camera Rotation Speed", "The speed of the rotation of the camera when the camera rotates to look at a " - "coordinate which is outside of the field of view." + "coordinate which is outside of the field of view" }; constexpr openspace::properties::Property::PropertyInfo TargetSpeedInfo = { "TargetAnimationSpeed", "Target Animation Speed", - "This determines the speed of the animation of the sky target." + "This determines the speed of the animation of the sky target" }; constexpr openspace::properties::Property::PropertyInfo BrowserSpeedInfo = { "BrowserAnimationSpeed", "Field of View Animation Speed", - "This determines the speed of the animation of the field of view in the browser." + "This determines the speed of the animation of the field of view in the browser" }; constexpr openspace::properties::Property::PropertyInfo HideWithGuiInfo = { "HideTargetsBrowsersWithGui", "Hide Targets and Browsers with GUI", "If checked, the targets and browsers will be disabled when the sky browser " - "panel is minimized." + "panel is minimized" }; constexpr openspace::properties::Property::PropertyInfo InverseZoomInfo = { "InverseZoomDirection", "Inverse Zoom Direction", "If checked, the zoom direction of the scroll over the AAS WWT browser will be " - "inversed." + "inversed" }; constexpr openspace::properties::Property::PropertyInfo SpaceCraftTimeInfo = { "SpaceCraftAnimationTime", "Space Craft Animation Time", "Sets the duration (in seconds) of the animation of the space craft when it is " - "pointed to where the target is aiming." + "pointed to where the target is aiming" }; constexpr openspace::properties::Property::PropertyInfo ImageCollectionInfo = { "WwtImageCollectionUrl", "AAS WorldWide Telescope Image Collection Url", - "The url of the image collection which is loaded into AAS WorldWide Telescope." + "The url of the image collection which is loaded into AAS WorldWide Telescope" }; struct [[codegen::Dictionary(SkyBrowserModule)]] Parameters { diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp index 26f3e40451..90e942a6f5 100644 --- a/modules/skybrowser/src/browser.cpp +++ b/modules/skybrowser/src/browser.cpp @@ -36,22 +36,22 @@ namespace { constexpr std::string_view _loggerCat = "Browser"; - const openspace::properties::Property::PropertyInfo DimensionsInfo = { + constexpr openspace::properties::Property::PropertyInfo DimensionsInfo = { "Dimensions", "Browser Dimensions", - "Set the dimensions of the web browser window." + "Set the dimensions of the web browser window" }; - const openspace::properties::Property::PropertyInfo UrlInfo = { + constexpr openspace::properties::Property::PropertyInfo UrlInfo = { "Url", "URL", - "The URL to load." + "The URL to load" }; - const openspace::properties::Property::PropertyInfo ReloadInfo = { + constexpr openspace::properties::Property::PropertyInfo ReloadInfo = { "Reload", "Reload", - "Reload the web browser." + "Reload the web browser" }; struct [[codegen::Dictionary(Browser)]] Parameters { diff --git a/modules/skybrowser/src/renderableskytarget.cpp b/modules/skybrowser/src/renderableskytarget.cpp index 6dc772f6b1..ebfe9ab4b3 100644 --- a/modules/skybrowser/src/renderableskytarget.cpp +++ b/modules/skybrowser/src/renderableskytarget.cpp @@ -52,20 +52,20 @@ namespace { constexpr openspace::properties::Property::PropertyInfo crossHairSizeInfo = { "CrosshairSize", "Crosshair Size", - "Determines the size of the crosshair. The size is determined in fov (degrees)." + "Determines the size of the crosshair. The size is determined in fov (degrees)" }; constexpr openspace::properties::Property::PropertyInfo RectangleThresholdInfo = { "RectangleThreshold", "Rectangle Threshold", "When the field of view is larger than the rectangle threshold, a rectangle will" - "be rendered in the target." + "be rendered in the target" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", "Line Width", - "The thickness of the line of the target. The larger number, the thicker line." + "The thickness of the line of the target. The larger number, the thicker line" }; struct [[codegen::Dictionary(RenderableSkyTarget)]] Parameters { diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp index ba3f25479e..6ab7f212c5 100644 --- a/modules/skybrowser/src/screenspaceskybrowser.cpp +++ b/modules/skybrowser/src/screenspaceskybrowser.cpp @@ -45,7 +45,7 @@ namespace { "Quality of Texture", "A parameter to set the resolution of the texture. 1 is full resolution and " "slower frame rate. Lower value means lower resolution of texture and faster " - "frame rate." + "frame rate" }; constexpr openspace::properties::Property::PropertyInfo DisplayCopyInfo = { @@ -53,20 +53,20 @@ namespace { "Display Copy Position", "Display a copy of this sky browser at an additional position. This copy will not " "be interactive. The position is in RAE (Radius, Azimuth, Elevation) coordinates " - "or Cartesian, depending on if the browser uses RAE or Cartesian coordinates." + "or Cartesian, depending on if the browser uses RAE or Cartesian coordinates" }; constexpr openspace::properties::Property::PropertyInfo DisplayCopyShowInfo = { "ShowDisplayCopy", "Show Display Copy", - "Show the display copy." + "Show the display copy" }; constexpr openspace::properties::Property::PropertyInfo IsHiddenInfo = { "IsHidden", "Is Hidden", "If checked, the browser will be not be displayed. If it is not checked, it will " - "be." + "be" }; struct [[codegen::Dictionary(ScreenSpaceSkyBrowser)]] Parameters { diff --git a/modules/space/horizonsfile.cpp b/modules/space/horizonsfile.cpp index 29da5853b7..197a6a7ede 100644 --- a/modules/space/horizonsfile.cpp +++ b/modules/space/horizonsfile.cpp @@ -409,7 +409,7 @@ void HorizonsFile::displayErrorMessage(const HorizonsResultCode code) const { case HorizonsResultCode::ErrorNoData: LERROR( "There is not enough data to compute the state of the target in " - "relation to the observer for the selected time range." + "relation to the observer for the selected time range" ); break; case HorizonsResultCode::MultipleObserverStations: { diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp index a5f0024704..6a1c798c5c 100644 --- a/modules/space/rendering/renderableconstellationbounds.cpp +++ b/modules/space/rendering/renderableconstellationbounds.cpp @@ -47,7 +47,7 @@ namespace { "File", "Vertex File Path", "The file pointed to with this value contains the vertex locations of the " - "constellations." + "constellations" }; constexpr openspace::properties::Property::PropertyInfo ConstellationInfo = { @@ -55,14 +55,14 @@ namespace { "Constellation File Path", "Specifies the file that contains the mapping between constellation " "abbreviations and full name of the constellation. If this value is empty, the " - "abbreviations are used as the full names." + "abbreviations are used as the full names" }; constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color of constellation lines", "Specifies the color of the constellation lines. The lines are always drawn at " - "full opacity." + "full opacity" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { @@ -74,7 +74,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo SelectionInfo = { "ConstellationSelection", "Constellation Selection", - "The constellations that are selected are displayed on the celestial sphere." + "The constellations that are selected are displayed on the celestial sphere" }; struct [[codegen::Dictionary(RenderableConstellationBounds)]] Parameters { diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp index bf21a0234c..9883f84cb1 100644 --- a/modules/space/rendering/renderablefluxnodes.cpp +++ b/modules/space/rendering/renderablefluxnodes.cpp @@ -64,155 +64,183 @@ namespace { "GOES Energy", "Select which energy bin you want to show. GOES = Geostationary Operational " "Environmental Satellites. Emin01 is values > 10 MeV, " - "Default is Emin03 where values > 100 MeV." + "Default is Emin03 where values > 100 MeV" }; + constexpr openspace::properties::Property::PropertyInfo ColorModeInfo = { "ColorMode", "Color Mode", "Color lines uniformly or using color tables based on specific values on nodes, " - "for examples flux values." + "for examples flux values" }; + constexpr openspace::properties::Property::PropertyInfo ColorTablePathInfo = { "ColorTablePath", "Path to Color Table", - "Color Table/Transfer Function to use for 'By Flux Value' coloring." + "Color Table/Transfer Function to use for 'By Flux Value' coloring" }; + constexpr openspace::properties::Property::PropertyInfo StreamColorInfo = { "Color", "Color", - "Color of particles." + "Color of particles" }; + constexpr openspace::properties::Property::PropertyInfo NodeSizeInfo = { "NodeSize", "Size of nodes", "Change the size of the rendered points of the nodes" }; + constexpr openspace::properties::Property::PropertyInfo ThresholdFluxInfo = { "ThresholdFlux", "Threshold flux value", - "This value specifies the threshold that will be changed with the flux value." + "This value specifies the threshold that will be changed with the flux value" }; + constexpr openspace::properties::Property::PropertyInfo FilteringInfo = { "FilterLower", "Filtering Lower Value in AU", - "Use filtering to show nodes within a given range." + "Use filtering to show nodes within a given range" }; + constexpr openspace::properties::Property::PropertyInfo FilteringUpperInfo = { "FilterUpper", "Filtering Upper Value in AU", - "Use filtering to show nodes within a given range." + "Use filtering to show nodes within a given range" }; + constexpr openspace::properties::Property::PropertyInfo AmountofNodesInfo = { "AmountOfNodes", "Every nth node to render in", "Show only every nth node" }; + constexpr openspace::properties::Property::PropertyInfo DefaultNodeSkipInfo = { "NodeSkip", "Every nth node to render default", "Show only every nth node outside of skippingmethod" }; + constexpr openspace::properties::Property::PropertyInfo EarthNodeSkipInfo = { "NodeSkipEarth", "Every nth node to render close to Earth", "Show only every nth node outside of skippingmethod" }; + constexpr openspace::properties::Property::PropertyInfo ScalingmethodInfo = { "ScalingFlux", "Scale the flux value with color table", - "Use scaling to color nodes with a given method." + "Use scaling to color nodes with a given method" }; + constexpr openspace::properties::Property::PropertyInfo NodeskipMethodInfo = { "SkippingNodes", "How to select nodes to skip", - "Methods to select nodes to skip." + "Methods to select nodes to skip" }; + constexpr openspace::properties::Property::PropertyInfo colorTableRangeInfo = { "ColorTableRange", "Color Table Range", "Valid range for the color table as the exponent, with base 10, of flux values. " "[Min, Max]" }; + constexpr openspace::properties::Property::PropertyInfo DomainZInfo = { "ZLimit", "Z-limits", "Valid range along the Z-axis. [Min, Max]" }; + constexpr openspace::properties::Property::PropertyInfo FluxColorAlphaInfo = { "FluxColorAlpha", "Flux Color Alpha", - "The value of alpha for the flux color mode." + "The value of alpha for the flux color mode" }; + constexpr openspace::properties::Property::PropertyInfo FluxNodeskipThresholdInfo = { "SkippingNodesByFlux", "Skipping Nodes By Flux", - "Select nodes to skip depending on flux value." + "Select nodes to skip depending on flux value" }; + constexpr openspace::properties::Property::PropertyInfo RadiusNodeSkipThresholdInfo = { "SkippingNodesByRadius", "Skipping Nodes By Radius", - "Select nodes to skip depending on Radius." + "Select nodes to skip depending on Radius" }; + constexpr openspace::properties::Property::PropertyInfo DistanceThresholdInfo = { "DistancePlanetThreshold", "Threshold for distance between planet", - "Changes threshold distance for highlighting nodes close to earth." + "Changes threshold distance for highlighting nodes close to earth" }; + constexpr openspace::properties::Property::PropertyInfo ProximityNodesSizeInfo = { "ProximityNodesSize", "Earths Proximity Nodes Size", - "Changes size of nodes only close to earth." + "Changes size of nodes only close to earth" }; + constexpr openspace::properties::Property::PropertyInfo MaxNodeDistanceSizeInfo = { "MaxNodeDistanceSize", "Max Node Distance Size", - "The maximum size of the nodes at a certin distance." + "The maximum size of the nodes at a certin distance" }; + constexpr openspace::properties::Property::PropertyInfo CameraPerspectiveEnabledInfo = { "CameraPerspectiveEnabled", "Use Camera perspective", "Camera perspective changes the size of the nodes dependent on the " - "distance from camera." + "distance from camera" }; + constexpr openspace::properties::Property::PropertyInfo DrawingCirclesInfo = { "RenderingCircles", "Render as circles", - "Using fragment shader to draw nodes as circles instead of squares." + "Using fragment shader to draw nodes as circles instead of squares" }; + constexpr openspace::properties::Property::PropertyInfo DrawingHollowInfo = { "RenderingHollowCircles", "Render as hollow circles", - "Using fragment shader to draw nodes as hollow circles." + "Using fragment shader to draw nodes as hollow circles" }; + constexpr openspace::properties::Property::PropertyInfo GaussiandAlphaFilterInfo = { "RenderingGaussianAlphaFilter", "Alpha by Gaussian", - "Using fragment shader to draw nodes with Gaussian filter for alpha value." + "Using fragment shader to draw nodes with Gaussian filter for alpha value" }; + constexpr openspace::properties::Property::PropertyInfo PerspectiveDistanceFactorInfo = { "PerspectiveDistanceFactor", "Perspective Distance factor", "This value decides how far away the camera must be to start " - "impacting the node size." + "impacting the node size" }; + constexpr openspace::properties::Property::PropertyInfo MinMaxNodeSizeInfo = { "MinMaxNodeSize", "Min & Max node size", - "The minimum and maximum node size." + "The minimum and maximum node size" }; + constexpr openspace::properties::Property::PropertyInfo pulseEnabledInfo = { "PulseEnabled", "Nodes close to Earth pulsate", - "Toggles the pulse for nodes close to Earth." + "Toggles the pulse for nodes close to Earth" }; + constexpr openspace::properties::Property::PropertyInfo gaussianPulseEnabledInfo = { "GaussianPulseEnabled", "Nodes close to Earth pulsate with alpha by gaussian", - "Toggles the pulse with alpha by gaussian for nodes close to Earth." + "Toggles the pulse with alpha by gaussian for nodes close to Earth" }; struct [[codegen::Dictionary(RenderableFluxNodes)]] Parameters { diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp index 4481a817d6..5176f092de 100644 --- a/modules/space/rendering/renderablehabitablezone.cpp +++ b/modules/space/rendering/renderablehabitablezone.cpp @@ -49,21 +49,21 @@ namespace { "EffectiveTemperature", "Effective Temperature", "The effective temperature of the corresponding star, in Kelvin. " - "Used to compute the width and size of the disc." + "Used to compute the width and size of the disc" }; constexpr openspace::properties::Property::PropertyInfo LuminosityInfo = { "Luminosity", "Luminosity", "The luminosity of the corresponding star, in units of solar luminosities. " - "Used to compute the width and size of the disc." + "Used to compute the width and size of the disc" }; constexpr openspace::properties::Property::PropertyInfo OptimisticInfo = { "Optimistic", "Optimistic" , "If true, the habitable zone disc is rendered with the optimistic boundaries " - "rather than the conservative ones." + "rather than the conservative ones" }; constexpr openspace::properties::Property::PropertyInfo KopparapuTeffIntervalInfo = { @@ -72,7 +72,7 @@ namespace { "The effective temperature interval for which Kopparapu's formula is used for " "the habitable zone computation. For stars with temperatures outside the range, " "a simpler method by Tom E. Harris is used. This method only uses the star " - "luminosity and does not include computation of the optimistic boundaries." + "luminosity and does not include computation of the optimistic boundaries" }; struct [[codegen::Dictionary(RenderableHabitableZone)]] Parameters { diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp index d95289da89..5a9a7d7011 100644 --- a/modules/space/rendering/renderableorbitalkepler.cpp +++ b/modules/space/rendering/renderableorbitalkepler.cpp @@ -178,7 +178,7 @@ namespace { "A segment quality value for the orbital trail. A value from 1 (lowest) to " "10 (highest) that controls the number of line segments in the rendering of the " "orbital trail. This does not control the direct number of segments because " - "these automatically increase according to the eccentricity of the orbit." + "these automatically increase according to the eccentricity of the orbit" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { @@ -186,13 +186,13 @@ namespace { "Line Width", "This value specifies the line width of the trail if the selected rendering " "method includes lines. If the rendering mode is set to Points, this value is " - "ignored." + "ignored" }; constexpr openspace::properties::Property::PropertyInfo LineColorInfo = { "Color", "Color", - "This value determines the RGB main color for the lines and points of the trail." + "This value determines the RGB main color for the lines and points of the trail" }; constexpr openspace::properties::Property::PropertyInfo TrailFadeInfo = { @@ -205,7 +205,7 @@ namespace { "StartRenderIdx", "Contiguous Starting Index of Render", "Index of object in renderable group to start rendering (all prior objects will " - "be ignored)." + "be ignored)" }; constexpr openspace::properties::Property::PropertyInfo RenderSizeInfo = { diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp index 30c79c40c1..db847fc948 100644 --- a/modules/space/rendering/renderablerings.cpp +++ b/modules/space/rendering/renderablerings.cpp @@ -48,13 +48,13 @@ namespace { "Texture", "Texture", "This value is the path to a texture on disk that contains a one-dimensional " - "texture which is used for these rings." + "texture which is used for these rings" }; constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size", - "This value specifies the radius of the rings in meter." + "This value specifies the radius of the rings in meter" }; constexpr openspace::properties::Property::PropertyInfo OffsetInfo = { @@ -63,7 +63,7 @@ namespace { "This value is used to limit the width of the rings. Each of the two values is " "a value between 0 and 1, where 0 is the center of the ring and 1 is the " "maximum extent at the radius. For example, if the value is {0.5, 1.0}, the " - "ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}." + "ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}" }; constexpr openspace::properties::Property::PropertyInfo NightFactorInfo = { @@ -71,14 +71,14 @@ namespace { "Night Factor", "This value is a multiplicative factor that is applied to the side of the rings " "that is facing away from the Sun. If this value is equal to '1', no darkening " - "of the night side occurs." + "of the night side occurs" }; constexpr openspace::properties::Property::PropertyInfo ColorFilterInfo = { "ColorFilter", "Color Filter", "This value affects the filtering out of part of the rings depending on the " - "color values of the texture. The higher value, the more rings are filtered out." + "color values of the texture. The higher value, the more rings are filtered out" }; struct [[codegen::Dictionary(RenderableRings)]] Parameters { diff --git a/modules/space/rendering/renderablesmallbody.cpp b/modules/space/rendering/renderablesmallbody.cpp index 4398e39909..98a2a9738d 100644 --- a/modules/space/rendering/renderablesmallbody.cpp +++ b/modules/space/rendering/renderablesmallbody.cpp @@ -55,7 +55,7 @@ namespace { "If enabled, then the contiguous set of objects starting from StartRenderIdx " "of size RenderSize will be rendered. If disabled, then the number of objects " "defined by UpperLimit will rendered from an evenly dispersed sample of the " - "full length of the data file." + "full length of the data file" }; constexpr openspace::properties::Property::PropertyInfo UpperLimitInfo = { @@ -63,7 +63,7 @@ namespace { "Upper Limit", "Upper limit on the number of objects for this renderable, regardless of " "how many objects are contained in the data file. Produces an evenly-distributed" - "sample from the data file." + "sample from the data file" }; double importAngleValue(const std::string& angle) { @@ -167,7 +167,7 @@ RenderableSmallBody::RenderableSmallBody(const ghoul::Dictionary& dictionary) void RenderableSmallBody::readDataFile(const std::string& filename) { if (!std::filesystem::is_regular_file(filename)) { throw ghoul::RuntimeError(fmt::format( - "JPL SBDB file {} does not exist.", filename + "JPL SBDB file {} does not exist", filename )); } @@ -251,7 +251,7 @@ void RenderableSmallBody::readDataFile(const std::string& filename) { catch (std::invalid_argument&) { constexpr std::string_view errMsg = "Unable to convert field {} to " "double value (invalid_argument exception). Ignoring line {}/{} " - "of {}."; + "of {}"; LINFO(fmt::format( errMsg, fieldCount, csvLine + 1, numberOfLines, filename @@ -260,7 +260,7 @@ void RenderableSmallBody::readDataFile(const std::string& filename) { catch (std::out_of_range&) { constexpr std::string_view errMsg = "Unable to convert field {} to " "double value (out_of_range exception). Ignoring line {}/{} of " - "{}."; + "{}"; LINFO(fmt::format( errMsg, fieldCount, csvLine + 1, numberOfLines, filename @@ -274,7 +274,7 @@ void RenderableSmallBody::readDataFile(const std::string& filename) { _data.clear(); _sbNames.clear(); LERROR(fmt::format( - "Abandoning data file {} (too many sequential line errors).", + "Abandoning data file {} (too many sequential line errors)", filename )); break; diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp index 841ef2ce3d..48a0bc7602 100644 --- a/modules/space/rendering/renderablestars.cpp +++ b/modules/space/rendering/renderablestars.cpp @@ -120,14 +120,14 @@ namespace { constexpr openspace::properties::Property::PropertyInfo SpeckFileInfo = { "SpeckFile", "Speck File", - "The speck file that is loaded to get the data for rendering these stars." + "The speck file that is loaded to get the data for rendering these stars" }; constexpr openspace::properties::Property::PropertyInfo ColorTextureInfo = { "ColorMap", "ColorBV Texture", "The path to the texture that is used to convert from the B-V value of the star " - "to its color. The texture is used as a one dimensional lookup function." + "to its color. The texture is used as a one dimensional lookup function" }; constexpr openspace::properties::Property::PropertyInfo MappingBvInfo = { @@ -189,7 +189,7 @@ namespace { "ColorOption", "Color Option", "This value determines which quantity is used for determining the color of the " - "stars." + "stars" }; constexpr openspace::properties::Property::PropertyInfo OtherDataOptionInfo = { @@ -202,13 +202,13 @@ namespace { "OtherDataValueRange", "Range of the other data values", "This value is the min/max value range that is used to normalize the other data " - "values so they can be used by the specified color map." + "values so they can be used by the specified color map" }; constexpr openspace::properties::Property::PropertyInfo FixedColorInfo = { "FixedColorValue", "Color used for fixed star colors", - "The color that should be used if the 'Fixed Color' value is used." + "The color that should be used if the 'Fixed Color' value is used" }; constexpr openspace::properties::Property::PropertyInfo OtherDataColorMapInfo = { @@ -229,13 +229,13 @@ namespace { "Texture", "Point Spread Function Texture", "The path to the texture that should be used as a point spread function for the " - "stars." + "stars" }; //constexpr openspace::properties::Property::PropertyInfo ShapeTextureInfo = { // "ShapeTexture", // "Shape Texture to be convolved", - // "The path to the texture that should be used as the base shape for the stars." + // "The path to the texture that should be used as the base shape for the stars" //}; // PSF @@ -244,30 +244,33 @@ namespace { "Magnitude Exponent", "Adjust star magnitude by 10^MagnitudeExponent. " "Stars closer than this distance are given full opacity. " - "Farther away, stars dim proportionally to the logarithm of their distance." + "Farther away, stars dim proportionally to the logarithm of their distance" }; constexpr openspace::properties::Property::PropertyInfo RenderMethodOptionInfo = { "RenderMethod", "Render Method", - "Render method for the stars." + "Render method for the stars" }; - openspace::properties::PropertyOwner::PropertyOwnerInfo - UserProvidedTextureOptionInfo = + const openspace::properties::PropertyOwner::PropertyOwnerInfo + UserProvidedTextureOptionInfo = { "UserProvidedTexture", "User Provided Texture", "" }; - openspace::properties::PropertyOwner::PropertyOwnerInfo ParametersOwnerOptionInfo = { + const openspace::properties::PropertyOwner::PropertyOwnerInfo + ParametersOwnerOptionInfo = + { "ParametersOwner", "Parameters Options", "" }; - openspace::properties::PropertyOwner::PropertyOwnerInfo MoffatMethodOptionInfo = { + const openspace::properties::PropertyOwner::PropertyOwnerInfo MoffatMethodOptionInfo = + { "MoffatMethodOption", "Moffat Method", "" @@ -276,34 +279,36 @@ namespace { constexpr openspace::properties::Property::PropertyInfo PSFMethodOptionInfo = { "PSFMethodOptionInfo", "PSF Method Option", - "Debug option for PSF main function: Spencer or Moffat." + "Debug option for PSF main function: Spencer or Moffat" }; constexpr openspace::properties::Property::PropertyInfo SizeCompositionOptionInfo = { "SizeComposition", "Size Composition Option", - "Base multiplyer for the final stars' sizes." + "Base multiplyer for the final stars' sizes" }; constexpr openspace::properties::Property::PropertyInfo LumPercentInfo = { "LumPercent", "Luminosity Contribution", - "Luminosity Contribution." + "Luminosity Contribution" }; constexpr openspace::properties::Property::PropertyInfo RadiusPercentInfo = { "RadiusPercent", "Radius Contribution", - "Radius Contribution." + "Radius Contribution" }; constexpr openspace::properties::Property::PropertyInfo BrightnessPercentInfo = { "BrightnessPercen", "App Brightness Contribution", - "App Brightness Contribution." + "App Brightness Contribution" }; - openspace::properties::PropertyOwner::PropertyOwnerInfo SpencerPSFParamOwnerInfo = { + const openspace::properties::PropertyOwner::PropertyOwnerInfo + SpencerPSFParamOwnerInfo = + { "SpencerPSFParamOwner", "Spencer PSF Paramameters", "PSF parameters for Spencer" @@ -312,28 +317,30 @@ namespace { constexpr openspace::properties::Property::PropertyInfo P0ParamInfo = { "P0Param", "P0", - "P0 parameter contribution." + "P0 parameter contribution" }; constexpr openspace::properties::Property::PropertyInfo P1ParamInfo = { "P1Param", "P1", - "P1 parameter contribution." + "P1 parameter contribution" }; constexpr openspace::properties::Property::PropertyInfo P2ParamInfo = { "P2Param", "P2", - "P2 parameter contribution." + "P2 parameter contribution" }; constexpr openspace::properties::Property::PropertyInfo AlphaConstInfo = { "AlphaConst", "Alpha", - "Empirical Alpha Constant." + "Empirical Alpha Constant" }; - openspace::properties::PropertyOwner::PropertyOwnerInfo MoffatPSFParamOwnerInfo = { + const openspace::properties::PropertyOwner::PropertyOwnerInfo + MoffatPSFParamOwnerInfo = + { "MoffatPSFParam", "Moffat PSF Parameters", "PSF parameters for Moffat" @@ -348,7 +355,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo BetaInfo = { "Beta", "Beta", - "Moffat's Beta Constant." + "Moffat's Beta Constant" }; constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = { @@ -356,13 +363,13 @@ namespace { "Fade-In Start and End Distances", "These values determine the initial and final distances from the center of " "our galaxy from which the astronomical object will start and end " - "fading-in." + "fading-in" }; constexpr openspace::properties::Property::PropertyInfo DisableFadeInInfo = { "DisableFadeIn", "Disable Fade-in effect", - "Enables/Disables the Fade-in effect." + "Enables/Disables the Fade-in effect" }; struct [[codegen::Dictionary(RenderableStars)]] Parameters { diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp index 93a0a82967..dc024b29f1 100644 --- a/modules/space/rendering/renderabletravelspeed.cpp +++ b/modules/space/rendering/renderabletravelspeed.cpp @@ -42,7 +42,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo SpeedInfo = { "TravelSpeed", "Speed of travel", - "The speed of light is the default value." + "The speed of light is the default value" }; constexpr openspace::properties::Property::PropertyInfo TargetInfo = { @@ -54,26 +54,26 @@ namespace { constexpr openspace::properties::Property::PropertyInfo LineColorInfo = { "Color", "Color", - "This value determines the RGB color for the line." + "This value determines the RGB color for the line" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", "Line Width", - "This value specifies the line width." + "This value specifies the line width" }; constexpr openspace::properties::Property::PropertyInfo IndicatorLengthInfo = { "IndicatorLength", "Indicator Length", - "This value specifies the length of the light indicator set in light seconds." + "This value specifies the length of the light indicator set in light seconds" }; constexpr openspace::properties::Property::PropertyInfo FadeLengthInfo = { "FadeLength", "Fade Length", "This value specifies the length of the faded tail of the light indicator " - "set in light seconds." + "set in light seconds" }; struct [[codegen::Dictionary(RenderableLightTravel)]] Parameters { diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp index 8f9624739c..7b2e335375 100644 --- a/modules/space/rotation/spicerotation.cpp +++ b/modules/space/rotation/spicerotation.cpp @@ -36,27 +36,27 @@ namespace { "SourceFrame", "Source", "This value specifies the source frame that is used as the basis for the " - "coordinate transformation. This has to be a valid SPICE name." + "coordinate transformation. This has to be a valid SPICE name" }; constexpr openspace::properties::Property::PropertyInfo DestinationInfo = { "DestinationFrame", "Destination", "This value specifies the destination frame that is used for the coordinate " - "transformation. This has to be a valid SPICE name." + "transformation. This has to be a valid SPICE name" }; constexpr openspace::properties::Property::PropertyInfo TimeFrameInfo = { "TimeFrame", "Time Frame", - "The time frame in which the spice kernels are valid." + "The time frame in which the spice kernels are valid" }; constexpr openspace::properties::Property::PropertyInfo FixedDateInfo = { "FixedDate", "Fixed Date", "A time to lock the rotation to. Setting this to an empty string will " - "unlock the time and return to rotation based on current simulation time." + "unlock the time and return to rotation based on current simulation time" }; struct [[codegen::Dictionary(SpiceRotation)]] Parameters { diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp index ee6b08d588..6bf6ec7c20 100644 --- a/modules/space/spacemodule.cpp +++ b/modules/space/spacemodule.cpp @@ -54,7 +54,7 @@ namespace { "ShowExceptions", "Show Exceptions", "If enabled, errors from SPICE will be thrown and show up in the log. If " - "disabled, the errors will be ignored silently." + "disabled, the errors will be ignored silently" }; } // namespace diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp index 836aef0f94..ef9f908cfd 100644 --- a/modules/space/translation/horizonstranslation.cpp +++ b/modules/space/translation/horizonstranslation.cpp @@ -47,7 +47,7 @@ namespace { "HorizonsTextFile", "Horizons Text File", "This value is the path to the file or files generated by Horizons with " - "either a Vector table or an Observer table with the correct settings (see wiki)." + "either a Vector table or an Observer table with the correct settings (see wiki)" }; struct [[codegen::Dictionary(HorizonsTranslation)]] Parameters { diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp index 937e00a4ee..5bf3538ec6 100644 --- a/modules/space/translation/keplertranslation.cpp +++ b/modules/space/translation/keplertranslation.cpp @@ -51,7 +51,7 @@ namespace { "Eccentricity", "This value determines the eccentricity, that is the deviation from a perfect " "sphere, for this orbit. Currently, hyperbolic orbits using Keplerian elements " - "are not supported." + "are not supported" }; constexpr openspace::properties::Property::PropertyInfo SemiMajorAxisInfo = { @@ -59,7 +59,7 @@ namespace { "Semi-major axis", "This value determines the semi-major axis, that is the distance of the object " "from the central body in kilometers (semi-major axis = average of periapsis and " - "apoapsis)." + "apoapsis)" }; constexpr openspace::properties::Property::PropertyInfo InclinationInfo = { @@ -67,7 +67,7 @@ namespace { "Inclination", "This value determines the degrees of inclination, or the angle of the orbital " "plane, relative to the reference plane, on which the object orbits around the " - "central body." + "central body" }; constexpr openspace::properties::Property::PropertyInfo AscendingNodeInfo = { @@ -75,34 +75,34 @@ namespace { "Right ascension of ascending Node", "This value determines the right ascension of the ascending node in degrees, " "that is the location of position along the orbit where the inclined plane and " - "the horizonal reference plane intersect." + "the horizonal reference plane intersect" }; constexpr openspace::properties::Property::PropertyInfo ArgumentOfPeriapsisInfo = { "ArgumentOfPeriapsis", "Argument of Periapsis", "This value determines the argument of periapsis in degrees, that is the " - "position on the orbit that is closest to the orbiting body." + "position on the orbit that is closest to the orbiting body" }; constexpr openspace::properties::Property::PropertyInfo MeanAnomalyAtEpochInfo = { "MeanAnomaly", "Mean anomaly at epoch", "This value determines the mean anomaly at the epoch in degrees, which " - "determines the initial location of the object along the orbit at epoch." + "determines the initial location of the object along the orbit at epoch" }; constexpr openspace::properties::Property::PropertyInfo EpochInfo = { "Epoch", "Epoch", "This value determines the epoch for which the initial location is defined in " - "the form of YYYY MM DD HH:mm:ss." + "the form of YYYY MM DD HH:mm:ss" }; constexpr openspace::properties::Property::PropertyInfo PeriodInfo = { "Period", "Orbit period", - "Specifies the orbital period (in seconds)." + "Specifies the orbital period (in seconds)" }; struct [[codegen::Dictionary(KeplerTranslation)]] Parameters { diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp index aecd6688a1..f1097a6861 100644 --- a/modules/space/translation/spicetranslation.cpp +++ b/modules/space/translation/spicetranslation.cpp @@ -42,7 +42,7 @@ namespace { "Target", "This is the SPICE NAIF name for the body whose translation is to be computed by " "the SpiceTranslation. It can either be a fully qualified name (such as 'EARTH') " - "or a NAIF integer id code (such as '399')." + "or a NAIF integer id code (such as '399')" }; constexpr openspace::properties::Property::PropertyInfo ObserverInfo = { @@ -50,21 +50,21 @@ namespace { "Observer", "This is the SPICE NAIF name for the parent of the body whose translation is to " "be computed by the SpiceTranslation. It can either be a fully qualified name " - "(such as 'SOLAR SYSTEM BARYCENTER') or a NAIF integer id code (such as '0')." + "(such as 'SOLAR SYSTEM BARYCENTER') or a NAIF integer id code (such as '0')" }; constexpr openspace::properties::Property::PropertyInfo FrameInfo = { "Frame", "Reference Frame", "This is the SPICE NAIF name for the reference frame in which the position " - "should be retrieved. The default value is GALACTIC." + "should be retrieved. The default value is GALACTIC" }; constexpr openspace::properties::Property::PropertyInfo FixedDateInfo = { "FixedDate", "Fixed Date", "A time to lock the position to. Setting this to an empty string will " - "unlock the time and return to position based on current simulation time." + "unlock the time and return to position based on current simulation time" }; struct [[codegen::Dictionary(SpiceTranslation)]] Parameters { diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp index 4862b7a7f9..4ddd6accfc 100644 --- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp +++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp @@ -44,7 +44,7 @@ namespace { "Active Color", "This value determines the color that the active instrument is rendered in. " "Shortly after activation, the used color is mixture of this and the flash " - "color. The default value is (0.6, 1.0, 0.0)." + "color. The default value is (0.6, 1.0, 0.0)" }; constexpr openspace::properties::Property::PropertyInfo FlashColorInfo = { diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp index 81bb595f9e..dde5b4692b 100644 --- a/modules/spacecraftinstruments/rendering/renderablefov.cpp +++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp @@ -51,7 +51,7 @@ namespace { "LineWidth", "Line Width", "This value determines width of the lines connecting the instrument to the " - "corners of the field of view." + "corners of the field of view" }; constexpr openspace::properties::Property::PropertyInfo StandoffDistanceInfo = { @@ -61,7 +61,7 @@ namespace { "distance of the plane to the focus object. If this value is '1', the field of " "view will be rendered exactly on the surface of, for example, a planet. With a " "value of smaller than 1, the field of view will hover of ther surface, thus " - "making it more visible." + "making it more visible" }; constexpr openspace::properties::Property::PropertyInfo AlwaysDrawFovInfo = { @@ -76,7 +76,7 @@ namespace { "Start of default color", "This value determines the color of the field of view frustum close to the " "instrument. The final colors are interpolated between this value and the end " - "color." + "color" }; constexpr openspace::properties::Property::PropertyInfo DefaultEndColorInfo = { @@ -84,21 +84,21 @@ namespace { "End of default color", "This value determines the color of the field of view frustum close to the " "target. The final colors are interpolated between this value and the start " - "color." + "color" }; constexpr openspace::properties::Property::PropertyInfo ActiveColorInfo = { "Colors.Active", "Active Color", "This value determines the color that is used when the instrument's field of " - "view is active." + "view is active" }; constexpr openspace::properties::Property::PropertyInfo TargetInFovInfo = { "Colors.TargetInFieldOfView", "Target in field-of-view Color", "This value determines the color that is used if the target is inside the field " - "of view of the instrument but the instrument is not yet active." + "of view of the instrument but the instrument is not yet active" }; constexpr openspace::properties::Property::PropertyInfo IntersectionStartInfo = { @@ -106,7 +106,7 @@ namespace { "Start of the intersection", "This value determines the color that is used close to the instrument if one of " "the field of view corners is intersecting the target object. The final color is " - "retrieved by interpolating between this color and the intersection end color." + "retrieved by interpolating between this color and the intersection end color" }; constexpr openspace::properties::Property::PropertyInfo IntersectionEndInfo = { @@ -114,7 +114,7 @@ namespace { "End of the intersection", "This value determines the color that is used close to the target if one of the " "field of view corners is intersecting the target object. The final color is " - "retrieved by interpolating between this color and the intersection begin color." + "retrieved by interpolating between this color and the intersection begin color" }; constexpr openspace::properties::Property::PropertyInfo SquareColorInfo = { @@ -122,7 +122,7 @@ namespace { "Orthogonal Square", "This value determines the color that is used for the field of view square in " "the case that there is no intersection and that the instrument is not currently " - "active." + "active" }; template @@ -663,10 +663,10 @@ void RenderableFov::computeIntercepts(double time, const std::string& target, ).interceptFound; }; - static const uint8_t NoIntersect = 0b00; - static const uint8_t ThisIntersect = 0b01; - static const uint8_t NextIntersect = 0b10; - static const uint8_t BothIntersect = 0b11; + constexpr uint8_t NoIntersect = 0b00; + constexpr uint8_t ThisIntersect = 0b01; + constexpr uint8_t NextIntersect = 0b10; + constexpr uint8_t BothIntersect = 0b11; const uint8_t type = (intersects[i] ? 1 : 0) + (intersects[j] ? 2 : 0); switch (type) { diff --git a/modules/spacecraftinstruments/rendering/renderablefov.h b/modules/spacecraftinstruments/rendering/renderablefov.h index 6a110c5b5b..d2c2641439 100644 --- a/modules/spacecraftinstruments/rendering/renderablefov.h +++ b/modules/spacecraftinstruments/rendering/renderablefov.h @@ -105,13 +105,13 @@ private: // Differentiating different vertex types using VertexColorType = int32_t; // This needs to be synced with the fov_vs.glsl shader - static const VertexColorType VertexColorTypeDefaultStart = 0; - static const VertexColorType VertexColorTypeDefaultEnd = 1; - static const VertexColorType VertexColorTypeInFieldOfView = 2; - static const VertexColorType VertexColorTypeActive = 3; - static const VertexColorType VertexColorTypeIntersectionStart = 4; - static const VertexColorType VertexColorTypeIntersectionEnd = 5; - static const VertexColorType VertexColorTypeSquare = 6; + static constexpr VertexColorType VertexColorTypeDefaultStart = 0; + static constexpr VertexColorType VertexColorTypeDefaultEnd = 1; + static constexpr VertexColorType VertexColorTypeInFieldOfView = 2; + static constexpr VertexColorType VertexColorTypeActive = 3; + static constexpr VertexColorType VertexColorTypeIntersectionStart = 4; + static constexpr VertexColorType VertexColorTypeIntersectionEnd = 5; + static constexpr VertexColorType VertexColorTypeSquare = 6; struct VBOData { GLfloat position[3]; diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp index 06955b7264..7b98035fa2 100644 --- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp @@ -57,7 +57,7 @@ namespace { "Perform Shading", "If this value is enabled, the model will be shaded based on the relative " "location to the Sun. If this value is disabled, shading is disabled and the " - "entire model is rendered brightly." + "entire model is rendered brightly" }; struct [[codegen::Dictionary(RenderableModelProjection)]] Parameters { diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp index 1c6bbd1195..6431461397 100644 --- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp @@ -61,14 +61,14 @@ namespace { "The texture path selected in this property is used as the base texture that is " "applied to the planet prior to any image projections. This menu always contains " "an empty option for not using a color map. If this value is specified in an " - "asset, the last texture is used." + "asset, the last texture is used" }; constexpr openspace::properties::Property::PropertyInfo AddColorTextureInfo = { "AddColorTexture", "Add Color Base Texture", "Adds a new base color texture to the list of selectable base maps used prior to " - "any image projection." + "any image projection" }; constexpr openspace::properties::Property::PropertyInfo HeightTexturePathsInfo = { @@ -76,13 +76,13 @@ namespace { "Heightmap Texture", "The texture path selected in this property is used as the height map on the " "planet. This menu always contains an empty option for not using a heightmap. If " - "this value is specified in an asset, the last texture is used." + "this value is specified in an asset, the last texture is used" }; constexpr openspace::properties::Property::PropertyInfo AddHeightTextureInfo = { "AddHeightTexture", "Add Heightmap Texture", - "Adds a new height map texture to the list of selectable height maps used." + "Adds a new height map texture to the list of selectable height maps used" }; constexpr openspace::properties::Property::PropertyInfo HeightExaggerationInfo = { @@ -90,7 +90,7 @@ namespace { "Height Exaggeration", "This value determines the level of height exaggeration that is applied to a " "potential height field. A value of '0' inhibits the height field, whereas a " - "value of '1' uses the measured height field." + "value of '1' uses the measured height field" }; constexpr openspace::properties::Property::PropertyInfo MeridianShiftInfo = { @@ -99,20 +99,20 @@ namespace { "If this value is enabled, a shift of the meridian by 180 degrees is performed. " "This is a fix especially for Pluto height maps, where the definition of the " "meridian has changed through the New Horizons mission and this requires this " - "shift." + "shift" }; constexpr openspace::properties::Property::PropertyInfo AmbientBrightnessInfo = { "AmbientBrightness", "Ambient Brightness", - "This value determines the ambient brightness of the dark side of the planet." + "This value determines the ambient brightness of the dark side of the planet" }; constexpr openspace::properties::Property::PropertyInfo MaxProjectionsPerFrameInfo = { "MaxProjectionsPerFrame", "Max Projections Per Frame", "The maximum number of image projections to perform per frame. " - "Useful to avoid freezing the system for large delta times." + "Useful to avoid freezing the system for large delta times" }; constexpr openspace::properties::Property::PropertyInfo ProjectionsInBufferInfo = { @@ -130,13 +130,13 @@ namespace { constexpr openspace::properties::Property::PropertyInfo RadiusInfo = { "Radius", "Radius", - "This value specifies the radius of this sphere in meters." + "This value specifies the radius of this sphere in meters" }; constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = { "Segments", "Segments", - "This value specifies the number of segments that this sphere is split into." + "This value specifies the number of segments that this sphere is split into" }; struct [[codegen::Dictionary(RenderablePlanetProjection)]] Parameters { diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp index badfde653a..85f402cb96 100644 --- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp +++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp @@ -43,7 +43,7 @@ namespace { "Points", "This value determines the number of control points that is used to construct " "the shadow geometry. The higher this number, the more detailed the shadow is, " - "but it will have a negative impact on the performance." + "but it will have a negative impact on the performance" }; constexpr openspace::properties::Property::PropertyInfo ShadowLengthInfo = { @@ -51,55 +51,55 @@ namespace { "Shadow Length", "This value determines the length of the shadow that is cast by the target " "object. The total distance of the shadow is equal to the distance from the " - "target to the Sun multiplied with this value." + "target to the Sun multiplied with this value" }; constexpr openspace::properties::Property::PropertyInfo ShadowColorInfo = { "ShadowColor", "Shadow Color", - "This value determines the color that is used for the shadow cylinder." + "This value determines the color that is used for the shadow cylinder" }; constexpr openspace::properties::Property::PropertyInfo TerminatorTypeInfo = { "TerminatorType", "Terminator Type", "This value determines the type of the terminator that is used to calculate the " - "shadow eclipse." + "shadow eclipse" }; constexpr openspace::properties::Property::PropertyInfo LightSourceInfo = { "LightSource", "Light Source", "This value determines the SPICE name of the object that is used as the " - "illuminator for computing the shadow cylinder." + "illuminator for computing the shadow cylinder" }; constexpr openspace::properties::Property::PropertyInfo ObserverInfo = { "Observer", "Observer", "This value specifies the SPICE name of the object that is the observer of the " - "shadow cylinder." + "shadow cylinder" }; constexpr openspace::properties::Property::PropertyInfo BodyInfo = { "Body", "Target Body", "This value is the SPICE name of target body that is used as the shadow caster " - "for the shadow cylinder." + "for the shadow cylinder" }; constexpr openspace::properties::Property::PropertyInfo BodyFrameInfo = { "BodyFrame", "Body Frame", "This value is the SPICE name of the reference frame in which the shadow " - "cylinder is expressed." + "cylinder is expressed" }; constexpr openspace::properties::Property::PropertyInfo AberrationInfo = { "Aberration", "Aberration", "This value determines the aberration method that is used to compute the shadow " - "cylinder." + "cylinder" }; struct [[codegen::Dictionary(RenderableShadowCylinder)]] Parameters { diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp index 9199f21876..4de6d289c0 100644 --- a/modules/spacecraftinstruments/util/hongkangparser.cpp +++ b/modules/spacecraftinstruments/util/hongkangparser.cpp @@ -266,7 +266,7 @@ bool HongKangParser::create() { if (captureStart != -1) { // end of capture sequence for camera, store end time of this sequence TimeRange cameraRange = { captureStart, time }; - ghoul_assert(cameraRange.isDefined(), "Invalid time range!"); + ghoul_assert(cameraRange.isDefined(), "Invalid time range"); _instrumentTimes.emplace_back(previousCamera, cameraRange); captureStart = -1; } diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp index 8c4ed50076..0a7887312d 100644 --- a/modules/spacecraftinstruments/util/projectioncomponent.cpp +++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp @@ -50,14 +50,14 @@ namespace { "PerformProjection", "Perform Projections", "If this value is enabled, this ProjectionComponent will perform projections. If " - "it is disabled, projections will be ignored." + "it is disabled, projections will be ignored" }; constexpr openspace::properties::Property::PropertyInfo ClearProjectionInfo = { "ClearAllProjections", "Clear Projections", "If this property is triggered, it will remove all the projections that have " - "already been applied." + "already been applied" }; constexpr openspace::properties::Property::PropertyInfo FadingInfo = { @@ -65,7 +65,7 @@ namespace { "Projection Fading", "This value fades the previously performed projections in or out. If this value " "is equal to '1', the projections are fully visible, if the value is equal to " - "'0', the performed projections are completely invisible." + "'0', the performed projections are completely invisible" }; constexpr openspace::properties::Property::PropertyInfo TextureSizeInfo = { @@ -74,14 +74,14 @@ namespace { "This value determines the size of the texture into which the images are " "projected and thus provides the limit to the resolution of projections that can " "be applied. Changing this value will not cause the texture to be automatically " - "updated, but triggering the 'ApplyTextureSize' property is required." + "updated, but triggering the 'ApplyTextureSize' property is required" }; constexpr openspace::properties::Property::PropertyInfo ApplyTextureSizeInfo = { "ApplyTextureSize", "Apply Texture Size", "Triggering this property applies a new size to the underlying projection " - "texture. The old texture is resized and interpolated to fit the new size." + "texture. The old texture is resized and interpolated to fit the new size" }; struct [[codegen::Dictionary(ProjectionComponent)]] Parameters { diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp index ceb806e0e3..e823dd6070 100644 --- a/modules/spout/renderableplanespout.cpp +++ b/modules/spout/renderableplanespout.cpp @@ -38,7 +38,7 @@ namespace { "SpoutName", "Spout Sender Name", "This value explicitly sets the Spout receiver to use a specific name. If this " - "is not a valid name, an empty image is used." + "is not a valid name, an empty image is used" }; constexpr openspace::properties::Property::PropertyInfo SelectionInfo = { @@ -46,13 +46,13 @@ namespace { "Spout Selection", "This property displays all available Spout sender on the system. If one them is " "selected, its value is stored in the 'SpoutName' property, overwriting its " - "previous value." + "previous value" }; constexpr openspace::properties::Property::PropertyInfo UpdateInfo = { "UpdateSelection", "Update Selection", - "If this property is trigged, the 'SpoutSelection' options will be refreshed." + "If this property is trigged, the 'SpoutSelection' options will be refreshed" }; struct [[codegen::Dictionary(RenderablePlaneSpout)]] Parameters { diff --git a/modules/spout/screenspacespout.cpp b/modules/spout/screenspacespout.cpp index 27d0dab270..142adc157a 100644 --- a/modules/spout/screenspacespout.cpp +++ b/modules/spout/screenspacespout.cpp @@ -36,7 +36,7 @@ namespace { "SpoutName", "Spout Sender Name", "This value explicitly sets the Spout receiver to use a specific name. If this " - "is not a valid name, an empty image is used." + "is not a valid name, an empty image is used" }; constexpr openspace::properties::Property::PropertyInfo SelectionInfo = { @@ -44,13 +44,13 @@ namespace { "Spout Selection", "This property displays all available Spout sender on the system. If one them is " "selected, its value is stored in the 'SpoutName' property, overwriting its " - "previous value." + "previous value" }; constexpr openspace::properties::Property::PropertyInfo UpdateInfo = { "UpdateSelection", "Update Selection", - "If this property is trigged, the 'SpoutSelection' options will be refreshed." + "If this property is trigged, the 'SpoutSelection' options will be refreshed" }; struct [[codegen::Dictionary(ScreenSpaceSpout)]] Parameters { diff --git a/modules/spout/spoutwrapper.cpp b/modules/spout/spoutwrapper.cpp index 0cbbb8be67..d4586cba73 100644 --- a/modules/spout/spoutwrapper.cpp +++ b/modules/spout/spoutwrapper.cpp @@ -37,14 +37,14 @@ namespace { constexpr openspace::properties::Property::PropertyInfo NameSenderInfo = { "SpoutName", "Spout Sender Name", - "This value sets the Spout sender to use a specific name." + "This value sets the Spout sender to use a specific name" }; constexpr openspace::properties::Property::PropertyInfo NameReceiverInfo = { "SpoutName", "Spout Receiver Name", "This value explicitly sets the Spout receiver to use a specific name. If this " - "is not a valid name, an empty image is used." + "is not a valid name, an empty image is used" }; constexpr openspace::properties::Property::PropertyInfo SelectionInfo = { @@ -52,13 +52,13 @@ namespace { "Spout Selection", "This property displays all available Spout sender on the system. If one them is " "selected, its value is stored in the 'SpoutName' property, overwriting its " - "previous value." + "previous value" }; constexpr openspace::properties::Property::PropertyInfo UpdateInfo = { "UpdateSelection", "Update Selection", - "If this property is trigged, the 'SpoutSelection' options will be refreshed." + "If this property is trigged, the 'SpoutSelection' options will be refreshed" }; } // namespace diff --git a/modules/statemachine/src/statemachine.cpp b/modules/statemachine/src/statemachine.cpp index a7413a6be4..81d5bf6ba7 100644 --- a/modules/statemachine/src/statemachine.cpp +++ b/modules/statemachine/src/statemachine.cpp @@ -118,8 +118,8 @@ const State* StateMachine::currentState() const { void StateMachine::transitionTo(const std::string& newState) { if (!currentState()) { LERROR( - "Cannot perform transition as the machine is in no current state. " - "First set an initial state." + "Cannot perform transition as the machine is in no current state. First set " + "an initial state" ); return; } diff --git a/modules/touch/include/touchinteraction.h b/modules/touch/include/touchinteraction.h index 70781d3d13..da4820ecc1 100644 --- a/modules/touch/include/touchinteraction.h +++ b/modules/touch/include/touchinteraction.h @@ -56,7 +56,7 @@ public: double averageFrameTime() const; private: - static const int TotalSamples = 10; + static constexpr int TotalSamples = 10; int _nSamples = 0; double _samples[TotalSamples]; int _index = 0; diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp index 3208976b26..3df84cc20d 100644 --- a/modules/touch/src/touchinteraction.cpp +++ b/modules/touch/src/touchinteraction.cpp @@ -120,7 +120,7 @@ namespace { "PinchZoomFactor", "Scaling distance travelled on pinch", "This value is used to reduce the amount of pinching needed. A linear kind of " - "sensitivity that will alter the pinch-zoom speed." + "sensitivity that will alter the pinch-zoom speed" }; constexpr openspace::properties::Property::PropertyInfo DirectManipulationInfo = { @@ -222,7 +222,7 @@ namespace { "Zoom Out Limit", "The maximum distance you are allowed to navigate away from the anchor. " "This should always be larger than the zoom in value if you want to be able " - "to zoom. Defaults to maximum allowed double." + "to zoom. Defaults to maximum allowed double" }; constexpr openspace::properties::Property::PropertyInfo ZoomInLimitInfo = { @@ -1097,7 +1097,7 @@ void TouchInteraction::step(double dt, bool directTouch) { } else { #ifdef TOUCH_DEBUG_PROPERTIES - LINFO("Zero the zoom velocity close to surface."); + LINFO("Zero the zoom velocity close to surface"); #endif _vel.zoom = 0.0; } diff --git a/modules/touch/src/win32_touch.cpp b/modules/touch/src/win32_touch.cpp index 002b6a30b7..c833f614d0 100644 --- a/modules/touch/src/win32_touch.cpp +++ b/modules/touch/src/win32_touch.cpp @@ -173,7 +173,7 @@ LRESULT CALLBACK HookCallback(int nCode, WPARAM wParam, LPARAM lParam) { Win32TouchHook::Win32TouchHook(void* nativeWindow) { HWND hWnd = reinterpret_cast(nativeWindow); if (hWnd == nullptr) { - LINFO("No windowhandle available for touch input."); + LINFO("No windowhandle available for touch input"); return; } @@ -186,7 +186,7 @@ Win32TouchHook::Win32TouchHook(void* nativeWindow) { // stack ready, drivers installed and digitizer is ready for input if (value & NID_MULTI_INPUT) { // Digitizer is multitouch - LINFO("Found Multitouch input digitizer!"); + LINFO("Found Multitouch input digitizer"); } if (value & NID_INTEGRATED_TOUCH) { // Integrated touch @@ -243,7 +243,7 @@ Win32TouchHook::Win32TouchHook(void* nativeWindow) { 0 //<- Global thread id (low-level mouse is global only) ); if (!gMouseHook) { - LINFO("Could not setup mousehook!"); + LINFO("Could not setup mousehook"); } MSG msg; diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp index 3ff06c7cdd..1ca33e900c 100644 --- a/modules/toyvolume/rendering/renderabletoyvolume.cpp +++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp @@ -74,8 +74,7 @@ namespace { { "Downscale", "Downscale Factor Volume Rendering", - "This value set the downscaling factor" - " when rendering the current volume." + "This value set the downscaling factor when rendering the current volume" }; } // namespace @@ -133,8 +132,9 @@ RenderableToyVolume::RenderableToyVolume(const ghoul::Dictionary& dictionary) _rayCastSteps = static_cast(dictionary.value("Steps")); } else { - LINFO("Number of raycasting steps not specified for ToyVolume." - " Using default value."); + LINFO( + "Number of raycasting steps not specified for ToyVolume. Using default value" + ); } } diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp index 20ae2b87b9..1833a452f9 100644 --- a/modules/vislab/rendering/renderabledistancelabel.cpp +++ b/modules/vislab/rendering/renderabledistancelabel.cpp @@ -41,21 +41,21 @@ namespace { "NodeLine", "Node Line", "Property to track a nodeline. When tracking the label text will be updating the " - "distance from the nodeline start and end." + "distance from the nodeline start and end" }; constexpr openspace::properties::Property::PropertyInfo DistanceUnitInfo = { "DistanceUnit", "Distance Unit", - "Property to define the unit in which the distance should be displayed." - "Defaults to 'km' if not specified." + "Property to define the unit in which the distance should be displayed" + "Defaults to 'km' if not specified" }; constexpr openspace::properties::Property::PropertyInfo CustomUnitDescriptorInfo = { "CustomUnitDescriptor", "Custom Unit Descriptor", "Property to define a custom unit descriptor to use to describe the distance " - "value. Defaults to the units SI descriptor if not specified." + "value. Defaults to the units SI descriptor if not specified" }; struct [[codegen::Dictionary(RenderableDistanceLabel)]] Parameters { diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp index a99de974e3..c3a161085c 100644 --- a/modules/volume/rendering/renderabletimevaryingvolume.cpp +++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp @@ -55,13 +55,13 @@ namespace { constexpr openspace::properties::Property::PropertyInfo StepSizeInfo = { "StepSize", "Step Size", - "Specifies how often to sample on the raycaster. Lower step -> higher resolution." + "Specifies how often to sample on the raycaster. Lower step -> higher resolution" }; constexpr openspace::properties::Property::PropertyInfo GridTypeInfo = { "GridType", "Grid Type", - "Spherical or Cartesian grid.", + "Spherical or Cartesian grid", openspace::properties::Property::Visibility::Developer }; @@ -69,44 +69,44 @@ namespace { "SecondsBefore", "Seconds before", "Specifies the number of seconds to show the first timestep before its " - "actual time. The default value is 0." + "actual time. The default value is 0" }; constexpr openspace::properties::Property::PropertyInfo SecondsAfterInfo = { "SecondsAfter", "Seconds after", "Specifies the number of seconds to show the the last timestep after its " - "actual time." + "actual time" }; constexpr openspace::properties::Property::PropertyInfo SourceDirectoryInfo = { "SourceDirectory", "Source Directory", - "Specifies the path to load timesteps from." + "Specifies the path to load timesteps from" }; constexpr openspace::properties::Property::PropertyInfo TransferFunctionInfo = { "TransferFunctionPath", "Transfer Function Path", - "Specifies the transfer function file path." + "Specifies the transfer function file path" }; constexpr openspace::properties::Property::PropertyInfo TriggerTimeJumpInfo = { "TriggerTimeJump", "Jump", - "Sets the time to be the first time of the volume sequence." + "Sets the time to be the first time of the volume sequence" }; constexpr openspace::properties::Property::PropertyInfo JumpToTimestepInfo = { "JumpToTimestep", "Jump to timestep", - "Lets you scrub through the sequence's time steps." + "Lets you scrub through the sequence's time steps" }; constexpr openspace::properties::Property::PropertyInfo BrightnessInfo = { "Brightness", "Brightness", - "The volume renderer's general brightness." + "The volume renderer's general brightness" }; constexpr openspace::properties::Property::PropertyInfo rNormalizationInfo = { diff --git a/modules/volume/shaders/boundsfs.glsl b/modules/volume/shaders/bounds_fs.glsl similarity index 100% rename from modules/volume/shaders/boundsfs.glsl rename to modules/volume/shaders/bounds_fs.glsl diff --git a/modules/volume/shaders/boundsvs.glsl b/modules/volume/shaders/bounds_vs.glsl similarity index 100% rename from modules/volume/shaders/boundsvs.glsl rename to modules/volume/shaders/bounds_vs.glsl diff --git a/modules/volume/textureslicevolumereader.inl b/modules/volume/textureslicevolumereader.inl index e00c579881..a1c2c8596b 100644 --- a/modules/volume/textureslicevolumereader.inl +++ b/modules/volume/textureslicevolumereader.inl @@ -41,7 +41,7 @@ TextureSliceVolumeReader::~TextureSliceVolumeReader() {} template void TextureSliceVolumeReader::initialize() { - ghoul_assert(_paths.size() > 0, "No paths to read slices from."); + ghoul_assert(_paths.size() > 0, "No paths to read slices from"); std::shared_ptr firstSlice = ghoul::io::TextureReader::ref().loadTexture(_paths[0], 2); @@ -75,7 +75,7 @@ TextureSliceVolumeReader::getSlice(int sliceIndex) const ghoul_assert(_isInitialized, "Volume is not initialized"); ghoul_assert( sliceIndex >= 0 && sliceIndex < static_cast(_paths.size()), - "Slice index " + std::to_string(sliceIndex) + "is outside the range." + "Slice index " + std::to_string(sliceIndex) + "is outside the range" ); if (!_cache.has(sliceIndex)) { diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp index 01d9bff38d..f23b4ae457 100644 --- a/modules/webbrowser/src/screenspacebrowser.cpp +++ b/modules/webbrowser/src/screenspacebrowser.cpp @@ -38,19 +38,19 @@ namespace { constexpr std::string_view _loggerCat = "ScreenSpaceBrowser"; - const openspace::properties::Property::PropertyInfo DimensionsInfo = { + constexpr openspace::properties::Property::PropertyInfo DimensionsInfo = { "Dimensions", "Browser Dimensions", - "Set the dimensions of the web browser windows." + "Set the dimensions of the web browser windows" }; - const openspace::properties::Property::PropertyInfo UrlInfo = { + constexpr openspace::properties::Property::PropertyInfo UrlInfo = { "Url", "URL", "The URL to load" }; - const openspace::properties::Property::PropertyInfo ReloadInfo = { + constexpr openspace::properties::Property::PropertyInfo ReloadInfo = { "Reload", "Reload", "Reload the web browser" diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp index 7be1392d44..0ba48cd738 100644 --- a/modules/webbrowser/webbrowsermodule.cpp +++ b/modules/webbrowser/webbrowsermodule.cpp @@ -52,19 +52,20 @@ namespace { #endif constexpr openspace::properties::Property::PropertyInfo - UpdateBrowserBetweenRenderablesInfo = { + UpdateBrowserBetweenRenderablesInfo = + { "UpdateBrowserBetweenRenderables", "Update Browser Between Renderables", "Run the message loop of the browser between calls to render individual " "renderables. When disabled, the browser message loop only runs " - "once per frame." + "once per frame" }; constexpr openspace::properties::Property::PropertyInfo BrowserUpdateIntervalInfo = { "BrowserUpdateInterval", "Browser Update Interval", "The time in microseconds between running the message loop of the browser. " - "Only used if UpdateBrowserBetweenRenderables is true." + "Only used if UpdateBrowserBetweenRenderables is true" }; } // namespace @@ -142,7 +143,7 @@ void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) { LDEBUG(fmt::format("CEF using web helper executable: {}", _webHelperLocation)); _cefHost = std::make_unique(_webHelperLocation.string()); - LDEBUG("Starting CEF... done!"); + LDEBUG("Starting CEF... done"); if (dictionary.hasValue(UpdateBrowserBetweenRenderablesInfo.identifier)) { _updateBrowserBetweenRenderables = diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp index 09e0438650..402dbefe32 100644 --- a/modules/webgui/webguimodule.cpp +++ b/modules/webgui/webguimodule.cpp @@ -44,32 +44,32 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ServerProcessEnabledInfo = { "ServerProcessEnabled", "Enable Server Process", - "Enable the node js based process used to serve the Web GUI." + "Enable the node js based process used to serve the Web GUI" }; constexpr openspace::properties::Property::PropertyInfo AddressInfo = { "Address", "Address", - "The network address to use when connecting to OpenSpace from the Web GUI." + "The network address to use when connecting to OpenSpace from the Web GUI" }; constexpr openspace::properties::Property::PropertyInfo PortInfo = { "Port", "Port", - "The network port to use when serving the Web GUI over HTTP." + "The network port to use when serving the Web GUI over HTTP" }; constexpr openspace::properties::Property::PropertyInfo WebSocketInterfaceInfo = { "WebSocketInterface", "WebSocket Interface", - "The identifier of the websocket interface to use when communicating." + "The identifier of the websocket interface to use when communicating" }; constexpr openspace::properties::Property::PropertyInfo ServerProcessEntryPointInfo = { "ServerProcessEntryPoint", "Server Process Entry Point", - "The node js command to invoke." + "The node js command to invoke" }; constexpr openspace::properties::Property::PropertyInfo DirectoriesInfo = { @@ -77,24 +77,23 @@ namespace { "Directories", "Directories from which to to serve static content, as a string list " "with entries expressed as pairs, where every odd is the endpoint name and every " - "even is the directory.", + "even is the directory", }; constexpr openspace::properties::Property::PropertyInfo DefaultEndpointInfo = { "DefaultEndpoint", "Default Endpoint", - "The 'default' endpoint. " - "The server will redirect http requests from / to /", + "The 'default' endpoint. The server will redirect http requests from / to " + "/" }; - constexpr openspace::properties::Property::PropertyInfo ServedDirectoriesInfo = { "ServedDirectories", "ServedDirectories", "Directories that are currently served. This value is set by the server process, " "as a verification of the actually served directories. For example, an onChange " - "callback can be registered to this, to reload browsers when the server is ready." - "Manual changes to this property have no effect." + "callback can be registered to this, to reload browsers when the server is " + "ready. Manual changes to this property have no effect" }; struct [[codegen::Dictionary(WebGuiModule)]] Parameters { diff --git a/scripts/core_scripts.lua b/scripts/core_scripts.lua index 8237fe66be..f05c4d9ec5 100644 --- a/scripts/core_scripts.lua +++ b/scripts/core_scripts.lua @@ -4,20 +4,20 @@ openspace.documentation = { Arguments = { sceneGraphNode = "[ String ]" }, Documentation = "This function marks the scene graph nodes identified by name " .. "as interesting, which will provide shortcut access to focus buttons and " .. - "featured properties." + "featured properties" }, { Name = "markInterestingTimes", Arguments = { times = "[ Table ]" }, Documentation = "This function marks interesting times for the current scene, " .. - "which will create shortcuts for a quick access." + "which will create shortcuts for a quick access" }, { Name = "removeInterestingNodes", Arguments = { sceneGraphNode = "[ String ]" }, Documentation = "This function removes unmarks the scene graph nodes " .. "identified by name as interesting, thus removing the shortcuts from the " .. - "features properties list." + "features properties list" }, { Name = "setDefaultGuiSorting", @@ -32,13 +32,13 @@ openspace.documentation = { Documentation = "This function sets the default values for the dashboard " .. "consisting of 'DashboardItemDate', 'DashboardItemSimulationIncrement', " .. "'DashboardItemDistance', 'DashboardItemFramerate', and " .. - "'DashboardItemParallelConnection'." + "'DashboardItemParallelConnection'" }, { Name = "rebindKey", Arguments = { oldKey = "String", newKey = "String" }, Documentation = "Rebinds all scripts from the old key (first argument) to the " .. - "new key (second argument)." + "new key (second argument)" } } diff --git a/scripts/drag_drop_handler.lua b/scripts/drag_drop_handler.lua index a0f08d7955..c6becc7219 100644 --- a/scripts/drag_drop_handler.lua +++ b/scripts/drag_drop_handler.lua @@ -44,7 +44,7 @@ elseif extension == ".asset" then if openspace.asset.isLoaded("]] .. filename .. [[") ~= true then openspace.printInfo("Adding asset: ']] .. filename .. [[' (drag-and-drop)"); end - openspace.asset.add("]] .. filename .. [[");]] .. ReloadUIScript + openspace.asset.add("]] .. filename .. '");' .. ReloadUIScript elseif extension == ".osrec" or extension == ".osrectxt" then - return [[openspace.sessionRecording.startPlayback("]] .. filename .. [[")]] + return 'openspace.sessionRecording.startPlayback("' .. filename .. '")' end diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp index 8997d2ef37..8f3f944263 100644 --- a/src/camera/camera.cpp +++ b/src/camera/camera.cpp @@ -29,11 +29,6 @@ namespace openspace { -// (2021-07-16, emmbr) Note that this hard coded vector for the view direction is also -// used in a qauternion -> view direction helper function in ghoul/glm.h -const glm::dvec3 Camera::ViewDirectionCameraSpace = glm::dvec3(0.0, 0.0, -1.0); -const glm::dvec3 Camera::UpDirectionCameraSpace = glm::dvec3(0.0, 1.0, 0.0); - Camera::Camera(const Camera& o) : sgctInternal(o.sgctInternal) , _position(o._position) diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp index 2fc6b36cdf..47f733b0a1 100644 --- a/src/engine/moduleengine.cpp +++ b/src/engine/moduleengine.cpp @@ -42,7 +42,7 @@ namespace { "AllModules", "All Modules", "The list of all modules that were compiled for this version of OpenSpace in the " - "same order in which they were initialized." + "same order in which they were initialized" }; } // namespace diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 191d6a37d5..0d4e371ef9 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -122,14 +122,14 @@ namespace { "PrintEvents", "Print Events", "If this is enabled, all events that are propagated through the system are " - "printed to the log." + "printed to the log" }; constexpr openspace::properties::Property::PropertyInfo VisibilityInfo = { "PropertyVisibility", "Property Visibility", "Hides or displays different settings in the GUI depending on how advanced they " - "are." + "are" }; constexpr openspace::properties::Property::PropertyInfo ShowHiddenSceneInfo = { @@ -485,7 +485,8 @@ void OpenSpaceEngine::initializeGL() { LFATAL(fmt::format( "Module {} required OpenGL extension {} which is not available " "on this system. Some functionality related to this module will " - "probably not work.", m->guiName(), ext + "probably not work", + m->guiName(), ext )); } } diff --git a/src/interaction/interactionmonitor.cpp b/src/interaction/interactionmonitor.cpp index 9dd1934a95..f51e23953d 100644 --- a/src/interaction/interactionmonitor.cpp +++ b/src/interaction/interactionmonitor.cpp @@ -33,13 +33,13 @@ namespace { "IdleTime", "Idle Time", "Time in seconds that has passed from latest registered interaction until the " - "application goes idle." + "application goes idle" }; constexpr openspace::properties::Property::PropertyInfo IsInActiveStateInfo = { "IsInActiveState", "Is State Active", "Keeps track whether the interaction session is in active state or not. False if " - "application is in idle state, true if it is in active state." + "application is in idle state, true if it is in active state" }; } // namespace diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp index 35ff4d4040..91c9594c95 100644 --- a/src/interaction/keybindingmanager.cpp +++ b/src/interaction/keybindingmanager.cpp @@ -75,7 +75,7 @@ void KeybindingManager::bindKey(Key key, KeyModifier modifier, std::string actio LWARNINGC( "bindKey", "Windows does not support binding keys to Shift + Keypad as it will " - "internally convert these into Home, End, etc, keys." + "internally convert these into Home, End, etc, keys" ); } #endif // WIN32 diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp index 96e31f08b1..0aac845fe1 100644 --- a/src/interaction/sessionrecording.cpp +++ b/src/interaction/sessionrecording.cpp @@ -181,7 +181,7 @@ bool SessionRecording::handleRecordingFile(std::string filenameIn) { if (std::filesystem::is_regular_file(absFilename)) { LERROR(fmt::format( - "Unable to start recording; file {} already exists.", absFilename + "Unable to start recording; file {} already exists", absFilename )); return false; } @@ -1791,8 +1791,8 @@ bool SessionRecording::addKeyframeToTimeline(std::vector& timelin } catch(...) { LERROR(fmt::format( - "Timeline memory allocation error trying to add keyframe {}. " - "The playback file may be too large for system memory.", + "Timeline memory allocation error trying to add keyframe {}. The playback " + "file may be too large for system memory", lineNum - 1 )); return false; @@ -1995,7 +1995,7 @@ bool SessionRecording::processNextNonCameraKeyframeAheadInTime() { return processScriptKeyframe(); default: LERROR(fmt::format( - "Bad keyframe type encountered during playback at index {}.", + "Bad keyframe type encountered during playback at index {}", _idxTimeline_nonCamera )); return false; @@ -2228,7 +2228,7 @@ void SessionRecording::readPlaybackHeader_stream(std::stringstream& conversionIn ); if (readBackHeaderString != FileHeaderTitle) { - throw ConversionError("File to convert does not contain expected header."); + throw ConversionError("File to convert does not contain expected header"); } version = readHeaderElement(conversionInStream, FileHeaderVersionLength); std::string readDataMode = readHeaderElement(conversionInStream, 1); @@ -2256,7 +2256,7 @@ SessionRecording::DataMode SessionRecording::readModeFromHeader(std::string file FileHeaderTitle.length() ); if (readBackHeaderString != FileHeaderTitle) { - LERROR("Specified playback file does not contain expected header."); + LERROR("Specified playback file does not contain expected header"); } readHeaderElement(inputFile, FileHeaderVersionLength); std::string readDataMode = readHeaderElement(inputFile, 1); @@ -2308,7 +2308,7 @@ std::string SessionRecording::convertFile(std::string filename, int depth) { std::ifstream conversionInFile; std::stringstream conversionInStream; if (depth >= _maximumRecursionDepth) { - LERROR("Runaway recursion in session recording conversion of file version."); + LERROR("Runaway recursion in session recording conversion of file version"); exit(EXIT_FAILURE); } std::string newFilename = filename; @@ -2348,7 +2348,7 @@ std::string SessionRecording::convertFile(std::string filename, int depth) { conversionOutFilename = determineConversionOutFilename(filename, mode); LINFO(fmt::format( "Starting conversion on rec file {}, version {} in {} mode. " - "Writing result to {}.", + "Writing result to {}", newFilename, fileVersion, (mode == DataMode::Ascii) ? "ascii" : "binary", conversionOutFilename )); @@ -2547,7 +2547,7 @@ std::string SessionRecording_legacy_0085::getLegacyConversionResult(std::string LERROR(fmt::format( "Version 00.85 is the oldest supported legacy file format; no conversion " "can be made. It is possible that file {} has a corrupted header or an invalid " - "file format version number.", + "file format version number", filename )); return filename; diff --git a/src/interaction/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp index 46eb9bc4c4..1255d3ee0a 100644 --- a/src/interaction/tasks/convertrecfileversiontask.cpp +++ b/src/interaction/tasks/convertrecfileversiontask.cpp @@ -95,9 +95,8 @@ void ConvertRecFileVersionTask::convert() { ); if (!hasBinaryFileExtension && !hasAsciiFileExtension) { LERROR(fmt::format( - "Input filename does not have expected {} or {} extension.", - SessionRecording::FileExtensionBinary, - SessionRecording::FileExtensionAscii + "Input filename does not have expected {} or {} extension", + SessionRecording::FileExtensionBinary, SessionRecording::FileExtensionAscii )); return; } @@ -114,7 +113,7 @@ documentation::Documentation ConvertRecFileVersionTask::documentation() { "InputFilePath", new StringAnnotationVerifier("A valid filename to convert"), Optional::No, - "The filename to update to the current file format.", + "The filename to update to the current file format", }, }, }; diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp index 1f07039ed9..e615993b6a 100644 --- a/src/interaction/tasks/convertrecformattask.cpp +++ b/src/interaction/tasks/convertrecformattask.cpp @@ -147,7 +147,7 @@ void ConvertRecFormatTask::convert() { } else { // Add error output for file type not recognized - LERROR("Session recording file unrecognized format type."); + LERROR("Session recording file unrecognized format type"); } } @@ -319,13 +319,13 @@ documentation::Documentation ConvertRecFormatTask::documentation() { "InputFilePath", new StringAnnotationVerifier("A valid filename to convert"), Optional::No, - "The filename to convert to the opposite format.", + "The filename to convert to the opposite format", }, { "OutputFilePath", new StringAnnotationVerifier("A valid output filename"), Optional::No, - "The filename containing the converted result.", + "The filename containing the converted result", }, }, }; diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp index 91ab2aeb0e..44785df83e 100644 --- a/src/navigation/navigationhandler.cpp +++ b/src/navigation/navigationhandler.cpp @@ -76,7 +76,7 @@ namespace { "UseKeyFrameInteraction", "Use keyframe interaction", "If this is set to 'true' the entire interaction is based off key frames rather " - "than using the mouse interaction." + "than using the mouse interaction" }; } // namespace diff --git a/src/navigation/navigationstate.cpp b/src/navigation/navigationstate.cpp index d73e2885fb..09fca66482 100644 --- a/src/navigation/navigationstate.cpp +++ b/src/navigation/navigationstate.cpp @@ -98,14 +98,14 @@ CameraPose NavigationState::cameraPose() const { if (!anchorNode) { LERROR(fmt::format( - "Could not find scene graph node '{}' used as anchor.", anchor + "Could not find scene graph node '{}' used as anchor", anchor )); return CameraPose(); } if (!referenceFrameNode) { LERROR(fmt::format( - "Could not find scene graph node '{}' used as reference frame.", + "Could not find scene graph node '{}' used as reference frame", referenceFrame )); return CameraPose(); diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp index fe36fbf67d..2c47c29ff2 100644 --- a/src/navigation/orbitalnavigator.cpp +++ b/src/navigation/orbitalnavigator.cpp @@ -51,7 +51,7 @@ namespace { "Anchor", "The name of the scene graph node that is the origin of the camera interaction. " "The camera follows, orbits and dollies towards this node. " - "Any scene graph node can be the anchor node." + "Any scene graph node can be the anchor node" }; constexpr openspace::properties::Property::PropertyInfo AimInfo = { @@ -59,21 +59,21 @@ namespace { "Aim", "The name of the scene graph node that is the aim of the camera. " "The camera direction is relative to the vector from the camera position " - "to this node." + "to this node" }; constexpr openspace::properties::Property::PropertyInfo RetargetAnchorInfo = { "RetargetAnchor", "Retarget Anchor", "When triggered, this property starts an interpolation to reset the " - "camera direction to the anchor node." + "camera direction to the anchor node" }; constexpr openspace::properties::Property::PropertyInfo RetargetAimInfo = { "RetargetAim", "Retarget Aim", "When triggered, this property starts an interpolation to reset the " - "camera direction to the aim node." + "camera direction to the aim node" }; constexpr openspace::properties::Property::PropertyInfo RollFrictionInfo = { @@ -81,7 +81,7 @@ namespace { "Roll Friction", "If this is enabled, a small friction is applied to the rolling part of the " "camera motion, thus slowing it down within a small time period. If this value " - "is disabled, the camera will roll forever." + "is disabled, the camera will roll forever" }; constexpr openspace::properties::Property::PropertyInfo RotationalFrictionInfo = { @@ -89,7 +89,7 @@ namespace { "Rotational Friction", "If this is enabled, a small friction is applied to the rotational part of the " "camera motion, thus slowing it down within a small time period. If this value " - "is disabled, the camera will rotate forever." + "is disabled, the camera will rotate forever" }; constexpr openspace::properties::Property::PropertyInfo ZoomFrictionInfo = { @@ -97,28 +97,28 @@ namespace { "Zoom Friction", "If this is enabled, a small friction is applied to the zoom part of the camera " "motion, thus slowing it down within a small time period. If this value is " - "disabled, the camera will zoom in or out forever." + "disabled, the camera will zoom in or out forever" }; constexpr openspace::properties::Property::PropertyInfo MouseSensitivityInfo = { "MouseSensitivity", "Mouse Sensitivity", "Determines the sensitivity of the camera motion thorugh the mouse. The lower " - "the sensitivity is the less impact a mouse motion will have." + "the sensitivity is the less impact a mouse motion will have" }; constexpr openspace::properties::Property::PropertyInfo JoystickSensitivityInfo = { "JoystickSensitivity", "Joystick Sensitivity", "Determines the sensitivity of the camera motion thorugh a joystick. The lower " - "the sensitivity is the less impact a joystick motion will have." + "the sensitivity is the less impact a joystick motion will have" }; constexpr openspace::properties::Property::PropertyInfo WebsocketSensitivityInfo = { "WebsocketSensitivity", "Websocket Sensitivity", "Determines the sensitivity of the camera motion thorugh a websocket. The lower " - "the sensitivity is the less impact a webstick motion will have." + "the sensitivity is the less impact a webstick motion will have" }; constexpr openspace::properties::Property::PropertyInfo FrictionInfo = { @@ -126,7 +126,7 @@ namespace { "Friction Factor", "Determines the factor that is applied if the 'Roll Friction', 'Rotational " "Friction', and 'Zoom Friction' values are enabled. The lower this value is, the " - "faster the camera movements will stop." + "faster the camera movements will stop" }; constexpr openspace::properties::Property::PropertyInfo FollowAnchorNodeInfo = { @@ -135,7 +135,7 @@ namespace { "If true, the camera will rotate with the current achor node if within a " "certain distance from it. When this happens, the object will appear fixed in " "relation to the camera. The distance at which the change happens is controlled " - "through another property." + "through another property" }; constexpr openspace::properties::Property::PropertyInfo FollowAnchorNodeDistanceInfo = @@ -144,14 +144,14 @@ namespace { "Follow Anchor Node Rotation Distance", "A factor used to determine the distance at which the camera starts rotating " "with the anchor node. The actual distance will be computed by multiplying " - "this factor with the approximate radius of the node." + "this factor with the approximate radius of the node" }; constexpr openspace::properties::Property::PropertyInfo MinimumDistanceInfo = { "MinimumAllowedDistance", "Minimum Allowed Distance", "Limits how close the camera can get to an object. The distance is given in " - "meters above the surface." + "meters above the surface" }; constexpr openspace::properties::Property::PropertyInfo StereoInterpolationTimeInfo = @@ -159,7 +159,7 @@ namespace { "StereoInterpolationTime", "Stereo Interpolation Time", "The time to interpolate to a new stereoscopic depth " - "when the anchor node is changed, in seconds." + "when the anchor node is changed, in seconds" }; constexpr openspace::properties::Property::PropertyInfo @@ -168,14 +168,14 @@ namespace { "RetargetAnchorInterpolationTime", "Retarget Interpolation Time", "The time to interpolate the camera rotation " - "when the anchor or aim node is changed, in seconds." + "when the anchor or aim node is changed, in seconds" }; constexpr openspace::properties::Property::PropertyInfo FollowRotationInterpTimeInfo = { "FollowRotationInterpolationTime", "Follow Rotation Interpolation Time", - "The interpolation time when toggling following focus node rotation." + "The interpolation time when toggling following focus node rotation" }; constexpr openspace::properties::Property::PropertyInfo InvertMouseButtons = { @@ -183,7 +183,7 @@ namespace { "Invert Left and Right Mouse Buttons", "If this value is 'false', the left mouse button causes the camera to rotate " "around the object and the right mouse button causes the zooming motion. If this " - "value is 'true', these two functionalities are reversed." + "value is 'true', these two functionalities are reversed" }; constexpr openspace::properties::Property::PropertyInfo @@ -194,7 +194,7 @@ namespace { "Dynamically adjust the view scaling based on the distance to the surface of " "the anchor and aim nodes. If enabled, view scale will be set to " "StereoscopicDepthOfFocusSurface / min(anchorDistance, aimDistance). " - "If disabled, view scale will be set to 10^StaticViewScaleExponent." + "If disabled, view scale will be set to 10^StaticViewScaleExponent" }; constexpr openspace::properties::Property::PropertyInfo StaticViewScaleExponentInfo = @@ -202,7 +202,7 @@ namespace { "StaticViewScaleExponent", "Static View Scale Exponent", "Statically scale the world by 10^StaticViewScaleExponent. " - "Only used if UseAdaptiveStereoscopicDepthInfo is set to false." + "Only used if UseAdaptiveStereoscopicDepthInfo is set to false" }; constexpr openspace::properties::Property::PropertyInfo @@ -212,21 +212,21 @@ namespace { "Stereoscopic Depth of the Surface in Focus", "Set the stereoscopically perceived distance (in meters) to the closest " "point out of the surface of the anchor and the center of the aim node. " - "Only used if UseAdaptiveStereoscopicDepthInfo is set to true." + "Only used if UseAdaptiveStereoscopicDepthInfo is set to true" }; constexpr openspace::properties::Property::PropertyInfo ApplyIdleBehaviorInfo = { "ApplyIdleBehavior", "Apply Idle Behavior", "When set to true, the chosen idle behavior will be applied to the camera, " - "moving the camera accordingly." + "moving the camera accordingly" }; constexpr openspace::properties::Property::PropertyInfo IdleBehaviorInfo = { "IdleBehavior", "Idle Behavior", "The chosen camera behavior that will be triggered when the idle behavior is " - "applied. Each option represents a predefined camera behavior." + "applied. Each option represents a predefined camera behavior" }; constexpr openspace::properties::Property::PropertyInfo @@ -235,21 +235,21 @@ namespace { "ShouldTriggerWhenIdle", "Should Trigger When Idle", "If true, the chosen idle behavior will trigger automatically after " - "a certain time (see 'IdleWaitTime' property)." + "a certain time (see 'IdleWaitTime' property)" }; constexpr openspace::properties::Property::PropertyInfo IdleWaitTimeInfo = { "IdleWaitTime", "Idle Wait Time", "The time (seconds) until idle behavior starts, if no camera interaction " - "has been performed. Note that friction counts as camera interaction." + "has been performed. Note that friction counts as camera interaction" }; constexpr openspace::properties::Property::PropertyInfo IdleBehaviorSpeedInfo = { "SpeedFactor", "Speed Factor", "A factor that can be used to increase or slow down the speed of an applied " - "idle behavior." + "idle behavior" }; constexpr openspace::properties::Property::PropertyInfo AbortOnCameraInteractionInfo = @@ -259,7 +259,7 @@ namespace { "If set to true, the idle behavior is aborted on camera interaction. If false, " "the behavior will be reapplied after the interaction. Examples of camera " "interaction are: changing the anchor node, starting a camera path or session " - "recording playback, or navigating manually using an input device." + "recording playback, or navigating manually using an input device" }; constexpr openspace::properties::Property::PropertyInfo @@ -268,13 +268,12 @@ namespace { "DampenInterpolationTime", "Start/End Dampen Interpolation Time", "The time to interpolate to/from full speed when an idle behavior is triggered " - "or canceled, in seconds." + "or canceled, in seconds" }; constexpr std::string_view IdleKeyOrbit = "Orbit"; constexpr std::string_view IdleKeyOrbitAtConstantLat = "OrbitAtConstantLatitude"; constexpr std::string_view IdleKeyOrbitAroundUp = "OrbitAroundUp"; - } // namespace namespace openspace::interaction { @@ -370,7 +369,7 @@ OrbitalNavigator::OrbitalNavigator() } else { LERROR(fmt::format( - "No scenegraph node with identifier {} exists.", _anchor.value() + "No scenegraph node with identifier {} exists", _anchor.value() )); } }); @@ -386,7 +385,7 @@ OrbitalNavigator::OrbitalNavigator() } else { LERROR(fmt::format( - "No scenegraph node with identifier {} exists.", _aim.value() + "No scenegraph node with identifier {} exists", _aim.value() )); } }); @@ -1671,7 +1670,7 @@ void OrbitalNavigator::applyIdleBehavior(double deltaTime, glm::dvec3& position, void OrbitalNavigator::orbitAnchor(double deltaTime, glm::dvec3& position, glm::dquat& globalRotation, double speedScale) { - ghoul_assert(_anchorNode != nullptr, "Node to orbit must be set!"); + ghoul_assert(_anchorNode != nullptr, "Node to orbit must be set"); // Apply a rotation to the right, in camera space // (Maybe we should also let the user decide which direction to rotate? @@ -1695,7 +1694,7 @@ void OrbitalNavigator::orbitAroundAxis(const glm::dvec3 axis, double deltaTime, glm::dvec3& position, glm::dquat& globalRotation, double speedScale) { - ghoul_assert(_anchorNode != nullptr, "Node to orbit must be set!"); + ghoul_assert(_anchorNode != nullptr, "Node to orbit must be set"); const glm::dmat4 modelTransform = _anchorNode->modelTransform(); const glm::dvec3 axisInWorldCoords = diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp index 970008835a..987ec92e55 100644 --- a/src/navigation/path.cpp +++ b/src/navigation/path.cpp @@ -115,7 +115,7 @@ Path::Path(Waypoint start, Waypoint end, Type type, _curve = std::make_unique(_start, _end); break; default: - LERROR("Could not create curve. Type does not exist!"); + LERROR("Could not create curve. Type does not exist"); throw ghoul::MissingCaseException(); } @@ -689,9 +689,8 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary, waypoints = { computeWaypointFromNodeInfo(info, startPoint, type) }; break; } - default: { + default: throw ghoul::MissingCaseException(); - } } // @TODO (emmbr) Allow for an instruction to represent a list of multiple waypoints @@ -699,7 +698,7 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary, if (glm::distance(startPoint.position(), waypointToAdd.position()) < LengthEpsilon) { LINFO("Already at the requested target"); - throw PathCurve::TooShortPathError("Path too short!"); + throw PathCurve::TooShortPathError("Path too short"); } checkVisibilityAndShowMessage(waypointToAdd.node()); @@ -719,7 +718,7 @@ Path createPathFromDictionary(const ghoul::Dictionary& dictionary, LINFO( "Switching to a linear path, to avoid problems with precision due to " - "immense path length." + "immense path length" ); return createPathFromDictionary(dictionary, Path::Type::Linear); diff --git a/src/navigation/pathcurve.cpp b/src/navigation/pathcurve.cpp index 537a6767d3..8c9b0fda87 100644 --- a/src/navigation/pathcurve.cpp +++ b/src/navigation/pathcurve.cpp @@ -65,7 +65,7 @@ std::vector PathCurve::points() const { void PathCurve::initializeParameterData() { _nSegments = static_cast(_points.size() - 3); - ghoul_assert(_nSegments > 0, "Cannot have a curve with zero segments!"); + ghoul_assert(_nSegments > 0, "Cannot have a curve with zero segments"); _curveParameterSteps.clear(); _lengthSums.clear(); @@ -91,7 +91,7 @@ void PathCurve::initializeParameterData() { _totalLength = _lengthSums.back(); if (_totalLength < LengthEpsilon) { - throw TooShortPathError("Path too short!"); + throw TooShortPathError("Path too short"); } // Compute a map of arc lengths s and curve parameters u, for reparameterization diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp index 1ab8edc6d0..42e6ca9f33 100644 --- a/src/navigation/pathnavigator.cpp +++ b/src/navigation/pathnavigator.cpp @@ -57,7 +57,7 @@ namespace { "Default Path Type", "The default path type chosen when generating a path or flying to a target. " "See wiki for alternatives. The shape of the generated path will be different " - "depending on the path type." + "depending on the path type" }; constexpr openspace::properties::Property::PropertyInfo IncludeRollInfo = { @@ -71,14 +71,14 @@ namespace { "Speed Scale", "Scale factor that the speed will be multiplied with during path traversal. " "Can be used to speed up or slow down the camera motion, depending on if the " - "value is larger than or smaller than one." + "value is larger than or smaller than one" }; constexpr openspace::properties::Property::PropertyInfo IdleBehaviorOnFinishInfo = { "ApplyIdleBehaviorOnFinish", "Apply Idle Behavior on Finish", "If set to true, the chosen IdleBehavior of the OrbitalNavigator will be " - "triggered once the path has reached its target." + "triggered once the path has reached its target" }; constexpr openspace::properties::Property::PropertyInfo ArrivalDistanceFactorInfo = { @@ -87,7 +87,7 @@ namespace { "A factor used to compute the default distance from a target scene graph node " "when creating a camera path. The factor will be multipled with the node's " "bounding sphere to compute the target height from the bounding sphere of the " - "object." + "object" }; constexpr openspace::properties::Property::PropertyInfo RotationSpeedFactorInfo = { @@ -95,7 +95,7 @@ namespace { "Rotation Speed Factor (Linear Path)", "Affects how fast the camera rotates to the target rotation during a linear " "path. A value of 1 means that the camera will rotate 90 degrees in about 5 " - "seconds. A value of 2 means twice that fast, and so on." + "seconds. A value of 2 means twice that fast, and so on" }; constexpr openspace::properties::Property::PropertyInfo MinBoundingSphereInfo = { @@ -103,14 +103,14 @@ namespace { "Minimal Valid Bounding Sphere", "The minimal allowed value for a bounding sphere, in meters. Used for " "computation of target positions and path generation, to avoid issues when " - "there is no bounding sphere." + "there is no bounding sphere" }; constexpr openspace::properties::Property::PropertyInfo RelevantNodeTagsInfo = { "RelevantNodeTags", "Relevant Node Tags", "List of tags for the nodes that are relevant for path creation, for example " - "when avoiding collisions." + "when avoiding collisions" }; } // namespace @@ -399,7 +399,7 @@ double PathNavigator::findValidBoundingSphere(const SceneGraphNode* node) const if (result > _minValidBoundingSphere) { LDEBUG(fmt::format( "The scene graph node '{}' has no, or a very small, bounding sphere. " - "Using bounding sphere of child node '{}' in computations.", + "Using bounding sphere of child node '{}' in computations", node->identifier(), child->identifier() )); @@ -409,7 +409,7 @@ double PathNavigator::findValidBoundingSphere(const SceneGraphNode* node) const LDEBUG(fmt::format( "The scene graph node '{}' has no, or a very small, bounding sphere. Using " - "minimal value. This might lead to unexpected results.", + "minimal value. This might lead to unexpected results", node->identifier()) ); diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp index 87f4e47fea..276ec3b486 100644 --- a/src/network/parallelconnection.cpp +++ b/src/network/parallelconnection.cpp @@ -37,9 +37,6 @@ namespace { namespace openspace { -// Gonna do some UTF-like magic once we reach 255 to introduce a second byte or something -const uint8_t ParallelConnection::ProtocolVersion = 6; - ParallelConnection::Message::Message(MessageType t, std::vector c) : type(t) , content(std::move(c)) diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp index 471ff8e701..7e56d805bb 100644 --- a/src/network/parallelpeer.cpp +++ b/src/network/parallelpeer.cpp @@ -50,34 +50,34 @@ namespace { "Password", "Password", "The general password that allows this OpenSpace instance access to the Wormhole " - "server." + "server" }; constexpr openspace::properties::Property::PropertyInfo HostPasswordInfo = { "HostPassword", "Host Password", "The password that is required to take control of the joint session and thus " - "send all commands to connected clients." + "send all commands to connected clients" }; constexpr openspace::properties::Property::PropertyInfo PortInfo = { "Port", "Port", "The port on which the Wormhole server is listening to connections from " - "OpenSpace." + "OpenSpace" }; constexpr openspace::properties::Property::PropertyInfo AddressInfo = { "Address", "Address", - "The address of the Wormhole server either as a DNS name or an IP address." + "The address of the Wormhole server either as a DNS name or an IP address" }; constexpr openspace::properties::Property::PropertyInfo NameInfo = { "Name", "Connection Name", "The name of this OpenSpace instance that will be potentially broadcast to other " - "connected instances." + "connected instances" }; constexpr openspace::properties::Property::PropertyInfo BufferTimeInfo = { @@ -86,7 +86,7 @@ namespace { "This is the number of seconds that received keyframes are buffered before they " "get applied to the rendering. A higher value leads to smoother rendering, " "particularly when the internet connection is unstable, but also leads to higher " - "delay." + "delay" }; constexpr openspace::properties::Property::PropertyInfo TimeKeyFrameInfo = { @@ -94,7 +94,7 @@ namespace { "Time keyframe interval", "Determines how often the information about the simulation time is sent (in " "seconds). Lower values mean more accurate representation of the time, but also " - "require higher internet bandwidth." + "require higher internet bandwidth" }; constexpr openspace::properties::Property::PropertyInfo CameraKeyFrameInfo = { @@ -387,13 +387,12 @@ void ParallelPeer::dataMessageReceived(const std::vector& message) { ); break; } - default: { + default: LERROR(fmt::format( "Unidentified message with identifier {} received in parallel connection", type )); break; - } } } diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp index 34283c67d5..4d0b5338d3 100644 --- a/src/properties/selectionproperty.cpp +++ b/src/properties/selectionproperty.cpp @@ -132,8 +132,8 @@ void SelectionProperty::clearOptions() { std::set SelectionProperty::fromLuaConversion(lua_State* state, bool& success) const { - static const int KEY = -2; - static const int VAL = -1; + constexpr int KEY = -2; + constexpr int VAL = -1; if (!lua_istable(state, VAL)) { LERROR("Parameter passed to the property is not a table"); diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp index 71ccae1c43..472354f82c 100644 --- a/src/rendering/dashboard.cpp +++ b/src/rendering/dashboard.cpp @@ -40,11 +40,12 @@ namespace { "If this value is 'false', this dashboard will be invisible, regardless of the " "state of the individual components" }; + constexpr openspace::properties::Property::PropertyInfo StartPositionOffsetInfo = { "StartPositionOffset", "Start Position Offset", - "A 2D vector controlling where the dashboard rendering starts." - "Adding an offset in x and y-direction on screen" + "A 2D vector controlling where the dashboard rendering starts. Adding an offset " + "in x and y-direction on screen" }; } // namespace diff --git a/src/rendering/dashboardtextitem.cpp b/src/rendering/dashboardtextitem.cpp index f0da228e6e..30d4420c53 100644 --- a/src/rendering/dashboardtextitem.cpp +++ b/src/rendering/dashboardtextitem.cpp @@ -35,13 +35,13 @@ namespace { "FontName", "Font Name", "This value is the name of the font that is used. It can either refer to an " - "internal name registered previously, or it can refer to a path that is used." + "internal name registered previously, or it can refer to a path that is used" }; constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", - "This value determines the size of the font that is used to render the distance." + "This value determines the size of the font that is used to render the distance" }; struct [[codegen::Dictionary(DashboardTextItem)]] Parameters { diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp index 537da2f6e2..06b16d2bf3 100644 --- a/src/rendering/luaconsole.cpp +++ b/src/rendering/luaconsole.cpp @@ -73,38 +73,38 @@ namespace { "IsVisible", "Is Visible", "Determines whether the Lua console is shown on the screen or not. Toggling it " - "will fade the console in and out." + "will fade the console in and out" }; constexpr openspace::properties::Property::PropertyInfo RemoveScriptingInfo = { "RemoteScripting", "Remote scripting", "Determines whether the entered commands will only be executed locally (if this " - "is disabled), or whether they will be send to connected remove instances." + "is disabled), or whether they will be send to connected remove instances" }; constexpr openspace::properties::Property::PropertyInfo BackgroundColorInfo = { "BackgroundColor", "Background Color", - "Sets the background color of the console." + "Sets the background color of the console" }; constexpr openspace::properties::Property::PropertyInfo EntryTextColorInfo = { "EntryTextColor", "Entry Text Color", - "Sets the text color of the entry area of the console." + "Sets the text color of the entry area of the console" }; constexpr openspace::properties::Property::PropertyInfo HistoryTextColorInfo = { "HistoryTextColor", "History Text Color", - "Sets the text color of the history area of the console." + "Sets the text color of the history area of the console" }; constexpr openspace::properties::Property::PropertyInfo HistoryLengthInfo = { "HistoryLength", "History Length", - "Determines the length of the history in number of lines." + "Determines the length of the history in number of lines" }; std::string sanitizeInput(std::string str) { diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp index 855cfc9914..d26f2e4fd9 100644 --- a/src/rendering/renderable.cpp +++ b/src/rendering/renderable.cpp @@ -45,14 +45,14 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Is Enabled", - "This setting determines whether this object will be visible or not." + "This setting determines whether this object will be visible or not" }; constexpr openspace::properties::Property::PropertyInfo OpacityInfo = { "Opacity", "Opacity", "This value determines the opacity of this renderable. A value of 0 means " - "completely transparent." + "completely transparent" }; constexpr openspace::properties::Property::PropertyInfo FadeInfo = { @@ -70,7 +70,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo RenderableTypeInfo = { "Type", "Renderable Type", - "This tells the type of the renderable.", + "This tells the type of the renderable", openspace::properties::Property::Visibility::Hidden }; @@ -79,7 +79,7 @@ namespace { "RenderBinMode", "Render Bin Mode", "This value specifies if the renderable should be rendered in the Background," - "Opaque, Pre/PostDeferredTransparency, or Overlay rendering step.", + "Opaque, Pre/PostDeferredTransparency, or Overlay rendering step", openspace::properties::Property::Visibility::Developer }; @@ -87,7 +87,7 @@ namespace { "DimInAtmosphere", "Dim In Atmosphere", "Enables/Disables if the object should be dimmed if the camera is in an " - "atmosphere.", + "atmosphere", openspace::properties::Property::Visibility::Developer }; diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 00cbe03c6c..064b8634e5 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -82,7 +82,7 @@ namespace { "ShowOverlayOnClients", "Show Overlay Information on Clients", "If this value is enabled, the overlay information text is also automatically " - "rendered on client nodes. This values is disabled by default." + "rendered on client nodes. This values is disabled by default" }; constexpr openspace::properties::Property::PropertyInfo ShowLogInfo = { @@ -90,7 +90,7 @@ namespace { "Show the on-screen log", "This value determines whether the on-screen log will be shown or hidden. Even " "if it is shown, all 'Debug' and 'Trace' level messages are omitted from this " - "log." + "log" }; constexpr openspace::properties::Property::PropertyInfo VerticalLogOffsetInfo = { @@ -104,7 +104,7 @@ namespace { "ShowVersion", "Shows the version on-screen information", "This value determines whether the Git version information (branch and commit) " - "hash are shown on the screen." + "hash are shown on the screen" }; constexpr openspace::properties::Property::PropertyInfo ShowCameraInfo = { @@ -119,7 +119,7 @@ namespace { "Screenshow Window Ids", "The list of window identifiers whose screenshot will be taken the next time " "anyone triggers a screenshot. If this list is empty (the default), all windows " - "will have their screenshot taken. Id's that do not exist are silently ignored." + "will have their screenshot taken. Id's that do not exist are silently ignored" }; constexpr openspace::properties::Property::PropertyInfo ApplyWarpingInfo = { @@ -128,7 +128,7 @@ namespace { "This value determines whether a warping should be applied before taking a " "screenshot. If it is enabled, all post processing is applied as well, which " "includes everything rendered on top of the rendering, such as the user " - "interface." + "interface" }; constexpr openspace::properties::Property::PropertyInfo ScreenshotUseDateInfo = { @@ -142,7 +142,7 @@ namespace { "ShowFrameInformation", "Show Frame Information", "If this value is enabled, the current frame number and frame times are rendered " - "into the window." + "into the window" }; constexpr openspace::properties::Property::PropertyInfo DisableMasterInfo = { @@ -152,7 +152,7 @@ namespace { "Every other aspect of the application will be unaffected by this and it will " "still respond to user input. This setting is reasonably only useful in the case " "of multi-pipeline environments, such as planetariums, where the output of the " - "master node is not required and performance can be gained by disabling it." + "master node is not required and performance can be gained by disabling it" }; constexpr openspace::properties::Property::PropertyInfo GlobalRotationInfo = { @@ -168,7 +168,7 @@ namespace { "ScreenSpaceRotation", "Screen Space Rotation", "Applies a rotation to all screen space renderables. " - "Defined using pitch, yaw, roll in radians." + "Defined using pitch, yaw, roll in radians" }; constexpr openspace::properties::Property::PropertyInfo MasterRotationInfo = { @@ -176,7 +176,7 @@ namespace { "Master Rotation", "Applies a view rotation for only the master node, defined using " "pitch, yaw, roll in radians. This can be used to compensate the master view " - "direction for tilted display systems in clustered immersive environments." + "direction for tilted display systems in clustered immersive environments" }; constexpr openspace::properties::Property::PropertyInfo DisableHDRPipelineInfo = { @@ -184,21 +184,21 @@ namespace { "Disable HDR Rendering", "If this value is enabled, the rendering will disable the HDR color handling " "and the LDR color pipeline will be used. Be aware of possible over exposure " - "in the final colors." + "in the final colors" }; constexpr openspace::properties::Property::PropertyInfo HDRExposureInfo = { "HDRExposure", "HDR Exposure", "This value determines the amount of light per unit area reaching the " - "equivalent of an electronic image sensor." + "equivalent of an electronic image sensor" }; constexpr openspace::properties::Property::PropertyInfo GammaInfo = { "Gamma", "Gamma Correction", "Gamma, is the nonlinear operation used to encode and decode luminance or " - "tristimulus values in the image." + "tristimulus values in the image" }; constexpr openspace::properties::Property::PropertyInfo HueInfo = { @@ -231,7 +231,7 @@ namespace { "Horizontal Field of View", "Adjusts the degrees of the horizontal field of view. The vertical field of " "view will be automatically adjusted to match, according to the current " - "aspect ratio." + "aspect ratio" }; constexpr openspace::properties::Property::PropertyInfo GlobalBlackoutFactorInfo = { @@ -250,13 +250,13 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledFontColorInfo = { "EnabledFontColor", "Enabled Font Color", - "The font color used for enabled options." + "The font color used for enabled options" }; constexpr openspace::properties::Property::PropertyInfo DisabledFontColorInfo = { "DisabledFontColor", "Disabled Font Color", - "The font color used for disabled options." + "The font color used for disabled options" }; } // namespace diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp index b3376ff984..0dd57fb310 100644 --- a/src/rendering/screenspacerenderable.cpp +++ b/src/rendering/screenspacerenderable.cpp @@ -49,7 +49,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Is Enabled", - "This setting determines whether this sceen space plane will be visible or not." + "This setting determines whether this sceen space plane will be visible or not" }; constexpr openspace::properties::Property::PropertyInfo @@ -62,21 +62,21 @@ namespace { "using cartesian coordinates. By switching this value, the correct property will " "be shown or hidden. The Cartesian coordinate system is useful if a regular " "rendering is applied, whereas the radius azimuth elevation are most useful in a " - "planetarium environment." + "planetarium environment" }; constexpr openspace::properties::Property::PropertyInfo UsePerspectiveProjectionInfo = { "UsePerspectiveProjection", "Use Perspective Projection", - "Determines whetether the z/radius values affects the size of the plane or not." + "Determines whetether the z/radius values affects the size of the plane or not" }; constexpr openspace::properties::Property::PropertyInfo CartesianPositionInfo = { "CartesianPosition", "Cartesian Coordinates", "This value determines the position of this screen space plane in Cartesian " - "three-dimensional coordinates (meters)." + "three-dimensional coordinates (meters)" }; constexpr openspace::properties::Property::PropertyInfo RadiusAzimuthElevationInfo = { @@ -84,7 +84,7 @@ namespace { "Radius Azimuth Elevation", "This value determines the position of this screen space plane in a " "coordinate system based on radius (meters), azimuth (radians) and elevation " - "(radians)." + "(radians)" }; constexpr openspace::properties::Property::PropertyInfo ScaleInfo = { @@ -92,20 +92,20 @@ namespace { "Scale Value", "This value determines a scale factor for the plane. The default size of a plane " "is determined by the concrete instance and reflects, for example, the size of " - "the image being displayed." + "the image being displayed" }; constexpr openspace::properties::Property::PropertyInfo LocalRotationInfo = { "Rotation", "Local Rotation", - "An euler rotation (x, y, z) to apply to the plane." + "An euler rotation (x, y, z) to apply to the plane" }; constexpr openspace::properties::Property::PropertyInfo MultiplyColorInfo = { "MultiplyColor", "Multiply Color", "If set, the plane's texture is multiplied with this color. " - "Useful for applying a color grayscale images." + "Useful for applying a color grayscale images" }; constexpr openspace::properties::Property::PropertyInfo BackgroundColorInfo = { @@ -113,7 +113,7 @@ namespace { "Background Color", "The fixed color that is combined with the screen space renderable to create the " "final color. The actual color of the screen space renderable is alpha-blended " - "with the background color to produce the final result." + "with the background color to produce the final result" }; constexpr openspace::properties::Property::PropertyInfo OpacityInfo = { @@ -121,7 +121,7 @@ namespace { "Opacity", "This value determines the opacity of the screen space plane. If this value " "is 1, the plane is completely opaque, if this value is 0, the plane is " - "completely transparent." + "completely transparent" }; constexpr openspace::properties::Property::PropertyInfo FadeInfo = { @@ -140,20 +140,20 @@ namespace { "Delete", "Delete", "If this property is triggered, this screen space plane is removed from the " - "scene." + "scene" }; constexpr openspace::properties::Property::PropertyInfo FaceCameraInfo = { "FaceCamera", "Face Camera", "If enabled, the local rotation is applied after the plane is rotated to face " - "the camera." + "the camera" }; constexpr openspace::properties::Property::PropertyInfo GammaInfo = { "Gamma", "Gamma Correction", - "Sets the gamma correction of the texture." + "Sets the gamma correction of the texture" }; float wrap(float value, float min, float max) { diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp index 795666978c..d802b6188c 100644 --- a/src/rendering/transferfunction.cpp +++ b/src/rendering/transferfunction.cpp @@ -57,7 +57,7 @@ void TransferFunction::setPath(const std::string& filepath) { } std::filesystem::path f = absPath(filepath); if (!std::filesystem::is_regular_file(f)) { - LERROR("Could not find transfer function file."); + LERROR("Could not find transfer function file"); _file = nullptr; return; } diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp index c826beb452..4f460e4bb4 100644 --- a/src/scene/scene.cpp +++ b/src/scene/scene.cpp @@ -127,7 +127,7 @@ Camera* Scene::camera() const { void Scene::registerNode(SceneGraphNode* node) { if (_nodesByIdentifier.count(node->identifier())) { throw Scene::InvalidSceneError( - "Node with identifier " + node->identifier() + " already exits." + "Node with identifier " + node->identifier() + " already exits" ); } @@ -276,7 +276,7 @@ void Scene::initialize() { ); } catch (const ghoul::RuntimeError& e) { - LERROR(node->name() << " not initialized."); + LERROR(node->name() << " not initialized"); LERRORC(std::string(_loggerCat) + "(" + e.component + ")", e.what()); OsEng.loadingScreen().updateItem( node->name(), @@ -312,7 +312,7 @@ void Scene::initializeGL() { node->initializeGL(); } catch (const ghoul::RuntimeError& e) { - LERROR(node->name() << " not initialized."); + LERROR(node->name() << " not initialized"); LERRORC(std::string(_loggerCat) + "(" + e.component + ")", e.what()); } } @@ -846,7 +846,7 @@ scripting::LuaLibrary Scene::luaLibrary() { "group tag expansion is performed and the first argument is used as an " "ECMAScript style regular expression that matches against the fully " "qualified IDs of properties. If the fifth argument is 'single' no " - "substitutions are performed and exactly 0 or 1 properties are changed." + "substitutions are performed and exactly 0 or 1 properties are changed" }, { "setPropertyValueSingle", @@ -862,14 +862,14 @@ scripting::LuaLibrary Scene::luaLibrary() { "specified. If 'duration' is 0, this parameter value is ignored. " "Otherwise, it has to be 'linear', 'easein', 'easeout', or 'easeinout'. " "This is the same as calling the setValue method and passing 'single' as " - "the fourth argument to setPropertyValue." + "the fourth argument to setPropertyValue" }, { "getPropertyValue", &luascriptfunctions::propertyGetValue, {}, "", - "Returns the value the property, identified by the provided URI." + "Returns the value the property, identified by the provided URI" }, codegen::lua::HasProperty, codegen::lua::GetProperty, diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp index a9d6926a46..416d5b87a5 100644 --- a/src/scene/scenegraphnode.cpp +++ b/src/scene/scenegraphnode.cpp @@ -47,7 +47,7 @@ namespace { "ComputeScreenSpaceData", "Compute Screen Space Data", "If this value is set to 'true', the screenspace-based properties are calculated " - "at regular intervals. If these values are set to 'false', they are not updated." + "at regular intervals. If these values are set to 'false', they are not updated" }; constexpr openspace::properties::Property::PropertyInfo ScreenSpacePositionInfo = { diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp index 6c104adcb7..33a4f46258 100644 --- a/src/scripting/scriptengine.cpp +++ b/src/scripting/scriptengine.cpp @@ -348,7 +348,7 @@ bool ScriptEngine::isLibraryNameAllowed(lua_State* state, const std::string& nam case LUA_TSTRING: LERROR(fmt::format("Library name '{}' specifies a string", name)); break; - case LUA_TTABLE: { + case LUA_TTABLE: if (hasLibrary(name)) { LERROR(fmt::format( "Library with name '{}' has been registered before", name @@ -358,7 +358,6 @@ bool ScriptEngine::isLibraryNameAllowed(lua_State* state, const std::string& nam LERROR(fmt::format("Library name '{}' specifies a table", name)); } break; - } case LUA_TFUNCTION: LERROR(fmt::format("Library name '{}' specifies a function", name)); break; @@ -702,7 +701,7 @@ void ScriptEngine::addBaseLibrary() { "", "Logs the passed value to the installed LogManager with a LogLevel of " "'Trace'. For Boolean, numbers, and strings, the internal values are " - "printed, for all other types, the type is printed instead." + "printed, for all other types, the type is printed instead" }, { "printDebug", @@ -711,7 +710,7 @@ void ScriptEngine::addBaseLibrary() { "", "Logs the passed value to the installed LogManager with a LogLevel of " "'Debug'. For Boolean, numbers, and strings, the internal values are " - "printed, for all other types, the type is printed instead." + "printed, for all other types, the type is printed instead" }, { "printInfo", @@ -720,7 +719,7 @@ void ScriptEngine::addBaseLibrary() { "", "Logs the passed value to the installed LogManager with a LogLevel of " "'Info'. For Boolean, numbers, and strings, the internal values are " - "printed, for all other types, the type is printed instead." + "printed, for all other types, the type is printed instead" }, { "printWarning", @@ -729,7 +728,7 @@ void ScriptEngine::addBaseLibrary() { "", "Logs the passed value to the installed LogManager with a LogLevel of " "'Warning'. For Boolean, numbers, and strings, the internal values are " - "printed, for all other types, the type is printed instead." + "printed, for all other types, the type is printed instead" }, { "printError", @@ -738,7 +737,7 @@ void ScriptEngine::addBaseLibrary() { "", "Logs the passed value to the installed LogManager with a LogLevel of " "'Error'. For Boolean, numbers, and strings, the internal values are " - "printed, for all other types, the type is printed instead." + "printed, for all other types, the type is printed instead" }, { "printFatal", @@ -747,7 +746,7 @@ void ScriptEngine::addBaseLibrary() { "", "Logs the passed value to the installed LogManager with a LogLevel of " "'Fatal'. For Boolean, numbers, and strings, the internal values are " - "printed, for all other types, the type is printed instead." + "printed, for all other types, the type is printed instead" }, codegen::lua::AbsolutePath, codegen::lua::SetPathToken, diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp index be21de9c01..f1d6d5f91d 100644 --- a/src/scripting/scriptscheduler.cpp +++ b/src/scripting/scriptscheduler.cpp @@ -39,7 +39,7 @@ namespace { "Enabled", "This enables or disables the ScriptScheduler. If disabled, no scheduled scripts " "will be executed. If enabled, scheduled scripts will be executed at their given " - "time as normal." + "time as normal" }; constexpr openspace::properties::Property::PropertyInfo ShouldRunAllTimeJumpInfo = { @@ -47,7 +47,7 @@ namespace { "Should Run All Time Jump", "If 'true': In a time jump, all scheduled scripts between the old time and the " "new time is executed. If 'false': In a time jump, no scripts scheduled between " - "the new time and the old time is executed." + "the new time and the old time is executed" }; struct [[codegen::Dictionary(ScheduledScript)]] Parameters { diff --git a/src/util/universalhelpers.cpp b/src/util/universalhelpers.cpp index 1001f4f329..9beca8052b 100644 --- a/src/util/universalhelpers.cpp +++ b/src/util/universalhelpers.cpp @@ -27,8 +27,10 @@ namespace openspace::helpers { double shiftAndScale(double t, double start, double end) { - ghoul_assert(0.0 < start && start < end && end < 1.0, - "Values must be 0.0 < start < end < 1.0!"); + ghoul_assert( + 0.0 < start && start < end && end < 1.0, + "Values must be 0.0 < start < end < 1.0" + ); double tScaled = t / (end - start) - start; return std::max(0.0, std::min(tScaled, 1.0)); diff --git a/src/util/versionchecker.cpp b/src/util/versionchecker.cpp index 7ddff9bb68..4b1b9b3f09 100644 --- a/src/util/versionchecker.cpp +++ b/src/util/versionchecker.cpp @@ -113,7 +113,7 @@ void VersionChecker::cancel() { } else { LINFO(fmt::format( - "OpenSpace version {}.{}.{} is up to date.", + "OpenSpace version {}.{}.{} is up to date", currentVersion.major, currentVersion.minor, currentVersion.patch @@ -127,7 +127,7 @@ void VersionChecker::cancel() { std::vector data = _request->downloadedData(); std::string response(data.begin(), data.end()); LWARNING(fmt::format( - "Failed to get latest OpenSpace version information from {}.", + "Failed to get latest OpenSpace version information from {}", _request->url() )); _request = nullptr; diff --git a/support/coding/codegen b/support/coding/codegen index 62647309af..93fb390f1b 160000 --- a/support/coding/codegen +++ b/support/coding/codegen @@ -1 +1 @@ -Subproject commit 62647309af0335f5334de21f598797dada4b0c89 +Subproject commit 93fb390f1b239f737346a42e06dcf7815fdaa77c