Merge lp:~joergberroth/unav/poi_quick_access_feature into lp:unav

[JkB]

*Implementation of a POI quick access feature

[Nekhelesh Ramananthan (nik90)]

We didn't discuss about which center point is used for calculating the POIs. In my opinion, this should be similar to the speed camera feature where we show all speed camera along the route. Similarly POIs should be shown along the route with maybe <2Km deviation. That would be really handy.

At the moment, the POIs are shown at the current user position which is okay I guess. But what if I want to see the POIs before starting on a journey?

review: Needs Information

[costales (costales)]

Hi! :)

A few thoughts:
- IMO, quick POIs should be Nearby at destination, same as the Nearby side icon :) We talked about that in the current UI approach :) If not, it's inconsistent.
- Icon to set POIs should be in the same gray of others. Maybe a POI + small settings icon?
- After a click, if nothing is found nothing is happen. Because of this I was thinking is not working (try with airports).
- The popup should be hidden after a click in a fast POI.

Thanks for the work Joerg!

[costales (costales)]

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

> - IMO, quick POIs should be Nearby at destination, same as the Nearby side
> icon :) We talked about that in the current UI approach :) If not, it's
> inconsistent.

I disagree. Imagine a use case where the user is starting a road-trip from Netherlands->Belgium, where he uses uNav. We already have Nearby Destination which will allow him to find restaurants, hotels etc at the destination (Belgium. This is very handy as we agreed before.

However, I am pretty sure the idea behind quick POIs is different from NearBy Destination as in it allows the user to find amenities like restaurants, gas-stations, car-repair stations etc during the road-ctrip. Imagine a situation where you are low on fuel / car radiator heating up or something..in that case, it would better if the quick POIs provides quick access to gas stations or car-repair stations within 5 Kms of his current position. Showing them at the destination is of no use if they are 200 Kms away (in Belgium) ;)

And speaking about consistency, the quick POIs are located in the "Route" menu. So it makes sense to show POIs along the route and not at the destination.

[costales (costales)]

> However, I am pretty sure the idea behind quick POIs is different from
> NearBy Destination as in it allows the user to find amenities like
> restaurants, gas-stations, car-repair stations etc during the road-ctrip.
> Imagine a situation where you are low on fuel / car radiator heating up or
> something..in that case, it would better if the quick POIs provides quick
> access to gas stations or car-repair stations within 5 Kms of his current
> position. Showing them at the destination is of no use if they are 200 Kms
> away (in Belgium) ;)
>
So it makes sense to show POIs along the route and not at the destination.
>

But this approach then it's no intuitive/easy. Even I didn't know if this
was searching in current pos or destination.

(?) We should duplicate the "Nearby at destination" to "Nearby on route"
and then same dialog for only search on route (I'm not sure if this is
possible with the API because is other [1]). But then, these icons alone
don't take so much sense to me :O

[1] http://wiki.openstreetmap.org/wiki/Nominatim

[Nekhelesh Ramananthan (nik90)]

> > However, I am pretty sure the idea behind quick POIs is different from
> > NearBy Destination as in it allows the user to find amenities like
> > restaurants, gas-stations, car-repair stations etc during the road-ctrip.
> > Imagine a situation where you are low on fuel / car radiator heating up or
> > something..in that case, it would better if the quick POIs provides quick
> > access to gas stations or car-repair stations within 5 Kms of his current
> > position. Showing them at the destination is of no use if they are 200 Kms
> > away (in Belgium) ;)
> >
> So it makes sense to show POIs along the route and not at the destination.
> >
>
> But this approach then it's no intuitive/easy. Even I didn't know if this
> was searching in current pos or destination.
>

Then we make it intuitive. Infact it is counter intuitive to expect a POI icon in the "route" menu to only show it in the destination. The destination is a special position. That's it. we are in the route menu. So we show POIs along the route.

We brainstorm on the icon we need to design and use for this feature. Nothing is easy ;) .. we need to work hard to make this feature a possibility.

> (?) We should duplicate the "Nearby at destination" to "Nearby on route"
> and then same dialog for only search on route (I'm not sure if this is
> possible with the API because is other [1]). But then, these icons alone
> don't take so much sense to me :O
>
> [1] http://wiki.openstreetmap.org/wiki/Nominatim

When the speed camera feature was implemented, the API only returns the speed camera in the map. It was Joerg's algorithm that showed the speed camera along the route. We use that same logic for the POIs as well.

Naturally the online API (nominatim) doesn't cover everything. But it is possible with the use of clever javascript code to adjust it to show POIs along the route. I am sure Joerg can do that :).

As for the icons, we will brainstorm.

let's not take the easy way out and say, well icons are unclear..so lets just show the POIs at the destination. Because showing the POIs at the destination is useless. What good is showing a gas station at the destination which might 200 Kms away from the current user position? Explain that to me.

[costales (costales)]

Are all we agree about POIs on route as new feature?

I would vote as the same Nearby without distances. 1 main icon in Route
popup for that. But I don't see 3 icons and then set them for ever :) What
do you think?

[Nekhelesh Ramananthan (nik90)]

> Are all we agree about POIs on route as new feature?
>
> I would vote as the same Nearby without distances. 1 main icon in Route
> popup for that. But I don't see 3 icons and then set them for ever :) What
> do you think?

Personally I think the quick POIs is a really good idea because it provides fast access to critical amenities like gas-stations, restaurants etc (based on user preferences). We should try to avoid burying it within further menus.

If you look at NearBy Destination POIs, it requires the user to do the following steps,

Step 1: Press on Route header action
Step 2: Press Nearby Destination
Step 3: Search for POI type
Step 4: Click on POI Type
Step 5: Press POI list to see all POIs near the destination.

5 steps is actually a lot. But fine..that's okay.

However, when we talk about Quick POIs, we shouldn't make it this difficult. After all, quick POIs provide access to critical amenities like Gas-stations, car-repair stations, and should be available in as minimum amounts of steps as possible.

I recommend that we stick to the current proposal by Joerg, and just fine tune the design instead of changing it completely. With his design, a user searching for gas-stations have to do the following,

Step 1: Press on route header action
Step 2: Press gas-station icon

And voila! He can see all near by gas-stations. Let's keep it that simple!

[Nekhelesh Ramananthan (nik90)]

And these 3 POIs are not something you set forever. You can easily adjust it to match your usecase.

[costales (costales)]

OK We keep the current approach :)

Then, what should search those icons? current position, current destination
or POIs on route?

And how the user know what are those action for?

A hug!

--
Sent using Dekko from my Ubuntu device

[JkB (joergberroth)]

Hi,

great that you worked it out.

IMO, the current approach to quick access pois at current user position
is the way to go.

First, I thought of searching along the route, too. But, I think that
searching at the current location is a more general approach as it shows
you all possible places to go around and not just those which stick to
the route.

Best Joerg

Am 02.05.2016 um 10:06 schrieb costales:
> OK We keep the current approach :)
>
> Then, what should search those icons? current position, current destination
> or POIs on route?
>
> And how the user know what are those action for?
>
> A hug!
>

[costales (costales)]

I added a few minor improvements.

The branch needs:
- Merge me here.
- Branch trunk here.
- You can choose 5 fast POIs, I only see 3 fast POIs.

A hug :)

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

One more question, do we need really need a distance range filter to be shown? If you are going from Point A -> Point B, you wouldn't deviate 15 Kms just to get to a gas-station ;) .. May be we can default to 5 Kms distance filter.

Another benefit is that we can then use the page header sections for the transport type (car, bicyle, walk)

[JkB (joergberroth)]

Well, I was thinking of that, but also I disagree on that, because there
are different ranges for single pois you might want to take into
consideration.
E.g. Gas stations. I do not run outof gas within 5km so I would set the
range higher to get more possible places to go.
On the other hand, going by bike I would generally take shorter distances
into consideration and for walking even shorter.
So int the end it might really rely on what you are searching specifically.
Should we really take that decision for the user?

