comp/src/gb.map/.component

 [Component]
 Key=gb.map
-Version=3.10.90
+Version=3.11.90
 State=1
 Authors=Fabien Bodard
 Needs=Form,ImageIO

comp/src/gb.map/.project

 # Gambas Project File 3.0
 Title=gb.map
-Startup=Form6
+Startup=Form1
 Icon=.hidden/control/mapview.png
-Version=3.10.90
+Version=3.11.90
 VersionFile=1
 Component=gb.image
 Component=gb.gui
@@ -16,3 +16,4 @@ TabSize=2
 Language=fr
 Type=Component
 Packager=1
+DoNotTranslate=".src/Tests"

comp/src/gb.map/.src/Map.class

@@ -212,7 +212,7 @@ End
 
 Public Sub _get(Name As String) As Object
   
-  Return $aLayers[$aLayerNames.Find(Name)]
+  Try Return $aLayers[$aLayerNames.Find(Name)]
   
 End
 

comp/src/gb.map/.src/_MapShape.class

@@ -338,9 +338,12 @@ Private Function Count_Read() As Integer
 End
 
 Public Sub Remove(Key As String)
-  
+
+  If Not $colKeyShape.Exist(Key) Then Return
+
   $aShapes.Remove($colKeyShape[Key])
   $colKeyShape.Remove(Key)
+  Load
   
 End