//= require index/changeset
//= require index/query
//= require router
+//= require bowser
$(document).ready(function () {
var loaderTimeout;
+ var map = new L.OSM.Map("map", {
+ zoomControl: false,
+ layerControl: false,
+ contextmenu: true
+ });
+
OSM.loadSidebarContent = function(path, callback) {
map.setSidebarOverlaid(false);
clearTimeout(loaderTimeout);
loaderTimeout = setTimeout(function() {
- $('#sidebar_loader').show();
+ $("#sidebar_loader").show();
}, 200);
// IE<10 doesn't respect Vary: X-Requested-With header, so
// prevent caching the XHR response as a full-page URL.
- if (path.indexOf('?') >= 0) {
- path += '&xhr=1';
+ if (path.indexOf("?") >= 0) {
+ path += "&xhr=1";
} else {
- path += '?xhr=1';
+ path += "?xhr=1";
}
- $('#sidebar_content')
+ $("#sidebar_content")
.empty();
$.ajax({
dataType: "html",
complete: function(xhr) {
clearTimeout(loaderTimeout);
- $('#flash').empty();
- $('#sidebar_loader').hide();
+ $("#flash").empty();
+ $("#sidebar_loader").hide();
var content = $(xhr.responseText);
- if (xhr.getResponseHeader('X-Page-Title')) {
- var title = xhr.getResponseHeader('X-Page-Title');
+ if (xhr.getResponseHeader("X-Page-Title")) {
+ var title = xhr.getResponseHeader("X-Page-Title");
document.title = decodeURIComponent(title);
}
- $('head')
- .find('link[type="application/atom+xml"]')
+ $("head")
+ .find("link[type=\"application/atom+xml\"]")
.remove();
- $('head')
- .append(content.filter('link[type="application/atom+xml"]'));
+ $("head")
+ .append(content.filter("link[type=\"application/atom+xml\"]"));
- $('#sidebar_content').html(content.not('link[type="application/atom+xml"]'));
+ $("#sidebar_content").html(content.not("link[type=\"application/atom+xml\"]"));
if (callback) {
callback();
var params = OSM.mapParams();
- // TODO internationalisation of the context menu strings
- var map = new L.OSM.Map("map", {
- zoomControl: false,
- layerControl: false,
- contextmenu: true,
- contextmenuWidth: 140,
- contextmenuItems: [{
- text: 'Directions from here',
- callback: function(e){ context_directionsfrom(e, map) }
- }, {
- text: 'Directions to here',
- callback: function(e){ context_directionsto(e, map) }
- }, '-', {
- text: 'Add a note here',
- callback: function(e){ context_addnote(e, map) }
- }, {
- text: 'Show address',
- callback: function(e){ context_describe(e, map) }
- }, {
- text: 'Query features',
- callback: function(e){ context_queryhere(e, map) }
- }, {
- text: 'Centre map here',
- callback: function(e){ context_centrehere(e, map) }
- }]
- });
-
- $(document).on('mousedown', function(e){
- if(e.shiftKey){
- map.contextmenu.disable(); // on firefox, shift disables our contextmenu. we explicitly do this for all browsers.
- }else{
- map.contextmenu.enable();
- // we also decide whether to disable some options that only like high zoom
- map.contextmenu.setDisabled(3, map.getZoom() < 12);
- map.contextmenu.setDisabled(5, map.getZoom() < 14);
- }
- });
-
- map.attributionControl.setPrefix('');
+ map.attributionControl.setPrefix("");
map.updateLayers(params.layers);
}
});
- var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+ var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
L.OSM.zoom({position: position})
.addTo(map);
- L.control.locate({
+ var locate = L.control.locate({
position: position,
+ icon: "icon geolocate",
+ iconLoading: "icon geolocate",
strings: {
- title: I18n.t('javascripts.map.locate.title'),
- popup: I18n.t('javascripts.map.locate.popup')
+ title: I18n.t("javascripts.map.locate.title"),
+ popup: I18n.t("javascripts.map.locate.popup")
}
}).addTo(map);
- var sidebar = L.OSM.sidebar('#map-ui')
+ var locateContainer = locate.getContainer();
+
+ $(locateContainer)
+ .removeClass("leaflet-control-locate leaflet-bar")
+ .addClass("control-locate")
+ .children("a")
+ .attr("href", "#")
+ .removeClass("leaflet-bar-part leaflet-bar-part-single")
+ .addClass("control-button");
+
+ var sidebar = L.OSM.sidebar("#map-ui")
.addTo(map);
L.OSM.layers({
L.control.scale()
.addTo(map);
- if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {
+ OSM.initializeContextMenu(map);
+
+ if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
OSM.initializeNotes(map);
if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
map.addLayer(map.noteLayer);
if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
map.addLayer(map.dataLayer);
}
+
+ if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) {
+ map.addLayer(map.gpsLayer);
+ }
}
- var placement = $('html').attr('dir') === 'rtl' ? 'right' : 'left';
- $('.leaflet-control .control-button').tooltip({placement: placement, container: 'body'});
+ var placement = $("html").attr("dir") === "rtl" ? "right" : "left";
+ $(".leaflet-control .control-button").tooltip({placement: placement, container: "body"});
var expiry = new Date();
expiry.setYear(expiry.getFullYear() + 10);
- map.on('moveend layeradd layerremove', function() {
+ map.on("moveend layeradd layerremove", function() {
updateLinks(
map.getCenter().wrap(),
map.getZoom(),
$.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
});
- if ($.cookie('_osm_welcome') === 'hide') {
- $('.welcome').hide();
+ if ($.cookie("_osm_welcome") !== "hide") {
+ $(".welcome").addClass("visible");
}
- $('.welcome .close').on('click', function() {
- $('.welcome').hide();
- $.cookie("_osm_welcome", 'hide', { expires: expiry });
+ $(".welcome .close-wrap").on("click", function() {
+ $(".welcome").removeClass("visible");
+ $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" });
+ });
+
+ var bannerExpiry = new Date();
+ bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
+
+ $("#banner .close-wrap").on("click", function(e) {
+ var cookieId = e.target.id;
+ $("#banner").hide();
+ e.preventDefault();
+ if (cookieId) {
+ $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" });
+ }
});
if (OSM.PIWIK) {
- map.on('layeradd', function (e) {
+ map.on("layeradd", function (e) {
if (e.layer.options) {
var goal = OSM.PIWIK.goals[e.layer.options.keyid];
if (goal) {
- $('body').trigger('piwikgoal', goal);
+ $("body").trigger("piwikgoal", goal);
}
}
});
map.setView([params.lat, params.lon], params.zoom);
}
- var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
-
if (params.marker) {
- marker.setLatLng([params.mlat, params.mlon]).addTo(map);
+ L.marker([params.mlat, params.mlon]).addTo(map);
}
$("#homeanchor").on("click", function(e) {
center = L.latLng(data.lat, data.lon);
map.setView(center, data.zoom);
- marker.setLatLng(center).addTo(map);
+ L.marker(center, {icon: OSM.getUserIcon()}).addTo(map);
});
function remoteEditHandler(bbox, object) {
var loaded = false,
- url = document.location.protocol === "https:" ?
- "https://127.0.0.1:8112/load_and_zoom?" :
- "http://127.0.0.1:8111/load_and_zoom?",
+ url,
query = {
left: bbox.getWest() - 0.0001,
top: bbox.getNorth() + 0.0001,
bottom: bbox.getSouth() - 0.0001
};
+ if (location.protocol === "http" ||
+ bowser.check({chrome: "53", firefox: "55"})) {
+ url = "http://127.0.0.1:8111/load_and_zoom?";
+ } else {
+ url = "https://127.0.0.1:8112/load_and_zoom?";
+ }
+
if (object) query.select = object.type + object.id;
- var iframe = $('<iframe>')
+ var iframe = $("<iframe>")
.hide()
- .appendTo('body')
+ .appendTo("body")
.attr("src", url + querystring.stringify(query))
- .on('load', function() {
+ .on("load", function() {
$(this).remove();
loaded = true;
});
setTimeout(function () {
if (!loaded) {
- alert(I18n.t('site.index.remote_failed'));
+ alert(I18n.t("site.index.remote_failed"));
iframe.remove();
}
}, 1000);
});
if (OSM.params().edit_help) {
- $('#editanchor')
- .removeAttr('title')
+ $("#editanchor")
+ .removeAttr("title")
.tooltip({
- placement: 'bottom',
- title: I18n.t('javascripts.edit_help')
+ placement: "bottom",
+ title: I18n.t("javascripts.edit_help")
})
- .tooltip('show');
+ .tooltip("show");
- $('body').one('click', function() {
- $('#editanchor').tooltip('hide');
+ $("body").one("click", function() {
+ $("#editanchor").tooltip("hide");
});
}
page.pushstate = page.popstate = function() {
map.setSidebarOverlaid(true);
- document.title = I18n.t('layouts.project_name.title');
+ document.title = I18n.t("layouts.project_name.title");
};
page.load = function() {
};
function addObject(type, id, center) {
- map.addObject({type: type, id: parseInt(id)}, function(bounds) {
+ map.addObject({type: type, id: parseInt(id, 10)}, function(bounds) {
if (!window.location.hash && bounds.isValid() &&
(center || !map.getBounds().contains(bounds))) {
OSM.router.withoutMoveListener(function () {
"/history": history,
"/user/:display_name/history": history,
"/note/:id": OSM.Note(map),
- "/node/:id(/history)": OSM.Browse(map, 'node'),
- "/way/:id(/history)": OSM.Browse(map, 'way'),
- "/relation/:id(/history)": OSM.Browse(map, 'relation'),
+ "/node/:id(/history)": OSM.Browse(map, "node"),
+ "/way/:id(/history)": OSM.Browse(map, "way"),
+ "/relation/:id(/history)": OSM.Browse(map, "relation"),
"/changeset/:id": OSM.Changeset(map),
"/query": OSM.Query(map)
});
projects / rails.git / blobdiff