Commit graph

2032 commits

Author SHA1 Message Date
Victor Shcherb
e5e2829137 Finish algorith to load for transport router 2019-07-29 16:17:27 +02:00
Victor Shcherb
5827eff2bc Finish algorith to load for transport router 2019-07-29 16:13:55 +02:00
Victor Shcherb
7854ee01dd Important changes for transport stop generation
Conflicts:
	OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java
2019-07-29 15:37:46 +02:00
Victor Shcherb
ac7cfffdd4 Important changes for transport stop generation 2019-07-29 15:36:38 +02:00
Victor Shcherb
3904d82342 Temporary refactoring 2019-07-29 15:36:19 +02:00
Victor Shcherb
0ce5b2f212 Fix transport stop compare 2019-07-29 10:08:35 +02:00
Victor Shcherb
221dc057e7 Fix transport stop compare 2019-07-29 10:07:26 +02:00
Victor Shcherb
d388eb7500 Merge branch 'r3.4' into transport_live_new 2019-07-29 10:00:34 +02:00
Victor Shcherb
ad6321a89e Change transport compare and add helper methods 2019-07-28 23:57:51 +02:00
Victor Shcherb
1e3a6493f8 Fix slight deviation for transport stops 2019-07-28 20:47:17 +03: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
crimean
6282cf520f Added year to opening hours parser 2019-07-25 13:44:23 +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
crimean
678f9f7bc0 Working on transport stop merge 2019-07-22 21:50:03 +03:00
crimean
ae983725c6 Fix compareStop 2019-07-22 17:53:50 +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
Victor Shcherb
d2234f6e57 Fix #5922 2019-07-08 18:29:04 +02:00
Victor Shcherb
e01d4f1de8 Fix #5922 2019-07-08 18:28:30 +02:00
Victor Shcherb
03ff085914 Fix #7175 2019-07-08 14:31:18 +02:00
Chumva
091119d06c Add check for empty or single undefined partition 2019-07-08 15:21:59 +03:00
Victor Shcherb
92daf0c8b2 Keep lit as additional 2019-07-08 14:19:54 +02:00
Victor Shcherb
80587b5c9d Add lit to tag 2019-07-08 13:40:01 +02:00
Victor Shcherb
f6e4080b72 Fix sorting 2019-07-08 12:07:02 +02:00
Victor Shcherb
9d813d068c Fix user property name 2019-07-08 11:47:58 +02:00
Victor Shcherb
c73f5f8220 Fix sorting undefined 2019-07-08 11:40:56 +02:00
Chumva
eb8e7dedc1 Fix route info translations 2019-07-08 12:39:43 +03:00
Chumva
90e8a16ad8 Fix compilation 2019-07-08 09:53:12 +03:00
Victor Shcherb
4d91f9b451 Add additional tags 2019-07-08 01:30:33 +02:00
Victor Shcherb
f62a349b47 Fix issues 2019-07-08 01:22:41 +02:00
Victor Shcherb
6a9e6b89a0 Fix small issues 2019-07-08 00:47:57 +02:00
Victor Shcherb
8232b8e998 Fix npes 2019-07-08 00:37:20 +02:00
Victor Shcherb
907b380433 Fix small issues 2019-07-08 00:13:37 +02:00
Victor Shcherb
461a54ece3 Fix compilation errors 2019-07-07 23:13:36 +02:00
crimean
a43dae3a58 Fix compilation 2019-07-07 20:58:44 +03:00
Victor Shcherb
8406e7b20a Fix RouteStatisticsHelper 2019-07-07 19:43:13 +02:00
Victor Shcherb
9d945c90b1 Fix route details 2019-07-07 19:31:38 +02:00
crimean
a3957c150d Refactoring route details statistics 2019-07-07 19:30:01 +03:00
Victor Shcherb
727b6ba399 Improve radius level math 2019-07-07 15:15:49 +02:00
crimean
91e9b9e9cb Fix #6240 2019-07-07 12:05:25 +03:00
Chumva
444f6c02a5 Add support for gpx metadata bounds 2019-07-05 14:13:24 +03:00
Chumva
ef178c7b0d Add support for gpx metadata author and copyright 2019-07-05 13:53:33 +03:00
Chumva
3cb65019c0 Add support for gpx metadata time and keywords 2019-07-05 10:11:46 +03:00
Chumva
884bec9d77 Add support for metadata link 2019-07-04 14:27:59 +03:00
Chumva
f21019af9e Remove unnecessary check for stop exits 2019-07-03 13:49:45 +03:00
Chumva
9777dae8b4 Fix stops with same exits 2019-07-03 12:25:07 +03:00
Chumva
410e2a55f4 Fix #6894 2019-07-03 10:31:47 +03:00
vshcherb
a18c3c8b83
Merge pull request #7116 from osmandapp/issue_7076
Issue 7076
2019-06-27 17:35:37 +02:00
Alexey
e027a31176
Merge pull request #7113 from osmandapp/Fix_7079
Fix #7079
2019-06-27 16:42:20 +03:00
madwasp79
ed50f6a3a8 Merge branch 'master' into issue_7076
# Conflicts:
#	OsmAnd/res/values/strings.xml
2019-06-27 15:25:45 +03:00
madwasp79
fa424cb561 #7076 - added info in current location in context menu 2019-06-27 15:23:52 +03:00
crimean
651688b3af Fix #7022 2019-06-27 14:51:06 +03:00
Chumva
411f8d73ff Fix #7079 2019-06-27 11:48:12 +03:00
Victor Shcherb
3556205c00 Add edit tag icon #6931 2019-06-26 18:47:07 +02:00
Victor Shcherb
e0878f4f04 Add params 2019-06-25 16:15:34 +02:00