fix: show layer inside the layer subgroup (#400)

OSGeo · Mar 6, 2020 · 2509f45 · 2509f45
1 parent 430b427
commit 2509f45
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/gui/wxpython/lmgr/layertree.py b/gui/wxpython/lmgr/layertree.py
@@ -550,8 +550,8 @@ def OnLayerContextMenu(self, event):
                     wx.EVT_MENU,
                     self.OnSetCompRegFromMap,
                     id=self.popupID['region'])
-                
-                # raster align 
+
+                # raster align
                 if ltype and ltype == "raster" and len(selected) == 1:
                     item = wx.MenuItem(
                         self.popupMenu,
@@ -1654,8 +1654,10 @@ def OnLayerChecked(self, event):
                             digitToolbar
                             and digitToolbar.GetLayer() !=
                             mapLayer):
-                        # ignore when map layer is edited
-                        self.Map.ChangeLayerActive(mapLayer, checked)
+                        # layer is maplayer type
+                        if mapLayer:
+                            # ignore when map layer is edited
+                            self.Map.ChangeLayerActive(mapLayer, checked)
                         self.lmgr.WorkspaceChanged()
                     child = self.GetNextSibling(child)
             else:
@@ -2039,15 +2041,15 @@ def GetOptData(self, dcmd, layer, params, propwin):
                     if mapLayer.type == 'raster':
                         if mapWin.IsLoaded(layer):
                             mapWin.UnloadRaster(layer)
-    
+
                         mapWin.LoadRaster(layer)
-    
+
                     elif mapLayer.type == 'raster_3d':
                         if mapWin.IsLoaded(layer):
                             mapWin.UnloadRaster3d(layer)
-    
+
                         mapWin.LoadRaster3d(layer)
-    
+
                     elif mapLayer.type == 'vector':
                         if mapWin.IsLoaded(layer):
                             mapWin.UnloadVector(layer)
@@ -2056,7 +2058,7 @@ def GetOptData(self, dcmd, layer, params, propwin):
                             mapWin.LoadVector(layer, points=True)
                         if (vInfo['lines'] + vInfo['boundaries']) > 0:
                             mapWin.LoadVector(layer, points=False)
-    
+
                     # reset view when first layer loaded
                     nlayers = len(
                         mapWin.Map.GetListOfLayers(