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

Merge remote-tracking branch 'origin/master' into routing

Browse source 
Conflicts:
	app/views/layouts/_search.html.erb
This commit is contained in:
Tom Hughes 2014-03-08 17:44:22 +00:00
commit b095b59d5e
220 changed files with 14150 additions and 1476 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/index.js
View file

@ -154,7 +154,7 @@ $(document).ready(function () {
map._object);
$.removeCookie("_osm_location");
$.cookie("_osm_location", cookieContent(map), { expires: expiry, path: "/" });
$.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
});
if ($.cookie('_osm_welcome') == 'hide') {
@ -342,7 +342,7 @@ $(document).ready(function () {
$(".describe_location").on("click", function(e) {
e.preventDefault();
var precision = zoomPrecision(map.getZoom());
var precision = OSM.zoomPrecision(map.getZoom());
OSM.router.route("/search?query=" + encodeURIComponent(
map.getCenter().lat.toFixed(precision) + "," +
map.getCenter().lng.toFixed(precision)));