Commit graph

739 commits

Author SHA1 Message Date
Victor Shcherb
0e45fd77fc Fix weight 2020-06-02 19:41:18 +02:00
Victor Shcherb
0929c79fd7 Fix poi additional search 2020-06-02 19:28:57 +02:00
Victor Shcherb
107fc81ed9 Fix poi type search 2020-06-02 18:31:19 +02:00
Victor Shcherb
a474d6bea7 Fix todo's 2020-06-02 17:52:16 +02:00
Victor Shcherb
c52054dadc Fix compilation problems 2020-06-02 16:03:38 +02:00
Dmitriy Ruban
557b11f5da
Merge branch 'master' into details_dialog_redesign 2020-06-02 13:22:14 +03:00
veliymolfar
e884e04631 configure map details dialog redesign 2020-06-02 13:17:33 +03:00
Victor Shcherb
f40657ebec Initial commit address search refactoring 2020-06-01 13:54:03 +02:00
max-klaus
ca0633141a Fix creating search tests 2020-05-31 18:53:08 +03:00
Victor Shcherb
9ca1dbd9cf Temporarily fix test results 2020-05-24 22:05:54 +02:00
Victor Shcherb
0944dc16f9 Temporarily fix tests 2020-05-24 21:26:56 +02:00
Victor Shcherb
022ed7e705 Fix critical bug in search comparator 2020-05-24 19:55:19 +02:00
Victor Shcherb
edd10cb092 Fix #9061 2020-05-24 19:41:23 +02:00
Victor Shcherb
108c2b5704 Fix search type and more comments 2020-05-24 18:53:55 +02:00
Victor Shcherb
d587bee309 Fix search & terrain action 2020-05-24 17:30:43 +02:00
Victor Shcherb
f980ec4340 Update ui tests & search fixing #8647
Conflicts:
	OsmAnd-java/src/test/resources/search/navacerrada.json
2020-05-24 15:56:29 +02:00
Victor Shcherb
ff20409fee Refactor comparator to avoid comparator mistakes (no logical change were made) 2020-05-24 15:01:43 +02:00
Victor Shcherb
61fe550b52 Fix concurrent modification exception on start 2020-05-23 10:47:05 +02:00
Victor Shcherb
88a6d62080 Fix map poi types 2020-05-22 14:58:05 +02: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
MadWasp79
9fe736957d clear garbage 2020-05-15 14:57:06 +03:00
MadWasp79
3c655c4f98 fixes 2020-05-15 14:39:42 +03:00
MadWasp79
3ec03040ea merge route parts implementation 2020-05-15 14:36:31 +03:00
veliymolfar
ccc98d8c87 Merge branches 'create_custom_poi' and 'master' of https://github.com/osmandapp/Osmand into create_custom_poi 2020-05-15 12:42:46 +03:00
Dima-1
beb6a1805f Fix #8926 Default color of Favorites changed to black 2020-05-14 19:06:37 +03:00
MadWasp79
d3d55cec4b combine routes WIP 2020-05-14 10:18:21 +03:00
Vitaliy
630999f26e Fix #8593 2020-05-13 17:42:48 +03:00
vshcherb
183bcb7b03
Merge pull request #8946 from osmandapp/minor_fixes
Fix possible StringIndexOutOfBoundsException
2020-05-13 16:33:37 +02:00
Victor Shcherb
733dfc3027 Add road shield 2020-05-13 15:45:45 +02:00
MadWasp79
3aafda798b Merge branch 'master' into route_merge 2020-05-13 15:12:45 +03:00
MadWasp79
7699e2061c add reading of incomplete routes. Add cache - work in progress 2020-05-13 15:09:30 +03:00
Vitaliy
dee6476797 Remove unnecessary sort 2020-05-12 21:57:52 +03:00
Vitaliy
0e12424179 Fix possible StringIndexOutOfBoundsException 2020-05-12 13:37:10 +03:00
MadWasp79
8e56faabd1 Merge branch 'master' into route_merge 2020-05-12 12:45:18 +03:00
MadWasp79
2c8824341a work in progress 2020-05-12 12:42:12 +03:00
Victor Shcherb
07385b53c3 Add obf file 2020-05-12 11:23:29 +02:00
Victor Shcherb
4526ae6426 Fix out of memory crash with map generation 2020-05-11 18:20:48 +02:00
Victor Shcherb
713b86d2fb Remove profile based constants use speed to replicate their values cause speed could be configured - #8749 2020-05-11 14:31:03 +02:00
MadWasp79
87a7b42f66 work in project, crude merge working 2020-05-08 16:40:58 +03:00
veliymolfar
c02a7820fa custom poi types cache db 2020-05-08 11:29:36 +03:00
Dima-1
dfdd6d5729 Fix black color favorite icon. 2020-05-06 18:17:42 +03:00
Vitaliy
5a3d0675f2 Fix #8817 2020-05-04 12:51:18 +03:00
Victor Shcherb
b821db8357 Merge branch 'master' of github.com:osmandapp/Osmand 2020-05-01 17:42:00 +02:00
Victor Shcherb
3e6733d538 Fix issue #8835 2020-05-01 17:41:39 +02:00
vshcherb
9fc4b1281d
Merge pull request #8876 from osmandapp/pt_static_fix
fix static fields
2020-05-01 16:12:38 +02:00
MadWasp79
70ad2b36a6 fix static fields 2020-05-01 17:08:06 +03:00
vshcherb
cd4296b27a
Merge pull request #8875 from osmandapp/poi_edit_location_fix_8839
fix edit poi location #8839
2020-05-01 15:44:25 +02:00
Victor Shcherb
27c19e483b Update transport route / add new method 2020-05-01 15:25:02 +02:00
MadWasp79
9ec38f6341 string format fix 2020-05-01 16:19:46 +03:00
max-klaus
4d498f4e10
Merge branch 'master' into create_custom_poi 2020-04-28 18:14:41 +03:00
MadWasp79
dd9e9ec9f2 add native pt setting to dev plugin
fix no result crash
2020-04-28 16:26:08 +03:00
veliymolfar
5204a2a15a read poi categories/types from obf 2020-04-27 13:43:10 +03:00
MadWasp79
937fedc1bf Merge branch 'master' into tp_to_native 2020-04-23 19:02:33 +03:00
MadWasp79
aa36bff8c6 remove unused fields 2020-04-23 14:47:52 +03:00
Vitaliy
f750a7732f Download description in progress 2020-04-22 21:39:44 +03:00
MadWasp79
580efa0cc0 Merge branch 'master' into tp_to_native 2020-04-21 11:52:45 +03:00
Vitaliy
2967b8f140 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_downloads
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java
2020-04-20 17:12:05 +03:00