From 2d22ab10f759828e27876f138b419ff4c0913b87 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 25 Feb 2015 11:16:10 +0000 Subject: [PATCH] Force coordinates into bounds when using the query tool --- app/assets/javascripts/index/query.js | 9 +++++---- db/structure.sql | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 9e82aa496..333fce549 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -259,8 +259,8 @@ OSM.Query = function(map) { * for each object. */ function queryOverpass(lat, lng) { - var latlng = L.latLng(lat, lng), - bounds = map.getBounds(), + var latlng = L.latLng(lat, lng).wrap(), + bounds = map.getBounds().wrap(), bbox = bounds.getSouth() + "," + bounds.getWest() + "," + bounds.getNorth() + "," + bounds.getEast(), radius = 10 * Math.pow(1.5, 19 - map.getZoom()), around = "around:" + radius + "," + lat + "," + lng, @@ -293,8 +293,9 @@ OSM.Query = function(map) { function clickHandler(e) { var precision = OSM.zoomPrecision(map.getZoom()), - lat = e.latlng.lat.toFixed(precision), - lng = e.latlng.lng.toFixed(precision); + latlng = e.latlng.wrap(), + lat = latlng.lat.toFixed(precision), + lng = latlng.lng.toFixed(precision); OSM.router.route("/query?lat=" + lat + "&lon=" + lng); } diff --git a/db/structure.sql b/db/structure.sql index a084ee624..c7e26ac66 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -126,7 +126,7 @@ CREATE TYPE user_status_enum AS ENUM ( CREATE FUNCTION maptile_for_point(bigint, bigint, integer) RETURNS integer LANGUAGE c STRICT - AS '/srv/www/omniauth.osm.compton.nu/db/functions/libpgosm.so', 'maptile_for_point'; + AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'maptile_for_point'; -- @@ -135,7 +135,7 @@ CREATE FUNCTION maptile_for_point(bigint, bigint, integer) RETURNS integer CREATE FUNCTION tile_for_point(integer, integer) RETURNS bigint LANGUAGE c STRICT - AS '/srv/www/omniauth.osm.compton.nu/db/functions/libpgosm.so', 'tile_for_point'; + AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'tile_for_point'; -- @@ -144,7 +144,7 @@ CREATE FUNCTION tile_for_point(integer, integer) RETURNS bigint CREATE FUNCTION xid_to_int4(xid) RETURNS integer LANGUAGE c IMMUTABLE STRICT - AS '/srv/www/omniauth.osm.compton.nu/db/functions/libpgosm.so', 'xid_to_int4'; + AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'xid_to_int4'; SET default_tablespace = ''; -- 2.43.2