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

Merge branch 'master' into overpass

Browse source
This commit is contained in:
Tom Hughes 2014-11-01 12:46:42 +00:00
commit 501d13e1c0
307 changed files with 127030 additions and 89142 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,7 @@
//= require index/history
//= require index/note
//= require index/new_note
//= require index/changeset
//= require index/query
//= require router
@ -161,6 +162,15 @@ $(document).ready(function () {
$.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
});
if ($.cookie('_osm_sotm') == 'hide') {
$('#sotm').hide();
}
$('#sotm .close').on('click', function() {
$('#sotm').hide();
$.cookie("_osm_sotm", 'hide', { expires: expiry });
});
if ($.cookie('_osm_welcome') == 'hide') {
$('.welcome').hide();
}
@ -302,7 +312,7 @@ $(document).ready(function () {
"/node/:id(/history)": OSM.Browse(map, 'node'),
"/way/:id(/history)": OSM.Browse(map, 'way'),
"/relation/:id(/history)": OSM.Browse(map, 'relation'),
"/changeset/:id": OSM.Browse(map, 'changeset'),
"/changeset/:id": OSM.Changeset(map),
"/query": OSM.Query(map)
});
@ -336,7 +346,7 @@ $(document).ready(function () {
if (query) {
OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
} else {
OSM.router.route("/" + OSM.formatHash(map));
OSM.router.route("/");
}
});