137 Commits
idle ... Yves86

Author SHA1 Message Date
djes
8e5061de43 Header 2017-06-15 17:22:24 +02:00
djes
552763d346 (djes) implemented the new functions by Yves86 2017-06-15 17:08:14 +02:00
djes
4183dcd59b Create README.md 2017-06-15 15:32:33 +02:00
djes
d3e277937e Old files cleaning bug fixed 2017-06-15 15:30:19 +02:00
djes
e67076802b Latest strange image drawing bugs killed 2017-06-15 15:15:02 +02:00
djes
55bbe10378 Better thread/download management 2017-06-15 12:24:23 +02:00
djes
b11176a46f Ensures that there's no loading threads while cleaning
Should be changed, as the feeling is less good, memory consumption could get huge, and unuseful threads may continue instead of being stopped.
2017-06-14 10:58:48 +02:00
djes
7d351f4f92 Threads and cache cleaning now mutually excluded 2017-06-14 10:39:03 +02:00
djes
da8c3e9001 semaphores test 2017-06-13 21:04:59 +02:00
djes
61503c3e98 Several bugfix 2017-06-12 20:37:08 +02:00
djes
bb405afca9 Download slots bugfix 2017-06-12 12:32:51 +02:00
djes
1b903ffdc6 One more lil bugfix 2017-06-09 16:58:58 +02:00
djes
bbb66d20b6 Little bugfix 2017-06-09 16:08:39 +02:00
djes
530273a934 Added download slots and automatic download cancellation after a delay 2017-06-09 15:16:08 +02:00
djes
1de62dfb16 Caching mechanism enhanced + better downloading wip 2017-06-09 13:49:29 +02:00
djes
bbf5be2efd New cache mechanism and thread overload fixed 2017-06-08 15:02:34 +02:00
djes
c862f9099e Overload bugfix in progress
When several threads are launched and the web server doesn't respond, a form of overload appears.
2017-06-08 12:27:56 +02:00
djes
4cb1f57bbc Cache bugfix in progress
And better web loading by thread limit
2017-06-07 17:15:04 +02:00
djes
280e4faba6 Revert "Little tile loading bugfix"
This reverts commit 74fe157b47.
2017-06-06 16:45:45 +02:00
djes
74fe157b47 Little tile loading bugfix 2017-06-02 12:53:29 +02:00
djes
246d56a008 Revert "Little tile loading bugfix"
This reverts commit aef23aa03b.
2017-06-02 12:51:38 +02:00
djes
aef23aa03b Little tile loading bugfix 2017-06-02 12:50:54 +02:00
djes
c1a650bce5 Geoserver layers support
Basic geoserver support (google maps services only by now)
2017-04-03 11:32:08 +02:00
djes
d5cd0cd6f3 Basic save GPX file function 2017-03-29 16:46:55 +02:00
djes
544750f74e Layer alpha
and some cleaning as usual
2017-03-29 12:15:33 +02:00
djes
7746b88731 Tile file lifetime management 2017-03-21 18:01:21 +01:00
djes
6e295ee658 Merge remote-tracking branch 'refs/remotes/origin/master' into djes 2017-03-20 12:39:53 +01:00
djes
ae1c031ea0 Options improvements 2017-03-20 12:38:40 +01:00
djes
6bdb4880b6 Not threadable HTTPProxy
bugfixing, plus the not threadable httpproxy() fix
2017-03-20 11:48:40 +01:00
djes
e55c4851ed Merge remote-tracking branch 'origin/djes' into djes
# Conflicts:
#	PBMap.pb
2017-03-20 10:25:50 +01:00
djes
a2ffb7b4de Merge pull request #10 from djes/djes
"here" support
2017-03-19 13:20:55 +01:00
djes
f2cb4f08e9 Latest HERE and proxy fixes 2017-03-15 20:17:27 +01:00
djes
799e61ce4e Here update with options
and new layer system based on map and list
2017-03-15 19:47:45 +01:00
djes
2346bf3b33 "HERE" addons and layer modifications
Layers are now map and list based to facilitate ordering and deletion
2017-03-15 18:17:51 +01:00
djes
c1b55ef8c3 "HERE" update 2017-03-15 15:33:37 +01:00
djes
0c1287e66f Dragging release bug fixed + here wip 2017-03-15 12:47:33 +01:00
djes
8cb400f1a9 Code makeup 2017-03-03 17:23:42 +01:00
djes
528279e85c Merge remote-tracking branch 'refs/remotes/origin/master' into djes 2017-03-01 16:38:24 +01:00
djes
2535b685dd Readme change 2017-03-01 16:07:20 +01:00
djes
fb5dc89363 Merge pull request #9 from djes/MasterRevision
Major revision
2017-03-01 15:31:14 +01:00
djes
8128748f6e Merge remote-tracking branch 'refs/remotes/origin/master' into djes 2017-03-01 14:25:25 +01:00
djes
4deae1d60d Curl dependencies removed + some bugfix 2017-03-01 14:19:28 +01:00
djes
2bfd523459 some bugfix + full curl lib usage in comments 2017-03-01 14:06:42 +01:00
djes
751ec96070 Curl option, cache clean function, and cache directory better handling
+ some cleaning
2017-03-01 12:55:28 +01:00
djes
deb766c4c5 Merge remote-tracking branch 'refs/remotes/origin/djes' into MasterRevision 2017-03-01 10:50:19 +01:00
djes
a2eac9192d Merge remote-tracking branch 'refs/remotes/origin/thyphoon' into Revision
# Conflicts:
#	PBMap.pb
2017-03-01 10:42:06 +01:00
djes
1b7cf13af7 Merge remote-tracking branch 'refs/remotes/origin/djes' into MasterRevision 2017-03-01 09:59:35 +01:00
djes
3c87aa702e Bug fixes + bugged rotation removing 2017-02-27 17:27:15 +01:00
djes
b126aacdad Rotation wip 2016-10-07 17:10:36 +02:00
djes
8825b35b1b Rotation wip 2016-10-07 16:22:49 +02:00
djes
382fd53525 Better mouse handling + rotation wip 2016-10-07 12:03:34 +02:00
djes
cdfbe3e839 Better curl error handling, tiles alpha, bugfix + cleanup 2016-10-04 14:01:27 +02:00
djes
1f45afc6f6 Merge remote-tracking branch 'refs/remotes/origin/tilewip' into djes
# Conflicts:
#	PBMap.pb
2016-10-04 13:58:10 +02:00
djes
eed9491b6e bugfix 2016-10-03 23:01:38 +02:00
djes
105eef9231 test 2016-10-03 22:42:59 +02:00
djes
12bc4f19f1 test 2016-10-03 22:42:35 +02:00
djes
2cf4cfe8c0 check 2016-10-03 22:39:40 +02:00
djes
8ac8a08059 Revert "Linux SetActiveGadget(-1) fix"
This reverts commit 86483640d7.

