Commit graph

100 commits

Author SHA1 Message Date
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
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
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
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
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
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
vshcherb
2cc5409044 Add rendering route data objects from java/ change download button behavior 2014-03-01 13:30:25 +02: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
3de7729bce Introduce new routing 2014-02-01 22:32:06 +01:00
vshcherb
fc11e13a1e Remove border lines & enable route precalculation 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
3bf2ded7a4 Fix invisible zigzags 2013-11-26 16:23:12 +01:00
vshcherb
367ca7f3ee Decrease penalty for traffic signals 2013-11-06 23:04:55 +01:00
Nelson A. de Oliveira
61699455e5 Replace StringBuffer with String
These may be replaced with java.lang.String expressions which results in
simpler and possibly more efficient code
2013-07-31 15:09:37 -03:00
Victor Shcherb
e9eee09a40 Fix slight turns on motorway 2013-04-21 13:08:37 +02:00
Victor Shcherb
7bc162a878 Move OsmAnd java core project back to android repository for maintainance reasons 2013-04-18 23:35:20 +02:00
Victor Shcherb
3db27de275 Restructure repository 2012-12-12 02:10:55 +01:00
Victor Shcherb
e59b53da68 Refactor project structure 2012-12-12 00:05:32 +01:00