diff --git a/doc/img/Map_plugin.png b/doc/img/Map_plugin.png
index 926b64443..1e8b78162 100644
Binary files a/doc/img/Map_plugin.png and b/doc/img/Map_plugin.png differ
diff --git a/doc/img/Map_plugin_apt.png b/doc/img/Map_plugin_apt.png
index dc5e55ae3..4a2cd9c94 100644
Binary files a/doc/img/Map_plugin_apt.png and b/doc/img/Map_plugin_apt.png differ
diff --git a/doc/img/Map_plugin_aurora.png b/doc/img/Map_plugin_aurora.png
new file mode 100644
index 000000000..f3dceb47b
Binary files /dev/null and b/doc/img/Map_plugin_aurora.png differ
diff --git a/doc/img/Map_plugin_beacons.png b/doc/img/Map_plugin_beacons.png
index 6455b5581..5aab4279a 100644
Binary files a/doc/img/Map_plugin_beacons.png and b/doc/img/Map_plugin_beacons.png differ
diff --git a/doc/img/Map_plugin_magdec.png b/doc/img/Map_plugin_magdec.png
new file mode 100644
index 000000000..be0cb7bfb
Binary files /dev/null and b/doc/img/Map_plugin_magdec.png differ
diff --git a/doc/img/Map_plugin_maidenhead_converter.png b/doc/img/Map_plugin_maidenhead_converter.png
new file mode 100644
index 000000000..2f1b87592
Binary files /dev/null and b/doc/img/Map_plugin_maidenhead_converter.png differ
diff --git a/doc/img/Map_plugin_maidenhead_grid1.png b/doc/img/Map_plugin_maidenhead_grid1.png
new file mode 100644
index 000000000..758875334
Binary files /dev/null and b/doc/img/Map_plugin_maidenhead_grid1.png differ
diff --git a/doc/img/Map_plugin_maidenhead_grid2.png b/doc/img/Map_plugin_maidenhead_grid2.png
new file mode 100644
index 000000000..d0bff27b7
Binary files /dev/null and b/doc/img/Map_plugin_maidenhead_grid2.png differ
diff --git a/doc/img/Map_plugin_pfd.png b/doc/img/Map_plugin_pfd.png
new file mode 100644
index 000000000..71ab4aaa2
Binary files /dev/null and b/doc/img/Map_plugin_pfd.png differ
diff --git a/plugins/feature/map/mapgui.cpp b/plugins/feature/map/mapgui.cpp
index d54840b94..42c534c20 100644
--- a/plugins/feature/map/mapgui.cpp
+++ b/plugins/feature/map/mapgui.cpp
@@ -1823,6 +1823,7 @@ void MapGUI::orientationChanged(Qt::ScreenOrientation orientation)
void MapGUI::displayToolbar()
{
+ ui->mapTypes->setVisible(m_settings.m_map2DEnabled);
// Replace buttons with menu when window gets narrow
bool narrow = this->screen()->availableGeometry().width() < 400;
ui->layersMenu->setVisible(narrow);
diff --git a/plugins/feature/map/readme.md b/plugins/feature/map/readme.md
index bd4c68414..c2c1965cc 100644
--- a/plugins/feature/map/readme.md
+++ b/plugins/feature/map/readme.md
@@ -35,7 +35,7 @@ As well as internet and built-in data sources:
* Satellite infra-red data (clouds),
* Sea marks,
* Satellite imagery from NASA GIBS (Global Imagery Browse Services),
-* Aurora probabilty from NOAA.
+* Aurora probabilty.
It can also create tracks showing the path aircraft, ships, radiosondes and APRS objects have taken, as well as predicted paths for satellites.
@@ -43,14 +43,12 @@ It can also create tracks showing the path aircraft, ships, radiosondes and APRS
-3D Models are not included with SDRangel. They must be downloaded by pressing the Download 3D Models button in the Display Settings dialog (21).
+3D Models are not included with SDRangel. They must be downloaded by pressing the Download 3D Models button in the Display Settings dialog (26).
Interface
-WASD keys can be used to move the camera up, left, down and right. QE for forward and back.
-
1: Find
To centre the map on an object or location, enter:
@@ -60,16 +58,26 @@ To centre the map on an object or location, enter:
* A Maidenhead locator (E.g: IO86av).
* An address (E.g: St Katharine's & Wapping, London EC3N 4AB)
-2: Map Type
+2: 2D Map Type
Allows you to select a 2D map type. The available types will depend upon the Map provider
-selected under Display Settings (7).
+selected under Display Settings (26).
3: Maidenhead locator conversion
-When checked, opens the Maidenhead locator converter dialog, which allows conversion between addresses, latitude and longitude and Maidenhead locators.
+When checked, opens the Maidenhead locator converter dialog, which allows conversion between addresses, latitude and longitude and Maidenhead locators. Enter a location in one field and press enter to convert.
-4: Display Beacon dialog
+
+
+4: Maidenhead grid
+
+When checked, displays a Maidenhead locatator grid on the 3D map. The grid size depends on the zoom level.
+
+
+
+
+
+5: Display Beacon dialog
When clicked, opens the Beacon dialog. Initially, no beacons will be listed. To download the IARU Region 1 beacon list, click the download button in the top right.
The beacons will then be displayed in the table and on the map.
@@ -79,7 +87,7 @@ The beacons will then be displayed in the table and on the map.
-5: Display IBP Beacon Project Dialog
+6: Display IBP Beacon Project Dialog
When clicked, opens the International Beacon Project dialog. The IBP consists of 18 HF beacons around the world,
that each transmit once on each of the frequencies 14.100, 18.110, 21.150, 24.930 and 28.200MHz every 3 minutes, for 10 seconds.
@@ -92,7 +100,7 @@ The IBP dialog shows which of the beacons should currently be transmitting.
More details of the IBP can be found at: https://www.ncdxf.org/beacon/beaconfaq.html
-6: Display Radio Time Transmitters dialog
+7: Display Radio Time Transmitters dialog
When clicked, opens the Radio Time Transmitters dialog.
@@ -101,7 +109,7 @@ When clicked, opens the Radio Time Transmitters dialog.
-7: Display Satellite Infrared
+8: Display Satellite Infrared
When checked, satellite infrared measurements (10.3um) are downloaded from the internet and are overlaid on the maps.
This essentially shows cloud cover. The images are updated every 10 minutes.
@@ -112,7 +120,7 @@ The data is similar to that which can be received using the [APT Demodulator](..
This is only supported on 2D raster maps and the 3D map.
-8: Display Weather Radar
+9: Display Weather Radar
When checked, weather radar measurements are downloaded from the internet and are overlaid on the maps.
This shows rain and other forms of precipitation.
@@ -125,7 +133,7 @@ Light blue through dark blue is snow, with dark blue being the most intense.
This is only supported on 2D raster maps and the 3D map.
-9: Display Sea Marks
+10: Display Sea Marks
When checked, sea marks are overlaid on the maps.
@@ -135,7 +143,7 @@ When checked, sea marks are overlaid on the maps.
This is only supported on 2D raster maps and the 3D map.
-10: Display Railways
+11: Display Railways
When checked, railway routes are overlaid on the maps.
@@ -145,19 +153,39 @@ When checked, railway routes are overlaid on the maps.
This is only supported on 2D raster maps and the 3D map.
-11: Display MUF Contours
+12: Display MUF Contours
When checked, contours will be downloaded and displayed on the 3D map, showing the MUF (Maximum Usable Frequency) for a 3000km path that reflects off the ionosphere.
The contours will be updated every 15 minutes. MUF contour data is available for the preceding 5 days.
-12: Display coF2 Contours
+13: Display coF2 Contours
When checked, contours will be downloaded and displayed on the 3D map, showing coF2 (F2 layer critical frequency), the maximum frequency at which radio waves will be reflected vertically from the F2 region of the ionosphere.
The contours will be updated every 15 minutes. coF2 contour data is available for the preceding 5 days.
-13: Display NASA GIBS Data
+14: Display Magnetic Declination
+
+When checked, contours will be displayed on the 3D map showing magnetic declination.
+
+Green contours represent 0 degrees. Red is positive, blue negative. Contours are in 2 degree steps. Clicking on a countour will display its value in the info box.
+
+
+
+15: Display Aurora Predicition
+
+When checked, aurora prediction data will be downloaded and displayed on the 3D map.
+
+Probabilties:
+
+* Green 10%
+* Yellow 50%
+* Red 90%
+
+
+
+16: Display NASA GIBS Data
When checked, enables overlay of data from NASA GIBS (Global Imagery Browse Services). This includes a vast array of Earth observation satellite data,
such as land and sea temperatures, atmospheric conditions, flux measurements and the like.
@@ -170,27 +198,37 @@ The 2D map will only show data from the default date (which is displayed in the
This is only supported on 2D raster maps and the 3D map.
-14: NASA GIBS Data
+17: NASA GIBS Data
Selects which data from NASA GIBS to overlay on the maps.
-15: NASA GIBS Opacity
+18: NASA GIBS Opacity
Sets the opacity used for the NASA GIBS overlay image overlay on the 3D map. Lower values make the image more transparent.
-16: Display Names
+19: Display Names
When checked, names of objects are displayed in a bubble next to each object.
-17: Display tracks for selected object
+20: First Person View
+
+When checked, tracking an object in the 3D view have the camera in a first person view. When unchecked, the camera will track the object from a third person view.
+
+21: PFD (Primary Flight Display)
+
+When checked, the aircraft PFD (Primary Flight Display) will be displayed. This is used for displaying ADS-B and Mode S data for an aircraft, such as speed, attitude and altitude.
+
+
+
+22: Display tracks for selected object
When checked, displays the track (taken or predicted) for the selected object.
-18: Display tracks for all objects
+23: Display tracks for all objects
When checked, displays the track (taken or predicted) for the all objects.
-19: Save to .kml
+24: Save to .kml
When clicked, items and tracks on the map will be saved to a [KML](https://en.wikipedia.org/wiki/Keyhole_Markup_Language) (.kml or .kmz) file, for use in other applications.
@@ -198,11 +236,11 @@ Note that the KML format requires 3D models in the Collada (.dae) format. Howeve
If you wish to view the models in a KML viewer, you will need to manually convert them. Note that you should still be able to view tracks without the models.
Note that the .glbe files cannot be converted to .dae.
-20: Delete
+25: Delete
When clicked, all items will be deleted from the map.
-21: Display settings
+26: Display settings
When clicked, opens the Map Display Settings dialog:
@@ -267,6 +305,7 @@ The map feature displays a 2D and a 3D map overlaid with objects reported by oth
* Changing the order in which the objects are drawn, which can help to cycle through multiple objects that are at the same location on the map.
* Setting the object as the tracking target on the 3D map.
* Left double clicking while holding shift on the 3D map will place a marker showing the position. Right clicking will clear it.
+* On the 3D map, WASD keys can be used to move the camera up, left, down and right. QE for forward and back.
The 2D map will only display the last reported positions for objects.
The 3D map, however, has a timeline that allows replaying how objects have moved over time.
@@ -319,6 +358,7 @@ Mapbox: https://www.mapbox.com/ Cesium: https://www.cesium.com Bing: https://www
Ionosonde data and MUF/coF2 contours from [KC2G](https://prop.kc2g.com/) with source data from [GIRO](https://giro.uml.edu/) and [NOAA NCEI](https://www.ngdc.noaa.gov/stp/iono/ionohome.html).
+Aurora probility data from [NOAA](https://www.swpc.noaa.gov/products/aurora-30-minute-forecast)
Sea Marks are from OpenSeaMap: https://www.openseamap.org/