Merge lp:~costales/unav/0.59-catch-more-URLs into lp:unav

[costales]

Please, try these URLs (with uNav closed and opened):
http://www.openstreetmap.org/#map=19/43.30257/-5.68930
http://www.openstreetmap.org/?mlat=43.54217&mlon=-5.67633&zoom=12
http://www.opencyclemap.org/?zoom=18&lat=43.5414&lon=-5.67165&layers=B0000
https://maps.google.com/?q=43.53291443249287,-5.664369592670359

[JkB (joergberroth)]

what about putting in the here maps (m.here.com) prefix also?

review: Needs Information

[costales (costales)]

@Joerg: I implemented only the free (as in freedom) and the most used (Google).
I don't like a conflict with calls to HERE app too.

[Nekhelesh Ramananthan (nik90)]

A couple of comments,

1. Please pull the latest trunk into this branch.

2. For me the google maps link did not work. It opened uNav when I clicked the link, but it did not take me to the lat,lng included in the url.

Rest of the links (openstreetmap and opencyclemap) worked as expected. Tested with uNav opened and closed.

@Joerg, can you test and comment as well.

review: Needs Fixing

[lp:~costales/unav/0.59-catch-more-URLs]

45. By costales on 2016-04-13

Fixed Google Maps catch

46. By costales on 2016-04-13

Revert version in Main

47. By costales on 2016-04-13

Merged trunk

[costales (costales)]

Fixed Google links ;) Well see!

review: Needs Resubmitting

[Nekhelesh Ramananthan (nik90)]

Thanks! Now everything works as expected. Approving!

Side note @marcos. The "resubmit" option is meant to be used by reviewers where they are requesting the developer to resubmit their merge proposal :).

review: Approve

=== modified file 'app-dispatcher.json'
--- app-dispatcher.json	2016-03-26 18:53:17 +0000
+++ app-dispatcher.json	2016-04-13 17:52:20 +0000
@@ -5,5 +5,17 @@
 	},
 	{
 		"protocol": "geo"
+	},
+	{
+		"protocol": "http",
+		"domain-suffix": "www.openstreetmap.org"
+	},
+	{
+		"protocol": "http",
+		"domain-suffix": "www.opencyclemap.org"
+	},
+	{
+		"protocol": "https",
+		"domain-suffix": "maps.google.com"
 	}
 ]

=== modified file 'qml/js/utils.js'
--- qml/js/utils.js	2016-04-11 17:40:45 +0000
+++ qml/js/utils.js	2016-04-13 17:52:20 +0000
@@ -99,6 +99,12 @@
 		return {is_dispatcher: true, url_is: 'geo'};
 	if (url.toString().indexOf('http://unav-go.github.io') > -1)
 		return {is_dispatcher: true, url_is: 'unav'};
+	if (url.toString().indexOf('http://www.openstreetmap.org') > -1)
+		return {is_dispatcher: true, url_is: 'osm'};
+	if (url.toString().indexOf('http://www.opencyclemap.org') > -1)
+		return {is_dispatcher: true, url_is: 'ocm'};
+	if (url.toString().indexOf('https://maps.google.com') > -1)
+		return {is_dispatcher: true, url_is: 'googlemaps'};
 	
 	return {is_dispatcher: false, url_is: 'none'};
 }
@@ -155,6 +161,51 @@
 }
 
 /**
+* Function split_osm_url(url): Return coordenates
+* url: URL calling OSM. ex: http://www.openstreetmap.org/#map=19/43.30257/-5.68930
+*                           http://www.openstreetmap.org/?mlat=43.54217&mlon=-5.67633&zoom=12
+**/
+function split_osm_url(url) {
+	var aux_url = url.replace('http://www.openstreetmap.org/#map=', '');
+	var params = aux_url.split('/');
+	if (params.length == 3)
+		return {lat: validate_lat(params[1]), lng: validate_lng(params[2])};
+	
+	var aux_url = url.replace('http://www.openstreetmap.org/?', '');
+	var params = aux_url.split('&');
+	if (params.length >= 2 && params[0].indexOf('mlat') != 1 && params[1].indexOf('mlon') != 1)
+		return {lat: validate_lat(params[0].replace('mlat=', '')), lng: validate_lng(params[1].replace('mlon=', ''))};
+	
+	return {lat: null, lng: null};
+}
+
+/**
+* Function split_ocm_url(url): Return coordenates
+* url: URL calling OpenCycleMap. ex: http://www.opencyclemap.org/?zoom=18&lat=43.5414&lon=-5.67165&layers=B0000
+**/
+function split_ocm_url(url) {
+	var aux_url = url.replace('http://www.opencyclemap.org/?', '');
+	var params = aux_url.split('&');
+	if (params.length >= 3 && params[1].indexOf('lat') != 1 && params[2].indexOf('lon') != 1)
+		return {lat: validate_lat(params[1].replace('lat=', '')), lng: validate_lng(params[2].replace('lon=', ''))};
+	
+	return {lat: null, lng: null};
+}
+
+/**
+* Function split_googlemaps_url(url): Return coordenates
+* url: URL calling Google Maps. ex: https://maps.google.com/?q=43.53291443249287,-5.664369592670359
+**/
+function split_googlemaps_url(url) {
+	var aux_url = url.replace('https://maps.google.com/?q=', '');
+	var params = aux_url.split(',');
+	if (params.length == 2)
+		return {lat: validate_lat(params[0]), lng: validate_lng(params[1])};
+	
+	return {lat: null, lng: null};
+}
+
+/**
 * Function get_url_coord(url): Return lat,lng
 * url: URL calling uNav
 **/
@@ -172,6 +223,15 @@
 		case 'unav':
 			coord = split_unav_url(url);
 			break;
+		case 'osm':
+			coord = split_osm_url(url);
+			break;
+		case 'ocm':
+			coord = split_ocm_url(url);
+			break;
+		case 'googlemaps':
+			coord = split_googlemaps_url(url);
+			break;
 	}
 	return coord;
 }