Am Dienstag, 3. Mai 2016 23:25:05 CEST schrieb Nekhelesh Ramananthan
<email address hidden>:
> One more question, do we need really need a distance range
> filter to be shown? If you are going from Point A -> Point B,
> you wouldn't deviate 15 Kms just to get to a gas-station ;) ..
> May be we can default to 5 Kms distance filter.
>
> Another benefit is that we can then use the page header
> sections for the transport type (car, bicyle, walk)

--
Versandt, mit Dekko von meinem Ubuntu-Gerät

[Nekhelesh Ramananthan (nik90)]

>
> Well, I was thinking of that, but also I disagree on that, because there
> are different ranges for single pois you might want to take into
> consideration.
> E.g. Gas stations. I do not run outof gas within 5km so I would set the
> range higher to get more possible places to go.
> On the other hand, going by bike I would generally take shorter distances
> into consideration and for walking even shorter.
> So int the end it might really rely on what you are searching specifically.
> Should we really take that decision for the user?

You're right about the different filter ranges for different POI types.

But the question to really ask is, if you would really deviate 10 KMs or more from your route to go to that Gas station? Which is why I initially requested that we show POI along the route, since that's more helpful for the user.

But I can see the reasoning for showing POIs around the current position of the user. But I think it is a bit far fetched for a user to deviate 10 Kms from his route to get to a POI. At least that is my opinion.

[JkB (joergberroth)]

Well, let's keep it up to the user, I would say.

Am Mittwoch, 4. Mai 2016 00:23:05 CEST schrieb Nekhelesh Ramananthan
<email address hidden>:
>>
>> Well, I was thinking of that, but also I disagree on that, because there
>> are different ranges for single pois you might want to take into
>> consideration.
>> E.g. Gas stations. I do not run outof gas within 5km so I would set the
>> range higher to get more possible places to go.
>> On the other hand, going by bike I would generally take shorter distances
>> into consideration and for walking even shorter.
>> So int the end it might really rely on what you are searching
>> specifically.
>> Should we really take that decision for the user?
>
> You're right about the different filter ranges for different POI types.
>
> But the question to really ask is, if you would really deviate
> 10 KMs or more from your route to go to that Gas station? Which
> is why I initially requested that we show POI along the route,
> since that's more helpful for the user.
>
> But I can see the reasoning for showing POIs around the current
> position of the user. But I think it is a bit far fetched for a
> user to deviate 10 Kms from his route to get to a POI. At least
> that is my opinion.

--
Versandt, mit Dekko von meinem Ubuntu-Gerät

[costales (costales)]

Click on a POI which doesn't return any POI near is not intuitive.
Example, search fast airports at 1km and you'll not see anything, but you'll not get anything.

review: Needs Fixing

[costales (costales)]

@Joerg: Do you think would be possible show POIs near to route? (500m?) in the blue line if there is a route? As your radars query?
I think that would be a really useful fast POIs, more than the arround.

If there isn't a route, then as now.

[JkB (joergberroth)]

Read my posts below.
I would not do it in general.
But we could add an seperate option to each choice that allows for that.

Am Donnerstag, 5. Mai 2016 19:06:11 CEST schrieb costales
<email address hidden>:
> @Joerg: Do you think would be possible show POIs near to route?
> (500m?) in the blue line if there is a route? As your radars
> query?
> I think that would be a really useful fast POIs, more than the arround.
>
> If there isn't a route, then as now.

--
Versandt, mit Dekko von meinem Ubuntu-Gerät

[JkB (joergberroth)]

That's right. Iwill add a hint.

Am Donnerstag, 5. Mai 2016 19:04:20 CEST schrieb costales
<email address hidden>:
> Review: Needs Fixing
>
> Click on a POI which doesn't return any POI near is not intuitive.
> Example, search fast airports at 1km and you'll not see
> anything, but you'll not get anything.

--
Versandt, mit Dekko von meinem Ubuntu-Gerät

[Nekhelesh Ramananthan (nik90)]

There are code conficts in your branch.

review: Needs Fixing

[lp:~joergberroth/unav/poi_quick_access_feature]

74. By JkB on 2016-05-16

*merge costales branch

75. By JkB on 2016-05-16

* made the notifications more generic.
*wip

[costales (costales)]

Click 1 time in a fast nearby POI without results > Show no results = OK.
Click again in that POI, you'll see "Searching..." but never the error.

review: Needs Fixing

[lp:~joergberroth/unav/poi_quick_access_feature]

76. By JkB on 2016-05-17

* minor fixes
* integrate speed camera errors

77. By JkB on 2016-05-17

*update unav.css

78. By JkB on 2016-05-18

*fix small issue with searching descirbed by costales

79. By JkB on 2016-05-20

*merge costales fixes as wip

80. By JkB on 2016-05-20

*separation of "info" and "warning/critical" appearance in NotificationBar.qml

81. By JkB on 2016-05-20

*additional notification improvements

[costales (costales)]

Great work Joerg!

review: Approve

[lp:~joergberroth/unav/poi_quick_access_feature]

82. By JkB on 2016-05-22

*minor design fixes
*only show current mode in PoiQuickAccessPage.qml

83. By JkB on 2016-05-22

* add search radius hint

84. By JkB on 2016-05-22

*minor design change

85. By JkB on 2016-05-22

*costales fixes
*improve search radius design

86. By JkB on 2016-05-22

*minor fixes

Unmerged revisions

=== modified file 'nav/class/UI.js'
--- nav/class/UI.js	2016-04-22 18:37:23 +0000
+++ nav/class/UI.js	2016-05-22 10:44:41 +0000
@@ -483,33 +483,7 @@
 }
 
 UI.prototype.KO_API_radars = function() {
-	$('#error_get_radars').show();
-	this.error_API_radars();
-	$('#error_get_radars').delay(8000).fadeOut('slow');
-}
-
-UI.prototype.error_API_radars = function() {
-	if (!$('#panel_msg').is(":visible") && !$('#panel_summary').is(":visible") && !$('#panel_review_btns').is(":visible")) {
-		$('#error_get_radars').hide();
-		return;
-	}
-	
-	if ($('#error_get_radars').is(":visible")) {
-		var aux_height = 0;
-		if ($('#panel_review_btns').is(':visible'))
-			aux_height = aux_height + $('#panel_review_btns').height();
-		if ($('#panel_review_summary').is(':visible'))
-			aux_height = aux_height + $('#panel_review_summary').height();
-		if ($('#panel_summary').is(':visible'))
-			aux_height = aux_height + $('#panel_summary').height();
-		if ($('#panel_txt_ind').is(':visible'))
-			aux_height = aux_height + $('#panel_txt_ind').height();
-		if ($('#panel_msg').is(':visible'))
-			aux_height = aux_height + $('#panel_msg').height();
-
-		$('#error_get_radars').css({bottom: aux_height});
-		$('.ol-scale-line').css({top: (window.innerHeight - aux_height - 22), bottom: 'auto'});
-	}
+	qml_show_notification('warning', 'speed_camera_error')
 }
 
 UI.prototype.map_height = function() {
@@ -634,8 +608,7 @@
 	this.markers(gps_data['start_lat'], gps_data['start_lng'], gps_data['end_lat'], gps_data['end_lng']);
 	
 	this.panels(route_indicator);
-	this.error_API_radars();
-	
+
 	this.scale_line();
 	
 	this.pos(gps_data['now_lat'], gps_data['now_lng'], gps_data['accu']);

=== modified file 'nav/css/unav.css'
--- nav/css/unav.css	2016-04-24 16:11:11 +0000
+++ nav/css/unav.css	2016-05-22 10:44:41 +0000
@@ -30,7 +30,7 @@
 #panel_review_btns {
 	bottom:25px;
 }
