Merge pull request #130 from jdlrobson/address149

fix geourls for android and safari (bug 38693)
wikimedia · Aug 14, 2012 · df7f1f5 · df7f1f5
2 parents 9b1be5a + ff8f3c7
commit df7f1f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/assets/www/android/platform.js b/assets/www/android/platform.js
@@ -3,9 +3,10 @@ $('html').addClass('android');
 // Android opens a.external externally automatically.
 
 platform.geoUrl = function(lat, lon, address) {
-    var q = 'geo:' + lat + ',' + lon;
+	var latlng = lat + ',' + lon;
+	var q = 'geo:' + latlng;
     if (address) {
-        q += '?q=' + encodeURIComponent(address);
+		q += '?q=' + latlng + ' (' + encodeURIComponent( address ) + ')';
     }
     return q;
 }

diff --git a/assets/www/js/platform-stub.js b/assets/www/js/platform-stub.js
@@ -5,9 +5,9 @@ window.platform = {
 		// Google maps links for web & iOS
 		// on iOS these open in native Maps app
 		var url = ['http://maps.google.com/maps',
-			'?ll=', lat, ',', lon];
+			'?q=', lat, ',', lon ];
 		if(address) {
-			url.push('&q=' + encodeURIComponent(address));
+			url.push( '%20(' + encodeURIComponent( address ) + ')' );
 		}
 		return url.join('');
 	}