Commit graph

167 commits

Author SHA1 Message Date
Saikrishna Arcot
4af103fb02 When setting a new primary or secondary turn, clear the bits from the currently-set turn first. 2014-12-08 12:56:05 -05:00
vshcherb
a2c041274b Merge pull request #952 from saiarcot895/merge-turn-lanes
Implement merging nearby turns together.
2014-12-07 00:46:57 +01:00
Saikrishna Arcot
08dc488850 Fix NullPointerException that occurs if there are no more turns with lanes indicated. 2014-12-05 23:00:12 -05:00
Saikrishna Arcot
d527eb4fe9 Fix slight turn definition, and remove redundant lines 2014-12-04 22:51:18 -05:00
Victor Shcherb
52dd94adc7 Remove unnecessary line 2014-11-28 18:33:04 +01:00
Saikrishna Arcot
cefabcf520 Make local variables to shorten lines. 2014-11-28 08:39:18 -06:00
Saikrishna Arcot
e4a2b38ea4 Remove vim file 2014-11-28 08:19:23 -06:00
Victor Shcherb
da7f23b4ac Fix routing with needles 2014-11-28 00:58:02 +01:00
Victor Shcherb
9931d436b4 Fix routing with needles 2014-11-28 00:57:34 +01:00
Victor Shcherb
b4db8bdbd9 Display lanes in driving mode 2014-11-25 18:37:09 +01:00
Saikrishna Arcot
2b9c96966e Update to call new methods. 2014-11-24 20:24:47 -05:00
Saikrishna Arcot
db6d99dc92 Merge remote-tracking branch 'origin/master' into merge-turn-lanes 2014-11-24 19:50:26 -05:00
Victor Shcherb
1fd9841ea6 Merge branch 'master' of ssh://github.com/osmandapp/Osmand
Conflicts:
	OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
2014-11-23 19:51:47 +01:00
Victor Shcherb
a9b1031ce9 Fix issue with turn type 2014-11-23 19:45:31 +01:00
Saikrishna Arcot
1ebad93158 Split determining which turns to merge into a separate function 2014-11-23 13:28:21 -05:00
Saikrishna Arcot
534d11d544 Update method call to reflect new parameters. 2014-11-23 11:41:07 -05:00
Saikrishna Arcot
9ef86bbe56 Merge branch 'master' into merge-turn-lanes
Conflicts:
	OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
2014-11-23 11:27:15 -05:00
Saikrishna Arcot
fcee2c6642 Log inconsistencies in lanes and turn:lanes values, and try to adjust lanes array to continue processing. 2014-11-21 11:31:18 -05:00
Saikrishna Arcot
72f8c1e1f4 Remove main lanes restriction 2014-11-21 07:58:15 -05:00
Saikrishna Arcot
751e569208 Refactor countLanes() so that it gets the right number of lanes by itself (similar to getTurnLanesString()) 2014-11-21 07:58:15 -05:00
Saikrishna Arcot
984dc80e58 Make a fix to ensure the directional lane is used 2014-11-21 07:51:41 -05:00
Saikrishna Arcot
e1b7f13b5c Implement merging nearby turns together.
When there are multiple turns near each other (< 60m), set the lanes
that are allowed on earlier turns such that staying on that lane will
carry you through the other turns.

