Commit graph

2761 commits

Author SHA1 Message Date
max-klaus
cf3ca008c0 Remove BinaryMapIndexTestReader 2020-06-17 15:46:34 +03:00
Victor Shcherb
b1bf712bcb fix compilation 2020-06-17 14:44:47 +02:00
max-klaus
51a8c0ed90 Update build.gradle (search tests) 2020-06-17 11:46:33 +03:00
max-klaus
fc121fc01d Update gitignore 2020-06-17 11:42:00 +03:00
max-klaus
6cf34d41b7 Remove tests from OsmAnd-java 2020-06-17 11:38:01 +03:00
veliymolfar
9527f8294d Merge branches 'master' and 'speed_cameras' of https://github.com/osmandapp/Osmand into speed_cameras
 Conflicts:
	OsmAnd/res/values/strings.xml
	OsmAnd/src/net/osmand/plus/UiUtilities.java
	OsmAnd/src/net/osmand/plus/mapsource/InputZoomLevelsBottomSheet.java
2020-06-17 11:05:01 +03:00
MadWasp79
78880e11b1 transforming tags WIP 2020-06-17 10:04:11 +03:00
Victor Shcherb
b7c42d47b0 Fix #9147 2020-06-16 23:30:59 +02:00
Victor Shcherb
45095ff454 Fix turn lanes 2020-06-16 18:53:05 +02:00
veliymolfar
1dd909b115 refactoring pr 2020-06-16 18:28:35 +03:00
max-klaus
5e103acc50 Introduced SearchDataCreator 2020-06-15 21:53:53 +03:00
Victor Shcherb
30cbd9472f Fix #9175 2020-06-12 14:30:45 +02:00
Victor Shcherb
bd81e430b9 Fix #5175 2020-06-11 18:52:40 +02:00
Victor Shcherb
9df2f79848 Fix matching 2020-06-11 13:57:11 +02:00
Victor Shcherb
cdf795c6af Add reshaper test 2020-06-11 11:58:28 +02:00
veliymolfar
6cf97379a7 Merge branches 'master' and 'speed_cameras' of https://github.com/osmandapp/Osmand into speed_cameras 2020-06-11 11:09:37 +03:00
Victor Shcherb
d3ef4fb292 Fix #5175 2020-06-11 01:29:59 +02:00
Victor Shcherb
41cc9fcd3f Fix #5097 2020-06-11 00:44:51 +02:00
Victor Shcherb
933bc1dddb Fix #3582 2020-06-10 22:58:18 +02:00
Victor Shcherb
1d9515e199 Merge branch 'master' of github.com:osmandapp/Osmand 2020-06-10 18:25:51 +02:00
Victor Shcherb
2223d9918e Fix #6439 #6417 2020-06-10 18:25:43 +02:00
veliymolfar
6cb52d9130 hide speed cameras poiTypes 2020-06-10 18:25:34 +03:00
veliymolfar
f2b1836e53 hide speed cameras from search 2020-06-10 17:08:44 +03:00
MadWasp79
37bd1a5b7a remove logs 2020-06-10 15:55:00 +03:00
MadWasp79
93467f3524 native pt by default
increase missing stop search radius
2020-06-10 15:07:26 +03:00
Victor Shcherb
40fd5667e5 Fix #9187 - add test 2020-06-09 19:09:45 +02:00
Victor Shcherb
32bf8e7c35 Fix https://github.com/osmandapp/Osmand/issues/6698 2020-06-08 22:30:35 +02:00
Victor Shcherb
3b56cb449d Add some comments 2020-06-08 22:30:35 +02:00
Victor Shcherb
0fd3dedceb Fix https://github.com/osmandapp/Osmand/issues/7456 2020-06-08 17:21:09 +02:00
Victor Shcherb
b439f2dd5b Add constant 2020-06-08 15:29:03 +02:00
Victor Shcherb
6fa0636ed2 Merge branch 'master' of github.com:osmandapp/Osmand 2020-06-07 23:36:38 +02:00
max-klaus
45b7266810
Merge branch 'master' into details_dialog_redesign 2020-06-06 17:06:21 +03:00
max-klaus
64c01bbbcc Merge branch 'r3.7' 2020-06-06 16:39:31 +03:00
max-klaus
6b12e5b9a9 Added maxDistance to generate limited test data 2020-06-06 16:39:04 +03:00
max-klaus
6fad0f9a51 Added Rolandstr test 2020-06-06 16:37:17 +03:00
max-klaus
b01fd38bdb Added fuel diesel test 2020-06-06 14:58:13 +03:00
Victor Shcherb
3641bd0ccc Add is in place 2020-06-06 13:54:17 +02:00
max-klaus
ee46905d4f Merge branch 'r3.7' 2020-06-06 13:34:07 +03:00
max-klaus
63f6724859 Fixed search (Hisar). Added test. Fixed wpt/favs search. 2020-06-06 13:33:37 +03:00
max-klaus
f8bf673bc2
Merge pull request #9157 from osmandapp/searchRefactor
Search refactor
2020-06-06 10:53:42 +03:00
max-klaus
dbd49ba706 Fix search filters show/hide 2020-06-05 21:06:41 +03:00
Victor Shcherb
ef773378d2 Merge branch 'r3.7' 2020-06-05 17:17:38 +02:00
Victor Shcherb
efef79d723 Merge branch 'r3.7' of github.com:osmandapp/Osmand into r3.7
Conflicts:
	OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
