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

Merge branch 'djes' of https://github.com/djes/PBMap into djes

Browse Source
This commit is contained in:
djes
2018-06-11 23:24:00 +02:00
parent 864d1e33f5 28c85648ca
commit c13ff4fc92
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PBMap.pb
View File

@@ -3,7 +3,7 @@
; Description: Permits the use of tiled maps like ; Description: Permits the use of tiled maps like
; OpenStreetMap in a handy PureBASIC module ; OpenStreetMap in a handy PureBASIC module
; Author: Thyphoon, djes, Idle, yves86 ; Author: Thyphoon, djes, Idle, yves86
; Date: July, 2017 ; Date: June, 2018
; License: PBMap : Free, unrestricted, credit ; License: PBMap : Free, unrestricted, credit
; appreciated but not required. ; appreciated but not required.
; OSM : see http://www.openstreetmap.org/copyright ; OSM : see http://www.openstreetmap.org/copyright
@@ -1987,7 +1987,7 @@ Module PBMap
Procedure DrawOSMCopyright(MapGadget.i, *Drawing.DrawingParameters) Procedure DrawOSMCopyright(MapGadget.i, *Drawing.DrawingParameters)
Protected *PBMap.PBMap = PBMaps(Str(MapGadget)) Protected *PBMap.PBMap = PBMaps(Str(MapGadget))
Protected Text.s = "<EFBFBD> OpenStreetMap contributors" Protected Text.s = "© OpenStreetMap contributors"
VectorFont(FontID(*PBMap\StandardFont), 12) VectorFont(FontID(*PBMap\StandardFont), 12)
VectorSourceColor(RGBA(0, 0, 0, 80)) VectorSourceColor(RGBA(0, 0, 0, 80))
MovePathCursor(GadgetWidth(*PBMap\Gadget) - VectorTextWidth(Text), GadgetHeight(*PBMap\Gadget) - 20) MovePathCursor(GadgetWidth(*PBMap\Gadget) - VectorTextWidth(Text), GadgetHeight(*PBMap\Gadget) - 20)
@@ -2543,14 +2543,14 @@ Module PBMap
EndIf EndIf
Next Next
EndIf EndIf
; YA pour s<EFBFBD>lectionner un point de la trace avec le clic gauche ; YA pour sélectionner un point de la trace avec le clic gauche
If *PBMap\EditMarker = #False If *PBMap\EditMarker = #False
Location\Latitude = GetMouseLatitude(MapGadget) Location\Latitude = GetMouseLatitude(MapGadget)
Location\Longitude = GetMouseLongitude(MapGadget) Location\Longitude = GetMouseLongitude(MapGadget)
If *PBMap\CallBackLeftClic > 0 If *PBMap\CallBackLeftClic > 0
CallFunctionFast(*PBMap\CallBackLeftClic, @Location) CallFunctionFast(*PBMap\CallBackLeftClic, @Location)
EndIf EndIf
; ajout YA // change la forme du pointeur de souris pour les d<EFBFBD>placements de la carte ; ajout YA // change la forme du pointeur de souris pour les déplacements de la carte
SetGadgetAttribute(*PBMap\Gadget, #PB_Canvas_Cursor, #PB_Cursor_Hand) SetGadgetAttribute(*PBMap\Gadget, #PB_Canvas_Cursor, #PB_Cursor_Hand)
Else Else
SetGadgetAttribute(*PBMap\Gadget, #PB_Canvas_Cursor, #PB_Cursor_Default) ; ajout YA pour remettre le pointeur souris en normal SetGadgetAttribute(*PBMap\Gadget, #PB_Canvas_Cursor, #PB_Cursor_Default) ; ajout YA pour remettre le pointeur souris en normal
@@ -2608,7 +2608,7 @@ Module PBMap
EndIf EndIf
Next Next
; Check if mouse touch tracks ; Check if mouse touch tracks
If *PBMap\Options\ShowTrackSelection ; YA ajout pour <EFBFBD>viter la s<EFBFBD>lection de la trace If *PBMap\Options\ShowTrackSelection ; YA ajout pour éviter la sélection de la trace
With *PBMap\TracksList() With *PBMap\TracksList()
; Trace Track ; Trace Track
If ListSize(*PBMap\TracksList()) > 0 If ListSize(*PBMap\TracksList()) > 0
@@ -2646,7 +2646,7 @@ Module PBMap
; *PBMap\MoveStartingPoint\x = - 1 ; *PBMap\MoveStartingPoint\x = - 1
*PBMap\Dragging = #False *PBMap\Dragging = #False
*PBMap\Redraw = #True *PBMap\Redraw = #True
;YA pour connaitre les coordonn<EFBFBD>es d'un marqueur apr<EFBFBD>s d<EFBFBD>placement ;YA pour connaitre les coordonnées d'un marqueur après déplacement
ForEach *PBMap\Markers() ForEach *PBMap\Markers()
If *PBMap\Markers()\Selected = #True If *PBMap\Markers()\Selected = #True
If *PBMap\CallBackMarker > 0 If *PBMap\CallBackMarker > 0
@@ -3147,4 +3147,5 @@ CompilerEndIf
; Folding = --------------------- ; Folding = ---------------------
; EnableThread ; EnableThread
; EnableXP ; EnableXP
; CompileSourceDirectory ; CompileSourceDirectory
; DisablePurifier = 1,1,1,1