thyphoon/PBMap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debug, code cleaning, debug infos

Browse Source 
Map list add was theaded and could lead to crash.
This commit is contained in:
djes
2016-08-25 11:56:54 +02:00
parent c679cfbd73
commit 46d4a37c98
1 changed files with 107 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
PBMap.pb
View File

@@ -25,7 +25,8 @@ UsePNGImageEncoder()
DeclareModule PBMap DeclareModule PBMap
;-Show debug infos ;-Show debug infos
Global Verbose = #False Global Verbose = #True
Global MyDebugLevel = 1
Global Proxy = #False Global Proxy = #False
Declare InitPBMap() Declare InitPBMap()
Declare SetMapServer(ServerURL.s="http://tile.openstreetmap.org/",TileSize.l=256,ZoomMin.l=0,ZoomMax.l=18) Declare SetMapServer(ServerURL.s="http://tile.openstreetmap.org/",TileSize.l=256,ZoomMin.l=0,ZoomMax.l=18)
@@ -73,6 +74,7 @@ Module PBMap
PBMapTileY.i PBMapTileY.i
PBMapZoom.i PBMapZoom.i
nImage.i nImage.i
key.s
GetImageThread.i GetImageThread.i
EndStructure EndStructure
@@ -95,8 +97,8 @@ Module PBMap
EndStructure EndStructure
Structure TileThread Structure TileThread
GetImageThread.i
*Tile.Tile *Tile.Tile
GetImageThread.i
EndStructure EndStructure
Structure ImgMemCach Structure ImgMemCach
@@ -162,9 +164,9 @@ Module PBMap
End End
EndProcedure 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) PrintN(msg)
EndIf EndIf
EndProcedure EndProcedure
@@ -417,14 +419,13 @@ Module PBMap
EndIf EndIf
EndProcedure EndProcedure
Procedure.i GetTileFromMem(Zoom.i, XTile.i, YTile.i) Procedure.i GetTileFromMem(key.s)
Protected key.s = "Z" + RSet(Str(Zoom), 4, "0") + "X" + RSet(Str(XTile), 8, "0") + "Y" + RSet(Str(YTile), 8, "0") MyDebug("Check if we have this image in memory", 3)
MyDebug("Check if we have this image in memory")
If FindMapElement(PBMap\MemCache\Images(), key) If FindMapElement(PBMap\MemCache\Images(), key)
MyDebug("Key : " + key + " found !") MyDebug("Key : " + key + " found !", 3)
ProcedureReturn PBMap\MemCache\Images()\nImage ProcedureReturn PBMap\MemCache\Images()\nImage
Else Else
MyDebug("Key : " + key + " not found !") MyDebug("Key : " + key + " not found !", 3)
ProcedureReturn -1 ProcedureReturn -1
EndIf EndIf
EndProcedure EndProcedure
@@ -434,11 +435,11 @@ Module PBMap
If FileSize(CacheFile) > 0 If FileSize(CacheFile) > 0
nImage = LoadImage(#PB_Any, CacheFile) nImage = LoadImage(#PB_Any, CacheFile)
If IsImage(nImage) If IsImage(nImage)
MyDebug("Loadimage " + CacheFile + " -> Success !") MyDebug("Loadimage " + CacheFile + " -> Success !", 3)
ProcedureReturn nImage ProcedureReturn nImage
EndIf EndIf
EndIf EndIf
MyDebug("Loadimage " + CacheFile + " -> Failed !") MyDebug("Loadimage " + CacheFile + " -> Failed !", 3)
ProcedureReturn -1 ProcedureReturn -1
EndProcedure EndProcedure
@@ -447,29 +448,29 @@ Module PBMap
Protected nImage.i = -1 Protected nImage.i = -1
Protected FileHandle.i Protected FileHandle.i
Protected TileURL.s = PBMap\ServerURL + Str(Zoom) + "/" + Str(XTile) + "/" + Str(YTile) + ".png" 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 If Proxy
FileHandle = CurlReceiveHTTPToFile(TileURL, CacheFile, ProxyURL$, ProxyPort$, ProxyUser$, ProxyPassword$) FileHandle = CurlReceiveHTTPToFile(TileURL, CacheFile, ProxyURL$, ProxyPort$, ProxyUser$, ProxyPassword$)
If FileHandle If FileHandle
nImage = GetTileFromHDD(CacheFile) nImage = GetTileFromHDD(CacheFile)
Else Else
MyDebug("File " + TileURL + " not correctly received with Curl and proxy") MyDebug("File " + TileURL + " not correctly received with Curl and proxy", 3)
EndIf EndIf
Else Else
*Buffer = ReceiveHTTPMemory(TileURL) ;TODO to thread by using #PB_HTTP_Asynchronous *Buffer = ReceiveHTTPMemory(TileURL) ;TODO to thread by using #PB_HTTP_Asynchronous
If *Buffer If *Buffer
nImage = CatchImage(#PB_Any, *Buffer, MemorySize(*Buffer)) nImage = CatchImage(#PB_Any, *Buffer, MemorySize(*Buffer))
If IsImage(nImage) If IsImage(nImage)
MyDebug("Load from web " + TileURL + " as Tile nb " + nImage) MyDebug("Load from web " + TileURL + " as Tile nb " + nImage, 3)
SaveImage(nImage, CacheFile, #PB_ImagePlugin_PNG) SaveImage(nImage, CacheFile, #PB_ImagePlugin_PNG)
FreeMemory(*Buffer) FreeMemory(*Buffer)
Else Else
MyDebug("Can't catch image " + TileURL) MyDebug("Can't catch image " + TileURL, 3)
nImage = -1 nImage = -1
;ShowMemoryViewer(*Buffer, MemorySize(*Buffer)) ;ShowMemoryViewer(*Buffer, MemorySize(*Buffer))
EndIf EndIf
Else Else
MyDebug("ReceiveHTTPMemory's buffer is empty") MyDebug("ReceiveHTTPMemory's buffer is empty", 3)
EndIf EndIf
EndIf EndIf
ProcedureReturn nImage ProcedureReturn nImage
@@ -477,38 +478,35 @@ Module PBMap
Procedure GetImageThread(*Tile.Tile) Procedure GetImageThread(*Tile.Tile)
Protected nImage.i = -1 Protected nImage.i = -1
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" Protected CacheFile.s = PBMap\HDDCachePath + "PBMap_" + Str(*Tile\PBMapZoom) + "_" + Str(*Tile\PBMapTileX) + "_" + Str(*Tile\PBMapTileY) + ".png"
Protected Tile.position Protected Tile.position
;Adding the image to the cache if possible ; PBMap\MemCache\Images(*Tile\key)\Mutex = CreateMutex()
AddMapElement(PBMap\MemCache\Images(), key) ; LockMutex(PBMap\MemCache\Images(*Tile\key)\Mutex)
PBMap\MemCache\Images(key)\Mutex = CreateMutex()
LockMutex(PBMap\MemCache\Images(key)\Mutex)
nImage = GetTileFromHDD(CacheFile) nImage = GetTileFromHDD(CacheFile)
If nImage = -1 If nImage = -1
nImage = GetTileFromWeb(*Tile\PBMapZoom, *Tile\PBMapTileX, *Tile\PBMapTileY, CacheFile) nImage = GetTileFromWeb(*Tile\PBMapZoom, *Tile\PBMapTileX, *Tile\PBMapTileY, CacheFile)
If nImage = -1 If nImage = -1
MyDebug("Error GetImageThread procedure, image not loaded - " + key) MyDebug("Error GetImageThread procedure, image not loaded - " + *Tile\key, 3)
*Tile\nImage = -1 *Tile\nImage = -1
ProcedureReturn ProcedureReturn
EndIf EndIf
EndIf EndIf
PBMap\MemCache\Images(key)\nImage = nImage PBMap\MemCache\Images(*Tile\key)\nImage = nImage
Tile\x=*Tile\PBMapTileX ; Tile\x=*Tile\PBMapTileX
Tile\y=*Tile\PBMapTiley ; Tile\y=*Tile\PBMapTiley
XY2LatLon(@Tile,@PBMap\MemCache\Images(key)\Location) ; XY2LatLon(@Tile,@PBMap\MemCache\Images(*Tile\key)\Location)
MyDebug("Image nb " + Str(nImage) + " successfully added to mem cache") MyDebug("Image nb " + Str(nImage) + " successfully added to mem cache", 3)
MyDebug("With the following key : " + key) MyDebug("With the following key : " + *Tile\key, 3)
;Define this tile image nb ;Define this tile image nb
*Tile\nImage = nImage *Tile\nImage = nImage
UnlockMutex(PBMap\MemCache\Images(key)\Mutex) ; UnlockMutex(PBMap\MemCache\Images(key)\Mutex)
EndProcedure EndProcedure
Procedure DrawTile(*Tile.Tile) Procedure DrawTile(*Tile.Tile)
Protected x = *Tile\Position\x Protected x = *Tile\Position\x
Protected y = *Tile\Position\y 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) MovePathCursor(x, y)
DrawVectorImage(ImageID(*Tile\nImage)) DrawVectorImage(ImageID(*Tile\nImage))
EndProcedure EndProcedure
@@ -517,8 +515,8 @@ Module PBMap
Protected x = *Tile\Position\x Protected x = *Tile\Position\x
Protected y = *Tile\Position\y Protected y = *Tile\Position\y
Protected Text$ = "Loading" Protected Text$ = "Loading"
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)
BeginVectorLayer() BeginVectorLayer()
;MovePathCursor(x, y) ;MovePathCursor(x, y)
VectorSourceColor(RGBA(255, 255, 255, 128)) VectorSourceColor(RGBA(255, 255, 255, 128))
@@ -538,17 +536,18 @@ Module PBMap
Protected ty = Int(*Drawing\Position\y) Protected ty = Int(*Drawing\Position\y)
Protected nx = *Drawing\CenterX / PBMap\TileSize ;How many tiles around the point Protected nx = *Drawing\CenterX / PBMap\TileSize ;How many tiles around the point
Protected ny = *Drawing\CenterY / PBMap\TileSize Protected ny = *Drawing\CenterY / PBMap\TileSize
MyDebug("Drawing tiles") MyDebug("Drawing tiles", 2)
For y = - ny - 1 To ny + 1 For y = - ny - 1 To ny + 1
For x = - nx - 1 To nx + 1 For x = - nx - 1 To nx + 1
;Was quiting the loop if a move occured, giving maybe smoother movement ;Was quiting the loop if a move occured, giving maybe smoother movement
;If PBMap\Moving ;If PBMap\Moving
; Break 2 ; Break 2
;EndIf ;EndIf
;Store parameters in only one memory place, and give it to the thread if needed
Protected *NewTile.Tile = AllocateMemory(SizeOf(Tile)) Protected *NewTile.Tile = AllocateMemory(SizeOf(Tile))
If *NewTile If *NewTile
With *NewTile With *NewTile
;Keep a track of tiles (especially to free memory) ;Keep a track of tiles and eventually threads associated (to free memory)
AddElement(PBMap\TilesThreads()) AddElement(PBMap\TilesThreads())
PBMap\TilesThreads()\Tile = *NewTile PBMap\TilesThreads()\Tile = *NewTile
;New tile parameters ;New tile parameters
@@ -557,76 +556,96 @@ Module PBMap
\PBMapTileX = tx + x \PBMapTileX = tx + x
\PBMapTileY = ty + y \PBMapTileY = ty + y
\PBMapZoom = PBMap\Zoom \PBMapZoom = PBMap\Zoom
\key = "Z" + RSet(Str(\PBMapZoom), 4, "0") + "X" + RSet(Str(\PBMapTileX), 8, "0") + "Y" + RSet(Str(\PBMapTileY), 8, "0")
;Check if the image exists ;Check if the image exists
\nImage = GetTileFromMem(\PBMapZoom, \PBMapTileX, \PBMapTileY) \nImage = GetTileFromMem(\key)
If \nImage = -1 If \nImage = -1
;If not, load it in the background ;If not, load it in the background
If AddMapElement(PBMap\MemCache\Images(), \key) ;Add the image to the cache *only* in this loop
\GetImageThread = CreateThread(@GetImageThread(), *NewTile) \GetImageThread = CreateThread(@GetImageThread(), *NewTile)
PBMap\TilesThreads()\GetImageThread = \GetImageThread PBMap\TilesThreads()\GetImageThread = \GetImageThread
MyDebug(" Creating get image thread nb " + Str(\GetImageThread)) MyDebug(" Creating get image thread nb " + Str(\GetImageThread), 2)
Else
MyDebug(" Can't add a new image to the map list", 2)
EndIf
EndIf EndIf
If IsImage(\nImage) If IsImage(\nImage)
DrawTile(*NewTile) DrawTile(*NewTile)
Else Else
MyDebug("Image missing") MyDebug("Image missing", 2)
DrawLoading(*NewTile) DrawLoading(*NewTile)
*Drawing\Dirty = #True ;Signals that this image is missing so we should have to redraw *Drawing\Dirty = #True ;Signals that this image is missing so we should have to redraw
EndIf EndIf
EndWith EndWith
Else Else
MyDebug(" Error, can't create a new tile") MyDebug(" Error, can't create a new tile", 2)
Break 2 Break 2
EndIf EndIf
Next Next
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 ;TODO : get out this proc from drawtiles in a special "free ressources" task
ForEach PBMap\TilesThreads() ForEach PBMap\TilesThreads()
;Check if there's no more loading thread
If IsThread(PBMap\TilesThreads()\GetImageThread) = 0 If IsThread(PBMap\TilesThreads()\GetImageThread) = 0
FreeMemory(PBMap\TilesThreads()\Tile) FreeMemory(PBMap\TilesThreads()\Tile)
DeleteElement(PBMap\TilesThreads()) DeleteElement(PBMap\TilesThreads())
EndIf EndIf
Next Next
;-**** Clean Mem Cache ; ;-**** Clean Mem Cache
;TODO in development, by now there's many cache problem as the loading thread could be perturbed ; ;TODO in development, by now there's many cache problem as the loading thread could be perturbed
;GadgetWidth(PBMap\Gadget)/PBMap\TileSize ; ;GadgetWidth(PBMap\Gadget)/PBMap\TileSize
Protected MaxNbTile.l ; Protected MaxNbTile.l
If GadgetWidth(PBMap\Gadget)>GadgetHeight(PBMap\Gadget) ; If GadgetWidth(PBMap\Gadget)>GadgetHeight(PBMap\Gadget)
MaxNbTile=GadgetWidth(PBMap\Gadget)/PBMap\TileSize ; MaxNbTile=GadgetWidth(PBMap\Gadget)/PBMap\TileSize
Else ; Else
MaxNbTile=GadgetHeight(PBMap\Gadget)/PBMap\TileSize ; MaxNbTile=GadgetHeight(PBMap\Gadget)/PBMap\TileSize
EndIf ; EndIf
Protected Scale.d= 40075*Cos(Radian(PBMap\TargetLocation\Latitude))/Pow(2,PBMap\Zoom) ; Protected Scale.d= 40075*Cos(Radian(PBMap\TargetLocation\Latitude))/Pow(2,PBMap\Zoom)
Protected Limit.d=Scale*(MaxNbTile)*1.5 ; Protected Limit.d=Scale*(MaxNbTile)*1.5
Debug "Cache cleaning" ; Debug "Cache cleaning"
ForEach PBMap\MemCache\Images() ; ForEach PBMap\MemCache\Images()
Protected Distance.d = HaversineInKM(@PBMap\MemCache\Images()\Location, @PBMap\TargetLocation) ; Protected Distance.d = HaversineInKM(@PBMap\MemCache\Images()\Location, @PBMap\TargetLocation)
Debug "Limit:"+StrD(Limit)+" Distance:"+StrD(Distance) ; Debug "Limit:"+StrD(Limit)+" Distance:"+StrD(Distance)
If Distance>Limit And IsImage(PBMap\MemCache\Images()\nImage) ; If Distance>Limit And IsImage(PBMap\MemCache\Images()\nImage)
LockMutex(PBMap\MemCache\Images()\Mutex) ; LockMutex(PBMap\MemCache\Images()\Mutex)
Debug "delete" ; Debug "delete"
Debug PBMap\MemCache\Images() ; Debug PBMap\MemCache\Images()
FreeImage(PBMap\MemCache\Images()\nImage) ; FreeImage(PBMap\MemCache\Images()\nImage)
UnlockMutex(PBMap\MemCache\Images()\Mutex) ; UnlockMutex(PBMap\MemCache\Images()\Mutex)
FreeMutex(PBMap\MemCache\Images()\Mutex) ; FreeMutex(PBMap\MemCache\Images()\Mutex)
DeleteMapElement(PBMap\MemCache\Images()) ; DeleteMapElement(PBMap\MemCache\Images())
EndIf ; EndIf
Next ; Next
EndProcedure EndProcedure
Procedure Pointer(x.i, y.i, color.l = 0) Procedure DrawPointer(*Drawing.DrawingParameters)
VectorSourceColor(color) If PBMap\CallBackMainPointer > 0
MovePathCursor(x, y) ; @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) AddPathLine(-8, -16, #PB_Path_Relative)
AddPathCircle(8, 0, 8, 180, 0, #PB_Path_Relative) AddPathCircle(8, 0, 8, 180, 0, #PB_Path_Relative)
AddPathLine(-8, 16, #PB_Path_Relative) AddPathLine(-8, 16, #PB_Path_Relative)
;FillPath(#PB_Path_Preserve) ;FillPath(#PB_Path_Preserve)
;ClipPath(#PB_Path_Preserve) ;ClipPath(#PB_Path_Preserve)
AddPathCircle(0, -16, 5, 0, 360, #PB_Path_Relative) AddPathCircle(0, -16, 5, 0, 360, #PB_Path_Relative)
VectorSourceColor(color) VectorSourceColor(RGBA($FF, 0, 0, $FF))
FillPath(#PB_Path_Preserve):VectorSourceColor(color);RGBA(0, 0, 0, 255)) FillPath(#PB_Path_Preserve):VectorSourceColor(RGBA($FF, 0, 0, $FF));RGBA(0, 0, 0, 255))
StrokePath(1) StrokePath(1)
EndIf
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 EndProcedure
Procedure TrackPointer(x.i, y.i,dist.l) Procedure TrackPointer(x.i, y.i,dist.l)
@@ -711,7 +730,7 @@ Module PBMap
If PBMap\Marker()\CallBackPointer > 0 If PBMap\Marker()\CallBackPointer > 0
CallFunctionFast(PBMap\Marker()\CallBackPointer, Pixel\X, Pixel\Y) CallFunctionFast(PBMap\Marker()\CallBackPointer, Pixel\X, Pixel\Y)
Else Else
Pointer(Pixel\X, Pixel\Y, PBMap\Marker()\color) DrawPointer(*Drawing)
EndIf EndIf
EndIf EndIf
EndIf EndIf
@@ -745,20 +764,9 @@ Module PBMap
DrawTiles(@Drawing) DrawTiles(@Drawing)
DrawTrack(@Drawing) DrawTrack(@Drawing)
DrawMarker(@Drawing) DrawMarker(@Drawing)
; @Procedure(X.i, Y.i) to DrawPointer (you must use VectorDrawing lib) DrawPointer(@Drawing)
If PBMap\CallBackMainPointer > 0 ;DrawScale(@Drawing)
CallFunctionFast(PBMap\CallBackMainPointer, Drawing\CenterX, Drawing\CenterY) ;- Display how many images in cache
Else
Pointer(Drawing\CenterX, Drawing\CenterY, RGBA($FF, 0, 0, $FF))
EndIf
;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))
;- Display How Many Image in Cache
VectorFont(FontID(PBMap\Font), 30) VectorFont(FontID(PBMap\Font), 30)
VectorSourceColor(RGBA(0, 0, 0, 80)) VectorSourceColor(RGBA(0, 0, 0, 80))
MovePathCursor(50,50) MovePathCursor(50,50)
@@ -1179,8 +1187,8 @@ CompilerIf #PB_Compiler_IsMainFile
CompilerEndIf CompilerEndIf
; IDE Options = PureBasic 5.50 (Windows - x64) ; IDE Options = PureBasic 5.50 (Windows - x64)
; ExecutableFormat = Console ; ExecutableFormat = Console
; CursorPosition = 595 ; CursorPosition = 445
; FirstLine = 581 ; FirstLine = 442
; Folding = --------- ; Folding = ---------
; EnableThread ; EnableThread
; EnableXP ; EnableXP