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

Multiple PBMaps WIP

Browse Source 
PBMap is now able to handle multiple maps.

Warning : it breaks compatibility with older codes !
InitPBMap() and Quit() are no longer used, only MapGadget() and FreeMapGadget() as in standard PureBASIC gadgets.
All functions should now include the MapGadget id as first parameter.

Now included, the André Beer demo.
This commit is contained in:
djes
2018-03-03 19:26:28 +01:00
parent 1c7b161a87
commit 648c9c9a4a
2 changed files with 436 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

369
Multiple-PBMaps-Demo.pb Normal file
View File

@@ -0,0 +1,369 @@
; Based on the orginal PBMap example (delivered with the package in Feb. 2018), this is an example with
; less functionality, but with 2 different Canvas Map gadgets placed in 2 tabs of a PanelGadget...
; (for testing purposes related to my GeoWorldEditor)
;
; Author: André Beer
; Last change: 26. Feb. 2018
; Modified by djes : 01. March 2018
; Adapted to new PBMap syntax by André: 02. March 2018
;
; ****************************************************************
;
;- Example of application
;
; ****************************************************************
XIncludeFile "PBMap.pb"
InitNetwork()
Enumeration
#Window_0
#Map
#Gdt_Left
#Gdt_Right
#Gdt_Up
#Gdt_Down
#Button_4
#Button_5
#Combo_0
#Text_0
#Text_1
#Text_2
#Text_3
#Text_4
#StringLatitude
#StringLongitude
#Gdt_AddMarker
#Gdt_Degrees
#Gdt_ClearDiskCache
#TextGeoLocationQuery
#StringGeoLocationQuery
; Additions for a 2nd panel:
#PanelGadget
#Map2_Canvas
#Map2_Move
#Map2_Left
#Map2_Right
#Map2_Up
#Map2_Down
#Map2_Zoom
#Map2_ZoomIn
#Map2_ZoomOut
#Map2_LatitudeText
#Map2_StringLatitude
#Map2_LongitudeText
#Map2_StringLongitude
EndEnumeration
; Menu events
Enumeration
#MenuEventLonLatStringEnter
#MenuEventGeoLocationStringEnter
EndEnumeration
Structure Location
Longitude.d
Latitude.d
EndStructure
Procedure UpdateLocation(*Location.Location)
SetGadgetText(#StringLatitude, StrD(*Location\Latitude))
SetGadgetText(#StringLongitude, StrD(*Location\Longitude))
ProcedureReturn 0
EndProcedure
; This callback demonstration procedure will receive relative coords from canvas
Procedure MyMarker(x.i, y.i, Focus = #False, Selected = #False)
Protected color = RGBA(0, 255, 0, 255)
MovePathCursor(x, y)
AddPathLine(-16,-32,#PB_Path_Relative)
AddPathCircle(16,0,16,180,0,#PB_Path_Relative)
AddPathLine(-16,32,#PB_Path_Relative)
VectorSourceColor(color)
FillPath(#PB_Path_Preserve)
If Focus
VectorSourceColor(RGBA($FF, $FF, 0, $FF))
StrokePath(2)
ElseIf Selected
VectorSourceColor(RGBA($FF, $FF, 0, $FF))
StrokePath(3)
Else
VectorSourceColor(RGBA(0, 0, 0, 255))
StrokePath(1)
EndIf
EndProcedure
Procedure MarkerMoveCallBack(*Marker.PBMap::Marker)
Debug "Identifier : " + *Marker\Identifier + "(" + StrD(*Marker\GeographicCoordinates\Latitude) + ", " + StrD(*Marker\GeographicCoordinates\Longitude) + ")"
EndProcedure
; Example of a custom procedure to alter tile rendering
Procedure DrawTileCallBack(x.i, y.i, image.i, alpha.d)
MovePathCursor(x, y)
DrawVectorImage(ImageID(image), 255 * alpha)
EndProcedure
; Example of a custom procedure to alter tile file just after loading
Procedure.s ModifyTileFileCallback(CacheFile.s, OrgURL.s)
Protected ImgNB = LoadImage(#PB_Any, CacheFile)
If ImgNB
StartDrawing(ImageOutput(ImgNB))
DrawText(0, 0,"PUREBASIC", RGB(255, 255, 0))
StopDrawing()
;*** Could be used to create new files
; Cachefile = ReplaceString(Cachefile, ".png", "_PB.png")
;***
If SaveImage(ImgNB, CacheFile, #PB_ImagePlugin_PNG, 0, 32) ;Warning, the 32 is mandatory as some tiles aren't correctly rendered
; Send back the new name (not functional by now)
ProcedureReturn CacheFile
EndIf
EndIf
EndProcedure
Procedure MainPointer(x.i, y.i)
VectorSourceColor(RGBA(255, 255,255, 255)) : AddPathCircle(x, y,32) : StrokePath(1)
VectorSourceColor(RGBA(0, 0, 0, 255)) : AddPathCircle(x, y, 29):StrokePath(2)
EndProcedure
Procedure ResizeAll()
Protected PanelTabHeight = GetGadgetAttribute(#PanelGadget, #PB_Panel_TabHeight)
ResizeGadget(#PanelGadget, #PB_Ignore, #PB_Ignore, WindowWidth(#Window_0), WindowHeight(#Window_0)-PanelTabHeight)
Protected PanelItemWidth = GetGadgetAttribute(#PanelGadget, #PB_Panel_ItemWidth)
Protected PanelItemHeight = GetGadgetAttribute(#PanelGadget, #PB_Panel_ItemHeight)
; First tab:
ResizeGadget(#Map, 10, 10, PanelItemWidth-198, PanelItemHeight-59)
ResizeGadget(#Text_1, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Gdt_Left, PanelItemWidth-150, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Gdt_Right, PanelItemWidth-90, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Gdt_Up, PanelItemWidth-120, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Gdt_Down, PanelItemWidth-120, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Text_2, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Button_4, PanelItemWidth-150, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Button_5, PanelItemWidth-100, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Text_3, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#StringLatitude, PanelItemWidth-120, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#StringLongitude, PanelItemWidth-120, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Text_4, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Gdt_AddMarker, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Gdt_Degrees, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Gdt_ClearDiskCache, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#TextGeoLocationQuery, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#StringGeoLocationQuery, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
; Second tab:
ResizeGadget(#Map2_Canvas, 10, 10, PanelItemWidth-198, PanelItemHeight-59)
ResizeGadget(#Map2_Move, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Map2_Left, PanelItemWidth-150, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Map2_Right, PanelItemWidth-90, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Map2_Up, PanelItemWidth-120, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Map2_Down, PanelItemWidth-120, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Map2_Zoom, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Map2_ZoomIn, PanelItemWidth-150, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Map2_ZoomOut, PanelItemWidth-100, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Map2_LatitudeText, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Map2_StringLatitude, PanelItemWidth-120, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Map2_LongitudeText, PanelItemWidth-170, #PB_Ignore, #PB_Ignore, #PB_Ignore)
ResizeGadget(#Map2_StringLongitude, PanelItemWidth-120, #PB_Ignore, #PB_Ignore, #PB_Ignore)
; Refresh the PBMap:
PBMap::Refresh(#Map)
PBMap::Refresh(#Map2_Canvas)
EndProcedure
;- MAIN TEST
If OpenWindow(#Window_0, 260, 225, 720, 595, "PBMap", #PB_Window_SystemMenu | #PB_Window_MinimizeGadget | #PB_Window_TitleBar | #PB_Window_ScreenCentered | #PB_Window_SizeGadget)
; ***
Define Event.i, Gadget.i, Quit.b = #False
Define pfValue.d
Define Degrees = 1
Define *Track
Define a, ActivePanel
LoadFont(0, "Arial", 12)
LoadFont(1, "Arial", 12, #PB_Font_Bold)
LoadFont(2, "Arial", 8)
PanelGadget(#PanelGadget, 0, 0, 720, 595)
AddGadgetItem(#PanelGadget, 0, "Map 1")
TextGadget(#Text_1, 530, 10, 60, 15, "Movements")
ButtonGadget(#Gdt_Left, 550, 60, 30, 30, Chr($25C4)) : SetGadgetFont(#Gdt_Left, FontID(0))
ButtonGadget(#Gdt_Right, 610, 60, 30, 30, Chr($25BA)) : SetGadgetFont(#Gdt_Right, FontID(0))
ButtonGadget(#Gdt_Up, 580, 030, 30, 30, Chr($25B2)) : SetGadgetFont(#Gdt_Up, FontID(0))
ButtonGadget(#Gdt_Down, 580, 90, 30, 30, Chr($25BC)) : SetGadgetFont(#Gdt_Down, FontID(0))
TextGadget(#Text_2, 530, 120, 60, 15, "Zoom")
ButtonGadget(#Button_4, 550, 140, 50, 30, " + ") : SetGadgetFont(#Button_4, FontID(1))
ButtonGadget(#Button_5, 600, 140, 50, 30, " - ") : SetGadgetFont(#Button_5, FontID(1))
TextGadget(#Text_3, 530, 190, 50, 15, "Latitude ")
StringGadget(#StringLatitude, 580, 190, 90, 20, "")
TextGadget(#Text_4, 530, 210, 50, 15, "Longitude ")
StringGadget(#StringLongitude, 580, 210, 90, 20, "")
ButtonGadget(#Gdt_AddMarker, 530, 240, 150, 30, "Add Marker")
ButtonGadget(#Gdt_Degrees, 530, 420, 150, 30, "Show/Hide Degrees", #PB_Button_Toggle)
ButtonGadget(#Gdt_ClearDiskCache, 530, 480, 150, 30, "Clear disk cache", #PB_Button_Toggle)
TextGadget(#TextGeoLocationQuery, 530, 515, 150, 15, "Enter an address")
StringGadget(#StringGeoLocationQuery, 530, 530, 150, 20, "")
SetActiveGadget(#StringGeoLocationQuery)
; Our main gadget
PBMap::MapGadget(#Map, 10, 10, 512, 512)
PBMap::SetOption(#Map, "ShowDegrees", "1") : Degrees = 0
PBMap::SetOption(#Map, "ShowDebugInfos", "1")
PBMap::SetDebugLevel(5)
PBMap::SetOption(#Map, "Verbose", "0")
PBMap::SetOption(#Map, "ShowScale", "1")
PBMap::SetOption(#Map, "Warning", "1")
PBMap::SetOption(#Map, "ShowMarkersLegend", "1")
PBMap::SetOption(#Map, "ShowTrackKms", "1")
PBMap::SetOption(#Map, "ColourFocus", "$FFFF00AA")
PBMap::SetCallBackMainPointer(#Map, @MainPointer()) ; To change the main pointer (center of the view)
PBMap::SetCallBackLocation(#Map, @UpdateLocation()) ; To obtain realtime coordinates
PBMap::SetLocation(#Map, -36.81148, 175.08634,12) ; Change the PBMap coordinates
PBMAP::SetMapScaleUnit(#Map, PBMAP::#SCALE_KM) ; To change the scale unit
PBMap::AddMarker(#Map, 49.0446828398, 2.0349812508, "", "", -1, @MyMarker()) ; To add a marker with a customised GFX
PBMap::SetCallBackMarker(#Map, @MarkerMoveCallBack())
PBMap::SetCallBackDrawTile(#Map, @DrawTileCallBack())
PBMap::SetCallBackModifyTileFile(#Map, @ModifyTileFileCallback())
AddGadgetItem(#PanelGadget, 1, "Map 2")
TextGadget(#Map2_Move, 530, 10, 60, 15, "Movements")
ButtonGadget(#Map2_Left, 550, 60, 30, 30, Chr($25C4)) : SetGadgetFont(#Gdt_Left, FontID(0))
ButtonGadget(#Map2_Right, 610, 60, 30, 30, Chr($25BA)) : SetGadgetFont(#Gdt_Right, FontID(0))
ButtonGadget(#Map2_Up, 580, 030, 30, 30, Chr($25B2)) : SetGadgetFont(#Gdt_Up, FontID(0))
ButtonGadget(#Map2_Down, 580, 90, 30, 30, Chr($25BC)) : SetGadgetFont(#Gdt_Down, FontID(0))
TextGadget(#Map2_Zoom, 530, 120, 60, 15, "Zoom")
ButtonGadget(#Map2_ZoomIn, 550, 140, 50, 30, " + ") : SetGadgetFont(#Button_4, FontID(1))
ButtonGadget(#Map2_ZoomOut, 600, 140, 50, 30, " - ") : SetGadgetFont(#Button_5, FontID(1))
TextGadget(#Map2_LatitudeText, 530, 190, 50, 15, "Latitude ")
StringGadget(#Map2_StringLatitude, 580, 190, 90, 20, "")
TextGadget(#Map2_LongitudeText, 530, 210, 50, 15, "Longitude ")
StringGadget(#Map2_StringLongitude, 580, 210, 90, 20, "")
; Our second map:
PBMap::MapGadget(#Map2_Canvas, 10, 10, 512, 512)
PBMap::SetOption(#Map2_Canvas, "ShowDegrees", "1") : Degrees = 0
PBMap::SetOption(#Map2_Canvas, "ShowDebugInfos", "1")
PBMap::SetDebugLevel(5)
PBMap::SetOption(#Map2_Canvas, "Verbose", "0")
PBMap::SetOption(#Map2_Canvas, "ShowScale", "1")
PBMap::SetOption(#Map2_Canvas, "Warning", "1")
PBMap::SetOption(#Map2_Canvas, "ShowMarkersLegend", "1")
PBMap::SetOption(#Map2_Canvas, "ShowTrackKms", "1")
PBMap::SetOption(#Map2_Canvas, "ColourFocus", "$FFFF00AA")
PBMap::SetCallBackMainPointer(#Map2_Canvas, @MainPointer()) ; To change the main pointer (center of the view)
PBMap::SetCallBackLocation(#Map2_Canvas, @UpdateLocation()) ; To obtain realtime coordinates
PBMap::SetLocation(#Map2_Canvas, 6.81148, 15.08634,12) ; Change the PBMap coordinates
PBMAP::SetMapScaleUnit(#Map2_Canvas, PBMAP::#SCALE_KM) ; To change the scale unit
PBMap::AddMarker(#Map2_Canvas, 49.0446828398, 2.0349812508)
CloseGadgetList()
ActivePanel = 2 ; Set the current active panel (1 = Map1, 2 = Map2)
SetGadgetState(#PanelGadget, 1)
AddKeyboardShortcut(#Window_0, #PB_Shortcut_Return, #MenuEventGeoLocationStringEnter)
; *** TODO : code to remove when the SetActiveGadget(-1) will be fixed
CompilerIf #PB_Compiler_OS = #PB_OS_Linux
Define Dummy = ButtonGadget(#PB_Any, 0, 0, 1, 1, "Dummy")
HideGadget(Dummy, 1)
CompilerElse
Define Dummy = -1
CompilerEndIf
Repeat
Event = WaitWindowEvent()
Select Event
Case #PB_Event_CloseWindow : Quit = 1
Case #PB_Event_Gadget ; {
Gadget = EventGadget()
Select Gadget
Case #PanelGadget
Select EventType()
Case #PB_EventType_Change
a = GetGadgetState(#PanelGadget)
If a <> ActivePanel
ActivePanel = a
If ActivePanel = 0
; ....
Else
; ....
EndIf
EndIf
EndSelect
Case #Gdt_Up
PBMap::SetLocation(#Map, 10* 360 / Pow(2, PBMap::GetZoom(#Map) + 8), 0, 0, #PB_Relative)
Case #Map2_Up
PBMap::SetLocation(#Map2_Canvas, 10* 360 / Pow(2, PBMap::GetZoom(#Map2_Canvas) + 8), 0, 0, #PB_Relative)
Case #Gdt_Down
PBMap::SetLocation(#Map, 10* -360 / Pow(2, PBMap::GetZoom(#Map) + 8), 0, 0, #PB_Relative)
Case #Map2_Down
PBMap::SetLocation(#Map2_Canvas, 10* -360 / Pow(2, PBMap::GetZoom(#Map2_Canvas) + 8), 0, 0, #PB_Relative)
Case #Gdt_Left
PBMap::SetLocation(#Map, 0, 10* -360 / Pow(2, PBMap::GetZoom(#Map) + 8), 0, #PB_Relative)
Case #Map2_Left
PBMap::SetLocation(#Map2_Canvas, 0, 10* -360 / Pow(2, PBMap::GetZoom(#Map2_Canvas) + 8), 0, #PB_Relative)
Case #Gdt_Right
PBMap::SetLocation(#Map, 0, 10* 360 / Pow(2, PBMap::GetZoom(#Map) + 8), 0, #PB_Relative)
Case #Map2_Right
PBMap::SetLocation(#Map2_Canvas, 0, 10* 360 / Pow(2, PBMap::GetZoom(#Map2_Canvas) + 8), 0, #PB_Relative)
Case #Button_4
PBMap::SetZoom(#Map, 1)
Case #Map2_ZoomIn
PBMap::SetZoom(#Map2_Canvas, 1)
Case #Button_5
PBMap::SetZoom(#Map, - 1)
Case #Map2_ZoomOut
PBMap::SetZoom(#Map2_Canvas, - 1)
Case #StringLatitude, #StringLongitude, #Map2_StringLatitude, #Map2_StringLongitude
Select EventType()
Case #PB_EventType_Focus
AddKeyboardShortcut(#Window_0, #PB_Shortcut_Return, #MenuEventLonLatStringEnter)
Case #PB_EventType_LostFocus
RemoveKeyboardShortcut(#Window_0, #PB_Shortcut_Return)
EndSelect
Case #Gdt_AddMarker
PBMap::AddMarker(#Map, ValD(GetGadgetText(#StringLatitude)), ValD(GetGadgetText(#StringLongitude)), "", "Test", RGBA(Random(255), Random(255), Random(255), 255))
Case #Gdt_Degrees
Degrees = 1 - Degrees
PBMap::SetOption(#Map, "ShowDegrees", Str(Degrees))
PBMap::Refresh(#Map)
SetGadgetState(#Gdt_Degrees, Degrees)
Case #Gdt_ClearDiskCache
PBMap::ClearDiskCache(#Map)
Case #StringGeoLocationQuery
Select EventType()
Case #PB_EventType_Focus
AddKeyboardShortcut(#Window_0, #PB_Shortcut_Return, #MenuEventGeoLocationStringEnter)
Case #PB_EventType_LostFocus
RemoveKeyboardShortcut(#Window_0, #PB_Shortcut_Return)
EndSelect
EndSelect
Case #PB_Event_SizeWindow
ResizeAll()
Case #PB_Event_Menu
; Receive "enter" key events
Select EventMenu()
Case #MenuEventGeoLocationStringEnter
If GetGadgetText(#StringGeoLocationQuery) <> ""
PBMap::NominatimGeoLocationQuery(#Map, GetGadgetText(#StringGeoLocationQuery))
PBMap::Refresh(#Map)
EndIf
; *** TODO : code to change when the SetActiveGadget(-1) will be fixed
SetActiveGadget(Dummy)
; ***
Case #MenuEventLonLatStringEnter
PBMap::SetLocation(#Map, ValD(GetGadgetText(#StringLatitude)), ValD(GetGadgetText(#StringLongitude))) ; Change the PBMap coordinates
PBMap::Refresh(#Map)
EndSelect
EndSelect
Until Quit = #True
PBMap::FreeMapGadget(#Map)
PBMap::FreeMapGadget(#Map2_Canvas)
EndIf
; IDE Options = PureBasic 5.61 (Windows - x64)
; CursorPosition = 204
; FirstLine = 176
; Folding = --
; EnableThread
; EnableXP
; CompileSourceDirectory

138
PBMap.pb
View File

@@ -118,8 +118,8 @@ DeclareModule PBMap
Declare DeleteMarker(MapGadget.i, *Ptr) Declare DeleteMarker(MapGadget.i, *Ptr)
Declare DeleteSelectedMarkers(MapGadget.i) Declare DeleteSelectedMarkers(MapGadget.i)
Declare Drawing(MapGadget.i) Declare Drawing(MapGadget.i)
Declare FatalError(msg.s) Declare FatalError(MapGadget.i, msg.s)
Declare Error(msg.s) Declare Error(MapGadget.i, msg.s)
Declare Refresh(MapGadget.i) Declare Refresh(MapGadget.i)
Declare.i ClearDiskCache(MapGadget.i) Declare.i ClearDiskCache(MapGadget.i)
@@ -339,7 +339,6 @@ Module PBMap
Global MyDebugLevel = 5 Global MyDebugLevel = 5
Global NewMap PBMaps() Global NewMap PBMaps()
Global *PBMap.PBMap
Global slash.s Global slash.s
CompilerSelect #PB_Compiler_OS CompilerSelect #PB_Compiler_OS
@@ -367,7 +366,8 @@ Module PBMap
;-Error management ;-Error management
; Shows an error msg and terminates the program ; Shows an error msg and terminates the program
Procedure FatalError(msg.s) Procedure FatalError(MapGadget, msg.s)
Protected *PBMap.PBMap = PBMaps(Str(MapGadget))
If *PBMap\Options\Warning If *PBMap\Options\Warning
MessageRequester("PBMap", msg, #PB_MessageRequester_Ok) MessageRequester("PBMap", msg, #PB_MessageRequester_Ok)
EndIf EndIf
@@ -375,7 +375,8 @@ Module PBMap
EndProcedure EndProcedure
; Shows an error msg ; Shows an error msg
Procedure Error(msg.s) Procedure Error(MapGadget, msg.s)
Protected *PBMap.PBMap = PBMaps(Str(MapGadget))
If *PBMap\Options\Warning If *PBMap\Options\Warning
MessageRequester("PBMap", msg, #PB_MessageRequester_Ok) MessageRequester("PBMap", msg, #PB_MessageRequester_Ok)
EndIf EndIf
@@ -387,11 +388,9 @@ Module PBMap
EndProcedure EndProcedure
; Send debug infos to stdout (allowing mixed debug infos with curl or other libs) ; Send debug infos to stdout (allowing mixed debug infos with curl or other libs)
Procedure MyDebug(msg.s, DbgLevel = 0) Procedure MyDebug(*PBMap.PBMap, msg.s, DbgLevel = 0) ;Directly pass the PBMap structure (faster)
; Protected *PBMap.PBMap = PBMaps(Str(MapGadget)) If *PBMap\Options\Verbose And DbgLevel <= MyDebugLevel
; If *PBMap\Options\Verbose And DbgLevel <= MyDebugLevel PrintN(msg)
If DbgLevel <= MyDebugLevel
;;PrintN(msg)
; Debug msg ; Debug msg
EndIf EndIf
EndProcedure EndProcedure
@@ -493,8 +492,8 @@ Module PBMap
Protected LatRad.d = Radian(*Location\Latitude) Protected LatRad.d = Radian(*Location\Latitude)
*Coords\x = n * (Mod( *Location\Longitude + 180.0, 360) / 360.0 ) *Coords\x = n * (Mod( *Location\Longitude + 180.0, 360) / 360.0 )
*Coords\y = n * ( 1.0 - Log(Tan(LatRad) + (1.0/Cos(LatRad))) / #PI ) / 2.0 *Coords\y = n * ( 1.0 - Log(Tan(LatRad) + (1.0/Cos(LatRad))) / #PI ) / 2.0
;MyDebug("Latitude : " + StrD(*Location\Latitude) + " ; Longitude : " + StrD(*Location\Longitude), 5) ;MyDebug(*PBMap, "Latitude : " + StrD(*Location\Latitude) + " ; Longitude : " + StrD(*Location\Longitude), 5)
;MyDebug("Coords X : " + Str(*Coords\x) + " ; Y : " + Str(*Coords\y), 5) ;MyDebug(*PBMap, "Coords X : " + Str(*Coords\x) + " ; Y : " + Str(*Coords\y), 5)
EndProcedure EndProcedure
; *** Converts tile.decimal to coords ; *** Converts tile.decimal to coords
@@ -1118,25 +1117,25 @@ Module PBMap
LockMutex(*PBMap\MemoryCacheAccessMutex) ; Prevents thread to start or finish LockMutex(*PBMap\MemoryCacheAccessMutex) ; Prevents thread to start or finish
Protected CacheSize = MapSize(*PBMap\MemCache\Images()) * Pow(*PBMap\TileSize, 2) * 4 ; Size of a tile = TileSize * TileSize * 4 bytes (RGBA) Protected CacheSize = MapSize(*PBMap\MemCache\Images()) * Pow(*PBMap\TileSize, 2) * 4 ; Size of a tile = TileSize * TileSize * 4 bytes (RGBA)
Protected CacheLimit = *PBMap\Options\MaxMemCache * 1024 Protected CacheLimit = *PBMap\Options\MaxMemCache * 1024
MyDebug("Cache size : " + Str(CacheSize/1024) + " / CacheLimit : " + Str(CacheLimit/1024), 5) MyDebug(*PBMap, "Cache size : " + Str(CacheSize/1024) + " / CacheLimit : " + Str(CacheLimit/1024), 5)
If CacheSize > CacheLimit If CacheSize > CacheLimit
MyDebug(" Cache full. Trying cache cleaning", 5) MyDebug(*PBMap, " Cache full. Trying cache cleaning", 5)
ResetList(*PBMap\MemCache\ImagesTimeStack()) ResetList(*PBMap\MemCache\ImagesTimeStack())
; Try to free half the cache memory (one pass) ; Try to free half the cache memory (one pass)
While NextElement(*PBMap\MemCache\ImagesTimeStack()) And CacheSize > (CacheLimit / 2) ; /2 = half While NextElement(*PBMap\MemCache\ImagesTimeStack()) And CacheSize > (CacheLimit / 2) ; /2 = half
Protected CacheMapKey.s = *PBMap\MemCache\ImagesTimeStack()\MapKey Protected CacheMapKey.s = *PBMap\MemCache\ImagesTimeStack()\MapKey
; Is the loading over ; Is the loading over
If *PBMap\MemCache\Images(CacheMapKey)\Tile <= 0 ;TODO Should not verify this var directly If *PBMap\MemCache\Images(CacheMapKey)\Tile <= 0 ;TODO Should not verify this var directly
MyDebug(" Delete " + CacheMapKey, 5) MyDebug(*PBMap, " Delete " + CacheMapKey, 5)
If *PBMap\MemCache\Images(CacheMapKey)\nImage;IsImage(*PBMap\MemCache\Images(CacheMapKey)\nImage) If *PBMap\MemCache\Images(CacheMapKey)\nImage;IsImage(*PBMap\MemCache\Images(CacheMapKey)\nImage)
FreeImage(*PBMap\MemCache\Images(CacheMapKey)\nImage) FreeImage(*PBMap\MemCache\Images(CacheMapKey)\nImage)
MyDebug(" and free image nb " + Str(*PBMap\MemCache\Images(CacheMapKey)\nImage), 5) MyDebug(*PBMap, " and free image nb " + Str(*PBMap\MemCache\Images(CacheMapKey)\nImage), 5)
*PBMap\MemCache\Images(CacheMapKey)\nImage = 0 *PBMap\MemCache\Images(CacheMapKey)\nImage = 0
EndIf EndIf
DeleteMapElement(*PBMap\MemCache\Images(), CacheMapKey) DeleteMapElement(*PBMap\MemCache\Images(), CacheMapKey)
DeleteElement(*PBMap\MemCache\ImagesTimeStack(), 1) DeleteElement(*PBMap\MemCache\ImagesTimeStack(), 1)
; ElseIf *PBMap\MemCache\Images(CacheMapKey)\Tile = 0 ; ElseIf *PBMap\MemCache\Images(CacheMapKey)\Tile = 0
; MyDebug(" Delete " + CacheMapKey, 5) ; MyDebug(*PBMap, " Delete " + CacheMapKey, 5)
; DeleteMapElement(*PBMap\MemCache\Images(), CacheMapKey) ; DeleteMapElement(*PBMap\MemCache\Images(), CacheMapKey)
; DeleteElement(*PBMap\MemCache\ImagesTimeStack(), 1) ; DeleteElement(*PBMap\MemCache\ImagesTimeStack(), 1)
; ElseIf *PBMap\MemCache\Images(CacheMapKey)\Tile > 0 ; ElseIf *PBMap\MemCache\Images(CacheMapKey)\Tile > 0
@@ -1147,27 +1146,27 @@ Module PBMap
EndIf EndIf
CacheSize = MapSize(*PBMap\MemCache\Images()) * Pow(*PBMap\TileSize, 2) * 4 ; Size of a tile = TileSize * TileSize * 4 bytes (RGBA) CacheSize = MapSize(*PBMap\MemCache\Images()) * Pow(*PBMap\TileSize, 2) * 4 ; Size of a tile = TileSize * TileSize * 4 bytes (RGBA)
Wend Wend
MyDebug(" New cache size : " + Str(CacheSize/1024) + " / CacheLimit : " + Str(CacheLimit/1024), 5) MyDebug(*PBMap, " New cache size : " + Str(CacheSize/1024) + " / CacheLimit : " + Str(CacheLimit/1024), 5)
If CacheSize > CacheLimit If CacheSize > CacheLimit
MyDebug(" Cache cleaning unsuccessfull, can't add new tiles.", 5) MyDebug(*PBMap, " Cache cleaning unsuccessfull, can't add new tiles.", 5)
EndIf EndIf
EndIf EndIf
UnlockMutex(*PBMap\MemoryCacheAccessMutex) UnlockMutex(*PBMap\MemoryCacheAccessMutex)
EndProcedure EndProcedure
Procedure.i GetTileFromHDD(CacheFile.s) Procedure.i GetTileFromHDD(*PBMap.PBMap, CacheFile.s) ;Directly pass the PBMap structure (faster)
Protected nImage.i, LifeTime.i, MaxLifeTime.i Protected nImage.i, LifeTime.i, MaxLifeTime.i
; Everything is OK, loads the file ; Everything is OK, loads the file
nImage = LoadImage(#PB_Any, CacheFile) nImage = LoadImage(#PB_Any, CacheFile)
If nImage If nImage
MyDebug(" Success loading " + CacheFile + " as nImage " + Str(nImage), 3) MyDebug(*PBMap, " Success loading " + CacheFile + " as nImage " + Str(nImage), 3)
ProcedureReturn nImage ProcedureReturn nImage
Else Else
MyDebug(" Failed loading " + CacheFile + " as nImage " + Str(nImage) + " -> not an image !", 3) MyDebug(*PBMap, " Failed loading " + CacheFile + " as nImage " + Str(nImage) + " -> not an image !", 3)
If DeleteFile(CacheFile) If DeleteFile(CacheFile)
MyDebug(" Deleting faulty image file " + CacheFile, 3) MyDebug(*PBMap, " Deleting faulty image file " + CacheFile, 3)
Else Else
MyDebug(" Can't delete faulty image file " + CacheFile, 3) MyDebug(*PBMap, " Can't delete faulty image file " + CacheFile, 3)
EndIf EndIf
EndIf EndIf
ProcedureReturn #False ProcedureReturn #False
@@ -1184,17 +1183,17 @@ Module PBMap
; nImage = CatchImage(#PB_Any, *Buffer, MemorySize(*Buffer)) ; nImage = CatchImage(#PB_Any, *Buffer, MemorySize(*Buffer))
; If IsImage(nImage) ; If IsImage(nImage)
; If SaveImage(nImage, CacheFile, #PB_ImagePlugin_PNG, 0, 32) ; The 32 is needed !!!! ; If SaveImage(nImage, CacheFile, #PB_ImagePlugin_PNG, 0, 32) ; The 32 is needed !!!!
; MyDebug("Loaded from web " + TileURL + " as CacheFile " + CacheFile, 3) ; MyDebug(*PBMap, "Loaded from web " + TileURL + " as CacheFile " + CacheFile, 3)
; Else ; Else
; MyDebug("Loaded from web " + TileURL + " but cannot save to CacheFile " + CacheFile, 3) ; MyDebug(*PBMap, "Loaded from web " + TileURL + " but cannot save to CacheFile " + CacheFile, 3)
; EndIf ; EndIf
; FreeMemory(*Buffer) ; FreeMemory(*Buffer)
; Else ; Else
; MyDebug("Can't catch image loaded from web " + TileURL, 3) ; MyDebug(*PBMap, "Can't catch image loaded from web " + TileURL, 3)
; nImage = -1 ; nImage = -1
; EndIf ; EndIf
; Else ; Else
; MyDebug(" Problem loading from web " + TileURL, 3) ; MyDebug(*PBMap, " Problem loading from web " + TileURL, 3)
; EndIf ; EndIf
; **** ; ****
@@ -1204,10 +1203,10 @@ Module PBMap
Procedure GetImageThread(*Tile.Tile) Procedure GetImageThread(*Tile.Tile)
;LockMutex(*PBMap\MemoryCacheAccessMutex) ;LockMutex(*PBMap\MemoryCacheAccessMutex)
MyDebug("Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " starting for image " + *Tile\CacheFile, 5) ;MyDebug(*PBMap, "Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " starting for image " + *Tile\CacheFile, 5)
; If MemoryCache is currently being cleaned, abort ; If MemoryCache is currently being cleaned, abort
; If *PBMap\MemoryCacheAccessNB = -1 ; If *PBMap\MemoryCacheAccessNB = -1
; MyDebug(" Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " canceled because of cleaning.", 5) ; MyDebug(*PBMap, " Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " canceled because of cleaning.", 5)
; *Tile\Size = 0 ; \Size = 0 signals that the download has failed ; *Tile\Size = 0 ; \Size = 0 signals that the download has failed
; PostEvent(#PB_Event_Gadget, *PBMap\Window, *PBMap\Gadget, #PB_MAP_TILE_CLEANUP, *Tile) ; To free memory outside the thread ; PostEvent(#PB_Event_Gadget, *PBMap\Window, *PBMap\Gadget, #PB_MAP_TILE_CLEANUP, *Tile) ; To free memory outside the thread
; UnlockMutex(*PBMap\MemoryCacheAccessMutex) ; UnlockMutex(*PBMap\MemoryCacheAccessMutex)
@@ -1223,22 +1222,22 @@ Module PBMap
Select Progress Select Progress
Case #PB_Http_Success Case #PB_Http_Success
*Tile\Size = FinishHTTP(*Tile\Download) ; \Size signals that the download is OK *Tile\Size = FinishHTTP(*Tile\Download) ; \Size signals that the download is OK
MyDebug(" Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " finished. Size : " + Str(*Tile\Size), 5) ;MyDebug(*PBMap, " Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " finished. Size : " + Str(*Tile\Size), 5)
Quit = #True Quit = #True
Case #PB_Http_Failed Case #PB_Http_Failed
FinishHTTP(*Tile\Download) FinishHTTP(*Tile\Download)
*Tile\Size = 0 ; \Size = 0 signals that the download has failed *Tile\Size = 0 ; \Size = 0 signals that the download has failed
MyDebug(" Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " failed.", 5) ;MyDebug(*PBMap, " Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " failed.", 5)
Quit = #True Quit = #True
Case #PB_Http_Aborted Case #PB_Http_Aborted
FinishHTTP(*Tile\Download) FinishHTTP(*Tile\Download)
*Tile\Size = 0 ; \Size = 0 signals that the download has failed *Tile\Size = 0 ; \Size = 0 signals that the download has failed
MyDebug(" Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " aborted.", 5) ;MyDebug(*PBMap, " Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " aborted.", 5)
Quit = #True Quit = #True
Default Default
MyDebug(" Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " downloading " + Str(Progress) + " bytes", 5) ;MyDebug(*PBMap, " Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " downloading " + Str(Progress) + " bytes", 5)
If ElapsedMilliseconds() - *Tile\Time > 10000 If ElapsedMilliseconds() - *Tile\Time > 10000
MyDebug(" Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " canceled after 10 seconds.", 5) ;MyDebug(*PBMap, " Thread nb " + Str(*Tile\GetImageThread) + " " + *Tile\key + " for image " + *Tile\CacheFile + " canceled after 10 seconds.", 5)
AbortHTTP(*Tile\Download) AbortHTTP(*Tile\Download)
EndIf EndIf
EndSelect EndSelect
@@ -1260,11 +1259,11 @@ Module PBMap
; Try to find the tile in memory cache ; Try to find the tile in memory cache
Protected *timg.ImgMemCach = FindMapElement(*PBMap\MemCache\Images(), key) Protected *timg.ImgMemCach = FindMapElement(*PBMap\MemCache\Images(), key)
If *timg If *timg
MyDebug("Key : " + key + " found in memory cache", 4) MyDebug(*PBMap, "Key : " + key + " found in memory cache", 4)
; Is the associated image already been loaded in memory ? ; Is the associated image already been loaded in memory ?
If *timg\nImage If *timg\nImage
; Yes, returns the image's nb ; Yes, returns the image's nb
MyDebug(" as image " + *timg\nImage, 4) MyDebug(*PBMap, " as image " + *timg\nImage, 4)
; *** Cache management ; *** Cache management
; Retrieves the image in the time stack, push it to the end (to say it's the lastly used) ; Retrieves the image in the time stack, push it to the end (to say it's the lastly used)
ChangeCurrentElement(*PBMap\MemCache\ImagesTimeStack(), *timg\TimeStackPtr) ChangeCurrentElement(*PBMap\MemCache\ImagesTimeStack(), *timg\TimeStackPtr)
@@ -1275,13 +1274,13 @@ Module PBMap
ProcedureReturn *timg ProcedureReturn *timg
Else Else
; No, try to load it from HD (see below) ; No, try to load it from HD (see below)
MyDebug(" but not the image.", 4) MyDebug(*PBMap, " but not the image.", 4)
EndIf EndIf
Else Else
; The tile has not been found in the cache, so creates a new cache element ; The tile has not been found in the cache, so creates a new cache element
*timg = AddMapElement(*PBMap\MemCache\Images(), key) *timg = AddMapElement(*PBMap\MemCache\Images(), key)
If *timg = 0 If *timg = 0
MyDebug(" Can't add a new cache element.", 4) MyDebug(*PBMap, " Can't add a new cache element.", 4)
UnlockMutex(*PBMap\MemoryCacheAccessMutex) UnlockMutex(*PBMap\MemoryCacheAccessMutex)
ProcedureReturn #False ProcedureReturn #False
EndIf EndIf
@@ -1290,14 +1289,14 @@ Module PBMap
; Stores the time stack ptr ; Stores the time stack ptr
*timg\TimeStackPtr = AddElement(*PBMap\MemCache\ImagesTimeStack()) *timg\TimeStackPtr = AddElement(*PBMap\MemCache\ImagesTimeStack())
If *timg\TimeStackPtr = 0 If *timg\TimeStackPtr = 0
MyDebug(" Can't add a new time stack element.", 4) MyDebug(*PBMap, " Can't add a new time stack element.", 4)
DeleteMapElement(*PBMap\MemCache\Images()) DeleteMapElement(*PBMap\MemCache\Images())
UnlockMutex(*PBMap\MemoryCacheAccessMutex) UnlockMutex(*PBMap\MemoryCacheAccessMutex)
ProcedureReturn #False ProcedureReturn #False
EndIf EndIf
; Associates the time stack element to the cache element ; Associates the time stack element to the cache element
*PBMap\MemCache\ImagesTimeStack()\MapKey = MapKey(*PBMap\MemCache\Images()) *PBMap\MemCache\ImagesTimeStack()\MapKey = MapKey(*PBMap\MemCache\Images())
MyDebug("Key : " + key + " added in memory cache", 4) MyDebug(*PBMap, "Key : " + key + " added in memory cache", 4)
EndIf EndIf
; If there's no active download thread for this tile ; If there's no active download thread for this tile
If *timg\Tile <= 0 If *timg\Tile <= 0
@@ -1308,10 +1307,10 @@ Module PBMap
If *timg\Size >= 0 ; Does the file exists ? If *timg\Size >= 0 ; Does the file exists ?
If *timg\Size = 0 Or (Date() - GetFileDate(CacheFile, #PB_Date_Modified) > *PBMap\Options\TileLifetime) ; If Lifetime > MaxLifeTime ; There's a bug with #PB_Date_Created If *timg\Size = 0 Or (Date() - GetFileDate(CacheFile, #PB_Date_Modified) > *PBMap\Options\TileLifetime) ; If Lifetime > MaxLifeTime ; There's a bug with #PB_Date_Created
If DeleteFile(CacheFile) If DeleteFile(CacheFile)
MyDebug(" Deleting image file " + CacheFile, 3) MyDebug(*PBMap, " Deleting image file " + CacheFile, 3)
*timg\Size = 0 *timg\Size = 0
Else Else
MyDebug(" Can't delete image file " + CacheFile, 3) MyDebug(*PBMap, " Can't delete image file " + CacheFile, 3)
UnlockMutex(*PBMap\MemoryCacheAccessMutex) UnlockMutex(*PBMap\MemoryCacheAccessMutex)
ProcedureReturn #False ProcedureReturn #False
EndIf EndIf
@@ -1320,9 +1319,9 @@ Module PBMap
EndIf EndIf
; Try To load it from HD ; Try To load it from HD
If *timg\Size > 0 If *timg\Size > 0
*timg\nImage = GetTileFromHDD(CacheFile.s) *timg\nImage = GetTileFromHDD(*PBMap, CacheFile.s)
Else Else
MyDebug(" Failed loading from HDD " + CacheFile + " -> Filesize = " + FileSize(CacheFile), 3) MyDebug(*PBMap, " Failed loading from HDD " + CacheFile + " -> Filesize = " + FileSize(CacheFile), 3)
EndIf EndIf
If *timg\nImage If *timg\nImage
; Image found and loaded from HDD ; Image found and loaded from HDD
@@ -1350,21 +1349,21 @@ Module PBMap
If \GetImageThread If \GetImageThread
*timg\Tile = *NewTile ; There's now a loading thread *timg\Tile = *NewTile ; There's now a loading thread
*timg\Alpha = 0 *timg\Alpha = 0
MyDebug(" Creating get image thread nb " + Str(\GetImageThread) + " to get " + CacheFile + " (key = " + key, 3) MyDebug(*PBMap, " Creating get image thread nb " + Str(\GetImageThread) + " to get " + CacheFile + " (key = " + key, 3)
*PBMap\ThreadsNB + 1 *PBMap\ThreadsNB + 1
Else Else
MyDebug(" Can't create get image thread to get " + CacheFile, 3) MyDebug(*PBMap, " Can't create get image thread to get " + CacheFile, 3)
FreeMemory(*NewTile) FreeMemory(*NewTile)
EndIf EndIf
EndWith EndWith
Else Else
MyDebug(" Error, can't allocate memory for a new tile loading thread", 3) MyDebug(*PBMap, " Error, can't allocate memory for a new tile loading thread", 3)
EndIf EndIf
Else Else
MyDebug(" Thread needed " + key + " for image " + CacheFile + " canceled because no free download slot.", 5) MyDebug(*PBMap, " Thread needed " + key + " for image " + CacheFile + " canceled because no free download slot.", 5)
EndIf EndIf
Else Else
MyDebug(" Error, maximum threads nb reached", 3) MyDebug(*PBMap, " Error, maximum threads nb reached", 3)
EndIf EndIf
EndIf EndIf
EndIf EndIf
@@ -1384,7 +1383,7 @@ Module PBMap
Protected tilemax.i = 1<<*PBMap\Zoom Protected tilemax.i = 1<<*PBMap\Zoom
Protected HereLoadBalancing.b ; Here is providing a load balancing system Protected HereLoadBalancing.b ; Here is providing a load balancing system
FindMapElement(*PBMap\Layers(), LayerName) FindMapElement(*PBMap\Layers(), LayerName)
MyDebug("Drawing tiles") MyDebug(*PBMap, "Drawing tiles")
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
px = *Drawing\RadiusX + x * *PBMap\TileSize - *Drawing\DeltaX px = *Drawing\RadiusX + x * *PBMap\TileSize - *Drawing\DeltaX
@@ -1401,27 +1400,27 @@ Module PBMap
Protected DirName.s = *PBMap\Options\HDDCachePath + LayerName Protected DirName.s = *PBMap\Options\HDDCachePath + LayerName
If FileSize(DirName) <> -2 If FileSize(DirName) <> -2
If CreateDirectory(DirName) = #False ; Creates a directory based on the layer name If CreateDirectory(DirName) = #False ; Creates a directory based on the layer name
Error("Can't create the following layer directory : " + DirName) Error(MapGadget, "Can't create the following layer directory : " + DirName)
Else Else
MyDebug(DirName + " successfully created", 4) MyDebug(*PBMap, DirName + " successfully created", 4)
EndIf EndIf
EndIf EndIf
; Creates the sub-directory based on the zoom ; Creates the sub-directory based on the zoom
DirName + slash + Str(*PBMap\Zoom) DirName + slash + Str(*PBMap\Zoom)
If FileSize(DirName) <> -2 If FileSize(DirName) <> -2
If CreateDirectory(DirName) = #False If CreateDirectory(DirName) = #False
Error("Can't create the following zoom directory : " + DirName) Error(MapGadget, "Can't create the following zoom directory : " + DirName)
Else Else
MyDebug(DirName + " successfully created", 4) MyDebug(*PBMap, DirName + " successfully created", 4)
EndIf EndIf
EndIf EndIf
; Creates the sub-directory based on x ; Creates the sub-directory based on x
DirName.s + slash + Str(tilex) DirName.s + slash + Str(tilex)
If FileSize(DirName) <> -2 If FileSize(DirName) <> -2
If CreateDirectory(DirName) = #False If CreateDirectory(DirName) = #False
Error("Can't create the following x directory : " + DirName) Error(MapGadget, "Can't create the following x directory : " + DirName)
Else Else
MyDebug(DirName + " successfully created", 4) MyDebug(*PBMap, DirName + " successfully created", 4)
EndIf EndIf
EndIf EndIf
With *PBMap\Layers() With *PBMap\Layers()
@@ -1749,7 +1748,7 @@ Module PBMap
Message = "Error in the XML file:" + Chr(13) Message = "Error in the XML file:" + Chr(13)
Message + "Message: " + XMLError(0) + Chr(13) Message + "Message: " + XMLError(0) + Chr(13)
Message + "Line: " + Str(XMLErrorLine(0)) + " Character: " + Str(XMLErrorPosition(0)) Message + "Line: " + Str(XMLErrorLine(0)) + " Character: " + Str(XMLErrorPosition(0))
Error(Message) Error(MapGadget, Message)
EndIf EndIf
Protected *MainNode,*subNode,*child,child.l Protected *MainNode,*subNode,*child,child.l
*MainNode = MainXMLNode(0) *MainNode = MainXMLNode(0)
@@ -1794,7 +1793,7 @@ Module PBMap
Message = "Error in the XML file:" + Chr(13) Message = "Error in the XML file:" + Chr(13)
Message + "Message: " + XMLError(0) + Chr(13) Message + "Message: " + XMLError(0) + Chr(13)
Message + "Line: " + Str(XMLErrorLine(0)) + " Character: " + Str(XMLErrorPosition(0)) Message + "Line: " + Str(XMLErrorLine(0)) + " Character: " + Str(XMLErrorPosition(0))
Error(Message) Error(MapGadget, Message)
ProcedureReturn #False ProcedureReturn #False
EndIf EndIf
ProcedureReturn #True ProcedureReturn #True
@@ -2073,6 +2072,7 @@ Module PBMap
EndProcedure EndProcedure
Procedure Refresh(MapGadget.i) Procedure Refresh(MapGadget.i)
Protected *PBMap.PBMap = PBMaps(Str(MapGadget))
*PBMap\Redraw = #True *PBMap\Redraw = #True
; Drawing() ; Drawing()
EndProcedure EndProcedure
@@ -2367,7 +2367,7 @@ Module PBMap
Size = ReceiveHTTPFile(Query, JSONFileName) Size = ReceiveHTTPFile(Query, JSONFileName)
If LoadJSON(0, JSONFileName) = 0 If LoadJSON(0, JSONFileName) = 0
; Demivec's code ; Demivec's code
MyDebug( JSONErrorMessage() + " at position " + MyDebug(*PBMap, JSONErrorMessage() + " at position " +
JSONErrorPosition() + " in line " + JSONErrorPosition() + " in line " +
JSONErrorLine() + " of JSON web Data", 1) JSONErrorLine() + " of JSON web Data", 1)
ElseIf JSONArraySize(JSONValue(0)) > 0 ElseIf JSONArraySize(JSONValue(0)) > 0
@@ -2400,11 +2400,11 @@ Module PBMap
EndIf EndIf
EndIf EndIf
If DeleteDirectory(*PBMap\Options\HDDCachePath, "", #PB_FileSystem_Recursive) If DeleteDirectory(*PBMap\Options\HDDCachePath, "", #PB_FileSystem_Recursive)
MyDebug("Cache in : " + *PBMap\Options\HDDCachePath + " cleared", 3) MyDebug(*PBMap, "Cache in : " + *PBMap\Options\HDDCachePath + " cleared", 3)
CreateDirectoryEx(*PBMap\Options\HDDCachePath) CreateDirectoryEx(*PBMap\Options\HDDCachePath)
ProcedureReturn #True ProcedureReturn #True
Else Else
MyDebug("Can't clear cache in " + *PBMap\Options\HDDCachePath, 3) MyDebug(*PBMap, "Can't clear cache in " + *PBMap\Options\HDDCachePath, 3)
ProcedureReturn #False ProcedureReturn #False
EndIf EndIf
EndProcedure EndProcedure
@@ -2705,7 +2705,7 @@ Module PBMap
Protected *PBMap.PBMap Protected *PBMap.PBMap
*PBMap.PBMap = AllocateStructure(PBMap) *PBMap.PBMap = AllocateStructure(PBMap)
If *PBMap = 0 If *PBMap = 0
FatalError("Cannot initialize PBMap memory") FatalError(MapGadget, "Cannot initialize PBMap memory")
EndIf EndIf
PBMaps(Str(MapGadget)) = *PBMap PBMaps(Str(MapGadget)) = *PBMap
With *PBMap With *PBMap
@@ -2723,7 +2723,7 @@ Module PBMap
\Mode = #MODE_DEFAULT \Mode = #MODE_DEFAULT
\MemoryCacheAccessMutex = CreateMutex() \MemoryCacheAccessMutex = CreateMutex()
If \MemoryCacheAccessMutex = #False If \MemoryCacheAccessMutex = #False
MyDebug("Cannot create a mutex", 0) MyDebug(*PBMap, "Cannot create a mutex", 0)
End End
EndIf EndIf
EndWith EndWith
@@ -2749,7 +2749,7 @@ Module PBMap
If CanvasGadget(MapGadget, X, Y, Width, Height, #PB_Canvas_Keyboard) If CanvasGadget(MapGadget, X, Y, Width, Height, #PB_Canvas_Keyboard)
BindMapGadget(MapGadget, TimerNB) BindMapGadget(MapGadget, TimerNB)
Else Else
FatalError("Cannot create the map gadget") FatalError(MapGadget, "Cannot create the map gadget")
EndIf EndIf
EndIf EndIf
EndProcedure EndProcedure
@@ -2791,10 +2791,6 @@ Module PBMap
EndIf EndIf
Next Next
EndProcedure EndProcedure
Procedure SelectPBMap(MapGadget.i) ; Could be used to have multiple PBMaps in one window
*PBMap = PBMaps(Str(MapGadget))
EndProcedure
EndModule EndModule
@@ -3140,8 +3136,8 @@ CompilerEndIf
; IDE Options = PureBasic 5.61 (Windows - x64) ; IDE Options = PureBasic 5.61 (Windows - x64)
; CursorPosition = 396 ; CursorPosition = 340
; FirstLine = 381 ; FirstLine = 76
; Folding = --------------------- ; Folding = ---------------------
; EnableThread ; EnableThread
; EnableXP ; EnableXP