Commit graph

494 commits

Author SHA1 Message Date
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
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
vshcherb
e545b744d0 Merge pull request #918 from saiarcot895/support-for-left-and-right
Support for left and right
2014-10-14 14:49:55 +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
Victor Shcherb
078505633b Fix map downloader 2014-10-13 00:58:01 +02:00
Victor Shcherb
3dfcf8fecf Merge branch 'master' of ssh://github.com/osmandapp/Osmand 2014-10-13 00:47:20 +02:00
Victor Shcherb
a00b64f85e Fix issue with unnecessary POI created 2014-10-13 00:46:54 +02:00
Taranenko Roman
515f610cac Added more elements in the predefined list of POI types and fixed issue
"Please add natural=tree to POI creation list". Fixed app crash in
DownloadIndexesThread.
2014-10-09 20:40:09 +03:00
Taranenko Roman
d1df74c273 Fixed scrolling through an online map ends up "downloading forever"
issue
2014-10-08 23:02:15 +03: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
6c3bd59a7a Small changes 2014-10-02 11:22:11 +02:00
Denis
f68498ad13 merge with master 2014-10-01 12:53:09 +03:00
Victor Shcherb
b6273d00c1 Fix zoom scale for high density phones (glitch 200-300%) 2014-10-01 00:27:01 +02:00
Denis_Bars
36f46e3176 Merge branch 'qtcore' of https://github.com/osmandapp/Osmand into qtcore 2014-09-28 16:26:13 +03:00
Victor Shcherb
13153bec28 Merge branch 'master' of ssh://github.com/osmandapp/Osmand 2014-09-27 12:44:49 +03:00
Victor Shcherb
82120c920e Add more info about error heartbeat 2014-09-27 12:44:37 +03:00
Zahnstocher
ae8141c5d8 Fix c:geo intent 2014-09-27 00:24:07 +02:00
Victor Shcherb
8dc635eae1 Update map utils 2014-09-26 10:42:47 +02:00
Victor Shcherb
fe84bf3a6f Delete osmodroid code and add binary inspector ability to trace vrouting 2014-09-26 10:03:19 +02:00
Victor Shcherb
3f4afca303 Add text size setting for the map 2014-09-24 22:32:37 +02:00
Victor Shcherb
f1cdd40305 Align map/text/icon scale 2014-09-23 09:40:26 +02:00
Victor Shcherb
68869a05b5 Update routing, make point precise 2014-09-22 02:08:34 +02:00
Victor Shcherb
e8ffb5b532 Fix search cmd 2014-09-14 10:21:44 +02:00
Victor Shcherb
8a23993e08 Fix rendering parser 2014-09-13 17:18:26 +02:00
Victor Shcherb
c017af3372 Working commit 2014-09-13 17:18:13 +02:00
Victor Shcherb
b95cd933f1 Storage 2014-09-13 12:49:00 +02:00
Victor Shcherb
355b59b0fd Refactor rendering rules 2014-09-13 12:27:39 +02:00
Victor Shcherb
93dd291796 Merge branch 'master' of ssh://github.com/osmandapp/Osmand 2014-09-11 00:41:03 +02:00
Victor Shcherb
75df4e7b23 introduce style aliases 2014-09-11 00:40:53 +02:00
vshcherb
bfe1f02255 Merge pull request #873 from rilaby/geopatterns
changed the patterns to stick to one for lat, lon;
2014-09-10 14:15:10 +02:00
rilaby
d916bb0cd6 changed the patterns to ctick to one for lat, lon; added support for
integer lat, lon; added new test cases;
2014-09-10 10:18:52 +03:00
vshcherb
4f03debcfd Merge pull request #871 from rilaby/geopatterns
GeoPointParserUtils bug fixed
2014-09-08 10:34:40 +02:00
rilaby
892d07a56d GeoPointParserUtils bug fixed 2014-09-08 10:25:43 +03:00
jeepingben
d656aa54e6 Switch MapTileDownloader order to LIFO -Issue 2364
Fetch the area the user visited most recently first.  This makes the GUI feel more responsive.
2014-09-05 08:39:15 -04:00
jeepingben
7bbfcc0b7e Create LIFOBlockingDeque.java
Add support for LIFO blocking queue (deque actually)
2014-09-05 08:34:34 -04:00
Victor Shcherb
11d62188e4 Fix additional 2014-09-05 12:23:57 +02:00
vshcherb
456eefde5a Merge pull request #863 from rilaby/geopatterns
search by geo urls reworked
2014-09-04 11:46:54 +02:00
rilaby
8d7d817c0a search by geo urls reworked 2014-09-04 09:47:08 +03:00
Victor Shcherb
62076bbca5 Remove whitespace 2014-09-03 19:39:50 +02:00
Victor Shcherb
6451541daf Update transformer 2014-09-03 19:04:08 +02:00
Victor Shcherb
1853caee90 support apply/filter 2014-09-03 11:33:30 +02:00
Victor Shcherb
9f999a1e2a Create rules transformer 2014-09-03 02:35:14 +02:00
Victor Shcherb
f81cfbf8df Support gpx rendering and nav rendering 2014-09-01 01:18:23 +02:00
Victor Shcherb
3baa09d434 Merge branch 'master' of ssh://github.com/osmandapp/Osmand 2014-08-31 23:41:21 +02:00
Victor Shcherb
8d540d66ac Fix rendering rules 2014-08-31 23:40:51 +02:00
rilaby
3a9c6c37f4 GeoPointParserUtil.java added to osmAnd-java 2014-08-31 20:25:01 +03:00
Victor Shcherb
8627391c4f Fix crash 2014-08-28 01:23:49 +02:00
Victor Shcherb
7c48e7052f Map rendering types 2014-08-27 23:44:49 +02:00
Victor Shcherb
3736b332e3 Fix format 2014-08-21 22:39:36 +02:00
Victor Shcherb
20677dd757 Add rendering parser state 2014-08-21 22:19:31 +02:00
Victor Shcherb
4f51bb9237 Update waypoint helper 2014-08-17 15:42:09 +02:00
Victor Shcherb
657bf17d82 Refactor favorites 2014-08-15 00:49:16 +02:00