-#panel_summary, #panel_review_summary, #error_get_radars {
+#panel_summary, #panel_review_summary {
 	position:absolute;
 	bottom:0px;
 	width:100%;
@@ -148,10 +148,3 @@
 	font-family:Ubuntu, Arial, Helvetica, sans-serif;font-size:16px;border-style:solid;
 	text-align:center;
 }
-
-#error_get_radars {
-	color: #ffffff;
-	height:20px;
-	background: #ed3146;
-	z-index: 3;
-}

=== added file 'nav/img/header/poiConfig.svg'
--- nav/img/header/poiConfig.svg	1970-01-01 00:00:00 +0000
+++ nav/img/header/poiConfig.svg	2016-05-22 10:44:41 +0000
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 96 96.000001"
+   sodipodi:docname="poiConfig.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.7646076"
+     inkscape:cx="82.687528"
+     inkscape:cy="35.845324"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4780"
+     showgrid="false"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="974"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="8" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="8,-8.0000001"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="4,-8.0000001"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,88.000001"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,92.000001"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="104,4"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-5,8.0000001"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="92,-8.0000001"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="88,-8.0000001"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,84.000001"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="12,-8.0000001"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-5,12"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,-9.0000001"
+       id="guide4080" />
+    <sodipodi:guide
+       position="48,-8.0000001"
+       orientation="1,0"
+       id="guide4170" />
+    <sodipodi:guide
+       position="-8,48"
+       orientation="0,1"
+       id="guide4172" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-78.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="next01.png"
+         transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
+         id="g4778"
+         inkscape:label="Layer 1">
+        <g
+           transform="matrix(-1,0,0,1,575.99999,611)"
+           id="g4780"
+           style="display:inline">
+          <path
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#191919;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99940658;marker:none;enable-background:accumulate"
+             d="m 434.00087,406.61221 a 22.758997,22.749993 0 0 1 -22.75899,22.75001 22.758997,22.749993 0 0 1 -7.93626,-1.44409 22.759,22.749993 0 0 0 1.09249,0.38453 c -12.50395,-4.16624 -36.30903,-12.54166 -54.43048,-21.68874 8.8e-4,-8.4e-4 0.003,-8.4e-4 0.003,-0.002 l -0.003,-0.002 c 18.12145,-9.14708 41.92653,-17.5225 54.43048,-21.68873 a 22.758997,22.749993 0 0 1 6.84377,-1.05956 22.758997,22.749993 0 0 1 22.75899,22.74997 z m -3.50138,0 a 19.257622,19.250002 0 0 0 -19.25761,-19.24998 19.257622,19.250002 0 0 0 -19.25765,19.24998 19.257622,19.250002 0 0 0 19.25765,19.25002 19.257622,19.250002 0 0 0 19.25761,-19.25002 z"
+             id="path4176"
+             inkscape:connector-curvature="0" />
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+             id="rect4782"
+             width="96.037987"
+             height="96"
+             x="-438.00244"
+             y="345.36221"
+             transform="scale(-1,1)" />
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+             id="rect4782-9"
+             width="47.169224"
+             height="47.150566"
+             x="-393.25696"
+             y="354.67883"
+             transform="scale(-1,1)" />
+          <path
+             inkscape:connector-curvature="0"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+             d="m 356.95492,366.27175 c -0.0106,-0.008 -0.0174,-0.0199 -0.0279,-0.0278 -0.0124,-0.01 -0.028,-0.015 -0.0403,-0.0249 z"
+             id="path4157" />
+          <path
+             inkscape:connector-curvature="0"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+             d="m 356.9482,390.2576 -0.0681,0.0528 c 0.0123,-0.01 0.0279,-0.0151 0.0403,-0.0249 0.0105,-0.008 0.0173,-0.0199 0.0279,-0.0278 z"
+             id="path4344" />
+          <path
+             inkscape:connector-curvature="0"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#191919;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.49851656;marker:none;enable-background:accumulate"
+             d="m 389.3233,365.74223 -27.47507,27.08241 -0.0691,0.0422 c -0.18999,0.11899 -1.29082,0.77766 -3.16016,1.69697 -1.86935,0.91931 -4.42819,2.05074 -7.29726,2.96034 l -1.35408,0.42976 0.42801,-1.35451 c 0.91016,-2.87043 2.04299,-5.42982 2.96247,-7.2982 0.91948,-1.86838 1.57833,-2.96718 1.69668,-3.15604 l 0.0413,-0.0691 27.09121,-27.46516 6.61206,6.60656 0.52397,0.52473 z m -25.54712,2.68886 -1.96538,0 0,-9.82303 1.96538,0 0,9.82303 z m -2.92792,23.2712 -4.6294,-4.62662 c -0.0872,0.14609 -0.70887,1.19142 -1.53834,2.87689 -0.39818,0.8091 -0.83107,1.78008 -1.26771,2.83947 l 1.71683,1.71615 c 1.05904,-0.43598 2.02949,-0.86831 2.83868,-1.26625 1.68563,-0.82896 2.73232,-1.45159 2.87994,-1.53964 z"
+             id="rect3972-1" />
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#191919;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;enable-background:accumulate"
+             id="rect3974-0"
+             width="15.71686"
+             height="1.9653834"
+             x="-374.32489"
+             y="-357.88004"
+             transform="matrix(0,-1,-1,0,0,0)" />
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#191919;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;enable-background:accumulate"
+             id="rect3976-5"
+             width="21.610626"
+             height="1.9653106"
+             x="-380.21872"
+             y="-351.98389"
+             transform="matrix(0,-1,-1,0,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== modified file 'nav/img/mode/bike.svg'
--- nav/img/mode/bike.svg	2016-03-26 18:53:17 +0000
+++ nav/img/mode/bike.svg	2016-05-22 10:44:41 +0000
@@ -10,36 +10,41 @@
    version="1.0"
    x="0px"
    y="0px"
-   viewBox="0 0 100 61.284"
+   viewBox="0 0 96 95.999999"
    enable-background="new 0 0 100 61.284"
    xml:space="preserve"
    id="svg2"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="noun_536.svg"><metadata
+   sodipodi:docname="bike.svg"
+   width="96"
+   height="96"
+   shape-rendering="crispEdges"><metadata
      id="metadata10"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs8" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
+     pagecolor="#c8c8c8"
+     bordercolor="#818181"
      borderopacity="1"
      objecttolerance="10"
      gridtolerance="10"
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="854"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
      id="namedview6"
      showgrid="false"
-     inkscape:zoom="3.8509235"
-     inkscape:cx="17.020898"
-     inkscape:cy="30.642"
+     inkscape:zoom="2.7230142"
+     inkscape:cx="-6.8710741"
+     inkscape:cy="30.019466"
      inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" /><path
