Commit graph

401 commits

Author SHA1 Message Date
vshcherb
58f60d7794 Merge pull request #994 from saiarcot895/fix-bits
Turn display fix
2014-12-09 12:06:59 +01:00
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
Victor Shcherb
a5431d2036 Be more verbose 2014-12-07 20:21:42 +01: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
Victor Shcherb
170aaabfa6 Refactor zoom representation 2014-12-06 14:55:36 +01:00
Victor Shcherb
239184861f Add strings to translate 2014-12-06 13:17:54 +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
Victor Shcherb
311cb29336 Fix collapsing 2014-12-05 23:33:58 +01:00
Saikrishna Arcot
d527eb4fe9 Fix slight turn definition, and remove redundant lines 2014-12-04 22:51:18 -05:00
Victor Shcherb
edd72827f3 Introduce new property engine_v1 2014-12-03 21:26:15 +01: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
vshcherb
2a0f3623d8 Merge pull request #963 from Bars107/master
Bugfixing.
2014-11-19 17:19:34 +01: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
68806ded9e Fix search by name 2014-11-19 00:47:59 +01:00
Victor Shcherb
b5975af3a9 Fix merge 2014-11-17 22:05:09 +01:00
Victor Shcherb
246ed334e6 Fix android 2.2 2014-11-08 01:40:36 +01: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
ecf65f5a8c Remove local lines 2014-10-27 20:12:36 +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
1db4e7dcfb Add categories, fix waypoints dialog 2014-10-26 12:14:31 +01:00
Victor Shcherb
4565612ee6 Fix issues with app crash 2014-10-25 14:15:10 +02:00
Victor Shcherb
d73569f946 Add rendering attribute support as parameter 2014-10-24 11:24:59 +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