Back out hack to setMapCenter and fix the problem in the right place.

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 531cce4221df34b2d10155e3f872251113d9197c..18812689b4c2c8318d792993e6366987bdde479a 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -29,7 +29,7 @@ class GeocoderController < ApplicationController
 
       if results_count == 1
         position = results.collect { |s| s[:results] }.compact.flatten[0]
 
       if results_count == 1
         position = results.collect { |s| s[:results] }.compact.flatten[0]

-        page.call "setPosition", position[:lat], position[:lon], position[:zoom]
+        page.call "setPosition", position[:lat].to_f, position[:lon].to_f, position[:zoom].to_i

       else
         page.call "openSidebar"
       end
       else
         page.call "openSidebar"
       end

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 3b05b1d4a962861a53388a78190b72a97eeb1bef..c80ed2242c8147db90177925af3db63eacee971f 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -132,7 +132,6 @@ function getMapCenter(center, zoom) {
 }
 
 function setMapCenter(center, zoom) {
 }
 
 function setMapCenter(center, zoom) {

-   zoom = parseInt(zoom);

    var numzoom = map.getNumZoomLevels();
    if (zoom >= numzoom) zoom = numzoom - 1;
    map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom);
    var numzoom = map.getNumZoomLevels();
    if (zoom >= numzoom) zoom = numzoom - 1;
    map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom);