Merge remote-tracking branch 'refs/remotes/origin/djes' into idle

# Conflicts:
#	PBMap.pb

PBMap.pb

@@ -26,9 +26,10 @@ UsePNGImageDecoder()
 UsePNGImageEncoder()
 
 DeclareModule PBMap
-  ;-Show debug infos
   #Red = 255
-  Global Verbose = 1;#False
+  ;-Show debug infos  
+  Global Verbose = 1
+  Global MyDebugLevel = 3
   ;-Proxy ON/OFF  
   Global Proxy = #False
   Declare InitPBMap(window)
@@ -75,6 +76,7 @@ Module PBMap
     PBMapTileY.i
     PBMapZoom.i
     nImage.i
+    key.s
     GetImageThread.i
   EndStructure
   
@@ -97,13 +99,14 @@ Module PBMap
   EndStructure  
   
   Structure TileThread
-    GetImageThread.i
     *Tile.Tile    
+    GetImageThread.i
   EndStructure
   
   Structure ImgMemCach
     nImage.i
-    Usage.i
+    ;Location.Location
+    ;Mutex.i
   EndStructure
   
   Structure TileMemCach
@@ -153,6 +156,7 @@ Module PBMap
   
   #PB_MAP_REDRAW = #PB_EventType_FirstCustomValue + 1 
   
+  ;-Global variables
   Global PBMap.PBMap, Null.i
   
   ;Shows an error msg and terminates the program
@@ -161,10 +165,11 @@ Module PBMap
     End
   EndProcedure
   
-  ;Send debug infos to stdout
+  ;Send debug infos to stdout (allowing mixed debug infos with curl or other libs)
-  Procedure MyDebug(msg.s)
+  Procedure MyDebug(msg.s, DbgLevel = 0)
-    If Verbose
+    If Verbose And MyDebugLevel >= DbgLevel
       PrintN(msg)
+      ;Debug msg  
     EndIf
   EndProcedure
   
@@ -181,8 +186,8 @@ Module PBMap
   Procedure.i CurlReceiveHTTPToFile(URL$, DestFileName$, ProxyURL$="", ProxyPort$="", ProxyUser$="", ProxyPassword$="")
     Protected *Buffer, curl.i, Timeout.i, res.i
     Protected FileHandle.i
