Commit graph

2553 commits

Author SHA1 Message Date
Vitaliy
5be8902e02 Merge branch 'master' into track_appearance
# Conflicts:
#	OsmAnd/res/values-ru/strings.xml
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/views/GPXLayer.java
#	OsmAnd/src/net/osmand/plus/views/RouteLayer.java
2020-07-20 17:30:15 +03:00
Victor Shcherb
0d8c3e6604 Add close because full stream is read 2020-07-19 17:42:11 +02:00
Vitaliy
4b4100cf0d Merge branch 'master' into track_appearance 2020-07-16 13:50:13 +03:00
Dima-1
10e5005e5a Merge branch 'master' into plan_a_route 2020-07-16 12:08:16 +03:00
Dima-1
255f52f52c Change Measure distance -> Plan a route 2020-07-16 12:03:16 +03:00
Vitaliy
bd54b829ef Add solid gradient scale type and track coloring card 2020-07-14 15:00:34 +03:00
vshcherb
8da0811ca4
Merge pull request #9440 from osmandapp/tag_to_text
fix for osmand_ele tags as text
2020-07-14 13:57:13 +02:00
Vitaliy
67d2166d0f Move GpxSplitType and GradientScaleType to android module 2020-07-14 11:49:44 +03:00
MadWasp79
a89ec4b10e fix for osmand_ele tags as text 2020-07-13 18:17:11 +03:00
Vitaliy
7a18f2e5ca Remove unnecessary annotations 2020-07-13 12:29:56 +03:00
Vitaliy
9de83eed83 Merge branch 'master' into gpx_appearance 2020-07-13 12:25:58 +03:00
Vitaliy
b7c1fe6ba7 Remove unnecessary setters from GpxDataItem 2020-07-13 12:03:20 +03:00
Victor Shcherb
f4d0145d59 Fix timings 2020-07-13 00:09:10 +02:00
Victor Shcherb
d592736252 Support sharing native context and passing road id to native (to speed up search) 2020-07-12 23:29:26 +02:00
Victor Shcherb
1433eb0ca9 Refactor native parameters for routing 2020-07-10 23:12:35 +02:00
Victor Shcherb
f59cea9c0a Refactor time fields 2020-07-10 20:45:49 +02:00
Victor Shcherb
a1cbdc111b Refactor time fields 2020-07-10 20:35:22 +02:00
Victor Shcherb
2b23c7e8ca Refactor field names 2020-07-10 19:55:01 +02:00
Vitaliy
f479debb79 Fix #8318 2020-07-10 16:56:55 +03:00
Victor Shcherb
e63e9b6865 Fix #9293 2020-07-09 19:35:00 +02:00
Victor Shcherb
2db3b07225 Fix exception 2020-07-09 14:01:43 +02:00
vshcherb
64c9fd702e
Merge pull request #9420 from osmandapp/gpx_tracking_fix
add preciese coordinates to new start points
2020-07-09 13:34:52 +02:00
MadWasp79
1a0e73af0d add preciese coordinates to new start points 2020-07-09 14:32:59 +03:00
Vitaliy
b42346f90a
Merge pull request #9406 from osmandapp/Fix_7131
Fix #7131
2020-07-09 11:45:10 +03:00
Vitaliy
4eabba3489 Show track start finish icons by default 2020-07-08 13:03:28 +03:00
Vitaliy
f178a292c1 Merge branch 'master' into gpx_appearance 2020-07-08 12:29:59 +03:00
Nazar-Kutz
89a05082ac Fix #7131 2020-07-08 11:03:21 +03:00
Victor Shcherb
45991e8834 Fix #9345 wrong time for short route 2020-07-07 22:53:00 +02:00
Victor Shcherb
005aa87d14 Fix #9336 2020-07-07 22:09:00 +02:00
Victor Shcherb
ede816431d Fix route preparation 2020-07-07 18:52:40 +02:00
Victor Shcherb
109eb77f88 Fix route calculation for GPX 2020-07-07 17:15:46 +02:00
Vitaliy
2284de7055 Load gpx split type from file 2020-07-07 14:15:48 +03:00
Vitaliy
5f60f452c0 Change gradient parameters names 2020-07-07 12:28:43 +03:00
Vitaliy
15e26432f8 Add selected gradient scale type for track 2020-07-07 12:28:43 +03:00
Vitaliy
a0c83cf8b5 Add track gradient scale types 2020-07-07 12:28:43 +03:00
Vitaliy
08a8281a8c Add show arrows and show start finish gpx params 2020-07-07 12:28:43 +03:00
Vitaliy
dbfb379cc8 Gpx width per file 2020-07-07 12:28:43 +03:00
Victor Shcherb
3d7c4b3fc8 Merge branch 'try_fix_9329' 2020-07-06 19:39:31 +02:00
Victor Shcherb
aa56153a53 Try to fix #9329 2020-07-04 00:53:37 +02:00
Victor Shcherb
f1c7d7e276 Try to fix #9329 2020-07-04 00:31:40 +02:00
Dima-1
6869639c08 Fix #9294 [Feature request] add length to the Vehicle parameters 2020-07-03 14:40:13 +03:00
Victor Shcherb
9320935467 Merge branch 'master' of github.com:osmandapp/Osmand 2020-07-02 02:43:35 +02:00
Victor Shcherb
3df0934d68 Fix gpx approximation 2020-07-02 02:42:44 +02:00
vshcherb
fe32670e44
Merge pull request #9351 from osmandapp/issue_9298
fix for incomplete roads reading #9298
2020-07-01 13:07:25 +02:00
MadWasp79
86b08b7568 fix cache and incomplete route offset 2020-07-01 13:29:56 +03:00
MadWasp79
9db069dd05 fix for incomplete roads reading 2020-06-30 12:03:51 +03:00
Victor Shcherb
284a007189 Fix route calculation 2020-06-29 18:48:13 +02:00
Victor Shcherb
a4cf6649b5 Update gpx route approximation 2020-06-29 18:48:12 +02:00
Victor Shcherb
fde9aa6445 Add gpx route approximation 2020-06-27 13:10:26 +02:00
Victor Shcherb
90b2814faa Add gpx approximation 2020-06-26 19:26:56 +02:00
Victor Shcherb
cf67a55b36 Fix transport reader 2020-06-25 12:43:43 +02:00
MadWasp79
4bd2135d75 quick fix for npe 2020-06-25 08:53:20 +03:00
MadWasp79
578835df55 quick fix 2020-06-24 13:29:14 +03:00
vshcherb
af5fc8ffd2
Merge pull request #9277 from osmandapp/directional_traffic_signals
Directional traffic signals #6774
2020-06-24 11:17:51 +02:00
Victor Shcherb
c820fa3033 Fix routing 2020-06-24 11:16:19 +02:00
Victor Shcherb
3030c73f8a Fix routing 2020-06-24 11:14:45 +02:00
MadWasp79
13910d284d cleaning 2020-06-24 10:38:32 +03:00
vshcherb
d5f506f4ad
Merge pull request #9302 from osmandapp/default_days_edit_poi
Mo-Fr by default in edit poi osm
2020-06-23 23:58:41 +02:00
Denis Kolomiets
ab603663f1
quick fix for polygon center point 2020-06-23 21:57:50 +03:00
MadWasp79
29d4379b84 fix 2020-06-23 21:25:20 +03:00
MadWasp79
bf4cd427f6 quick fix for null 2020-06-23 21:23:56 +03:00
veliymolfar
2f9d0485be Mo-Fr by default in edit poi osm 2020-06-23 19:09:58 +03:00
MadWasp79
f67b1b347a refactoring 2020-06-23 16:32:47 +03:00
MadWasp79
45852fc5ba Merge branch 'directional_traffic_signals' of https://github.com/osmandapp/Osmand into directional_traffic_signals 2020-06-23 15:56:55 +03:00
MadWasp79
613fed62e7 refactoring 2020-06-23 15:55:46 +03:00
Denis Kolomiets
89bef4e615
remove logging 2020-06-23 14:31:38 +03:00
MadWasp79
c1f5534c32 simplify center calc for 4-point polygons 2020-06-20 16:31:47 +03:00
MadWasp79
ae77d4089e tags fix 2020-06-20 12:51:34 +03:00
max-klaus
b2fb7e7cfb Refactor names 2020-06-20 11:05:28 +03:00
Victor Shcherb
8298dbdf17 Support dots in street names - https://github.com/osmandapp/Osmand/issues/6154 2020-06-19 19:04:08 +02:00
Victor Shcherb
54c0510bbe Fix tests 2020-06-19 18:48:53 +02:00
veliymolfar
ba396c7542 fix edit osm poi opening hours formatting 2020-06-19 18:01:06 +03:00
MadWasp79
0dc70df409 add more stict check for tags 2020-06-19 17:55:53 +03:00
MadWasp79
54e9b29d9e remove unused variable 2020-06-19 17:25:02 +03:00
MadWasp79
f6473011f8 cleaning 2020-06-19 16:46:33 +03:00
MadWasp79
2a0db125f6 directional traffic signals 2020-06-19 16:37:29 +03:00
Victor Shcherb
37465266aa Make simpler 2020-06-19 13:30:07 +02:00
Dmitriy Ruban
e75841b312
Merge branch 'master' into speed_cameras 2020-06-19 13:43:35 +03:00
veliymolfar
c20e096cda refactor speed cameras hiding 2020-06-19 10:07:46 +03:00
Victor Shcherb
4727143bbe Slightly limit additional poi categoreis 2020-06-18 14:48:32 +02:00
Victor Shcherb
b540b5b2e7 Add aditional types to search 2020-06-18 14:18:24 +02:00
veliymolfar
18074b0dfc small refactor 2020-06-18 13:38:24 +03:00
veliymolfar
05ffbdffaa refactor speed camera restriction 2020-06-18 12:29:59 +03:00
Victor Shcherb
13d3741fea Fix search tests 2020-06-17 21:37:55 +02:00
vshcherb
36555ab120
Merge pull request #9265 from osmandapp/pt_fixes
fix read routes
2020-06-17 21:06:15 +02:00
Victor Shcherb
e0b3e82cb3 Fix tests 2020-06-17 19:56:30 +02:00
MadWasp79
ec73ca835f fix read routes 2020-06-17 20:42:30 +03:00
max-klaus
820dbaec0e Added noData parameter to search tests 2020-06-17 18:59:36 +03:00
vshcherb
86378cbc93
Merge pull request #9261 from osmandapp/gpx_context_menu
Gpx context menu fixes
2020-06-17 16:39:49 +02:00
max-klaus
6b6708e82b Drop empty BinaryMapIndexTestReader 2020-06-17 16:47:35 +03:00
Vitaliy
e225ad7b03 Fix gpx context menu navigation and add check for segment bounds 2020-06-17 16:42:05 +03:00
max-klaus
79d66be999 Merge branch 'obf_search_test' 2020-06-17 16:36:26 +03:00
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