-     d="m 80.596,22.157 c -2.17,0 -4.255,0.364 -6.205,1.024 -1.512,-3.352 -3.279,-7.274 -5.348,-11.878 l 1.32,-3.63 4.537,-0.083 0,-3.795 -17.078,0 c -1.494,2.044 0.605,2.035 8.168,3.712 l -1.32,3.713 -33.743,0 C 33.2,3.281 31.916,3.859 42.147,3.877 L 42.147,0 C 28.063,0.137 30.505,-1.45 22.963,22.81 21.809,22.595 20.62,22.477 19.403,22.477 8.704,22.477 0,31.182 0,41.881 0,52.58 8.704,61.284 19.403,61.284 c 10.7,0 19.404,-8.704 19.404,-19.403 0,-8.006 -4.875,-14.895 -11.812,-17.855 0.422,-1.328 0.876,-2.746 1.363,-4.261 28.386,29.941 17.737,25.087 33.012,25.694 0.073,0 0.143,-0.001 0.216,-0.002 1.809,8.839 9.646,15.508 19.01,15.508 C 91.296,60.965 100,52.261 100,41.562 100,30.863 91.296,22.157 80.596,22.157 Z M 34.268,41.881 c 0,8.196 -6.668,14.864 -14.864,14.864 -8.196,0 -14.865,-6.668 -14.865,-14.864 0,-8.196 6.668,-14.864 14.864,-14.864 0.739,0 1.465,0.056 2.175,0.161 -4.735,14.932 -4.167,13.232 -4.196,14.491 -0.023,1.062 0.834,1.904 1.912,1.977 1.932,-0.196 1.497,0.124 6.325,-15.261 5.1,2.356 8.649,7.517 8.649,13.496 z M 53.428,40.956 29.951,15.372 62.97,15.313 53.428,40.956 Z m 7.766,0.537 -3.61,-0.011 9.367,-24.588 3.634,8.052 c -5.606,3.39 -9.366,9.536 -9.391,16.547 z M 72.471,29.124 78.075,41.541 65.733,41.506 c 0.02,-5.176 2.699,-9.735 6.738,-12.382 z m 8.125,27.302 c -6.854,0 -12.638,-4.666 -14.348,-10.988 15.471,0.015 16.851,0.808 17.067,-1.876 -0.021,-0.782 -0.312,-1.318 -7.046,-16.22 1.369,-0.418 2.822,-0.645 4.326,-0.645 8.196,0 14.864,6.668 14.864,14.865 0,8.197 -6.667,14.864 -14.863,14.864 z"
+     inkscape:current-layer="svg2"
+     showborder="true"
+     inkscape:showpageshadow="false" /><path
+     d="m 76.14832,56.00316 c -1.9964,0 -3.9146,0.33488 -5.7086,0.94208 -1.39104,-3.08384 -3.01668,-6.69208 -4.92016,-10.92776 l 1.2144,-3.3396 4.17404,-0.07636 0,-3.4914 -15.71176,0 c -1.37448,1.88048 0.5566,1.8722 7.51456,3.41504 l -1.2144,3.41596 -31.04356,0 c 2.091161,-7.30388 0.909881,-6.77212 10.322401,-6.75556 l 0,-3.56684 c -12.95728,0.12604 -10.71064,-1.334 -17.64928,20.9852 C 22.064281,56.40612 20.9704,56.29756 19.85076,56.29756 10.00768,56.29756 2,64.30616 2,74.14924 2,83.99232 10.00768,92 19.85076,92 c 9.844,0 17.851681,-8.00768 17.851681,-17.85076 0,-7.36552 -4.485,-13.7034 -10.86704,-16.4266 0.38824,-1.22176 0.80592,-2.52632 1.25396,-3.92012 26.11512,27.54572 16.31804,23.08004 30.371039,23.63848 0.06716,0 0.13156,-9.2e-4 0.19872,-0.0018 1.66428,8.13188 8.874321,14.26736 17.489201,14.26736 C 85.992321,91.70652 94,83.69884 94,73.85576 94,64.01268 85.992321,56.00316 76.148321,56.00316 Z M 33.52656,74.14924 c 0,7.54032 -6.13456,13.67488 -13.67488,13.67488 -7.54032,0 -13.6758,-6.13456 -13.6758,-13.67488 0,-7.54032 6.13456,-13.67488 13.67488,-13.67488 0.67988,0 1.3478,0.05152 2.001,0.14812 -4.3562,13.73744 -3.83364,12.17344 -3.86032,13.33172 -0.02116,0.97704 0.76728,1.75168 1.75904,1.81884 1.77744,-0.18032 1.37724,0.11408 5.819,-14.04012 4.692,2.16752 7.95708,6.91564 7.95708,12.41632 z m 17.6272,-0.851 L 29.55492,49.76096 59.9324,49.70668 51.15376,73.29824 Z m 7.14472,0.49404 -3.3212,-0.01012 8.61764,-22.62096 3.34328,7.40784 c -5.15752,3.1188 -8.61672,8.77312 -8.63972,15.22324 z M 68.67332,62.4128 73.829,73.83644 62.47436,73.80424 c 0.0184,-4.76192 2.48308,-8.9562 6.19896,-11.39144 z m 7.475,25.11784 c -6.30568,0 -11.62696,-4.29272 -13.20016,-10.10896 14.23332,0.0138 15.50292,0.74336 15.70164,-1.72592 -0.01932,-0.71944 -0.28704,-1.21256 -6.48232,-14.9224 1.25948,-0.38456 2.59624,-0.5934 3.97992,-0.5934 7.54032,0 13.67488,6.13456 13.67488,13.6758 0,7.54124 -6.13364,13.67488 -13.67396,13.67488 z"
      id="path4"
      style="fill:#ffffff"
      inkscape:connector-curvature="0" /></svg>
\ No newline at end of file

=== modified file 'nav/img/mode/car.svg'
--- nav/img/mode/car.svg	2016-03-26 18:53:17 +0000
+++ nav/img/mode/car.svg	2016-05-22 10:44:41 +0000
@@ -11,17 +11,19 @@
    version="1.1"
    x="0px"
    y="0px"
-   viewBox="0 0 100 125"
+   viewBox="0 0 96 96"
    enable-background="new 0 0 100 100"
    xml:space="preserve"
    id="svg2"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="noun_152445_cc.svg"><metadata
+   sodipodi:docname="car.svg"
+   width="96"
+   height="96"><metadata
      id="metadata18"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs16" /><sodipodi:namedview
-     pagecolor="#ffffff"
+     pagecolor="#acacac"
      bordercolor="#666666"
      borderopacity="1"
      objecttolerance="10"
@@ -29,19 +31,19 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="854"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
      id="namedview14"
      showgrid="false"
      inkscape:zoom="1.888"
      inkscape:cx="-17.266949"
      inkscape:cy="62.5"
      inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" /><switch
      id="switch4"
-     transform="matrix(1.0943644,0,0,1.0943644,-4.9408658,7.8912164)"><foreignObject
+     transform="matrix(1.0244202,0,0,1.0244202,-3.4294271,11.070804)"><foreignObject
        requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
        x="0"
        y="0"

=== modified file 'nav/img/mode/walk.svg'
--- nav/img/mode/walk.svg	2016-03-26 18:53:17 +0000
+++ nav/img/mode/walk.svg	2016-05-22 10:44:41 +0000
@@ -10,17 +10,19 @@
    version="1.0"
    x="0px"
    y="0px"
-   viewBox="0 0 55.74 100"
+   viewBox="0 0 95.999997 96"
    enable-background="new 0 0 55.74 100"
    xml:space="preserve"
    id="svg2"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="walk.svg"><metadata
+   sodipodi:docname="walk.svg"
+   width="96"
+   height="96"><metadata
      id="metadata12"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs10" /><sodipodi:namedview
-     pagecolor="#ffffff"
+     pagecolor="#858585"
      bordercolor="#666666"
      borderopacity="1"
      objecttolerance="10"
@@ -28,22 +30,22 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1615"
-     inkscape:window-height="1026"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
      id="namedview8"
      showgrid="false"
      inkscape:zoom="2.36"
      inkscape:cx="-89.079151"
      inkscape:cy="50"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" /><path
-     d="m 24.471,13.769 c -3.862,0 -6.884,-3.025 -6.884,-6.885 0,-3.862 3.022,-6.884 6.884,-6.884 3.86,0 6.885,3.022 6.885,6.884 0,3.86 -3.025,6.885 -6.885,6.885 z"
+     d="m 44.51332,14.66748 c -3.55304,0 -6.33328,-2.783 -6.33328,-6.3342 C 38.18004,4.78024 40.96028,2 44.51332,2 c 3.5512,0 6.3342,2.78024 6.3342,6.33328 0,3.5512 -2.783,6.3342 -6.3342,6.3342 z"
      id="path4"
      style="fill:#ffffff"
      inkscape:connector-curvature="0" /><path
