mavproxy_map/mavproxy_elevation: fix behaviour when no terrain module

MAVProxy/modules/lib/mp_elevation.py

@@ -26,7 +26,7 @@ class ElevationModel():
     def __init__(self, database='SRTM3', offline=0, debug=False, cachedir=None):
         '''Use offline=1 to disable any downloading of tiles, regardless of whether the
         tile exists'''
-        if database.lower() == 'srtm':
+        if database is not None and database.lower() == 'srtm':
             # compatibility with the old naming
             database = "SRTM3"
         self.database = database
@@ -40,7 +40,7 @@ def __init__(self, database='SRTM3', offline=0, debug=False, cachedir=None):
             self.mappy = GAreader.ERMap()
             self.mappy.read_ermapper(os.path.join(os.environ['HOME'], './Documents/Elevation/Canberra/GSNSW_P756demg'))
         else:
-            print("Error: Bad terrain source " + database)
+            print("Error: Bad terrain source " + str(database))
             self.database = None
 
     def GetElevation(self, latitude, longitude, timeout=0):

MAVProxy/modules/mavproxy_map/__init__.py

@@ -67,7 +67,11 @@ def __init__(self, mpstate):
         title = "Map"
         if self.instance > 1:
             title += str(self.instance)
-        self.map = mp_slipmap.MPSlipMap(service=service, elevation=self.module('terrain').ElevationModel.database, title=title)
+        elevation = None
+        terrain_module = self.module('terrain')
+        if terrain_module is not None:
+            elevation = terrain_module.ElevationModel.database
+        self.map = mp_slipmap.MPSlipMap(service=service, elevation=elevation, title=title)
         if self.instance == 1:
             self.mpstate.map = self.map
             mpstate.map_functions = { 'draw_lines' : self.draw_lines }