diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-04-03 14:39:45 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-04-03 14:39:45 +0100 |
| commit | 1923dc99b708511570fe5bf207ff63362c55ca9b (patch) | |
| tree | 3d63276f897bc0183d98aa98f315dec25fe317af /web/js/map-OpenLayers.js | |
| parent | d3e033d5426144dcc7bf0da3170fbf2361d22ba6 (diff) | |
| parent | a16e71730cf86cd48773ffbd8390c65e1dc2fc6a (diff) | |
Merge branch 'send-report-rewrite' into bromley-new-send-reports
Conflicts:
bin/send-reports
perllib/FixMyStreet/Geocode/Bing.pm
web/js/map-OpenLayers.js
Diffstat (limited to 'web/js/map-OpenLayers.js')
| -rw-r--r-- | web/js/map-OpenLayers.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 8ea54cac3..9d8974fb6 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -480,7 +480,11 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { fixmystreet.map.getProjectionObject() ); var p = fixmystreet.map.getViewPortPxFromLonLat(lonlat); +<<<<<<< HEAD p.x -= ( o.left - bo.left + w ) / 2; +======= + p.x -= ( o.left + w ) / 2; +>>>>>>> send-report-rewrite lonlat = fixmystreet.map.getLonLatFromViewPortPx(p); fixmystreet.map.panTo(lonlat); } |