X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/ed27f5c1039a168fd68baa5b64054b060069593b..b687c8f1cbd62f88c61db9b209bc8f7145203d3c:/src/assets/js/base.js
diff --git a/src/assets/js/base.js b/src/assets/js/base.js
index c9635fb..a8f6d0a 100644
--- a/src/assets/js/base.js
+++ b/src/assets/js/base.js
@@ -1,3 +1,5 @@
+'use strict';
+
var map;
var last_click_latlng;
@@ -27,7 +29,10 @@ function parse_and_normalize_geojson_string(part) {
}
function map_link_to_osm() {
- return 'https://openstreetmap.org/#map=' + map.getZoom() + '/' + map.getCenter().lat + '/' + map.getCenter().lng;
+ var zoom = map.getZoom();
+ var lat = map.getCenter().lat;
+ var lng = map.getCenter().lng;
+ return 'https://openstreetmap.org/#map=' + zoom + '/' + lat + '/' + lng;
}
function map_viewbox_as_string() {
@@ -56,12 +61,18 @@ function map_viewbox_as_string() {
// *********************************************************
function fetch_from_api(endpoint_name, params, callback) {
- // `&a=&b=&c=1` => '&c='
- for (var k in params) {
- if (typeof (params[k]) === 'undefined' || params[k] === '' || params[k] === null) delete params[k];
+ // `&a=&b=&c=1` => '&c=1'
+
+ var param_names = Object.keys(params);
+ for (var i = 0; i < param_names.length; i += 1) {
+ var val = param_names[i];
+ if (typeof (val) === 'undefined' || val === '' || val === null) {
+ delete param_names[i];
+ }
}
- var api_url = get_config_value('Nominatim_API_Endpoint') + endpoint_name + '.php?' + $.param(params);
+ var api_url = get_config_value('Nominatim_API_Endpoint') + endpoint_name + '.php?'
+ + $.param(params);
if (endpoint_name !== 'status') {
$('#api-request-link').attr('href', api_url);
}
@@ -100,10 +111,11 @@ function hide_error() {
}
-$(document).ajaxError(function (event, jqXHR, ajaxSettings, thrownError) {
+$(document).ajaxError(function (event, jqXHR, ajaxSettings/* , thrownError */) {
// console.log(thrownError);
// console.log(ajaxSettings);
- show_error('Error fetching results from ' + ajaxSettings.url + '');
+ var url = ajaxSettings.url;
+ show_error('Error fetching results from ' + url + '');
});