From 063c97feb6a9cafc822fab0b53e66ff1cd0c10a3 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 6 Sep 2014 18:22:54 +0100 Subject: Precalculate centers for buildings Currently done because this is the simplist way of doing it. --- create-data.js | 5 +++-- src/leaflet-soton.js | 10 ++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/create-data.js b/create-data.js index d97092c..d0e8202 100755 --- a/create-data.js +++ b/create-data.js @@ -209,8 +209,9 @@ function createTable(name, query, callback) { function createCollections(callback) { var collectionQueries = { - buildings: 'select ST_AsGeoJSON(ST_Transform(way, 4326), 10) as \ - polygon,name,loc_ref,uri,leisure,height \ + buildings: 'select ST_AsGeoJSON(ST_Transform(way, 4326), 10) as polygon,\ + ST_AsText(ST_Transform(ST_Centroid(way), 4326)) as center,\ + name,loc_ref,uri,leisure,height \ from uni_building where uri is not null', parking: 'select ST_AsGeoJSON(ST_Transform(way, 4326), 10) as polygon,\ name,access,capacity,"capacity:disabled",fee from uni_parking', diff --git a/src/leaflet-soton.js b/src/leaflet-soton.js index b9818bc..e5bb696 100644 --- a/src/leaflet-soton.js +++ b/src/leaflet-soton.js @@ -821,15 +821,9 @@ SELECT * WHERE {\ map, function() { map.closeInfo(); }); - var temp = { _rings: building.geometry.coordinates, _map: this }; + map.panTo(building.properties.center); - - var center = building.geometry.coordinates[0][0]; - center = [center[1], center[0]]; - - map.panTo(center); - - map.showInfo(content, center); + map.showInfo(content, building.properties.center); return; } -- cgit v1.2.3