diff --git a/plugins/feature/skymap/readme.md b/plugins/feature/skymap/readme.md
index b1f16d390..11430978b 100644
--- a/plugins/feature/skymap/readme.md
+++ b/plugins/feature/skymap/readme.md
@@ -13,6 +13,10 @@ With the ESASky map, a host of astronomical data is available from JWST, Hubble,
![Sky Map feature ESASky](../../../doc/img/SkyMap_ESASky.png)
+Additionally, a map of the Moon can be viewed in 2D or 3D, that supports a variety of data layers from various Lunar missions, such as LRO (Lunar Reconnaissance Orbiter).
+
+![Moon map](../../../doc/img/SkyMap_Moon.png)
+
Interface
![Sky Map feature plugin GUI](../../../doc/img/SkyMap_settings.png)
@@ -38,6 +42,7 @@ Allows you to select the sky map:
* WWT - World Wide Telescope
* ESASky
* Aladin
+* Moon - Map of the Moon
Each map provides different features, image and data sets.
@@ -128,6 +133,14 @@ ESASky and Aladin are able to overlay catalog data:
Attribution
+WWT is from [NumFOCUS](https://worldwidetelescope.org/about/).
+
+ESASky is from [ESAC | ESA](https://www.cosmos.esa.int/web/esdc/esasky-credits).
+
+Aladin Sky Atlas is from [Centre de Données astronomiques de Strasbourg | CDS](https://aladin.cds.unistra.fr/).
+
+Moon map is from [Applied Coherent Technology | ACT](https://www.actgate.com/).
+
Constellation icons created by Freepik - https://www.flaticon.com
API
diff --git a/plugins/feature/skymap/skymapgui.cpp b/plugins/feature/skymap/skymapgui.cpp
index 6f1e4b720..0da9aa04d 100644
--- a/plugins/feature/skymap/skymapgui.cpp
+++ b/plugins/feature/skymap/skymapgui.cpp
@@ -302,6 +302,10 @@ void SkyMapGUI::on_map_currentIndexChanged(int index)
ui->web->load(QUrl(QString("http://127.0.0.1:%1/skymap/html/esasky.html").arg(m_webPort)));
} else if (m_settings.m_map == "Aladin") {
ui->web->load(QUrl(QString("http://127.0.0.1:%1/skymap/html/aladin.html").arg(m_webPort)));
+ } else if (m_settings.m_map == "Moon") {
+ ui->web->load(QUrl(QString("http://quickmap.lroc.asu.edu/"))); // Jumping straight to 3D view doesn't seem to work
+ setStatusText("");
+ m_ready = true;
}
updateToolbar();
updateBackgrounds();
@@ -499,7 +503,6 @@ void SkyMapGUI::applyAllSettings()
void SkyMapGUI::find(const QString& text)
{
- qDebug() << "**********find" << text << m_ready;
if (!m_ready)
{
// Save for when ready
@@ -984,6 +987,7 @@ void SkyMapGUI::updateToolbar()
bool namesVisible = false;
bool projectionVisible = true;
bool backgroundVisible = true;
+ bool basicVisible = true;
if (m_settings.m_map == "WWT")
{
@@ -996,6 +1000,13 @@ void SkyMapGUI::updateToolbar()
backgroundVisible = false;
reticleVisible = false;
}
+ else if (m_settings.m_map == "Moon")
+ {
+ projectionVisible = false;
+ backgroundVisible = false;
+ reticleVisible = false;
+ basicVisible = false;
+ }
ui->background->setVisible(backgroundVisible);
ui->projection->setVisible(projectionVisible);
@@ -1004,6 +1015,14 @@ void SkyMapGUI::updateToolbar()
ui->displayConstellations->setVisible(constellationsVisible);
ui->displayReticle->setVisible(reticleVisible);
+ ui->find->setVisible(basicVisible);
+ ui->findLabel->setVisible(basicVisible);
+ ui->displayGrid->setVisible(basicVisible);
+ ui->displayReticle->setVisible(basicVisible);
+ ui->displayAntennaFoV->setVisible(basicVisible);
+ ui->track->setVisible(basicVisible);
+ ui->source->setVisible(basicVisible);
+
updateProjection();
}
diff --git a/plugins/feature/skymap/skymapgui.ui b/plugins/feature/skymap/skymapgui.ui
index 795d0f065..a3da04658 100644
--- a/plugins/feature/skymap/skymapgui.ui
+++ b/plugins/feature/skymap/skymapgui.ui
@@ -116,6 +116,11 @@
Aladin
+ -
+
+ Moon
+
+
-
@@ -394,17 +399,17 @@
+
+ ButtonSwitch
+ QToolButton
+
+
RollupContents
QWidget
1
-
- ButtonSwitch
- QToolButton
-
-
QWebEngineView
QWidget