-    MyDebug("ReceiveHTTPToFile from " + URL$ + " " + ProxyURL$ + ProxyPort$ + ProxyUser$)
+    MyDebug("ReceiveHTTPToFile from " + URL$ + " " + ProxyURL$ + ProxyPort$ + ProxyUser$, 3)
-    MyDebug(" to file : " + DestFileName$)
+    MyDebug(" to file : " + DestFileName$, 3)
     FileHandle = CreateFile(#PB_Any, DestFileName$)
     If FileHandle And Len(URL$)
       curl  = curl_easy_init()
@@ -215,11 +220,11 @@ Module PBMap
         curl_easy_setopt(curl, #CURLOPT_WRITEFUNCTION, @ReceiveHTTPWriteToFileFunction())
         res = curl_easy_perform(curl)
         If res <> #CURLE_OK
-          MyDebug("CURL problem")
+          MyDebug("CURL problem", 3)
         EndIf
         curl_easy_cleanup(curl)
       Else
-        MyDebug("Can't init CURL")
+        MyDebug("Can't init CURL", 3)
       EndIf
       CloseFile(FileHandle)
       ProcedureReturn FileSize(DestFileName$)
@@ -243,7 +248,7 @@ Module PBMap
     PBMap\TileThreadMutex = CreateMutex()
     PBMap\Drawing\Mutex = CreateMutex()
     PBMap\Drawing\Semaphore = CreateSemaphore()
-    PBMap\EditMarkerIndex = -1                      ;<- You must initialize with No Marker selected
+    PBMap\EditMarkerIndex = -1                      ;Initialised with "no marker selected"
     PBMap\Font = LoadFont(#PB_Any, "Arial", 20, #PB_Font_Bold)
     PBMap\Window = window
     ;- Proxy details
@@ -295,6 +300,7 @@ Module PBMap
   EndProcedure
   
   Procedure Quit()
+<<<<<<< HEAD
     ;kill main drawing thread (nicer than KillThread(PBMap\MainDrawingThread))
     ;LockMutex(PBMap\Drawing\Mutex)
     PBMap\Drawing\End = #True
@@ -306,8 +312,36 @@ Module PBMap
         FreeMemory(PBMap\TilesThreads()\Tile)
         DeleteElement(PBMap\TilesThreads())
         ResetList( PBMap\TilesThreads()) 
+=======
+    Protected TimeCounter.q
+    ;Ask main drawing thread to stop and wait for it for 2 seconds
+    LockMutex(PBMap\Drawing\Mutex)
+    PBMap\Drawing\End = #True
+    UnlockMutex(PBMap\Drawing\Mutex)
+    TimeCounter = ElapsedMilliseconds()
+    Repeat
+      Delay(100)
+      If ElapsedMilliseconds() - TimeCounter > 2000
+        ;Should not occur
+        KillThread(PBMap\MainDrawingThread)
+>>>>>>> refs/remotes/origin/djes
       EndIf
-    Wend
+    Until Not IsThread(PBMap\MainDrawingThread)
+    ;Wait for loading threads to finish nicely. Passed 2 seconds, kills them.
+    TimeCounter = ElapsedMilliseconds()
+    Repeat
+      ResetList(PBMap\TilesThreads()) 
+      While NextElement(PBMap\TilesThreads())
+        If IsThread(PBMap\TilesThreads()\GetImageThread) = 0
+          FreeMemory(PBMap\TilesThreads()\Tile)
+          DeleteElement(PBMap\TilesThreads())
+        ElseIf ElapsedMilliseconds() - TimeCounter > 2000
+          ;Should not occur
+          KillThread(PBMap\TilesThreads()\GetImageThread)
+        EndIf
+      Wend
+      Delay(10)
+    Until ListSize(PBMap\TilesThreads()) = 0 
     curl_global_cleanup()
   EndProcedure
   
@@ -425,16 +459,37 @@ Module PBMap
     EndIf
   EndProcedure
   
+<<<<<<< HEAD
+=======
+  Procedure.i GetTileFromMem(key.s)
+    MyDebug("Check if we have this image in memory", 3)
+    If FindMapElement(PBMap\MemCache\Images(), key)
+      MyDebug("Key : " + key + " found !", 3)
+      ProcedureReturn PBMap\MemCache\Images()\nImage
+    Else
+      MyDebug("Key : " + key + " not found !", 3)
+      ProcedureReturn -1
+    EndIf
+  EndProcedure
+  
+>>>>>>> refs/remotes/origin/djes
   Procedure.i GetTileFromHDD(CacheFile.s)
     Protected nImage.i
+    Debug  "Loading image " + CacheFile + " ; Size : " + Str(FileSize(CacheFile))     
     If FileSize(CacheFile) > 0
       nImage = LoadImage(#PB_Any, CacheFile)
       If IsImage(nImage)
-        MyDebug("Loadimage " + CacheFile + " -> Success !")
+        Debug "Success loading " + CacheFile + " as nImage " + Str(nImage)
+        MyDebug("Success loading " + CacheFile + " as nImage " + Str(nImage), 3)
         ProcedureReturn nImage  
+      Else
+        Debug "Failed loading " + CacheFile + " as nImage " + Str(nImage) + " -> not an image !"
+        MyDebug("Failed loading " + CacheFile + " as nImage " + Str(nImage) + " -> not an image !", 3)
       EndIf
+    Else
+      Debug "Failed loading " + CacheFile + " -> Size = 0"
+      MyDebug("Failed loading " + CacheFile + " -> Size = 0", 3)
     EndIf
-    MyDebug("Loadimage " + CacheFile + " -> Failed !")
     ProcedureReturn -1
   EndProcedure
   
@@ -456,31 +511,39 @@ Module PBMap
     Protected nImage.i = -1
     Protected FileHandle.i
     Protected TileURL.s = PBMap\ServerURL + Str(Zoom) + "/" + Str(XTile) + "/" + Str(YTile) + ".png"   
-    MyDebug("Check if we have this image on Web")
+    MyDebug("Check if we have this image on Web", 3)
     If Proxy
       FileHandle = CurlReceiveHTTPToFile(TileURL, CacheFile, ProxyURL$, ProxyPort$, ProxyUser$, ProxyPassword$)
       If FileHandle
         nImage = GetTileFromHDD(CacheFile)
       Else
-        MyDebug("File " + TileURL + " not correctly received with Curl and proxy")
+        MyDebug("File " + TileURL + " not correctly received with Curl and proxy", 3)
       EndIf
     Else
       *Buffer = ReceiveHTTPMemory(TileURL)  ;TODO to thread by using #PB_HTTP_Asynchronous
       If *Buffer
         nImage = CatchImage(#PB_Any, *Buffer, MemorySize(*Buffer))
         If IsImage(nImage)
+<<<<<<< HEAD
           MyDebug("Load from web " + TileURL + " as Tile nb " + nImage)
           Debug "url: " + TileURL 
           Debug "cache file: " + CacheFile 
+=======
+          MyDebug("Load from web " + TileURL + " as Tile nb " + nImage, 3)
+>>>>>>> refs/remotes/origin/djes
           SaveImage(nImage, CacheFile, #PB_ImagePlugin_PNG)
           FreeMemory(*Buffer)
         Else
-          MyDebug("Can't catch image " + TileURL)
+          MyDebug("Can't catch image " + TileURL, 3)
           nImage = -1
           ;ShowMemoryViewer(*Buffer, MemorySize(*Buffer))
         EndIf
       Else
+<<<<<<< HEAD
         Debug("ReceiveHTTPMemory's buffer is empty")
+=======
+        MyDebug("ReceiveHTTPMemory's buffer is empty", 3)
+>>>>>>> refs/remotes/origin/djes
       EndIf
     EndIf
     ProcedureReturn nImage
@@ -488,6 +551,7 @@ Module PBMap
   
   Procedure GetImageThread(*Tile.Tile)
     Protected nImage.i = -1
+<<<<<<< HEAD
     LockMutex(PBMap\TileThreadMutex)
     Protected key.s = "Z" + RSet(Str(*Tile\PBMapZoom), 4, "0") + "X" + RSet(Str(*Tile\PBMapTileX), 8, "0") + "Y" + RSet(Str(*Tile\PBMapTileY), 8, "0")
     Protected CacheFile.s = PBMap\HDDCachePath + "PBMap_" + Str(*Tile\PBMapZoom) + "_" + Str(*Tile\PBMapTileX) + "_" + Str(*Tile\PBMapTileY) + ".png"
@@ -516,13 +580,39 @@ Module PBMap
     ;Define this tile image nb
     *Tile\nImage = nImage
     PostEvent(#PB_Event_Gadget,PBMap\window,PBmap\Gadget,#PB_MAP_REDRAW,*tile)
+=======
+    Protected CacheFile.s = PBMap\HDDCachePath + "PBMap_" + Str(*Tile\PBMapZoom) + "_" + Str(*Tile\PBMapTileX) + "_" + Str(*Tile\PBMapTileY) + ".png"
+    Protected Tile.position
+;     PBMap\MemCache\Images(*Tile\key)\Mutex = CreateMutex()
+;     LockMutex(PBMap\MemCache\Images(*Tile\key)\Mutex)
+;    LockMutex(LoadMutexTest)
+    nImage = GetTileFromHDD(CacheFile)
+;    UnlockMutex(LoadMutexTest)    
+    If nImage = -1
+      nImage = GetTileFromWeb(*Tile\PBMapZoom, *Tile\PBMapTileX, *Tile\PBMapTileY, CacheFile)
+      If nImage = -1
+        MyDebug("Error GetImageThread procedure, image not loaded - " + *Tile\key, 3)    
+        *Tile\nImage = -1
+        ProcedureReturn
+      EndIf
+    EndIf
+    PBMap\MemCache\Images(*Tile\key)\nImage = nImage
+;     Tile\x=*Tile\PBMapTileX
+;     Tile\y=*Tile\PBMapTiley
+;     XY2LatLon(@Tile,@PBMap\MemCache\Images(*Tile\key)\Location)
+    MyDebug("Image nb " + Str(nImage) + " successfully added to mem cache", 3)   
+    MyDebug("With the following key : " + *Tile\key, 3)  
+    ;Define this tile image nb
+    *Tile\nImage = nImage
+    ;     UnlockMutex(PBMap\MemCache\Images(key)\Mutex)
+>>>>>>> refs/remotes/origin/djes
   EndProcedure
   
   Procedure DrawTile(*Tile.Tile)
     Protected x = *Tile\Position\x 
     Protected y = *Tile\Position\y 
-    MyDebug("  Drawing tile nb " + " X : " + Str(*Tile\PBMapTileX) + " Y : " + Str(*Tile\PBMapTileX))
+    MyDebug("  Drawing tile nb " + " X : " + Str(*Tile\PBMapTileX) + " Y : " + Str(*Tile\PBMapTileX), 2)
-    MyDebug("  at coords " + Str(x) + "," + Str(y))
+    MyDebug("  at coords " + Str(x) + "," + Str(y), 2)
     MovePathCursor(x, y)
     DrawVectorImage(ImageID(*Tile\nImage))
   EndProcedure
@@ -531,6 +621,7 @@ Module PBMap
     Protected x = *Tile\Position\x 
     Protected y = *Tile\Position\y 
     Protected Text$ = "Loading"
+<<<<<<< HEAD
     MyDebug("  Drawing tile nb " + " X : " + Str(*Tile\PBMapTileX) + " Y : " + Str(*Tile\PBMapTileX))
     MyDebug("  at coords " + Str(x) + "," + Str(y))
 ;     BeginVectorLayer()
@@ -544,6 +635,21 @@ Module PBMap
 ;     MovePathCursor(x + (PBMap\TileSize - VectorTextWidth(Text$)) / 2, y + (PBMap\TileSize - VectorTextHeight(Text$)) / 2)
 ;     DrawVectorText(Text$)
 ;     EndVectorLayer()
+=======
+    MyDebug("  Drawing tile nb " + " X : " + Str(*Tile\PBMapTileX) + " Y : " + Str(*Tile\PBMapTileX), 2)
+    MyDebug("  at coords " + Str(x) + "," + Str(y), 2)
+    BeginVectorLayer()
+    ;MovePathCursor(x, y)
+    VectorSourceColor(RGBA(255, 255, 255, 128))
+    AddPathBox(x, y, PBMap\TileSize, PBMap\TileSize)
+    FillPath()
+    MovePathCursor(x, y)
+    VectorFont(FontID(PBMap\Font), PBMap\TileSize / 20)
+    VectorSourceColor(RGBA(150, 150, 150, 255))
+    MovePathCursor(x + (PBMap\TileSize - VectorTextWidth(Text$)) / 2, y + (PBMap\TileSize - VectorTextHeight(Text$)) / 2)
+    DrawVectorText(Text$)
+    EndVectorLayer()
+>>>>>>> refs/remotes/origin/djes
   EndProcedure
   
   Procedure DrawTiles(*Drawing.DrawingParameters)
@@ -553,6 +659,7 @@ Module PBMap
     Protected ty = Int(*Drawing\Position\y)
     Protected nx = *Drawing\CenterX / PBMap\TileSize ;How many tiles around the point
     Protected ny = *Drawing\CenterY / PBMap\TileSize
+<<<<<<< HEAD
     Protected px,py,img 
     
     MyDebug("Drawing tiles")
@@ -572,6 +679,20 @@ Module PBMap
            If *NewTile
             With *NewTile
             ;Keep a track of tiles (especially to free memory)
+=======
+    MyDebug("Drawing tiles", 2)
+    For y = - ny - 1 To ny + 1
+      For x = - nx - 1 To nx + 1
+        ;Was quiting the loop if a move occured, giving maybe smoother movement
+        ;If PBMap\Moving
+        ;  Break 2
+        ;EndIf
+        ;Store parameters in only one memory place, and give it to the thread if needed
+        Protected *NewTile.Tile = AllocateMemory(SizeOf(Tile))
+        If *NewTile
+          With *NewTile
+            ;Keep a track of tiles, and eventually associated threads, to free memory
+>>>>>>> refs/remotes/origin/djes
             AddElement(PBMap\TilesThreads())
             PBMap\TilesThreads()\Tile = *NewTile
             ;New tile parameters
@@ -580,6 +701,7 @@ Module PBMap
             \PBMapTileX = tx + x
             \PBMapTileY = ty + y
             \PBMapZoom  = PBMap\Zoom
+<<<<<<< HEAD
             \GetImageThread = CreateThread(@GetImageThread(), *NewTile)
             PBMap\TilesThreads()\GetImageThread = \GetImageThread
             myDebug(" Creating get image thread nb " + Str(\GetImageThread))
@@ -590,17 +712,46 @@ Module PBMap
             MyDebug(" Error, can't create a new tile")
             Break 2
           EndIf   
+=======
+            \key = "Z" + RSet(Str(\PBMapZoom), 4, "0") + "X" + RSet(Str(\PBMapTileX), 8, "0") + "Y" + RSet(Str(\PBMapTileY), 8, "0")  ;Unique identifier
+            ;Check if the image exists
+            \nImage = GetTileFromMem(\key)
+            If \nImage = -1
+              ;If not, load it in the background        
+              If AddMapElement(PBMap\MemCache\Images(), \key) ;Add the image to the cache, once in this loop
+                \GetImageThread = CreateThread(@GetImageThread(), *NewTile)
+                PBMap\TilesThreads()\GetImageThread = \GetImageThread
+                MyDebug(" Creating get image thread nb " + Str(\GetImageThread), 2)
+              Else
+                MyDebug(" Can't add a new image to the map list", 2)
+                CallDebugger
+              EndIf
+            EndIf
+            If IsImage(\nImage)   
+              DrawTile(*NewTile)
+            Else
+              MyDebug("Image missing", 2)
+              DrawLoading(*NewTile)
+              *Drawing\Dirty = #True ;Signals that this image is missing so we should have to redraw
+            EndIf
+          EndWith  
+        Else
+          MyDebug(" Error, can't create a new tile", 2)
+          Break 2
+>>>>>>> refs/remotes/origin/djes
         EndIf 
       Next
     Next
-    ;Free tile memory when the loading thread has finished
+            ;Free tile memory
     ;TODO : get out this proc from drawtiles in a special "free ressources" task
     ForEach PBMap\TilesThreads()
+      ;Check if there's no more loading thread
       If IsThread(PBMap\TilesThreads()\GetImageThread) = 0
         FreeMemory(PBMap\TilesThreads()\Tile)
         DeleteElement(PBMap\TilesThreads())
       EndIf         
     Next
+<<<<<<< HEAD
     ;EnableDebugger 
   EndProcedure
   
@@ -616,6 +767,62 @@ Module PBMap
     AddPathCircle(0,-16,5,0,360,#PB_Path_Relative)
     VectorSourceColor(color)
     FillPath(#PB_Path_Preserve):VectorSourceColor(RGBA(0, 0, 0, 255)):StrokePath(1)
+=======
+;     ;-**** Clean Mem Cache
+;     ;TODO in development, by now there's many cache problem as the loading thread could be perturbed
+;     ;GadgetWidth(PBMap\Gadget)/PBMap\TileSize
+;     Protected MaxNbTile.l
+;     If GadgetWidth(PBMap\Gadget)>GadgetHeight(PBMap\Gadget)
+;       MaxNbTile=GadgetWidth(PBMap\Gadget)/PBMap\TileSize
+;     Else
+;       MaxNbTile=GadgetHeight(PBMap\Gadget)/PBMap\TileSize
+;     EndIf
+;     Protected Scale.d= 40075*Cos(Radian(PBMap\TargetLocation\Latitude))/Pow(2,PBMap\Zoom)
+;     Protected Limit.d=Scale*(MaxNbTile)*1.5
+;     Debug "Cache cleaning"
+;     ForEach PBMap\MemCache\Images()
+;         Protected Distance.d = HaversineInKM(@PBMap\MemCache\Images()\Location, @PBMap\TargetLocation)
+;         Debug "Limit:"+StrD(Limit)+" Distance:"+StrD(Distance)
+;         If Distance>Limit And IsImage(PBMap\MemCache\Images()\nImage) 
+;           LockMutex(PBMap\MemCache\Images()\Mutex)          
+;           Debug "delete"
+;           Debug PBMap\MemCache\Images()
+;           FreeImage(PBMap\MemCache\Images()\nImage)
+;           UnlockMutex(PBMap\MemCache\Images()\Mutex)
+;           FreeMutex(PBMap\MemCache\Images()\Mutex)
+;           DeleteMapElement(PBMap\MemCache\Images())
+;         EndIf
+;     Next
+  
+  EndProcedure
+  
+  Procedure DrawPointer(*Drawing.DrawingParameters)
+    If PBMap\CallBackMainPointer > 0
+      ; @Procedure(X.i, Y.i) to DrawPointer (you must use VectorDrawing lib)
+      CallFunctionFast(PBMap\CallBackMainPointer, *Drawing\CenterX, *Drawing\CenterY)
+    Else 
+      VectorSourceColor(RGBA($FF, 0, 0, $FF))
+      MovePathCursor(*Drawing\CenterX, *Drawing\CenterY)
+      AddPathLine(-8, -16, #PB_Path_Relative)
+      AddPathCircle(8, 0, 8, 180, 0, #PB_Path_Relative)
+      AddPathLine(-8, 16, #PB_Path_Relative)
+      ;FillPath(#PB_Path_Preserve) 
+      ;ClipPath(#PB_Path_Preserve)
+      AddPathCircle(0, -16, 5, 0, 360, #PB_Path_Relative)
+      VectorSourceColor(RGBA($FF, 0, 0, $FF))
+      FillPath(#PB_Path_Preserve):VectorSourceColor(RGBA($FF, 0, 0, $FF));RGBA(0, 0, 0, 255)) 
+      StrokePath(1)
+    EndIf  
+>>>>>>> refs/remotes/origin/djes
+  EndProcedure
+  
+  Procedure DrawScale(*Drawing.DrawingParameters)
+    ;TODO Add Option and function to display Scale on Map
+    Protected Scale.d= 40075*Cos(Radian(PBMap\TargetLocation\Latitude))/Pow(2,PBMap\Zoom)
+    VectorFont(FontID(PBMap\Font), 30)
+    VectorSourceColor(RGBA(0, 0, 0, 80))
+    MovePathCursor(50,50)
+    DrawVectorText(StrD(Scale))
   EndProcedure
         
   Procedure TrackPointer(x.i, y.i,dist.l)
@@ -700,7 +907,7 @@ Module PBMap
           If PBMap\Marker()\CallBackPointer > 0
             CallFunctionFast(PBMap\Marker()\CallBackPointer, Pixel\X, Pixel\Y)
           Else
-            Pointer(Pixel\X, Pixel\Y, PBMap\Marker()\color)
+            DrawPointer(*Drawing)
           EndIf
         EndIf 
       EndIf 
@@ -731,6 +938,7 @@ Module PBMap
       ;Drawing\Dirty = #False
       ;Main drawing stuff
       StartVectorDrawing(CanvasVectorOutput(PBMap\Gadget))
+<<<<<<< HEAD
       DrawTiles(*Drawing)
       ;DrawTrack(*Drawing)
       ;DrawMarker(*Drawing)
@@ -749,6 +957,34 @@ Module PBMap
      ; EndIf
       ;UnlockMutex(*SharedDrawing\Mutex)      
     ;Until Drawing\End    
+=======
+      DrawTiles(@Drawing)
+      DrawTrack(@Drawing)
+      DrawMarker(@Drawing)
+      DrawPointer(@Drawing)
+      ;DrawScale(@Drawing)      
+      ;- Display how many images in cache
+      VectorFont(FontID(PBMap\Font), 30)
+      VectorSourceColor(RGBA(0, 0, 0, 80))
+      MovePathCursor(50,50)
+      DrawVectorText(Str(MapSize(PBMap\MemCache\Images())))
+      MovePathCursor(50,80)
+      DrawVectorText(Str(ListSize(PBMap\TilesThreads())))
+      StopVectorDrawing()      
+      ;Redraw
+      ; If something was not correctly drawn, redraw after a while
+      LockMutex(*SharedDrawing\Mutex)      ;Be sure that we're not modifying variables while moving (seems not useful, but it is, especially to clean the semaphore)
+      If Drawing\Dirty
+        MyDebug("Something was dirty ! We try again to redraw")
+        Drawing\PassNb + 1
+        SignalSemaphore(*SharedDrawing\Semaphore)
+      Else
+        ;Clean the semaphore to avoid multiple unuseful redraws
+        Repeat : Until TrySemaphore(*SharedDrawing\Semaphore) = 0
+      EndIf
+      UnlockMutex(*SharedDrawing\Mutex)      
+    Until Drawing\End
+>>>>>>> refs/remotes/origin/djes
   EndProcedure
   
   Procedure Refresh()
@@ -921,13 +1157,19 @@ Module PBMap
                       ;New move values
                       PBMap\Position\x - MouseX
                       PBMap\Position\y - MouseY
+<<<<<<< HEAD
                       ;-*** Fill parameters and signal the drawing thread
                      ; LockMutex(PBMap\Drawing\Mutex)
+=======
+                      ;Fill parameters and send a signal to the drawing thread
+                      LockMutex(PBMap\Drawing\Mutex)
+>>>>>>> refs/remotes/origin/djes
                       ;PBMap tile position in tile.decimal
                       PBMap\Drawing\Position\x = PBMap\Position\x / PBMap\TileSize
                       PBMap\Drawing\Position\y = PBMap\Position\y / PBMap\TileSize
                       PBMap\Drawing\PassNb = 1
                       XY2LatLon(@PBMap\Drawing, @PBMap\TargetLocation)
+<<<<<<< HEAD
                       ;If CallBackLocation send Location to function
                       If PBMap\CallBackLocation > 0
                         CallFunctionFast(PBMap\CallBackLocation, @PBMap\TargetLocation)
@@ -938,6 +1180,16 @@ Module PBMap
                     ;SignalSemaphore(PBMap\Drawing\Semaphore)
                      DrawingThread()  
                     ;- ***                   
+=======
+                      UnlockMutex(PBMap\Drawing\Mutex)
+                      ;Start drawing
+                      SignalSemaphore(PBMap\Drawing\Semaphore)                    
+                    EndIf
+                    ;If CallBackLocation send Location to function
+                    If PBMap\CallBackLocation > 0
+                      CallFunctionFast(PBMap\CallBackLocation, @PBMap\TargetLocation)
+                    EndIf 
+>>>>>>> refs/remotes/origin/djes
                     PBMap\MoveStartingPoint\x = GetGadgetAttribute(PBMap\Gadget, #PB_Canvas_MouseX) 
                     PBMap\MoveStartingPoint\y = GetGadgetAttribute(PBMap\Gadget, #PB_Canvas_MouseY)
                     ; DrawingThread()  
@@ -1105,10 +1357,24 @@ CompilerIf #PB_Compiler_IsMainFile
   CloseConsole()
   
 CompilerEndIf
+<<<<<<< HEAD
 ; IDE Options = PureBasic 5.42 LTS (Windows - x86)
 ; CursorPosition = 1073
 ; FirstLine = 1062
 ; Folding = --------
 ; EnableUnicode
+=======
+; IDE Options = PureBasic 5.50 (Windows - x64)
+; CursorPosition = 450
+; FirstLine = 444
+; Folding = ---------
+>>>>>>> refs/remotes/origin/djes
 ; EnableThread
 ; EnableXP
+; EnableUnicode
+; IDE Options = PureBasic 5.42 LTS (Windows - x86)
+; CursorPosition = 30
+; FirstLine = 21
+; Folding = ---------
+; EnableUnicode
+; EnableXP