Merge lp:~costales/unav/0.65-parse-pois-url into lp:unav

[costales]

Add http:// in the beggining if the POI hasn't that in the URL, for launch externally in the browser.

[lp:~costales/unav/0.65-parse-pois-url]

153. By costales on 2017-01-09

http or https

=== modified file 'qml/PoiDetailsPage.qml'
--- qml/PoiDetailsPage.qml	2016-07-15 13:11:01 +0000
+++ qml/PoiDetailsPage.qml	2017-01-09 13:31:35 +0000
@@ -68,7 +68,7 @@
                 cuisine.title = poiDetailsModel.get(0).cuisine
                 phone.title = poiDetailsModel.get(0).phone
                 openingHours.title = poiDetailsModel.get(0).opening_hours
-                website.title = poiDetailsModel.get(0).website
+                website.title = QmlJs.parse_poi_url(poiDetailsModel.get(0).website)
                 internet.title = poiDetailsModel.get(0).internet_access
                 wheelchair.title = poiDetailsModel.get(0).wheelchair
                 lat = parseFloat(mainPageStack.clickedLat)
@@ -125,7 +125,7 @@
                     poiActionButtonModel.append({mode: "CALL", iconName: "call-start"})
                 }
 
-                if (website.title && website.title.substring(0, 4) === "http") {
+                if (website.title) {
                     poiActionButtonModel.append({mode: "WEB", iconName: "stock_website"})
                 }
             }

=== modified file 'qml/PoiListPage.qml'
--- qml/PoiListPage.qml	2016-07-15 14:30:09 +0000
+++ qml/PoiListPage.qml	2017-01-09 13:31:35 +0000
@@ -222,7 +222,7 @@
                         "name":         poiXmlModel.get(i).name.split(',')[0],
                         "description":  poiXmlModel.get(i).description,
                         "phone":        poiXmlModel.get(i).phone,
-                        "website":      poiXmlModel.get(i).website,
+                        "website":      QmlJs.parse_poi_url(poiXmlModel.get(i).website),
                         // "cuisine":   poiXmlModel.get(i).cuisine,
                         "wheelchair":   poiXmlModel.get(i).wheelchair,
                         "openinghours": poiXmlModel.get(i).openinghours,

=== modified file 'qml/js/utils.js'
--- qml/js/utils.js	2016-08-28 07:13:49 +0000
+++ qml/js/utils.js	2017-01-09 13:31:35 +0000
@@ -91,6 +91,17 @@
 }
 
 /**
+* Function parse_poi_url(poi_website): Return string
+* url: POI's URL
+**/
+function parse_poi_url(poi_website) {
+	if (poi_website.substring(0, 8) === "https://" || poi_website.substring(0, 7) === "http://")
+		return poi_website;
+	else
+		return "http://" + poi_website;
+}
+
+/**
 * Function is_url_dispatcher(url): Return boolean
 * url: URL calling uNav
 **/