From 1f27b9f1c372b5194136c62316d9d57cdd948813 Mon Sep 17 00:00:00 2001
From: Andreas Bircher <bircher@gmx.ch>
Date: Fri, 15 Dec 2017 11:06:55 -0500
Subject: [PATCH] smaller tiles and only allow offline caching downloading
 together with map tiles

---
 src/QtLocationPlugin/QGCMapEngine.cpp                  | 5 +----
 src/QtLocationPlugin/QGCMapUrlEngine.cpp               | 2 +-
 src/QtLocationPlugin/QMLControl/OfflineMap.qml         | 8 +++++---
 src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc | 4 ++++
 src/TerrainTile.h                                      | 2 --
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/QtLocationPlugin/QGCMapEngine.cpp b/src/QtLocationPlugin/QGCMapEngine.cpp
index 65fdcab0d..abcbcc413 100644
--- a/src/QtLocationPlugin/QGCMapEngine.cpp
+++ b/src/QtLocationPlugin/QGCMapEngine.cpp
@@ -112,7 +112,7 @@ getQGCMapEngine()
 }
 
 //-----------------------------------------------------------------------------
-const double QGCMapEngine::srtm1TileSize = 0.025;
+const double QGCMapEngine::srtm1TileSize = 0.01;
 
 //-----------------------------------------------------------------------------
 void
@@ -393,9 +393,6 @@ QGCMapEngine::getMapNameList()
             mapList << kEsriTypes[i].name;
         }
     }
-    for(size_t i = 0; i < NUM_ELEVMAPS; i++) {
-        mapList << kElevationTypes[i].name;
-    }
     return mapList;
 }
 
diff --git a/src/QtLocationPlugin/QGCMapUrlEngine.cpp b/src/QtLocationPlugin/QGCMapUrlEngine.cpp
index 95c6de3e1..74cea6cb0 100644
--- a/src/QtLocationPlugin/QGCMapUrlEngine.cpp
+++ b/src/QtLocationPlugin/QGCMapUrlEngine.cpp
@@ -552,7 +552,7 @@ UrlFactory::_tryCorrectGoogleVersions(QNetworkAccessManager* networkManager)
 #define AVERAGE_MAPBOX_SAT_MAP      15739
 #define AVERAGE_MAPBOX_STREET_MAP   5648
 #define AVERAGE_TILE_SIZE           13652
-#define AVERAGE_AIRMAP_ELEV_SIZE    34000
+#define AVERAGE_AIRMAP_ELEV_SIZE    5360
 
 //-----------------------------------------------------------------------------
 quint32
diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml
index cd132a5af..9fc876e55 100644
--- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml
+++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml
@@ -433,7 +433,7 @@ QGCView {
                     Row {
                         spacing:    ScreenTools.defaultFontPixelWidth
                         anchors.horizontalCenter: parent.horizontalCenter
-                        visible:    !_defaultSet
+                        visible:    !_defaultSet && mapType !== "Airmap Elevation Data"
                         QGCLabel {  text: qsTr("Zoom Levels:"); width: infoView._labelWidth; }
                         QGCLabel {  text: offlineMapView._currentSelection ? (offlineMapView._currentSelection.minZoom + " - " + offlineMapView._currentSelection.maxZoom) : ""; horizontalAlignment: Text.AlignRight; width: infoView._valueWidth; }
                     }
@@ -737,8 +737,10 @@ QGCView {
                             anchors.right:  parent.right
                             text:           qsTr("Fetch elevation data")
                             checked:        QGroundControl.mapEngineManager.fetchElevation
-                            onClicked:      QGroundControl.mapEngineManager.fetchElevation = checked
-                            visible:        mapType != "Airmap Elevation Data"
+                            onClicked: {
+                                QGroundControl.mapEngineManager.fetchElevation = checked
+                                handleChanges()
+                            }
                         }
                     }
 
diff --git a/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc b/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
index ea64716f8..926845cf5 100644
--- a/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
+++ b/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
@@ -83,6 +83,10 @@ QGCMapEngineManager::updateForCurrentView(double lon0, double lat0, double lon1,
         QGCTileSet set = QGCMapEngine::getTileCount(z, lon0, lat0, lon1, lat1, mapType);
         _totalSet += set;
     }
+    if (_fetchElevation) {
+        QGCTileSet set = QGCMapEngine::getTileCount(1, lon0, lat0, lon1, lat1, UrlFactory::AirmapElevation);
+        _totalSet += set;
+    }
     emit tileX0Changed();
     emit tileX1Changed();
     emit tileY0Changed();
diff --git a/src/TerrainTile.h b/src/TerrainTile.h
index ccc6ac8d3..6f6254fc2 100644
--- a/src/TerrainTile.h
+++ b/src/TerrainTile.h
@@ -5,8 +5,6 @@
 
 #include <QGeoCoordinate>
 
-#define TERRAIN_TILE_SIZE 91
-
 Q_DECLARE_LOGGING_CATEGORY(TerrainTileLog)
 
 /**
-- 
2.22.0