//= require leaflet.note
//= require leaflet.share
//= require leaflet.polyline
+//= require leaflet.query
+//= require leaflet.contextmenu
+//= require index/contextmenu
//= require index/search
//= require index/browse
//= require index/export
//= require index/note
//= require index/new_note
//= require index/directions
+//= require index/changeset
+//= require index/query
//= require router
+//= require bowser
-(function() {
+$(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');
- document.title = decodeURIComponent(escape(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();
}
});
};
-})();
-$(document).ready(function () {
var params = OSM.mapParams();
- var map = new L.OSM.Map("map", {
- zoomControl: false,
- layerControl: false
- });
-
- 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({
sidebar: sidebar
}).addTo(map);
+ L.OSM.query({
+ position: position,
+ sidebar: sidebar
+ }).addTo(map);
+
L.control.scale()
.addTo(map);
- if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
- initializeNotes(map);
+ 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);
}
- initializeBrowse(map);
+ OSM.initializeBrowse(map);
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);
+ }
}
- $('.leaflet-control .control-button').tooltip({placement: 'left', 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: 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,
+ query = {
+ left: bbox.getWest() - 0.0001,
+ top: bbox.getNorth() + 0.0001,
+ right: bbox.getEast() + 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>")
+ .hide()
+ .appendTo("body")
+ .attr("src", url + querystring.stringify(query))
+ .on("load", function() {
+ $(this).remove();
+ loaded = true;
+ });
+
+ setTimeout(function () {
+ if (!loaded) {
+ alert(I18n.t("site.index.remote_failed"));
+ iframe.remove();
+ }
+ }, 1000);
+
+ return false;
+ }
+
$("a[data-editor=remote]").click(function(e) {
var params = OSM.mapParams(this.search);
remoteEditHandler(map.getBounds(), params.object);
});
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");
});
}
OSM.Index = function(map) {
var page = {};
- page.pushstate = function() {
- $("#content").addClass("overlay-sidebar");
- map.invalidateSize({pan: false})
- .panBy([-350, 0], {animate: false});
- document.title = I18n.t('layouts.project_name.title');
+ page.pushstate = page.popstate = function() {
+ map.setSidebarOverlaid(true);
+ document.title = I18n.t("layouts.project_name.title");
};
page.load = function() {
+ var params = querystring.parse(location.search.substring(1));
+ if (params.query) {
+ $("#sidebar .search_form input[name=query]").value(params.query);
+ }
if (!("autofocus" in document.createElement("input"))) {
$("#sidebar .search_form input[name=query]").focus();
}
return map.getState();
};
- page.popstate = function() {
- $("#content").addClass("overlay-sidebar");
- map.invalidateSize({pan: false});
- document.title = I18n.t('layouts.project_name.title');
- };
-
- page.unload = function() {
- map.panBy([350, 0], {animate: false});
- $("#content").removeClass("overlay-sidebar");
- map.invalidateSize({pan: false});
- };
-
return page;
};
};
function addObject(type, id, center) {
- var bounds = map.addObject({type: type, id: parseInt(id)}, function(bounds) {
- if (!window.location.hash && bounds.isValid()) {
- OSM.router.moveListenerOff();
- map.once('moveend', OSM.router.moveListenerOn);
- if (center || !map.getBounds().contains(bounds)) map.fitBounds(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 () {
+ map.fitBounds(bounds);
+ });
}
});
}
OSM.router = OSM.Router(map, {
"/": OSM.Index(map),
"/search": OSM.Search(map),
+ "/directions": OSM.Directions(map),
"/export": OSM.Export(map),
"/note/new": OSM.NewNote(map),
"/history/friends": history,
"/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'),
- "/changeset/:id": OSM.Browse(map, 'changeset')
+ "/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)
});
- if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {
+ if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {
remoteEditHandler(map.getBounds(), params.object);
OSM.router.setCurrentPath("/");
}
if (OSM.router.route(this.pathname + this.search + this.hash))
e.preventDefault();
});
-
- $(".search_form").on("submit", function(e) {
- e.preventDefault();
- if ($(".query_wrapper.routing").is(":visible")) {
- // Directions
- OSM.directions.requestRoute(true, true);
- } else {
- // Search
- $("header").addClass("closed");
- var query = $(this).find("input[name=query]").val();
- if (query) {
- OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
- } else {
- OSM.router.route("/" + OSM.formatHash(map));
- }
- }
- });
-
- $(".describe_location").on("click", function(e) {
- e.preventDefault();
- var precision = OSM.zoomPrecision(map.getZoom());
- OSM.router.route("/search?query=" + encodeURIComponent(
- map.getCenter().lat.toFixed(precision) + "," +
- map.getCenter().lng.toFixed(precision)));
- });
-
- OSM.directions = OSM.Directions(map, 'OSM.directions', $('.query_wrapper.routing'));
- OSM.directions.chooseEngine('javascripts.directions.engines.osrm_car');
-
- $(".get_directions").on("click",function(e) {
- e.preventDefault();
- $(".search").hide();
- $(".routing").show();
- $(".search_form input[type='submit']").addClass("routing_submit");
- $(".query_wrapper.routing [name=route_from]").focus();
- $("#map").on('dragend dragover',function(e) { e.preventDefault(); });
- $("#map").on('drop',function(e) { OSM.directions.handleDrop(e); e.preventDefault(); });
- $(".routing_marker").on('dragstart',function(e) {
- e.originalEvent.dataTransfer.effectAllowed = 'move';
- e.originalEvent.dataTransfer.setData('id', this.id);
- var xo=e.originalEvent.clientX - $(e.target).offset().left;
- var yo=e.originalEvent.clientY - $(e.target).offset().top;
- e.originalEvent.dataTransfer.setData('offsetX', e.originalEvent.target.width/2 - xo);
- e.originalEvent.dataTransfer.setData('offsetY', e.originalEvent.target.height - yo);
- });
- });
-
- $(".close_directions").on("click",function(e) {
- e.preventDefault();
- $(".search").show();
- $(".routing").hide();
- $(".search_form input[type='submit']").removeClass("routing_submit");
- OSM.directions.close();
- $("#map").off('dragend drop dragover');
- $(".routing_marker").off('dragstart');
- $(".query_wrapper.search [name=query]").focus();
- });
-
});
projects / rails.git / blobdiff