Commit graph

2429 commits

Author SHA1 Message Date
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