fixed SWRAD GEO/SAT

bluesky/ui/qtgl/glmap.py

@@ -1,5 +1,4 @@
 ''' BlueSky OpenGL map object. '''
-from os import path
 import numpy as np
 
 from bluesky.ui import palette
@@ -49,15 +48,22 @@ def create(self):
                 break
 
     def draw(self, skipmap=False):
+        actdata = bs.net.get_nodedata()
+
         # Send the (possibly) updated global uniforms to the buffer
         self.shaderset.set_vertex_scale_type(self.shaderset.VERTEX_IS_LATLON)
 
         # --- DRAW THE MAP AND COASTLINES ---------------------------------------------
         # Map and coastlines: don't wrap around in the shader
         self.shaderset.enable_wrap(False)
 
-        if not skipmap:
+        if actdata.show_map and not skipmap:
             self.map.draw()
+
+        # Skip coastlines if set to disabled
+        if not actdata.show_coast:
+            return
+
         shaderset = glh.ShaderSet.selected
         if shaderset.data.wrapdir == 0:
             # Normal case, no wrap around

bluesky/ui/qtgl/guiclient.py

@@ -347,6 +347,7 @@ def setflag(self, flag, args=None):
 
         # Satellite image background on/off
         elif flag == 'SAT':
+            print('setting sat')
             self.show_map = not self.show_map
 
         # Satellite image background on/off