# Conflicts:
#	PBMap.pb
2016-10-03 22:39:14 +02:00
djes
b900bdc9db transparency 2016-10-03 22:34:06 +02:00
djes
2fa810fb88 Alpha apparition + img loading update 2016-10-03 17:08:48 +02:00
djes
a1f593c89b Cleaning up tile structure 2016-10-03 16:48:14 +02:00
djes
43f0fc982f BindMapGadget and SetActiveGadget(-1) workaround, and new screenshot 2016-10-03 09:22:42 +02:00
djes
86483640d7 Linux SetActiveGadget(-1) fix 2016-10-02 19:52:49 +02:00
djes
717de5f6a3 Lil track update 2016-09-30 22:16:20 +02:00
djes
6de6c21de7 Geolocation WIP 2016-09-30 21:56:48 +02:00
djes
2e59908fd1 wip 2016-09-30 17:13:15 +02:00
djes
39ee09edd7 geolocation wip 2016-09-30 16:59:20 +02:00
djes
c1f6555236 Form 2016-09-30 16:01:07 +02:00
djes
079297b750 Markers legend and identifier edit 2016-09-30 14:33:36 +02:00
djes
a999381fd3 Edit marker WIP 2016-09-30 12:10:06 +02:00
djes
df10cc2965 Map move limit 2016-09-28 14:15:47 +02:00
djes
67a8893ea7 Select/delete tracks 2016-09-28 12:37:17 +02:00
djes
dcf460825d Select WIP - IsInDrawingBoundaries 2016-09-28 11:13:59 +02:00
djes
2e3e36872d Merge remote-tracking branch 'origin/djes' into djes
# Conflicts:
#	PBMap.pb
2016-09-26 17:01:43 +02:00
djes
a79c06299b New marker with legend by yves86 + colour options wip 2016-09-25 18:49:36 +02:00
djes
90f3d8a6a5 esthetic 2016-09-24 12:54:22 +02:00
djes
5c3fa46408 Merge pull request #8 from djes/djes
Djes
2016-09-24 11:36:21 +02:00
djes
e3b1bc8a6d Multitracks wip, markers moving with cursor 2016-09-24 11:29:59 +02:00
djes
a5f68fdc39 Cleanup 2016-09-23 17:02:52 +02:00
djes
ad0533a826 CTRL Key multiselect + Multiple tracks
TODO : debunk the faulty image bug
2016-09-23 16:34:38 +02:00
djes
6eb134d36a Revert "CTRL key multiselect"
This reverts commit 1089eb80b0.
2016-09-23 16:21:44 +02:00
djes
578a8b7c8b Revert "Multiple tracks wip"
This reverts commit 87fe1be7d2.
2016-09-23 16:20:50 +02:00
djes
87fe1be7d2 Multiple tracks wip 2016-09-23 14:46:20 +02:00
djes
b1a8db8b1e Cursor keys to move markers 2016-09-18 14:19:27 +02:00
djes
1089eb80b0 CTRL key multiselect 2016-09-16 17:13:38 +02:00
djes
95ec4c41de Delete markers (wip CTRL key) 2016-09-16 11:42:20 +02:00
djes
60288ffbef Markers legend 2016-09-15 17:57:19 +02:00
djes
d9ecfeca56 Better makers handing, example app with lat/lon editable, cleanup 2016-09-15 17:27:32 +02:00
djes
f89476609f New markers select/move 2016-09-13 12:08:08 +02:00
djes
970959bd51 Cache management based on the tile last usage , and some cleanup 2016-09-12 17:23:04 +02:00
djes
00bb41566a Cache tree creation 2016-09-12 14:42:46 +02:00
djes
ecc8a998c9 Example upgrade 2016-09-12 14:02:40 +02:00
djes
6bef5e9bfd Tile loading fix, option file, misc fixes 2016-09-12 12:57:52 +02:00
djes
e226f9475c lil update 2016-09-09 17:30:00 +02:00
djes
564bd9f2b1 Add files via upload 2016-09-09 17:24:17 +02:00
djes
eccf177c63 Delete screenshot.png 2016-09-09 17:24:03 +02:00
djes
b7943d279b Add files via upload 2016-09-09 17:20:30 +02:00
djes
a62575f31c Merge remote-tracking branch 'refs/remotes/origin/master' into djes 2016-09-09 16:19:39 +02:00
djes
f52092c7c6 Update README.md 2016-09-09 16:19:00 +02:00
djes
784737b09b Merge pull request #7 from djes/djes
Djes
2016-09-09 16:16:14 +02:00
djes
0dc468fbbb Cleanup 2016-09-09 16:06:49 +02:00
djes
efdbcc8e49 Cleanup + layer update 2016-09-09 16:02:40 +02:00
djes
c698760d7d SetZoomOnPosition bugfixed and double clic fast go 2016-09-09 12:33:46 +02:00
djes
5aba6510b5 wip 2016-09-07 12:35:38 +02:00
djes
26265c21a0 Clarification on LatLon2PixelRel/LatLon2Pixel 2016-09-07 11:55:53 +02:00
djes
9665398eec Better LatLon2Pixel and bughunt
Wheelmouse zoom still not working.
2016-09-06 17:17:56 +02:00
djes
b2b6a48d89 Cleanup 2016-09-06 12:46:50 +02:00
djes
17f999f11c wip 2016-09-05 17:06:54 +02:00
djes
f5a382ff59 wip 2016-09-05 16:42:00 +02:00
djes
3a889a9bdd wip 2016-09-02 17:23:11 +02:00
djes
4e48cda38a bug hunt 2016-09-02 15:42:38 +02:00
djes
93c64758ac cleanup 2016-09-02 14:00:25 +02:00
djes
f6f149e84e cleanup 2016-09-02 12:48:46 +02:00
djes
cfc43dd86c degrees bugfix 2016-09-02 12:32:10 +02:00
djes
3ab6952998 idle's fix 2016-09-02 08:51:40 +02:00
djes
c1a6dda16a Marker select fixed 2016-09-01 17:43:40 +02:00
djes
3f36ae9799 Working Degrees (phew!), now working on marker select (doh!)
marker select now doesn't work as the coordinates are in a clipped
range...
2016-09-01 17:30:54 +02:00
djes
37197745c5 wip 2016-09-01 15:24:35 +02:00
djes
d7f7a2442b Tracking this damn degrees bug 2016-08-31 17:26:52 +02:00
djes
90bd9ef731 wip 2016-08-31 14:55:22 +02:00
djes
6c06a85b70 neg modulo bugfix 2016-08-31 12:54:43 +02:00
djes
c7fe9344d2 wip 2016-08-31 12:12:31 +02:00
djes
b937a377e3 wip 2016-08-31 10:41:42 +02:00
djes
45e0c3a3fa Merge remote-tracking branch 'refs/remotes/origin/idle' into djes
# Conflicts:
#	PBMap.pb
2016-08-31 10:15:48 +02:00
djes
0e063a5623 DrawDegrees bugfix (not fully fixed...) 2016-08-30 16:48:28 +02:00
djes
295d0d72bc Lil fix 2016-08-30 12:51:41 +02:00
djes
2b2ffac2ee Merging idle and mine 2016-08-30 12:44:23 +02:00
djes
108673b7f7 Merge remote-tracking branch 'refs/remotes/origin/idle' into djes
# Conflicts:
#	PBMap.pb
2016-08-30 12:40:37 +02:00
djes
941fd5a7a0 Better thread handling 2016-08-30 12:16:52 +02:00
djes
c815fbf6f2 Complete rework of tile loading/thread 2016-08-30 10:35:41 +02:00
djes
ff2bcc0f59 Redraw bugfix 2016-08-29 17:10:35 +02:00
djes
e25a66206b Drawing based on timer 2016-08-29 16:47:48 +02:00
djes
612fb30bab Cleanup 2016-08-29 15:49:44 +02:00
djes
afab1a76d1 Debuging.... 2016-08-29 14:03:34 +02:00
djes
31d763455f Code cleaning, event handling work 2016-08-29 11:52:31 +02:00
djes
d274490ada Merge remote-tracking branch 'refs/remotes/origin/idle' into djes 2016-08-29 10:02:56 +02:00
djes
2e8b74d4d5 Merge remote-tracking branch 'refs/remotes/origin/idle' into djes 2016-08-29 09:28:43 +02:00
7 changed files with 2586 additions and 1933 deletions

