cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always use controller computed zoom when starting Potlatch

Browse source 
The value of mapParams.zoom may have come from the cookie and be
unrelated to the actual view the user came from with this click, so
just use the default zoom set by the controller.

Fixes #621.
This commit is contained in:
Tom Hughes 2013-12-05 09:48:53 +00:00
parent 7318ee4b93
commit 7a35004389
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/site/_potlatch.html.erb
View file

@ -51,10 +51,10 @@
// 700,600 for fixed size, 100%,100% for resizable
}
var mapParams = OSM.mapParams();
<% if @lat && @lon -%>
doSWF(<%= @lat %>, <%= @lon %>, mapParams.zoom || <%= @zoom %>);
doSWF(<%= @lat %>, <%= @lon %>, <%= @zoom %>);
<% else -%>
var mapParams = OSM.mapParams();
doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17);
<% end -%>
</script>

4
app/views/site/_potlatch2.html.erb
View file

@ -70,10 +70,10 @@
}
}
var mapParams = OSM.mapParams();
<% if @lat && @lon -%>
doSWF(<%= @lat %>, <%= @lon %>, mapParams.zoom || <%= @zoom %>);
doSWF(<%= @lat %>, <%= @lon %>, <%= @zoom %>);
<% else -%>
var mapParams = OSM.mapParams();
doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17);
<% end -%>