Commit graph

1970 commits

Author SHA1 Message Date
Victor Shcherb
ad6321a89e Change transport compare and add helper methods 2019-07-28 23:57:51 +02:00
Victor Shcherb
78d3d6179f Fix slight deviation for transport stops 2019-07-28 19:11:17 +02:00
Victor Shcherb
fafa1146fd Merge branch 'r3.4' 2019-07-26 10:41:44 +02:00
Victor Shcherb
c791c4a054 Fix issue with conditional opening hours 2019-07-26 10:41:36 +02:00
Victor Shcherb
2623e93d58 Merge branch 'r3.4' 2019-07-26 00:28:28 +02:00
Victor Shcherb
e613c1a7a7 Fix #7322 2019-07-26 00:28:06 +02:00
crimean
caaaf0b3c3 Added year to opening hours parser 2019-07-25 13:53:15 +03:00
crimean
4d8fcc5238 Added year to opening hours parser 2019-07-25 13:45:04 +03:00
Chumva
1cbba16e19 Merge branch 'GpxStatisticImprovements' 2019-07-23 16:38:46 +03:00
Chumva
32c9dd8ea9 Fix #7054 2019-07-23 16:10:35 +03:00
Victor Shcherb
c35f174f60 Merge remote-tracking branch 'origin/transport_live_new' 2019-07-22 15:57:45 +02:00
crimean
9425cfb6e8 Live updates for transport 2019-07-22 16:48:41 +03:00
vshcherb
dfe3576cac
Merge pull request #7302 from osmandapp/conditionalRouting
Implement conditional restrictions
2019-07-22 12:04:03 +02:00
Victor Shcherb
fce78cf8a5 Merge branch 'master' of github.com:osmandapp/Osmand 2019-07-21 22:34:11 +02:00
Victor Shcherb
6d7bb74874 Merge branch 'conditionalRouting' 2019-07-21 22:33:29 +02:00
Victor Shcherb
8e0c1524ee Fix npe 2019-07-21 21:29:43 +02:00
Victor Shcherb
5c6229f47b Fix native integration for conditional time 2019-07-21 21:25:57 +02:00
Victor Shcherb
6a39d99d4c Fix field for copy 2019-07-21 16:46:08 +02:00
Victor Shcherb
589ce11be2 Fix typo 2019-07-21 16:36:49 +02:00
Victor Shcherb
718f79a9cd Adapt / prepare for text values for altitude 2019-07-21 15:40:09 +02:00
Victor Shcherb
5b9e711e2a Simplify tags 2019-07-21 15:12:42 +02:00
Victor Shcherb
918495b2ad Add conditional tags to geocoding 2019-07-21 14:09:04 +02:00
Victor Shcherb
446e991ca5 Implement conditional restrictions 2019-07-21 13:56:27 +02:00
Victor Shcherb
f2f84210e7 Implement conditional restrictions 2019-07-21 13:54:46 +02:00
Chumva
e7bb115e29 Fix import gpx files to custom folders
(cherry picked from commit caac552822)
2019-07-20 14:47:06 +03:00
crimean
806b7374d9 Fix gpx email writing 2019-07-20 14:06:20 +03:00
crimean
f20d4a6a87 Fix gpx email writing 2019-07-20 14:05:50 +03:00
Chumva
caac552822 Fix import gpx files to custom folders 2019-07-17 17:20:38 +03:00
crimean
459236c3a1 Fix travel UI 2019-07-17 11:11:36 +03:00
crimean
51bf9f51cc Fix travel UI 2019-07-17 11:11:11 +03:00
crimean
bbba770fc2 Fix #6914 2019-07-16 14:45:32 +03:00
crimean
78e7bb4d3d Fix #6914 2019-07-16 14:44:56 +03:00
Chumva
56778e1724 Merge remote-tracking branch 'origin/r3.4' 2019-07-16 13:03:13 +03:00
Chumva
68ea16b12e Fix gpx bounds parsing for old version 2019-07-13 18:40:58 +03:00
crimean
0c1018f09b Added fileOffset to TransportRoute 2019-07-13 18:08:29 +03:00
crimean
bade74ee40 Added fileOffset to TransportRoute 2019-07-13 18:07:51 +03:00
Victor Shcherb
b436272ae5 Merge branch 'r3.4' 2019-07-12 18:13:45 +02:00
Victor Shcherb
c45a766c9e Improve fix 2019-07-12 18:13:11 +02:00
crimean
8f031a379e Fix gpx import 2019-07-12 19:06:27 +03:00
crimean
18eafa3719 Fix gpx import 2019-07-12 19:05:57 +03:00
Victor Shcherb
d5909154ba Update route details 2019-07-10 15:43:22 +02:00
crimean
6cdfc14432 Transport route menu fix 2019-07-10 15:53:21 +03:00
crimean
c5b0db7786 Transport route menu fix 2019-07-10 15:52:20 +03:00
crimean
6a7b4fe8d5 Transport route/stop fixes 2019-07-09 21:30:13 +03:00
crimean
f277ac7ccf Transport route/stop fixes 2019-07-09 21:29:39 +03:00
Victor Shcherb
7dbbc4ff78 Merge remote-tracking branch 'origin/r3.4' 2019-07-09 17:36:52 +02:00
Chumva
f500c4597f Add check for referencesToRoutes 2019-07-09 18:20:48 +03:00
Victor Shcherb
aa1b256a39 Merge branch 'r3.4'
Conflicts:
	OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
2019-07-09 11:01:00 +02:00
Victor Shcherb
5b9d3cc126 Update map markers params 2019-07-09 10:59:02 +02:00
Victor Shcherb
94297c88e7 Fix #5922 2019-07-08 18:42:41 +02:00