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

Track bugfix

Browse Source
This commit is contained in:
djes
2016-07-25 23:01:22 +02:00
parent 3cd42fbee6
commit 8c2f59801b
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
osm.pb
View File

@@ -309,8 +309,8 @@ Module OSM
Protected mapHeight.l = Pow(2,OSM\Zoom+8) Protected mapHeight.l = Pow(2,OSM\Zoom+8)
Protected x1.l,y1.l Protected x1.l,y1.l
;Protected deltaX = OSM\Position\x - Int(OSM\Drawing\x) * OSM\TileSize ;Get the position into the tile Protected deltaX = OSM\Position\x - Int(OSM\Drawing\x) * OSM\TileSize ;Get the position into the tile
;Protected deltaY = OSM\Position\y - Int(OSM\Drawing\y) * OSM\TileSize Protected deltaY = OSM\Position\y - Int(OSM\Drawing\y) * OSM\TileSize
; get x value ; get x value
x1 = (*Location\Longitude+180)*(mapWidth/360) x1 = (*Location\Longitude+180)*(mapWidth/360)
@@ -329,8 +329,8 @@ Module OSM
mercN = Log(Tan((#PI/4)+(latRad/2))) ; mercN = Log(Tan((#PI/4)+(latRad/2))) ;
y2 = (mapHeight/2)-(mapWidth*mercN/(2*#PI)); y2 = (mapHeight/2)-(mapWidth*mercN/(2*#PI));
*Pixel\x=GadgetWidth(OSM\Gadget)/2 - (x2-x1); + deltaX *Pixel\x=GadgetWidth(OSM\Gadget)/2 - (x2-x1) - deltaX
*Pixel\y=GadgetHeight(OSM\Gadget)/2 - (y2-y1);+ deltaY *Pixel\y=GadgetHeight(OSM\Gadget)/2 - (y2-y1) - deltaY
EndProcedure EndProcedure
Procedure LoadGpxFile(file.s) Procedure LoadGpxFile(file.s)
@@ -595,7 +595,7 @@ Module OSM
ForEach OSM\track() ForEach OSM\track()
If @OSM\TargetLocation\Latitude<>0 And @OSM\TargetLocation\Longitude<>0 If @OSM\TargetLocation\Latitude<>0 And @OSM\TargetLocation\Longitude<>0
getPixelCoorfromLocation(@OSM\track(),@Pixel) getPixelCoorfromLocation(@OSM\track(), @Pixel)
If ListIndex(OSM\track())=0 If ListIndex(OSM\track())=0
MovePathCursor(Pixel\X + DeltaX, Pixel\Y + DeltaY) MovePathCursor(Pixel\X + DeltaX, Pixel\Y + DeltaY)
Else Else
@@ -768,7 +768,7 @@ Module OSM
OSM\MoveStartingPoint\y = GetGadgetAttribute(OSM\Gadget, #PB_Canvas_MouseY) OSM\MoveStartingPoint\y = GetGadgetAttribute(OSM\Gadget, #PB_Canvas_MouseY)
;If CallBackLocation send Location to function ;If CallBackLocation send Location to function
If OSM\CallBackLocation>0 If OSM\CallBackLocation>0
CallFunctionFast(OSM\CallBackLocation,@OSM\TargetLocation) CallFunctionFast(OSM\CallBackLocation, @OSM\TargetLocation)
EndIf EndIf
EndIf EndIf
Case #PB_EventType_LeftButtonUp Case #PB_EventType_LeftButtonUp
@@ -822,10 +822,11 @@ CompilerIf #PB_Compiler_IsMainFile
EndStructure EndStructure
Procedure UpdateLocation(*Location.Location) Procedure UpdateLocation(*Location.Location)
SetGadgetText(#String_0,StrD(*Location\Latitude)) SetGadgetText(#String_0, StrD(*Location\Latitude))
SetGadgetText(#String_1,StrD(*Location\Longitude)) SetGadgetText(#String_1, StrD(*Location\Longitude))
ProcedureReturn 0 ProcedureReturn 0
EndProcedure EndProcedure
;- Main ;- Main
If OpenWindow(#Window_0, 260, 225, 700, 571, "OpenStreetMap", #PB_Window_SystemMenu | #PB_Window_MinimizeGadget | #PB_Window_TitleBar | #PB_Window_ScreenCentered ) If OpenWindow(#Window_0, 260, 225, 700, 571, "OpenStreetMap", #PB_Window_SystemMenu | #PB_Window_MinimizeGadget | #PB_Window_TitleBar | #PB_Window_ScreenCentered )
@@ -876,8 +877,8 @@ CompilerIf #PB_Compiler_IsMainFile
CompilerEndIf CompilerEndIf
; IDE Options = PureBasic 5.42 LTS (Windows - x64) ; IDE Options = PureBasic 5.42 LTS (Windows - x64)
; CursorPosition = 331 ; CursorPosition = 332
; FirstLine = 328 ; FirstLine = 531
; Folding = ----- ; Folding = -----
; EnableUnicode ; EnableUnicode
; EnableThread ; EnableThread