Commit graph

2312 commits

Author SHA1 Message Date
Victor Shcherb
c91489af9e Merge branch 'r3.7' 2020-05-23 10:47:15 +02:00
Victor Shcherb
61fe550b52 Fix concurrent modification exception on start 2020-05-23 10:47:05 +02:00
Victor Shcherb
4f89a04ea3 Merge branch 'r3.7' 2020-05-22 14:58:11 +02:00
Victor Shcherb
88a6d62080 Fix map poi types 2020-05-22 14:58:05 +02:00
Vitaliy
b45e432eb2 Merge branch 'r3.7' 2020-05-21 18:14:06 +03:00
max-klaus
e69e0d95cc Added search test 2020-05-21 13:38:49 +03:00
MadWasp79
6de17daa15 fixes for route merge 2020-05-20 21:00:53 +03:00
Victor Shcherb
b73df007de Fix warning r3.7 2020-05-20 18:04:53 +02:00
Victor Shcherb
ac5a345455 Fix warning r3.7 2020-05-20 18:00:34 +02:00
Victor Shcherb
ae10663f55 Merge branch 'r3.7' of github.com:osmandapp/Osmand into r3.7 2020-05-20 17:28:51 +02:00
Victor Shcherb
1a71225c8a Refactor and fix compilation 2020-05-20 17:28:44 +02:00
vshcherb
ed203001ff
Merge pull request #9019 from osmandapp/FixCME
Fix ConcurrentModificationException
2020-05-20 14:15:54 +02:00
Nazar-Kutz
62c114f36e Fix ConcurrentModificationException 2020-05-20 14:10:07 +03:00
Nazar-Kutz
0b5db53bc5 Fix ConcurrentModificationException 2020-05-20 14:01:14 +03:00
Vitaliy
801c61f5ae Add check for render file extension 2020-05-20 13:43:15 +03:00
vshcherb
5ccca873bd
Merge pull request #9020 from osmandapp/import_fixes
Check XML files during import
2020-05-20 12:02:03 +02:00
Nazar-Kutz
49d346771c Fix ConcurrentModificationException 2020-05-20 12:33:10 +03:00
Vitaliy
7c86a40225 Move import dialog to separate class 2020-05-20 12:26:12 +03:00
Nazar-Kutz
43ba5d203f Fix ConcurrentModificationException 2020-05-20 12:15:07 +03:00
Victor Shcherb
ca5448286a Small refactoring transport 2020-05-19 18:40:48 +02:00
Vitaliy
31b408bbb3 Fix possible npe 2020-05-18 16:34:33 +03:00
vshcherb
392d69dd66
Merge pull request #8918 from osmandapp/create_custom_poi
custom poi types cache db
2020-05-18 15:23:05 +02:00
Victor Shcherb
c906fcab5b Small refactoring 2020-05-18 15:20:30 +02:00
Victor Shcherb
e95aa4483b Merge branch 'master' of github.com:osmandapp/Osmand 2020-05-18 13:15:58 +02:00
Victor Shcherb
35c7ec20c3 Update icon name 2020-05-18 13:15:50 +02:00
Dima-1
a8db838530 Merge branch 'master' into Fix_default_color_favorites
# Conflicts:
#	OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
2020-05-18 12:00:36 +03:00
Dima-1
a5f40100c8 Fix favorites default icon and background 2020-05-18 11:53:12 +03:00
veliymolfar
3a800d2520 refactor poi cache db 2020-05-18 11:24:41 +03:00
Victor Shcherb
b06f746d7a Fix multi route planner 2020-05-17 21:05:33 +02:00
Victor Shcherb
500cd84903 Update transport route planner #8986 2020-05-17 19:46:55 +02:00
Victor Shcherb
9a7fcbd7b8 Fix error #7365 2020-05-17 14:40:04 +02:00
vshcherb
36ae49de65
Merge pull request #8978 from osmandapp/route_merge
Route merge
2020-05-17 13:24:16 +02:00
Victor Shcherb
684e2d3d36 Fix routing 2020-05-17 13:21:59 +02:00
Victor Shcherb
7589610a27 Fix routing 2020-05-16 22:55:40 +02:00
Victor Shcherb
30fe9c8698 Add more info 2020-05-16 22:41:21 +02:00
Victor Shcherb
ee1f8c683b Optimize drawing geometry 2020-05-16 22:35:30 +02:00
Victor Shcherb
f529dfad5d Optimize drawing geometry 2020-05-16 22:24:08 +02:00
Victor Shcherb
a01a4ad63e Fix broken geometry 2020-05-16 21:28:00 +02:00
Victor Shcherb
0d96394a0e Udpate planner 2020-05-16 20:15:16 +02:00
Victor Shcherb
15ce3fa998 Add incomplete stops to cached indexes 2020-05-16 19:57:11 +02:00
Victor Shcherb
a00011693a clean up 2020-05-16 17:18:58 +02:00
Victor Shcherb
a52767bdb3 clean up 2020-05-16 17:17:04 +02:00
Victor Shcherb
7319a235c0 Lazy loading reading 2020-05-16 17:12:34 +02:00
Victor Shcherb
4873ab04a9 Update transport rotues 2020-05-16 16:51:51 +02:00
Victor Shcherb
e5bd6cb065 Update transport rotues 2020-05-16 16:49:17 +02:00
Victor Shcherb
52fec9c7cc Update transport rotues 2020-05-16 16:48:01 +02:00
Victor Shcherb
b456c41b34 Update transport rotues 2020-05-16 16:33:59 +02:00
Victor Shcherb
99503fdec5 Update transport rotues 2020-05-16 16:03:54 +02:00
Victor Shcherb
87f49ed3d9 Transport route 2020-05-15 17:27:59 +02:00
Victor Shcherb
082a24a21a Fix upgrade process 2020-05-15 15:51:54 +02:00