Victor Shcherb
|
8b3441220e
|
Merge branch 'r3.4'
Conflicts:
OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java
|
2019-07-29 16:28:30 +02:00 |
|
Victor Shcherb
|
464778d336
|
Finish algorith to load for transport router
|
2019-07-29 16:27:23 +02:00 |
|
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 |
|