-     d="M 54.491,51.724 49.979,51.303 49.877,35.25 41.653,30.046 c 0,0 1.333,10.545 1.333,16.085 0,4.831 0.172,8.736 0.172,8.736 L 53.686,96.918 46.251,100 34.46,61.549 26.265,71.973 16.926,98.31 8.532,94.955 17.957,66.99 28.294,50.665 25.393,29.266 18.933,42.81 2.311,48.518 0,44.319 15.234,35.432 c 0,0 3.691,-9.819 6.711,-15.962 1.027,-2.091 5.196,-2.774 6.894,-2.901 4.896,-0.362 7.428,1.296 11.488,3.432 4.055,2.13 15.413,10.727 15.413,10.727 l -1.249,20.996 z"
+     d="M 72.13172,49.58608 67.98068,49.19876 67.88684,34.43 60.32076,29.64232 c 0,0 1.22636,9.7014 1.22636,14.7982 0,4.44452 0.15824,8.03712 0.15824,8.03712 L 71.39112,91.16456 64.55092,94 53.7032,58.62508 46.1638,68.21516 37.57192,92.4452 29.84944,89.3586 38.52044,63.6308 48.03048,48.6118 45.36156,28.92472 39.41836,41.3852 24.12612,46.63656 22,42.77348 36.01528,34.59744 c 0,0 3.39572,-9.03348 6.17412,-14.68504 0.94484,-1.92372 4.78032,-2.55208 6.34248,-2.66892 4.50432,-0.33304 6.83376,1.19232 10.56896,3.15744 3.7306,1.9596 14.17996,9.86884 14.17996,9.86884 l -1.14908,19.31632 z"
      id="path6"
      style="fill:#ffffff"
      inkscape:connector-curvature="0" /></svg>
\ No newline at end of file

=== modified file 'nav/index.html'
--- nav/index.html	2016-04-24 16:15:59 +0000
+++ nav/index.html	2016-05-22 10:44:41 +0000
@@ -103,11 +103,6 @@
 		<span id="txt_mapspeed"></span>
 	</div>
 	
-	<!-- Error getting radar -->
-	<div id="error_get_radars" style="display:none;">
-		<span data-localize="Error getting speed cameras">Error getting speed cameras</span>
-	</div>
-	
 	<!-- Warning for long routes -->
 	<div id="popup_longroute" style="display:none;" data-role="dialog">
 	  <section>
@@ -524,11 +519,13 @@
 		
 		function qml_save_pos() {
 			if (ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326')[1].toFixed(6) == 50.009167 && ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326')[0].toFixed(6) == 4.666389)
-				return;
-			
+				return;			
 			window.location = 'http://save_pos?' + ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326')[1] + '/' + ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326')[0] + '/' + this.map.getView().getZoom();
 		}
 
+		function qml_show_notification(mode, message) {
+			window.location = 'http://show_notification?' + mode.toString() + '/' + message.toString();
+		}
 
 		// QML events returning
 		function calc2coord(lat, lng) {

=== modified file 'qml/Main.qml'
--- qml/Main.qml	2016-04-25 19:52:54 +0000
+++ qml/Main.qml	2016-05-22 10:44:41 +0000
@@ -150,9 +150,6 @@
             property bool favPopup: false
             property bool onLoadingExecuted: false
 
-            onCurrentLatChanged: console.log("CURRENT Lat changed: " + mainPageStack.currentLat)
-
-
             property string usContext: "messaging://"
             // Workaround: as long as map keeps a webcontainer this function handles js events to the webview.
             function executeJavaScript(code) {
@@ -320,7 +317,7 @@
                                 goThereActionPopover.phone = params[5];
                             
                             if (params[6] !== "none")
-                                goThereActionPopover.poiName = params[6].replace(/¿¿¿/g, "\/");
+                                goThereActionPopover.poiName = decodeURIComponent(params[6]);
 
                             mainPageStack.favPopup = false;
                             goThereActionPopover.show();
@@ -366,8 +363,23 @@
                             navApp.settings.prevLng = params[1];
                             navApp.settings.prevZoom = params[2];
                             break;
+                        
+                        case "http://show_notification/":
+                            if (params[1] === "speed_camera_error") {
+                                notifiactionBar.text =  i18n.tr("Error getting speed cameras!");
+                            }
+                        switch (params[0]) {
+                            case "info":
+                                notifiactionBar.info();
+                                break;
+                            case "warning":
+                                notifiactionBar.warning();
+                                break;
+                            case "critical":
+                                notifiactionBar.critical();
+                            }
+                            notificationBarTimer.start();
                         }
-
                         request.action = Oxide.NavigationRequest.ActionReject;
                     }
 
@@ -507,6 +519,19 @@
                     }
                 }
 