For a standard left/right turn at a traffic light at two one-way roads
(dual carriageway), this means that the left and right turns are
correctly highlighted.
2014-11-21 07:51:41 -05:00
Denis
5f321bd150 Fixed bug with same item can be added to avoid roads twice 2014-11-19 14:58:16 +02:00
Victor Shcherb
ee2eff593f Add impassable road implementation 2014-11-02 18:48:09 +01:00
Victor Shcherb
34a4b9825e Calculate route from center of city 2014-10-29 01:56:25 +01:00
Victor Shcherb
4a757ae29d Merge branch 'master' of ssh://github.com/osmandapp/Osmand 2014-10-26 23:50:58 +01:00
Victor Shcherb
a410e2b565 Fix be attentive with route recalculation 2014-10-26 23:48:47 +01:00
Victor Shcherb
9e87ec17e9 FIx issue 2384 2014-10-26 23:15:48 +01:00
vshcherb
e5a9a43d59 Merge pull request #930 from saiarcot895/infer-turn-from-lanes
Add support for determining the actual turn to be taken based on the lanes highlighted
2014-10-26 18:51:40 +01:00
Victor Shcherb
4565612ee6 Fix issues with app crash 2014-10-25 14:15:10 +02:00
Saikrishna Arcot
24ab8baa10 Switch primary and secondary turns if the secondary turn is the actual turn 2014-10-22 11:26:36 -04:00
Saikrishna Arcot
ebb4d42f29 Assign new turn in attachKeepLeftInfoAndLanes() 2014-10-22 10:31:48 -04:00
Victor Shcherb
8e44071064 Add impassable road implementation 2014-10-21 23:17:46 +02:00
Victor Shcherb
dd429d1923 Fix text rendering & add comment 2014-10-21 22:35:35 +02:00
Saikrishna Arcot
ee58eebe3c Add support for determining the actual turn to be taken based on the lanes highlighted 2014-10-21 09:48:27 -04:00
vshcherb
ed05531de0 Merge pull request #908 from saiarcot895/lanes-with-multi-turns
Add support for reading in lanes that have multiple turns
2014-10-16 00:33:58 +02:00
Saikrishna Arcot
1e1f1c3fb4 Rename getLanesInfo() to assignLanesInfo() 2014-10-14 23:17:13 -04:00
vshcherb
7ab39cb7f2 Merge pull request #917 from saiarcot895/fix-lane-counting
Fix error caused by missing lane tags.
2014-10-14 14:51:54 +02:00
Saikrishna Arcot
8c7f2e68e7 Add a right/left turn arrow on the rightmost/leftmost lane if it's not
included as per turn:lanes and a right/left turn is being taken.
2014-10-13 09:53:52 -05:00
Saikrishna Arcot
45ab0689c3 Add ability to fully use turn:lanes for left and right turns as well
If the turn being made is a left or right turn, and turn:lanes is
present, then the lanes for the turn will be displayed, and only the
lane that takes a left or right turn will be highlighted.
2014-10-13 09:26:25 -05:00
Saikrishna Arcot
ef5ed3c17f Fix error caused by missing lane tags.
When there is both a slight left turn and a slight right turn possible
at a point, and neither of the outbound roads have a lanes tag, then
an ArrayIndexOutOfBoundsException is thrown.
2014-10-13 08:37:00 -05:00
Saikrishna Arcot
54871563db Add support for reading in lanes that have multiple turns 2014-10-07 22:38:48 -04:00
Victor Shcherb
8602f9aed4 Merge branch 'master' of ssh://github.com/osmandapp/Osmand 2014-10-08 00:53:42 +03:00
Victor Shcherb
4290fc3bad Fix bug 2014-10-08 00:53:04 +03:00
vshcherb
d6f1be4f80 Merge pull request #902 from saiarcot895/basic-turn-lanes-reading
Add basic support for reading turn:lanes and drawing the turns as lanes
2014-10-08 00:23:43 +03:00
Saikrishna Arcot
88156c0370 Swap secondary and primary turns if the secondary turn is actually the turn being made. 2014-10-06 14:10:57 -04:00
Saikrishna Arcot
3ef0a4f9a8 Change return type of attachTurnLanesData to void 2014-10-06 12:43:50 -04:00
Saikrishna Arcot
bd5d29fc5f Rename countLines() to countLanes() 2014-10-04 10:41:30 -04:00
Saikrishna Arcot
a11e5bb9e6 Add basic support for reading turn:lanes and drawing the turns as lanes 2014-10-04 10:39:25 -04:00
Victor Shcherb
19ef80c33f count lines differenetly 2014-10-02 17:50:02 +02:00
Victor Shcherb
e27a425465 Show different turns 2014-10-02 14:14:34 +02:00
Victor Shcherb
2c6b19b775 Refactor turn types 2014-10-02 13:47:39 +02:00
Victor Shcherb
3f4afca303 Add text size setting for the map 2014-09-24 22:32:37 +02:00
Victor Shcherb
68869a05b5 Update routing, make point precise 2014-09-22 02:08:34 +02:00
Victor Shcherb
2eca9ec77f New experimental routing 2014-07-18 17:50:38 +02:00
Denis
e2e4d234aa Removed UTurn message. Added functionality to cancel voice commands if user is off the route. Added off the route indicator with lenght to return to path. 2014-07-17 12:50:50 +04:00
Victor Shcherb
93a5a7933d Don't use uturn in services 2014-07-11 18:48:08 +02:00
Victor Shcherb
a449658b41 Download layer 2014-07-06 16:17:46 +02:00
unknown
e1177cf3ce fixed bug 95 2014-07-03 12:41:37 +03:00
vshcherb
2dc9e63dc9 Fix collator issue 2014-04-12 23:37:18 +02:00
vshcherb
fb83b64ac4 Fix bug in countries with mph limits 2014-04-07 00:56:17 +02:00
vshcherb
681f6a27e0 Fix small issues 2014-03-26 12:56:02 +01:00
vshcherb
016f4acd3b Fix navigate action menu & put read time out for tiles 2014-03-08 15:50:07 +01:00
vshcherb
c185447fbe Add missing points/roads for basemap 2014-03-06 01:57:55 +01:00
vshcherb
3c1104b1d0 Improve gpx route calculation 2014-03-03 18:44:17 +01:00
vshcherb
05e763f60c Improve gpx route calculation 2014-03-03 15:55:32 +02:00
vshcherb
1f7f7f54da Add osmand route calculation following gpx track 2014-03-02 19:47:03 +02:00
vshcherb
82137dc66b Fix roundabout issue 2014-03-01 16:49:21 +02:00
vshcherb
2cc5409044 Add rendering route data objects from java/ change download button behavior 2014-03-01 13:30:25 +02:00
vshcherb
c7e764239b Add dynamic routing parameters for osmand routing.xml 2014-02-26 21:03:12 +01:00
vshcherb
df6cf9f480 Update routing 2014-02-21 01:03:34 +01:00
vshcherb
07db561e06 Small changes 2014-02-12 01:01:28 +01:00
vshcherb
f82ea8df18 Speedup routing 2014-02-07 02:38:42 +01:00
vshcherb
33e2902aa5 Add speech rate to accessibility settings 2014-02-06 01:07:45 +01:00
vshcherb
be06d96141 Update warnings & settings with new routing 2014-02-06 00:35:08 +01:00
vshcherb
1370e3050d Update warnings & settings with new routing 2014-02-06 00:17:07 +01:00
vshcherb
da25b2869b Add new routing config 2014-02-05 21:10:04 +01:00
vshcherb
7e9053b2bc Add new routing config 2014-02-05 17:57:24 +01:00
vshcherb
db06f5ee00 Introduce New routing config 2014-02-02 14:06:15 +01:00
vshcherb
311ec40157 finalize changes 2014-02-01 22:32:06 +01:00
vshcherb
bc55c294d5 Add precalculated route 2014-02-01 22:32:06 +01:00
vshcherb
efdfdb55e9 Update routing provider 2014-02-01 22:32:06 +01:00
vshcherb
3de7729bce Introduce new routing 2014-02-01 22:32:06 +01:00
vshcherb
2ce1385ae5 Change interface 2014-02-01 22:32:06 +01:00
vshcherb
4b9697f104 Update map utils douglas-peuker (to return filtered out points) 2014-01-20 19:34:45 +01:00
vshcherb
2d3a054fd0 Fix small issues 2014-01-20 01:50:30 +01:00
vshcherb
fc11e13a1e Remove border lines & enable route precalculation 2014-01-19 23:59:14 +01:00
vshcherb
5dd8c35988 Update calculation 2014-01-19 23:59:14 +01:00
vshcherb
f965160876 Update android routing 2014-01-19 23:59:14 +01:00
vshcherb
3fc759ef1c Small changes 2014-01-19 23:59:14 +01:00
vshcherb
ad72ef705b Test new routing 2014-01-19 23:59:14 +01:00
vshcherb
b9e4a8cc3d Investigate new routing 2014-01-19 23:59:14 +01:00
vshcherb
00a446d335 Merge pull request #550 from jasalamanca/testRouting
Adding vehicle parameter to TestRouting
2013-11-27 02:19:33 -08:00
Javier Salamanca
83fd1e69c4 - Adding vehicle parameter to TestRouting
- Reseting context before searching route.
2013-11-27 08:33:13 +01:00
vshcherb
3bf2ded7a4 Fix invisible zigzags 2013-11-26 16:23:12 +01:00
vshcherb
119623e98a Refactor amenity structure 2013-11-10 16:54:28 +01:00
vshcherb
367ca7f3ee Decrease penalty for traffic signals 2013-11-06 23:04:55 +01:00
vshcherb
29d1fe315c Fix and arrive at destination point 2013-11-06 17:41:18 +01:00
vshcherb
6c7cd3d3c2 Simulate position in tunnels 2013-10-29 21:13:57 +01:00
vshcherb
b50fd54528 Small refactoring route details 2013-10-26 14:41:07 +02:00