2
.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
PBMap.pb.bak
*.exe

40
Forms/MarkerEdit.pbf Normal file
View File

@@ -0,0 +1,40 @@
;
; This code is automatically generated by the FormDesigner.
; Manual modification is possible to adjust existing commands, but anything else will be dropped when the code is compiled.
; Event procedures needs to be put in another source file.
;
Global WindowMarkerEdit
Global TextIdentifier, TextLegend, StringIdentifier, EditorLegend
Procedure OpenWindowMarkerEdit(x = 0, y = 0, width = 300, height = 100)
WindowMarkerEdit = OpenWindow(#PB_Any, x, y, width, height, Marker Edit, #PB_Window_SystemMenu | #PB_Window_TitleBar | #PB_Window_WindowCentered | #PB_Window_NoGadgets)
TextIdentifier = TextGadget(#PB_Any, 2, 2, 80, 25, Identifier)
TextLegend = TextGadget(#PB_Any, 2, 27, 80, 25, Legend)
StringIdentifier = StringGadget(#PB_Any, 84, 2, 120, 25, "")
EditorLegend = EditorGadget(#PB_Any, 84, 27, 210, 70)
EndProcedure
Procedure WindowMarkerEdit_Events(event)
Select event
Case #PB_Event_CloseWindow
ProcedureReturn #False
Case #PB_Event_Menu
Select EventMenu()
EndSelect
Case #PB_Event_Gadget
Select EventGadget()
EndSelect
EndSelect
ProcedureReturn #True
EndProcedure
; IDE Options = PureBasic 5.50 (Windows - x64)
; CursorPosition = 11
; Folding = -
; EnableXP

3154
PBMap.pb

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,10 @@
# PBMap
Purebasic open source tiled map software.
Created to develop and test tiles applications in PureBasic.
Open source tiled map software.
To develop tiled map applications in PureBasic.
Based on OpenStreetMap services
OSM copyright : http://www.openstreetmap.org/copyright
This code is free !
@@ -11,4 +15,6 @@ http://www.purebasic.fr/french/viewtopic.php?f=3&t=16160 (french)
Contributors :
Thyphoon
djes
Idle
Progi1984
yves86

29
gettext.pbi Normal file
View File

@@ -0,0 +1,29 @@
Procedure.s gettext(String.s = "")
Protected Language.s = "EN_en"
Select Language
Case "EN_en"
ProcedureReturn String
Case "FR_fr"
Select String
Case "Identifier"
ProcedureReturn("Identificateur")
Default
ProcedureReturn String
EndSelect
Default
ProcedureReturn String
EndSelect
EndProcedure
; IDE Options = PureBasic 5.50 (Windows - x64)
; CursorPosition = 21
; Folding = -
; EnableXP

File diff suppressed because it is too large Load Diff

BIN
screenshot.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 286 KiB