2020-06-05 17:13:26 +02:00
max-klaus
0f1b90c1b8 Remove local wiki category from search 2020-06-05 18:13:09 +03:00
Victor Shcherb
8f1f9521f1 Remove unnecessary fields 2020-06-05 17:12:54 +02:00
max-klaus
4b45f3a43e
Merge branch 'r3.7' into searchRefactor 2020-06-05 17:56:27 +03:00
max-klaus
629fa232c9 Fix show poi on map (search). Fix compilation. 2020-06-05 17:22:02 +03:00
Victor Shcherb
01ad124049 Fix concurrent modification exception 2020-06-05 13:39:07 +02:00
Victor Shcherb
c638e01dfd Fix route calculation 2020-06-04 18:37:58 +02:00
Victor Shcherb
ca69159332 Add fuel test 2020-06-04 16:46:52 +02:00
Victor Shcherb
f55ecd0719 Add fuel test 2020-06-04 16:46:16 +02:00
Victor Shcherb
ac7e1d4436 Fix compilation 2020-06-04 16:07:38 +02:00
Victor Shcherb
a2c04cd48a Fix compilation 2020-06-04 16:02:39 +02:00
vshcherb
3ccb9bc037
Merge branch 'r3.7' into searchRefactor 2020-06-04 15:56:44 +02:00
Victor Shcherb
84c7fd425b Fix tests 2020-06-04 15:55:46 +02:00
Victor Shcherb
96674b5fd3 Fix tests 2020-06-04 15:33:52 +02:00
Victor Shcherb
3c9d940fbb Fix spring street 2020-06-04 14:47:59 +02:00
Victor Shcherb
811e6ebbf9 Fix tests 2020-06-03 16:21:29 +02:00
Victor Shcherb
b755d328e9 Improve tests 2020-06-03 16:08:57 +02:00
max-klaus
4a803afc3b Added multiple search tests 2020-06-03 17:03:21 +03:00
Victor Shcherb
99aa47d5af Improve tests 2020-06-03 13:43:27 +02:00
Victor Shcherb
378f1a66d0 Merge branch 'searchRefactor' of github.com:osmandapp/Osmand into searchRefactor 2020-06-03 13:41:58 +02:00
Victor Shcherb
1592c46979 Improve tests 2020-06-03 13:41:50 +02:00
max-klaus
c07d101b8e Merge branch 'searchRefactor' of github.com:osmandapp/Osmand into searchRefactor 2020-06-03 14:36:23 +03:00
max-klaus
5fc0c531dc Fix burger_king results 2020-06-03 14:35:28 +03:00
Victor Shcherb
63f9fe8033 Revert test location 2020-06-03 13:32:20 +02:00
Victor Shcherb
6dde05d297 Fix compilation 2020-06-03 12:34:07 +02:00
Victor Shcherb
823506103a Fix test 2020-06-02 23:00:40 +02:00
Victor Shcherb
bbcee5bc1d Fix test 2020-06-02 22:57:43 +02:00
Victor Shcherb
dd261a4aa5 Fix test 2020-06-02 22:52:32 +02:00
Victor Shcherb
9323c2d047 Fix test 2020-06-02 22:46:17 +02:00
Victor Shcherb
a691646c6d Fix tests 2020-06-02 22:37:14 +02:00
Victor Shcherb
60c609f12a Fix tests 2020-06-02 22:27:17 +02:00
Victor Shcherb
40fe15ca9d Fix tests 2020-06-02 21:03:21 +02:00
Victor Shcherb
d926ded6ef Merge remote-tracking branch 'origin/r3.7' into searchRefactor 2020-06-02 21:01:52 +02:00
max-klaus
5bd16a3f5a Added search olc test 2020-06-02 22:00:24 +03:00
max-klaus
56e989db68 Added search tests 2020-06-02 22:00:11 +03:00
max-klaus
624a501326 Fix creating search tests 2020-06-02 21:59:58 +03:00
max-klaus
a3fc582b45 Added search tests 2020-06-02 21:59:38 +03:00
max-klaus
f94d351e65 Added search test 2020-06-02 21:58:38 +03:00
Victor Shcherb
32798d167a Fix search test 2020-06-02 20:52:02 +02:00
Victor Shcherb
5b8ef9160e Update search ui core test 2020-06-02 20:13:01 +02:00
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
max-klaus
2b14f6ef13 Added search olc test 2020-06-02 10:28:31 +03:00
Victor Shcherb
f40657ebec Initial commit address search refactoring 2020-06-01 13:54:03 +02:00
max-klaus
3c6115d583 Added search tests 2020-05-31 18:56:41 +03:00
max-klaus
ca0633141a Fix creating search tests 2020-05-31 18:53:08 +03:00
max-klaus
7ef3b77005 Added search tests 2020-05-25 11:16:29 +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
cf28032858 Refactor tests 2020-05-24 15:36:41 +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
Reimar Döffinger
2cc239b842 Change memoryLimitation variable to long.
Otherwise it overflows to a negative value and gives
out of memory errors if set to 2GB or higher.
2020-04-19 23:39:46 +02:00
MadWasp79
9cc7a4f6d5 comment unused fields in pt result conversion 2020-04-17 17:29:42 +03:00
Vitaliy
4ca1925ac5 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_downloads
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-16 18:10:19 +03:00
Vitaliy
309da9c907 Merge branch 'master' of https://github.com/osmandapp/Osmand into Wiki
# Conflicts:
#	OsmAnd/res/values-it/strings.xml
#	OsmAnd/res/values-zh-rTW/strings.xml
2020-04-16 16:18:09 +03:00
Nazar-Kutz
81089f916d Small fixes 2020-04-16 14:54:20 +03:00
Nazar-Kutz
9cc0d0b77a Fix POI categories order 2020-04-16 11:51:37 +03:00
Nazar-Kutz
447682d319 Wikipedia fixes (After review) p.2 2020-04-16 11:12:40 +03:00
Vitaliy
ac60edda8d Add gpx download type 2020-04-14 23:49:09 +03:00
MadWasp79
a128455d7e cleaning 2020-04-14 14:59:33 +03:00
Nazar-Kutz
989417ffab Wikipedia Poi Fixes (After review) 2020-04-14 09:58:58 +03:00
Victor Shcherb
6aab0d9f0a Improve gpx parsing 2020-04-13 13:06:29 +02:00
Victor Shcherb
ec63b4ce11 Small fixes 2020-04-12 19:21:32 +02:00
Victor Shcherb
9cc1da2fb6 Add small method 2020-04-12 14:08:14 +02:00
MadWasp79
2c4402631e testing 2020-04-10 15:52:40 +03:00
MadWasp79
53d64e8306 alpha 2020-04-08 18:29:22 +03:00
vshcherb
d2b1f577c0
Merge branch 'master' into WikipediaDashboard 2020-04-08 14:59:47 +02:00
Nazar-Kutz
3d3da9ee8e Wikipedia Poi (Fixes 1) 2020-04-08 12:15:20 +03:00
MadWasp79
db28739267 debugging 2020-04-06 15:12:29 +03:00
MadWasp79
91967e9ead interface to native 2020-04-03 10:39:35 +03:00
max-klaus
2e487bf47d Fix export route to gpx issue 2020-04-01 10:55:23 +03:00
Vitaliy
ddf505025e Fix rendering file extension and remove import xml file dialog 2020-03-31 21:31:29 +03:00
Nazar-Kutz
7b268cd9d9 Add Wikipedia POI separate screen and logic 2020-03-31 12:41:49 +03:00
MadWasp79
0ca08b7581 Merge branch 'master' into tp_to_native 2020-03-30 11:14:47 +03:00
Vitaliy
88d4365e86 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-30 10:43:31 +03:00
Victor Shcherb
04ec715d95 Fix #8590 2020-03-27 18:33:33 +01:00
Victor Shcherb
644038889e Dont index borough 2020-03-26 19:42:01 +01:00
Vitaliy
b774ccc51d Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
2020-03-26 11:09:53 +02:00
Vitaliy
0c52eeef18 Fix check for render and router plugin items 2020-03-25 22:02:05 +02:00
max-klaus
67a9205157
Merge branch 'master' into FIx_8032_Customize_fav_icons_tmp 2020-03-25 20:59:00 +03:00
max-klaus
7b3aea100d Refactor 2020-03-25 20:55:23 +03:00
Victor Shcherb
8e6028c6a4 Fix #8584 2020-03-24 21:46:13 +01:00
madwasp79
3a2a8466c2 PT native implementation 2020-03-24 18:02:23 +02:00
Dima-1
59e4284d00 Add gpx wptpt editor 2020-03-24 12:14:33 +02:00
Vitaliy
3e81b5926e Merge branch 'master' into custom_plugins
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/OsmandPlugin.java
#	OsmAnd/src/net/osmand/plus/SettingsHelper.java
#	OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java
#	OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java
2020-03-23 13:41:47 +02:00
max-klaus
249d1b60d7 Added RESOURCES type to import/export 2020-03-22 19:04:43 +03:00
max-klaus
d518c29d0f Hide gpx options for new gpx routing 2020-03-20 11:23:30 +03:00
max-klaus
8710881eea Added point names to route gpx 2020-03-19 21:43:19 +03:00
max-klaus
b499315837 Merge branch 'master' of github.com:osmandapp/Osmand 2020-03-19 12:54:49 +03:00
max-klaus
0f2490c747 Fix gpx route importing (read ele) 2020-03-19 12:54:39 +03:00
Victor Shcherb
c7bbb80213 Fix npe 2020-03-18 16:33:46 +01:00
max-klaus
5335d7c3e0 Remove elevation tags from gpx 2020-03-17 22:26:52 +03:00
max-klaus
056468be1b Fix segment indexes 2020-03-17 21:16:49 +03:00
max-klaus
8be3628037 Fix start / end loop 2020-03-17 19:46:09 +03:00
max-klaus
dc170e54ce
Merge branch 'master' into gpx_route 2020-03-17 18:48:12 +03:00
max-klaus
95087d3b88 Fix gpx to route fixes 2020-03-17 18:38:56 +03:00
max-klaus
0e9148ce5b Fix turn lanes write/read 2020-03-15 23:51:16 +03:00
max-klaus
03e67d495b Fixed gpx to route feature 2020-03-15 19:17:38 +03:00
max-klaus
86f4cf45f7 Gpx to route in progress 2020-03-14 21:18:30 +03:00
Dima-1
9a0a518948 Add buttons 2020-03-12 19:08:19 +02:00
MadWasp79
48af2bdd88 wip-1 2020-03-12 11:05:02 +02:00
max-klaus
2bbb8b212d Truncate route date 2020-03-11 21:37:46 +03:00
max-klaus
d69553bdd8 Optimize xml output 2020-03-10 11:29:10 +03:00
Victor Shcherb
13c1fec075 Fix issue #8649 2020-03-09 17:08:31 +01:00
max-klaus
0fb78ed4f6 Added lanes to gpx export. Write route segments to gpx. 2020-03-07 23:34:18 +03:00
Dima-1
c670aa2d8b Merge branch 'master' into FIx_8032_Customize_fav_icons_tmp
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/data/FavouritePoint.java
2020-03-06 11:28:40 +02:00
Yan
17708d6932 Fix rendering_exception leading to "Could not draw chosen area"
Exception was caused by additionalTypes being null.
Occured when zooming out.
2020-03-05 00:21:42 +01:00
Denis Kolomiets
59f479098a
quick fix for npe 2020-03-04 16:18:36 +02:00
Dima-1
dcdca35a4f Merge branch 'master' into FIx_8032_Customize_fav_icons_tmp
# Conflicts:
#	OsmAnd/res/layout/favorites_list_item.xml
2020-03-03 14:14:15 +02:00
Vitaliy
145faf5168 Add import rendering files 2020-03-02 15:39:58 +02:00
Vitaliy
2bc1b51806 Fix possible npe 2020-03-02 15:38:56 +02:00
vshcherb
3987b9a25b
Merge pull request #8568 from osmandapp/polycenter_fix
fix multipolygon center for map and poi
2020-02-28 12:45:54 +02:00
max-klaus
fd997ad521 Added 28 Free Street search test 2020-02-27 18:46:38 +03:00
Victor Shcherb
b72f83f319 Improve search 2020-02-27 15:53:01 +02:00
Victor Shcherb
3485dc86c7 Test fix 2020-02-27 15:47:37 +02:00
max-klaus
fa77b30a13 Fix #8471 2020-02-27 16:37:05 +03:00
Victor Shcherb
e0498b4ba5 Disable test 2020-02-26 18:31:55 +02:00
Victor Shcherb
c734cb6256 Fix 3.6 Search 2020-02-26 18:30:54 +02:00
vshcherb
eeeda95f2c
Merge pull request #8569 from osmandapp/minor_fixes
Minor fixes
2020-02-26 17:59:06 +02:00
Vitaliy
09f735eec9 Fix several possible npe 2020-02-26 17:04:31 +02:00
MadWasp79
628b3167c6 refactoring 2020-02-26 15:50:41 +02:00
MadWasp79
6a56535c9f fix multipolygon center for map and poi 2020-02-26 15:38:27 +02:00
MadWasp79
9790a408c6 fix custom routing for PT #8224 2020-02-25 18:30:39 +02:00
max-klaus
f7ac5286ee Fix fillRuleArray out of bounds 2020-02-25 11:26:24 +03:00
max-klaus
9a0dfac9a3 Fix fillRuleArray out of bounds 2020-02-25 11:24:15 +03:00
Victor Shcherb
30c3898a5f Fix #8319 2020-02-24 18:41:40 +01:00
Victor Shcherb
961547b5e6 Fix #8319 2020-02-24 18:40:38 +01:00
Dima-1
7c050800b8 Add fav multilayer background 2020-02-20 13:47:35 +02:00
veliymolfar
1af5cb9eaf Merge remote-tracking branch 'origin/master' into import_screen 2020-02-20 10:25:45 +02:00
Dima-1
d4f3c1b597 Custom fav icon 2020-02-19 19:12:59 +02:00
veliymolfar
5256ac14b2 refactor & corrections 2020-02-19 17:48:29 +02:00
max-klaus
c2b9cb1035
Merge pull request #8497 from osmandapp/avoid_cached_roads
Avoid saved roads
2020-02-19 13:53:47 +03:00
Victor Shcherb
f2e911a8a0 Fix straight to visualization 2020-02-18 19:05:35 +01:00
Victor Shcherb
f85152a099 Merge branch 'master' into straight_to 2020-02-18 18:04:04 +01:00
Victor Shcherb
74fe3d7cc9 Remove unused 2020-02-18 18:03:37 +01:00
MadWasp79
762f2840f3 fix direct to 2020-02-18 18:59:17 +02:00
Vitaliy
2e15315a16 Add full names to avoid road info 2020-02-18 17:07:36 +02:00
veliymolfar
e90ff36dc2 Merge remote-tracking branch 'origin/master' into import_screen
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
2020-02-18 17:00:16 +02:00
Vitaliy
1cb49fe402 Avoid roads second part 2020-02-18 16:40:39 +02:00
Vitaliy
bd0d4a9c9e Avoid saved roads initial commit 2020-02-18 14:12:40 +02:00
max-klaus
b9d217e675 Fix #8488 2020-02-18 14:15:15 +03:00
Victor Shcherb
b3466bcf69 Merge branch 'straight_to'
Conflicts:
	OsmAnd/res/values/strings.xml
	OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
