Commit graph

62956 commits

Author SHA1 Message Date
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
21f445a883
Merge pull request #9149 from osmandapp/fix_subcategories_search
resetSearchTypes
2020-06-06 13:35:03 +03: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
40a1a6fb64
Merge pull request #9155 from osmandapp/searchRefactor
Fix show poi on map (search). Fix compilation.
2020-06-05 17:56:36 +03:00
max-klaus
4b45f3a43e
Merge branch 'r3.7' into searchRefactor 2020-06-05 17:56:27 +03:00
vshcherb
79b5b9bf08
Merge pull request #9154 from osmandapp/minor_fixes
Fix possible terrain db error
2020-06-05 16:52:13 +02:00
max-klaus
629fa232c9 Fix show poi on map (search). Fix compilation. 2020-06-05 17:22:02 +03:00
Vitaliy
dea014a98b Fix possible SQLiteException 2020-06-05 16:49:15 +03:00
Victor Shcherb
01ad124049 Fix concurrent modification exception 2020-06-05 13:39:07 +02:00
Vitaliy
dfc3197d47 Merge branch 'r3.7' 2020-06-05 14:22:11 +03:00
vshcherb
eabb67813c
Merge pull request #9152 from osmandapp/minor_fixes
Fix several possible errors
2020-06-05 12:59:05 +02:00
Vitaliy
06c43fdef6 Fix several possible errors 2020-06-05 13:31:17 +03:00
sonora
082c3ec889 string improvement 2020-06-05 10:02:53 +02:00
Victor Shcherb
c638e01dfd Fix route calculation 2020-06-04 18:37:58 +02:00
vshcherb
5afe3a90ad
Merge pull request #9140 from osmandapp/fix_8791
don`t ask location if not using current position
2020-06-04 17:18:35 +02:00
Dmitry
2dc4eb17c7 Fix string 2020-06-04 18:00:26 +03: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
Dima-1
8d1fc4d61a Fix merge 2020-06-04 17:40:58 +03:00
veliymolfar
44ede64fb5 Merge remote-tracking branch 'origin/details_dialog_redesign' into details_dialog_redesign 2020-06-04 17:35:22 +03:00
veliymolfar
a7985f5113 refactor 2020-06-04 17:31:52 +03:00
Dima-1
8ff2ee215d Merge branch 'r3.7'
# Conflicts:
#	OsmAnd/res/layout/point_editor_fragment_new.xml
#	OsmAnd/res/values/strings.xml
2020-06-04 17:27:49 +03:00
vshcherb
1c15cd5797
Merge pull request #9123 from osmandapp/Vechicle_pref_numeric_dialog
Vechicle pref numeric dialog
2020-06-04 16:15:31 +02:00
vshcherb
e28672a4cb
Merge pull request #9134 from osmandapp/fix_osf_export
Fix osf export
2020-06-04 16:11:36 +02:00
Victor Shcherb
9a4a2ee34e Merge branch 'r3.7' 2020-06-04 16:07:49 +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
Victor Shcherb
6a32363e66 Fix compilation 2020-06-04 16:02:20 +02:00
Vitaliy
f3b64d3d9e Change action description 2020-06-04 17:00:10 +03:00
Victor Shcherb
e8ad8c94a8 Merge remote-tracking branch 'origin/r3.7' 2020-06-04 15:57:32 +02:00
vshcherb
b035c7cb04
Merge pull request #9121 from osmandapp/searchRefactor
Search refactor
2020-06-04 15:56:54 +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
Vitaliy
ea26f669e1
Change action description 2020-06-04 15:50:13 +03:00
Victor Shcherb
3c9d940fbb Fix spring street 2020-06-04 14:47:59 +02:00
veliymolfar
1d869b309c resetSearchTypes 2020-06-04 15:00:35 +03:00
Vitaliy
9fe91cb276
Merge pull request #9141 from osmandapp/train_icon
change icon for train
2020-06-04 14:48:14 +03:00
vshcherb
1e06372fe9
Merge pull request #9143 from osmandapp/text_scale
Fix white points
2020-06-04 12:32:30 +02:00
Dima-1
1f011927cb fix white point 2020-06-04 13:30:07 +03:00
veliymolfar
296672f798 change icon for train 2020-06-04 12:16:53 +03:00