+                Timer {
+                    id: notificationBarTimer
+                    interval: 8000
+                    repeat: false
+                    onTriggered: {
+                        notifiactionBar.visible = false
+                    }
+                }
+
+                NotificationBar {
+                    id: notifiactionBar
+                }
+
                 XmlListModel {
                     id: reverseXmlModel
 
@@ -617,47 +642,56 @@
 
                     Component {
                         id: routeMenu
-                        Item {
-                            width: parent.width
+                        Column {
                             height: routePageGrid.height
-
+                            spacing: 0
                             Component.onCompleted: {
                                 mainPageStack.executeJavaScript("qml_set_route_status();")
                             }
 
-                            CustomGridView {
-                                id: routePageGrid
-
-                                ListModel {
-                                    id: routePageModel
-                                    Component.onCompleted: initialize()
-
-                                    function initialize() {
-                                        routePageModel.append({mode: "DESTINATION", text: i18n.tr("NearBy Destination"), iconName: "location"})
-                                        routePageModel.append({mode: "CANCEL", text: i18n.tr("Cancel Route"), iconName: "dialog-error-symbolic"})
-                                    }
-                                }
-
-                                itemWidth: units.gu(9)
-                                model: routePageModel
+                            Row {
+                                id: gridRow
+                                spacing: units.gu(2)
                                 anchors.horizontalCenter: parent.horizontalCenter
 
-                                delegate: GridDelegate {
-                                    id: delegate
-
-                                    width: units.gu(9)
-                                    title: model.text
-                                    icon.name: model.iconName
-
-                                    onClicked: {
-                                        if (model.mode === "DESTINATION") {
-                                            mainPageStack.addPageToNextColumn(mainPageStack.primaryPage, Qt.resolvedUrl("PoiPage.qml"), {"lat": mainPageStack.endLat, "lng": mainPageStack.endLng})
-                                        } else if (model.mode === "CANCEL") {
-                                            mainPageStack.routeState = 'no';
-                                            mainPageStack.executeJavaScript("click_cancel_route();");
-                                        }
-                                        goThereActionPopover.showMenu = false
-                                        goThereActionPopover.hide()
+                                Loader {
+                                    id: poiQuickAccessLoader
+                                    sourceComponent: POIQuickAccessGridView {}
+                                }
+
+                                CustomGridView {
+                                    id: routePageGrid
+
+                                    ListModel {
+                                        id: routePageModel
+                                        Component.onCompleted: initialize()
+
+                                        function initialize() {
+                                            routePageModel.append({mode: "DESTINATION", text: i18n.tr("NearBy Destination"), iconName: "location"})
+                                            routePageModel.append({mode: "CANCEL", text: i18n.tr("Cancel Route"), iconName: "dialog-error-symbolic"})
+                                        }
+                                    }
+
+                                    itemWidth: units.gu(8)
+                                    model: routePageModel
+
+                                    delegate: GridDelegate {
+                                        id: delegate
+
+                                        width: units.gu(8)
+                                        title: model.text
+                                        icon.name: model.iconName
+
+                                        onClicked: {
+                                            if (model.mode === "DESTINATION") {
+                                                mainPageStack.addPageToNextColumn(mainPageStack.primaryPage, Qt.resolvedUrl("PoiPage.qml"), {"lat": mainPageStack.endLat, "lng": mainPageStack.endLng})
+                                            } else if (model.mode === "CANCEL") {
+                                                mainPageStack.routeState = 'no';
+                                                mainPageStack.executeJavaScript("click_cancel_route();");
+                                            }
+                                            goThereActionPopover.showMenu = false
+                                            goThereActionPopover.hide()
+                                        }
                                     }
                                 }
                             }
@@ -706,9 +740,9 @@
                                         mainPageStack.favPopup = !mainPageStack.favPopup;
                                         mainPageStack.showSideBar()
                                         var incubator = mainPageStack.addPageToNextColumn(mainPageStack.primaryPage, Qt.resolvedUrl("SearchPage.qml"), {favLat: mainPageStack.clickedLat, favLng: mainPageStack.clickedLng, favName: ""});
-                                        if (incubator && incubator.status == Component.Loading) {
+                                        if (incubator && incubator.status === Component.Loading) {
                                             incubator.onStatusChanged = function(status) {
-                                                if (status == Component.Ready) {
+                                                if (status === Component.Ready) {
                                                     incubator.object.addFavorite()
                                                 }
                                             }

=== modified file 'qml/PoiDetailsPage.qml'
--- qml/PoiDetailsPage.qml	2016-04-28 16:07:19 +0000
+++ qml/PoiDetailsPage.qml	2016-05-22 10:44:41 +0000
@@ -52,7 +52,7 @@
     XmlListModel {
         id: poiDetailsModel
 
-        readonly property string baseUrl: "http://nominatim.openstreetmap.org/reverse?format=xml&addressdetails=1&email=[e-mail]&extratags=1"
+        readonly property string baseUrl: "https://nominatim.openstreetmap.org/reverse?format=xml&addressdetails=1&email=[e-mail]&extratags=1"
         readonly property string url: baseUrl + "&osm_type=" + osm_type + "&osm_id=" + osm_id
 
         property string lat

=== modified file 'qml/PoiListPage.qml'
--- qml/PoiListPage.qml	2016-04-30 09:20:05 +0000
+++ qml/PoiListPage.qml	2016-05-22 10:44:41 +0000
@@ -160,7 +160,7 @@
             if (status === XmlListModel.Loading) { statusLabel.text =  i18n.tr("Searching…") }
         }
 
-        readonly property string baseUrl: "http://nominatim.openstreetmap.org/search?format=xml&bounded=1&limit=50&email=[e-mail]&extratags=1"
+        readonly property string baseUrl: "https://nominatim.openstreetmap.org/search?format=xml&bounded=1&limit=50&email=[e-mail]&extratags=1"
         readonly property double geoDist: navApp.settings.unit === 0 ? 0.01 : 0.01 / 0.621371192
         // geographic distance ~1.1km / ~1.1mi
         // rough estimation only. Could be redefined.

=== added file 'qml/PoiQuickAccessPage.qml'
--- qml/PoiQuickAccessPage.qml	1970-01-01 00:00:00 +0000
+++ qml/PoiQuickAccessPage.qml	2016-05-22 10:44:41 +0000
@@ -0,0 +1,185 @@
+/*
+ * GPS Navigation http://launchpad.net/unav
+ * Copyright (C) 2015-2016 Marcos Alvarez Costales https://launchpad.net/~costales
+ * Copyright (C) 2015-2016 JkB https://launchpad.net/~joergberroth
+ * Copyright (C) 2016 Nekhelesh Ramananthan http://launchpad.net/~nik90
+ *
+ * GPS Navigation is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GPS Navigation is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import QtQuick.XmlListModel 2.0
+import QtQuick.LocalStorage 2.0
+import "components"
+import "js/PoiCategories.js" as Categories
+import "js/db.js" as UnavDB
+
+Page {
+    id: poiQuickAccessPage
+
+    property string unit: navApp.settings.unit === 0 ? "km" : "mi"
+    property var factorList: ["1", "5", "15", "30", "50"]
+
+    readonly property int maxQuickAccessItems: 5
+
+    property string mode: "Car"
+
+    Component.onCompleted: {
+        switch (navApp.settings.routingMode) {
+        case 0:
+            poiQuickAccessPage.mode = "Car";
+            break;
+        case 1:
+            poiQuickAccessPage.mode = "Walk";
+            break;
+        case 2:
+            poiQuickAccessPage.mode = "Bike";
+            break;
+        }
+        categoryListModel.initialize()
+    }
+
+    Component.onDestruction: {
+        // Hide 2nd column when returning to the map to avoid an empty white column
+        if (mainPageStack.columns === 1)
+            mainPageStack.hideSideBar()
+    }
+
+    header: UNavHeader {
+        id: poiQuickAccessHeader
+
+        flickable: categoryList
+
+        title: i18n.tr("Quick Access: ") + i18n.tr(mode)
+
+        trailingActionBar {
+            actions: [
+                CloseHeaderAction {}
+            ]
+        }
+
+        extension: UNavPageSection {
+            id: distanceSections
+            anchors {
+                left: parent.left
+                bottom: parent.bottom
+            }
+
+            model: [factorList[0]+unit, factorList[1]+unit, factorList[2]+unit, factorList[3]+unit, factorList[4]+unit]
+            selectedIndex: 1
+        }
+    }
+
+    ListModel {
+        id: categoryListModel
+        property var indices: []
+        function initialize() {
+            categoryListModel.clear();
+            categoryListModel.indices = [];
+            var res = UnavDB.getQuickAccessItems(poiQuickAccessPage.mode);
+            var len = res.rows.length;
+            for ( var i = 0; i < len; ++i) {
+                categoryListModel.indices.push( res.rows.item(i).type )
+            }
+            Categories.data.forEach( function(category) {
+                categoryListModel.append(category);
+            });
+            categoryList.update()
+        }
+    }
+
+    SortFilterModel {
+        id: sortedCategoryListModel
+        model: categoryListModel
+        filter.property: "label"
+        filter.pattern: RegExp("", "gi")
+    }
+
+    ListView {
+        id: categoryList
+
+        model: sortedCategoryListModel
+        anchors.fill: parent
+        clip: true
+
+        section.property: "theme"
+        section.criteria: ViewSection.FullString
+        section.labelPositioning: ViewSection.CurrentLabelAtStart + ViewSection.InlineLabels
+        section.delegate: Rectangle {
+            width: parent.width
+            height: sectionHeader.height
+
+            ListItemHeader {
+                id: sectionHeader
+                title: section
+            }
+        }
+
+        delegate: ListItem {
+            id: poiItem
+            divider.visible: true
+            height: poiItemLayout.height
+
+            ListItemLayout {
+                id: poiItemLayout
+                title.text: label
+
+                Icon {
+                    source: Qt.resolvedUrl("../nav/img/poi/" + model.en_label + ".svg")
+                    height: units.gu(2.5)
+                    width: height
+                    SlotsLayout.position: SlotsLayout.Leading
+                }
+
+                CheckBox {
+                    id: quickAccessCheckBox
+                    checked: categoryListModel.indices.indexOf(model.en_label) > -1
+                    SlotsLayout.position: SlotsLayout.Trailing
+                    onClicked: {
+                        var count = UnavDB.countQuickAccessItems(poiQuickAccessPage.mode).rows.item(0).count;
+                        if (!quickAccessCheckBox.checked) {
+                            UnavDB.removeQuickAccessItem( poiQuickAccessPage.mode, model.en_label )
+                        } else if (quickAccessCheckBox.checked && count >= poiQuickAccessPage.maxQuickAccessItems ){
+                            quickAccessCheckBox.checked = false;
+                            PopupUtils.open(maxSelectedDialogComponent);
+                        } else if (quickAccessCheckBox.checked && count < poiQuickAccessPage.maxQuickAccessItems ){
+                            UnavDB.saveToQuickAccessItem(poiQuickAccessPage.mode, model.en_label, model.clause, factorList[header.extension.selectedIndex])
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Scrollbar {
+        flickableItem: categoryList
+        align: Qt.AlignTrailing
+    }
+
+    Component {
+        id: maxSelectedDialogComponent
+        Dialog {
+            id: maxSelectedDialog
+            title: i18n.tr("Selection")
+            //TRANSLATORS: argument is a number > 1.
+            text: i18n.tr("Max. %1 POIs can be selected.").arg(poiQuickAccessPage.maxQuickAccessItems)
+
+            Button {
+                text: i18n.tr("OK")
+                color: UbuntuColors.orange
+                onClicked: PopupUtils.close(maxSelectedDialog);
+            }
+        }
+    }
+}
+

=== added file 'qml/components/NotificationBar.qml'
--- qml/components/NotificationBar.qml	1970-01-01 00:00:00 +0000
+++ qml/components/NotificationBar.qml	2016-05-22 10:44:41 +0000
@@ -0,0 +1,88 @@
+/*
+ * GPS Navigation http://launchpad.net/unav
+ * Copyright (C) 2015-2016 JkB https://launchpad.net/~joergberroth
+ * Copyright (C) 2015-2016 Marcos Alvarez Costales https://launchpad.net/~costales
+ *
+ * GPS Navigation is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GPS Navigation is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Rectangle {
+    id: notificationRectangle
+
+    property alias text: notificationLabel.text
+
+    signal info()
+    signal warning()
+    signal critical()
+
+    onInfo: {
+        notificationLabel.color = UbuntuColors.slate
+        notificationRectangle.color = "#FFFFFF"
+        notificationRectangle.visible = true;
+        notificationIcon.name = ""
+        notificationLabel.fontSize = "medium"
+        notificationRectangle.height = notificationLabel.height + units.gu(1)
+    }
+    onWarning: {
+        notificationLabel.color = "#FFFFFF"
+        notificationRectangle.color = UbuntuColors.orange;
+        notificationRectangle.visible = true;
+        notificationLabel.fontSize = "large"
+        notificationIcon.name = "dialog-warning-symbolic"
+        notificationRectangle.height = notificationLabel.height + units.gu(4)
+    }
+    onCritical: {
+        notificationLabel.color = "#FFFFFF"
+        notificationRectangle.color = UbuntuColors.red
+        notificationRectangle.visible = true;
+        notificationLabel.fontSize = "large"
+        notificationIcon.name = "dialog-error-symbolic"
+        notificationRectangle.height = notificationLabel.height + units.gu(4)
+    }
+
+    width: parent.width
+    visible: false
+
+    anchors {
+        top: goThereActionPopover.isShown ? goThereActionPopover.bottom : navigationPage.header.bottom
+    }
+
+    Icon {
+        id: notificationIcon
+        width: units.gu(3.5)
+        height: width
+        anchors {
+            verticalCenter: parent.verticalCenter
+            left: parent.left
+            leftMargin: units.gu(2)
+        }
+        visible: name !== ""
+        color: "#FFFFFF"
+
+    }
+
+    Label {
+        id: notificationLabel
+        anchors {
+            left: notificationIcon.visible ? notificationIcon.right : parent.left
+            margins: units.gu(1)
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+        }
+        horizontalAlignment: Text.AlignHCenter
+        maximumLineCount: 3
+        wrapMode: Text.WordWrap
+        elide: Text.ElideRight
+    }
+}

=== added file 'qml/components/POIQuickAccessGridView.qml'
--- qml/components/POIQuickAccessGridView.qml	1970-01-01 00:00:00 +0000
+++ qml/components/POIQuickAccessGridView.qml	2016-05-22 10:44:41 +0000
@@ -0,0 +1,184 @@
+/*
+ * GPS Navigation http://launchpad.net/unav
+ * Copyright (C) 2015-2016 JkB https://launchpad.net/~joergberroth
+ * Copyright (C) 2015-2016 Marcos Alvarez Costales https://launchpad.net/~costales
+ *
+ * GPS Navigation is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GPS Navigation is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import QtQuick.LocalStorage 2.0
+import "../js/db.js" as UnavDB
+import QtQuick.XmlListModel 2.0
+
+Grid {
+    id: gridView
+
+    readonly property int maxQuickAccessItems: 5
+
+    property int itemWidth: units.gu(3.5)
+
+    rowSpacing: units.gu(1)
+    columnSpacing: units.gu(2)
+    width: (columns * itemWidth) + columnSpacing * (columns - 1)
+
+    columns: 2
+    rows: 2
+    layoutDirection: Qt.RightToLeft
+
+    ListModel {
+        id: quickAccessModel
+        function initialize() {
+            quickAccessModel.clear();
+            var mode;
+            if (navApp.settings.routingMode === 0) {mode = "Car"}
+            if (navApp.settings.routingMode === 1) {mode = "Walk"}
+            if (navApp.settings.routingMode === 2) {mode = "Bike"}
+            var res = UnavDB.getQuickAccessItems( mode )
+            var len = res.rows.length;
+            for ( var i = 0; i < (len <= maxQuickAccessItems ? len : maxQuickAccessItems) ; ++i) {
+                quickAccessModel.append(
+                            {
+                                label: i18n.tr(res.rows.item(i).type),
+                                en_label: res.rows.item(i).type,
+                                clause: res.rows.item(i).clause,
+                                distance: res.rows.item(i).distance
+                            }
+                            );
+            }
+            quickAccessModel.insert(0,{label:"add"});
+            var gridcolumns = Math.ceil(quickAccessModel.count/2);
+            gridView.columns = gridcolumns > 2 ? gridcolumns : 2
+        }
+        Component.onCompleted: initialize()
+    }
+
+    XmlListModel {
+        id: poiXmlModel
+        property string distance
+        property string clause
+        function allPOI() {
+            var allPOI = [];
+            for (var i = 0; i < poiXmlModel.count; i++) {
+                allPOI.push({
+                                title: poiXmlModel.get(i).name.split(',')[0],
+                                lat: parseFloat(poiXmlModel.get(i).lat),
+                                lng: parseFloat(poiXmlModel.get(i).lng),
+                                osm_id: poiXmlModel.get(i).osm_id,
+                                osm_type: poiXmlModel.get(i).osm_type.charAt(0).toUpperCase(),
+                                phone: poiXmlModel.get(i).phone,
+                                distance: poiXmlModel.distance
+                            });
+            }
+            return allPOI;
+        }
+
+        onStatusChanged: {
+
+            if (status === XmlListModel.Error) {
+                console.log(errorString());
+                source = "";
+                notificationBarTimer.start();
+                notifiactionBar.text = i18n.tr("Error getting results. Please, check your data connection.");
+                notifiactionBar.critical();
+            }
+            if (status === XmlListModel.Ready && count === 0) {
+                notificationBarTimer.start();
+                notifiactionBar.text = i18n.tr("Sorry, no results found nearby.");
+                notifiactionBar.info();
+            }
+            if (status === XmlListModel.Ready && count >> 0) {
+                notifiactionBar.visible = false;
+                mainPageStack.executeJavaScript("ui.markers_POI_set(" + JSON.stringify(poiXmlModel.allPOI()) + ")");
+                mainPageStack.center_onpos = 1;
+                goThereActionPopover.hide();
+            }
+        }
+
+        readonly property string baseUrl: "https://nominatim.openstreetmap.org/search?format=xml&bounded=1&limit=50&email=[e-mail]&extratags=1"
+        readonly property double geoDist: navApp.settings.unit === 0 ? 0.01 : 0.01 / 0.621371192
+        // geographic distance ~1.1km / ~1.1mi
+        // rough estimation only. Could be redefined.
+
+        function search() {
+            // Boxed area in which to search for PoI
+            var bbox = ( Number(mainPageStack.currentLng) - geoDist*distance).toString() + ","
+                    + ( Number(mainPageStack.currentLat) - geoDist*distance).toString() + ","
+                    + ( Number(mainPageStack.currentLng) + geoDist*distance).toString() + ","
+                    + ( Number(mainPageStack.currentLat) + geoDist*distance).toString();
+            source = (baseUrl + "&q=" + clause + "&viewbox=" + bbox);
+        }
+        function clear() {
+            source = "";
+        }
+
+        source: ""
+        query: "/searchresults/place"
+
+        XmlRole { name: "osm_type"; query: "@osm_type/string()"; }
+        XmlRole { name: "osm_id"; query: "@osm_id/string()"; }
+        XmlRole { name: "name"; query: "@display_name/string()"; }
+        XmlRole { name: "phone"; query: "extratags/tag[@key='phone']/@value/string()"; }
+        XmlRole { name: "lat"; query: "@lat/string()"; }
+        XmlRole { name: "lng"; query: "@lon/string()"; }
+    }
+
+    Repeater {
+
+        model: quickAccessModel
+
+        delegate: AbstractButton {
+            id: button
+            width: units.gu(4)
+            height: width
+            opacity: button.pressed ? 0.5 : (enabled ? 1 : 0.2)
+
+            Behavior on opacity {
+                UbuntuNumberAnimation { }
+            }
+
+            UbuntuShape {
+                id: shape
+
+                aspect: UbuntuShape.Flat
+                anchors.fill: parent
+                radius: "medium"
+            }
+
+            Icon {
+                source: model.label !== "add" ? Qt.resolvedUrl("../../nav/img/poi/" + model.en_label + ".svg"): "../../nav/img/header/poiConfig.svg"
+                opacity: 0.6 //model.label === "add" ? 1 :0.6
+                width: units.gu(3.25)
+                enabled: navigationPage.buttonsEnabled
+
+                anchors.centerIn: parent
+                color: UbuntuColors.slate
+            }
+            onClicked: {
+                if (model.label === "add") {
+                    goThereActionPopover.hide()
+                    mainPageStack.showSideBar()
+                    mainPageStack.addPageToNextColumn(mainPageStack.primaryPage, Qt.resolvedUrl("../PoiQuickAccessPage.qml"))
+                } else {
+                    poiXmlModel.clear()
+                    notifiactionBar.text = i18n.tr("Searching…")
+                    notifiactionBar.info()
+                    poiXmlModel.distance = model.distance;
+                    poiXmlModel.clause = model.clause;
+                    poiXmlModel.search();
+                    mainPageStack.executeJavaScript("ui.markers_POI_clear()")
+                }
+            }
+        }
+    }
+}
+

=== modified file 'qml/js/db.js'
--- qml/js/db.js	2016-04-17 14:08:53 +0000
+++ qml/js/db.js	2016-05-22 10:44:41 +0000
@@ -20,12 +20,15 @@
 
 function openDB() {
 	if (db === null) {
-		db = LocalStorage.openDatabaseSync("unav_db", "0.1", "Favorites and history", 1000);
-		db.transaction(function(tx){
-			tx.executeSql('CREATE TABLE IF NOT EXISTS favorites(key TEXT UNIQUE, lat TEXT, lng TEXT)');
-			tx.executeSql('CREATE TABLE IF NOT EXISTS nearByHistory(id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, type TEXT UNIQUE, clause TEXT)');
-			tx.executeSql('CREATE TABLE IF NOT EXISTS favHistory(id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, key TEXT UNIQUE, lat TEXT, lng TEXT)');
-			tx.executeSql('CREATE TABLE IF NOT EXISTS searchHistory(id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, key TEXT UNIQUE, lat TEXT, lng TEXT)');
+	db = LocalStorage.openDatabaseSync("unav_db", "0.1", "Favorites and history", 1000);
+	db.transaction(function(tx){
+			tx.executeSql('CREATE TABLE IF NOT EXISTS favorites( key TEXT UNIQUE, lat TEXT, lng TEXT)');
+			tx.executeSql('CREATE TABLE IF NOT EXISTS nearByHistory( id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, type TEXT UNIQUE, clause TEXT )');
+			tx.executeSql('CREATE TABLE IF NOT EXISTS favHistory( id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, key TEXT UNIQUE, lat TEXT, lng TEXT )');
+			tx.executeSql('CREATE TABLE IF NOT EXISTS searchHistory( id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, key TEXT UNIQUE, lat TEXT, lng TEXT )');
+			tx.executeSql('CREATE TABLE IF NOT EXISTS  Car_poiQuickAccess( type TEXT UNIQUE, clause TEXT, distance TEXT )');
+			tx.executeSql('CREATE TABLE IF NOT EXISTS Bike_poiQuickAccess( type TEXT UNIQUE, clause TEXT, distance TEXT )');
+			tx.executeSql('CREATE TABLE IF NOT EXISTS Walk_poiQuickAccess( type TEXT UNIQUE, clause TEXT, distance TEXT )');
 		});
 	}
 }
@@ -77,7 +80,7 @@
 	openDB();
 	db.transaction( function(tx){
 		tx.executeSql('INSERT OR REPLACE INTO favHistory(key, lat, lng) VALUES(?,?,?)', [key, parseFloat(lat).toFixed(7).toString(), parseFloat(lng).toFixed(7).toString()]);
-        tx.executeSql('DELETE FROM favHistory WHERE id IN (SELECT id FROM favHistory ORDER BY id DESC LIMIT -1 OFFSET 3)'); // Keep last 3
+		tx.executeSql('DELETE FROM favHistory WHERE id IN (SELECT id FROM favHistory ORDER BY id DESC LIMIT -1 OFFSET 3)'); // Keep last 3
 	});
 }
 
@@ -91,6 +94,7 @@
 }
 
 function removeHistoryFavorite(key) {
+
 	openDB();
 	db.transaction( function(tx){
 		tx.executeSql('DELETE FROM favHistory WHERE key=?;', [key]);
@@ -148,6 +152,39 @@
 	});
 }
 
+// QuickAccess Storage
+function saveToQuickAccessItem(mode, type, clause, distance) {
+	openDB();
+	db.transaction( function(tx){
+		tx.executeSql('INSERT OR REPLACE INTO ' + mode +'_poiQuickAccess(type, clause, distance) VALUES(?,?,?)', [type, clause, distance]);
+	});
+}
+
+function getQuickAccessItems(mode) {
+	var res;
+	openDB();
+	db.transaction( function(tx) {
+		res = tx.executeSql('SELECT * FROM ' + mode +'_poiQuickAccess', []);
+	});
+	return res;
+}
+
+function countQuickAccessItems(mode) {
+	var res;
+	openDB();
+	db.transaction( function(tx) {
+		res = tx.executeSql('SELECT COUNT(*) AS count FROM ' + mode +'_poiQuickAccess', []);
+	});
+	return res;
+}
+
+function removeQuickAccessItem(mode, key) {
+	openDB();
+	db.transaction( function(tx){
+		tx.executeSql('DELETE FROM ' + mode +'_poiQuickAccess WHERE type=?;', [key]);
+	});
+}
+
 // delete historytables
 function dropHistoryTables() {
 	openDB();