2020-02-17 20:14:45 +01:00
Victor Shcherb
9cfdceb850 Fix straight line routing 2020-02-17 17:17:33 +01:00
Victor Shcherb
1c7c254718 Fix routing helper to support points 2020-02-17 17:06:04 +01:00
max-klaus
e764ae41cc
Merge pull request #8462 from osmandapp/custom_routing_config
Improve custom routing support
2020-02-17 16:46:16 +03:00
Victor Shcherb
f7bdb0f04a Update map utils 2020-02-17 13:05:46 +01:00
Vitaliy
2f3474766e Add default attributes to custom routing config 2020-02-17 11:43:08 +02:00
Victor Shcherb
96292936be Update algorithms 2020-02-15 21:51:02 +01:00
Victor Shcherb
f6b4b7654e Fix issue with map utils 2020-02-15 21:11:25 +01:00
Vitaliy
30d063f2af Merge branch 'master' into custom_routing_config
# Conflicts:
#	OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java
2020-02-15 13:14:55 +02:00
veliymolfar
c7f2de7f22 import ui, duplicate quick actions, files, small fixes 2020-02-14 19:05:14 +02:00
Vitaliy
3d992b56e3 Make impassable road locations static 2020-02-14 12:23:11 +02:00
vshcherb
5b0177285b
Merge branch 'master' into exp_imp_profile_with_features 2020-02-13 15:57:12 +01:00
veliymolfar
44ccddc3dc Merge remote-tracking branch 'origin/exp_imp_profile_with_features' into import_screen
# Conflicts:
#	OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
2020-02-13 10:20:15 +02:00
vshcherb
6b0595f6a0
Merge branch 'master' into straight_to 2020-02-11 19:28:14 +01:00
vshcherb
c70282bd65
Merge pull request #8437 from osmandapp/Fix_8304
Fix_8304
2020-02-11 17:27:49 +01:00
Vitaliy
c066e737fe Fix #8269 2020-02-11 16:50:13 +02:00
Vitaliy
973fc013aa Fix #8304 2020-02-11 12:48:20 +02:00
MadWasp79
b39612f985 Merge branch 'master' into straight_to 2020-02-11 11:18:37 +02:00
MadWasp79
db4f832b04 basic implementation 2020-02-11 10:56:34 +02:00
veliymolfar
21653be128 refactor 2020-02-10 19:04:45 +02:00
veliymolfar
c8d76dc85c corrections 2020-02-10 17:34:19 +02:00
Victor Shcherb
7ab05ae877 Fix #7101, display passed favorites by default (change default value of appearance) 2020-02-10 12:08:07 +01:00
veliymolfar
99a64eaa7b Merge remote-tracking branch 'origin/master' into exp_imp_profile_with_features 2020-02-10 10:31:38 +02:00
Victor Shcherb
623acae43c Update osmand regions 2020-02-07 19:20:14 +01:00
Victor Shcherb
c9d0f75162 make lowercase 2020-02-07 19:14:25 +01:00
Victor Shcherb
1e7d00f192 Include regional name for countries (zh-Hans, zh-Hant) 2020-02-07 19:02:12 +01:00
Victor Shcherb
757e2ed213 Include regional name for countries (zh-Hans, zh-Hant) 2020-02-07 19:00:13 +01:00
Victor Shcherb
fe56004b66 Add locale 2020-02-07 18:39:33 +01:00
veliymolfar
6912cb9b8c export sql mapsourse 2020-02-07 19:11:51 +02:00
max-klaus
e064607e0d
Merge pull request #8405 from osmandapp/fix_8029
Fix_8029
2020-02-06 20:51:09 +03:00
veliymolfar
af5efd12b7 refactor / change to ITileSource 2020-02-06 19:20:26 +02:00
max-klaus
4a74ebdba9 Fix #8284 2020-02-06 19:24:43 +03:00
Vitaliy
ee1a0b2e08 Fix #8029 2020-02-06 18:12:25 +02:00
Victor Shcherb
c7db70a24a Clean up 2020-02-06 12:38:28 +01:00
vshcherb
022760831b
Merge pull request #8397 from osmandapp/issue_8164
fix attempt  #8164
2020-02-06 12:36:06 +01:00
MadWasp79
a7aad131df fix 2020-02-06 13:35:39 +02:00
MadWasp79
cbc55ede29 fix 2020-02-06 13:34:16 +02:00
MadWasp79
017a63f657 typo 2020-02-06 13:07:28 +02:00
MadWasp79
f975b3c7e1 add flag for recalc to fix routes loading 2020-02-06 12:38:49 +02:00
MadWasp79
59f379111a fix 2020-02-06 11:31:18 +02:00
MadWasp79
b0bfbfa192 refactoring 2020-02-06 10:34:32 +02:00
MadWasp79
37007a1111 fix on fix 2020-02-06 10:27:11 +02:00
MadWasp79
4b7569d05a fix attempt 2020-02-05 21:08:32 +02:00
veliymolfar
ee4c34ac09 wip / import export mapSources poiFilter 2020-02-05 19:07:07 +02:00
Nazar-Kutz
9de628131b Fix #7979 2020-02-05 13:11:53 +02:00
vshcherb
911f4788b1
Merge pull request #8381 from osmandapp/poi_search_fix
fix for #6497
2020-02-03 15:24:30 +01:00
MadWasp79
1d25742602 fix for #6497 2020-02-03 16:07:39 +02:00
nazar-kutz
0240c89752
Merge branch 'master' into ArrangePoiFilters 2020-02-03 15:15:57 +02:00
Nazar-Kutz
d54419d70d Fixes p.3 2020-02-03 15:04:34 +02:00
Nazar-Kutz
6234b77135 Small fixes p.3 2020-02-03 13:51:42 +02:00
Nazar-Kutz
a455c4bcbf Small fixes p.2 2020-02-03 13:18:34 +02:00
Nazar-Kutz
5a75243c36 Fix p.2 2020-02-03 13:16:06 +02:00
max-klaus
782b3a6236 Fix precision error 2020-02-01 21:11:59 +03:00
max-klaus
aac1742afb Revert MapUtils import 2020-02-01 20:59:41 +03:00
max-klaus
dfebbbc29e Merge branch 'master' of github.com:osmandapp/Osmand 2020-02-01 20:56:27 +03:00
max-klaus
cec25eb700 Fix compilation. Working on radius ruler. 2020-02-01 20:56:16 +03:00
Victor Shcherb
bc7633ce1d Fix compilation 2020-02-01 18:54:00 +01:00
Victor Shcherb
416b8d3665 Add 2 methods 2020-02-01 18:50:19 +01:00
MadWasp79
e16daa5163 zoom tweaks 2020-01-30 18:22:37 +02:00
Victor Shcherb
ac11868e2a Fix labelx, labely 2020-01-28 19:44:51 +01:00
Victor Shcherb
6778ebda7c Fix labelx, labely 2020-01-28 19:11:12 +01:00
Victor Shcherb
6f48ca6cbb Fix labelx, labely 2020-01-28 18:48:43 +01:00
MadWasp79
8c8f83c5d0 work in progress 2020-01-28 19:35:58 +02:00
MadWasp79
ad6fa6ad7b Merge branch 'master' into polylabel_center_point 2020-01-28 16:56:56 +02:00
MadWasp79
f65331d84e polygon label work in progress 2020-01-28 16:55:43 +02:00
max-klaus
c378b30740
Merge pull request #8306 from osmandapp/routing_reg_
Routing region fix #7668
2020-01-28 11:27:59 +03:00
Victor Shcherb
93ba9d64fc Add label coordinates 2020-01-27 17:29:13 +01:00
MadWasp79
c4bd3d090a Merge branch 'master' into polylabel_center_point 2020-01-27 18:02:47 +02:00
MadWasp79
720354c6ce add function to calculate correct central point of polygons 2020-01-27 17:41:27 +02:00
Victor Shcherb
673c7b79e8 Fix translation 2020-01-24 18:17:30 +01:00
Dima-1
ac87261ade Fix custom favorite icons 2020-01-24 18:36:42 +02:00
MadWasp79
576c4330b4 refactoring and fixes 2020-01-24 15:51:27 +02:00
MadWasp79
42a7a5d88d fix defining driving region 3 #7668 2020-01-23 18:31:04 +02:00
Dima-1
4f39004c5e GPXLayer custom icon 2020-01-23 14:08:18 +02:00
MadWasp79
e5ca877802 fix defining driving region #7668 2020-01-23 10:19:06 +02:00
Nazar
f119539679 Add UI and behavior for profile and routing file importing 2020-01-16 15:11:21 +02:00
max-klaus
249e38a913 Fix search test 2020-01-14 15:46:25 +03:00
max-klaus
1368066253
Merge pull request #8203 from osmandapp/Fix_7084
Fix_7084
2020-01-10 14:36:00 +03:00
vshcherb
c7b47c8352
Merge pull request #8204 from osmandapp/lanes_turn_fix
fix for #8198
2020-01-10 12:29:03 +01:00
MadWasp79
133e2ff142 fix for #8198 2020-01-09 17:34:53 +02:00
Vitaliy
145a33a66d Fix #7084 2020-01-09 15:25:48 +02:00
MadWasp79
c718369ce5 pr clean 2020-01-03 12:16:04 +02:00
MadWasp79
2e3b780694 Merge branch 'master' into exit_and_shield_widget 2020-01-03 09:34:29 +02:00
Victor Shcherb
ac76b1645d Add antarctica 2019-12-18 20:42:33 +01:00
Dmitriy Ruban
44e2fe3c72 shields in top bar 2019-12-18 19:10:33 +02:00
Dmitriy Ruban
3ce2f41d9e shields in top bar 2019-12-17 17:16:03 +02:00
max-klaus
ac73644fcd Fix #8087 2019-12-15 14:19:20 +03:00
Dmitriy Ruban
f712e1fba6 shield fix 2019-12-12 13:55:14 +02:00
Dmitriy Ruban
55db01e9b4 exit shield in top bar 2019-12-11 15:44:17 +02:00
Victor Shcherb
f5d86ebfa2 Simplify caching 2019-12-09 17:24:16 +01:00
Victor Shcherb
f529ac1006 Update timer general router 2019-12-09 16:53:35 +01:00
Victor Shcherb
86a7352337 Fix issue 2019-12-09 15:57:33 +01:00
Victor Shcherb
f4bfa131b7 Fix cache evals 2019-12-09 15:47:11 +01:00
Dmitriy Ruban
36418d2f54 initial commit 2019-12-09 16:44:41 +02:00
Victor Shcherb
160a0cba62 Fix caches method 2019-12-09 15:28:45 +01:00
MadWasp79
2bec1a70ea clean 2019-12-09 16:01:07 +02:00
MadWasp79
b43fb6332a refactoring 2019-12-09 15:57:20 +02:00
MadWasp79
40737935ea routing optimization via cache. v1 2019-12-09 15:30:04 +02:00
Nazar
de019543c4 Small fixes p.3 2019-11-29 11:57:58 +02:00
Nazar
36c9e2a2e4 Small fixes 2019-11-28 10:18:13 +02:00
Nazar
c0c7254930 Fix #7394 2019-11-27 15:58:41 +02:00
Victor Shcherb
9d20aaad2a Fix result preparation 2019-11-27 12:01:04 +01:00
Victor Shcherb
aad4931b84 Fix result preparation 2019-11-27 12:00:31 +01:00
max-klaus
3519ff0a57 Fix mapillary anr 2019-11-23 17:43:37 +03:00
Chumva
b04844f159 Improve join segments functionality 2019-11-22 16:27:05 +02:00
Chumva
418cb67b5b Merge branch 'r3.5' of ssh://github.com/osmandapp/Osmand into Fix_7084 2019-11-22 09:08:18 +02:00
max-klaus
a596ff9551 Completly remove bsh 2019-11-21 21:47:17 +03:00
Chumva
06224bb9b6 Fix #7084 2019-11-21 10:24:29 +02:00
max-klaus
0a9ba4399c Fix #7561 2019-11-09 20:51:14 +03:00
MadWasp79
2ffc78a0c2 add min/max speed to routingSpeed 2019-11-05 18:51:36 +02:00
max-klaus
00561a6865 Fix #7775 2019-11-03 16:55:07 +03:00
max-klaus
83149359e9 Fix #7658 2019-10-28 15:44:37 +03:00
MadWasp79
bb19a35540 fix for #7576 2019-10-21 17:27:23 +03:00
vshcherb
b4d2dc0e3b
Merge pull request #7687 from osmandapp/issue_7599
lower tertiary roads value in speak_priority #7599
2019-10-21 10:06:00 +02:00
MadWasp79
df00cb66b5 lower tertiary roads value in speak_priority 2019-10-17 16:57:22 +03:00
vshcherb
0a62b3f5f6
Merge pull request #7674 from osmandapp/issue_7545
fix for #7545
2019-10-15 14:56:29 +02:00
MadWasp79
4bc796aa19 fix for #7545 2019-10-15 09:25:05 +03:00
max-klaus
d175387920 Fix collator crash by search 2019-10-14 18:58:31 +03:00
max-klaus
0a298dc9c8 Fix #7640 2019-10-13 19:40:49 +03:00
vshcherb
30f257dc8b
Merge pull request #7636 from osmandapp/routing_fix
fix for slow excluded id check
2019-10-08 15:31:29 +03:00
MadWasp79
a6c985043d add max width parameter 2019-10-08 12:43:02 +03:00
MadWasp79
534f03d558 clean up 2019-10-07 17:55:40 +03:00
MadWasp79
2ee126419f code clean-up 2019-10-07 13:23:30 +03:00
max-klaus
90daf2293e Added new download card 2019-10-04 18:39:14 +03:00