//= require leaflet.note
//= require leaflet.share
//= require leaflet.polyline
+//= require leaflet.query
+//= require leaflet.contextmenu
//= require index/search
//= require index/browse
//= require index/export
//= require index/new_note
//= require index/directions
//= require index/changeset
+//= require index/query
//= require router
$(document).ready(function () {
// 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'
+ path += '&xhr=1';
} else {
- path += '?xhr=1'
+ path += '?xhr=1';
}
$('#sidebar_content')
if (xhr.getResponseHeader('X-Page-Title')) {
var title = xhr.getResponseHeader('X-Page-Title');
- document.title = decodeURIComponent(escape(title));
+ document.title = decodeURIComponent(title);
}
$('head')
var params = OSM.mapParams();
+ // TODO consider using a separate js file for the context menu additions
+ var context_describe = function(e){
+ var precision = OSM.zoomPrecision(map.getZoom());
+ OSM.router.route("/search?query=" + encodeURIComponent(
+ e.latlng.lat.toFixed(precision) + "," + e.latlng.lng.toFixed(precision)
+ ));
+ };
+
+ var context_directionsfrom = function(e){
+ var precision = OSM.zoomPrecision(map.getZoom());
+ OSM.router.route("/directions?" + querystring.stringify({
+ route: e.latlng.lat.toFixed(precision) + ',' + e.latlng.lng.toFixed(precision) + ';' + $('#route_to').val()
+ }));
+ }
+
+ var context_directionsto = function(e){
+ var precision = OSM.zoomPrecision(map.getZoom());
+ OSM.router.route("/directions?" + querystring.stringify({
+ route: $('#route_from').val() + ';' + e.latlng.lat.toFixed(precision) + ',' + e.latlng.lng.toFixed(precision)
+ }));
+ }
+
+ // TODO only allow this if zoomed in enough
+ var context_addnote = function(e){
+ // TODO this currently doesn't work correctly - I think the "route" needs to be chained to ensure it comes once the pan has finished.
+ map.panTo(e.latlng, {animate: false});
+ OSM.router.route('/note/new');
+ }
+
+ var context_centrehere = function(e){
+ map.panTo(e.latlng);
+ }
+
+ var context_queryhere = function(e) {
+ var precision = OSM.zoomPrecision(map.getZoom()),
+ latlng = e.latlng.wrap(),
+ lat = latlng.lat.toFixed(precision),
+ lng = latlng.lng.toFixed(precision);
+
+ OSM.router.route("/query?lat=" + lat + "&lon=" + lng);
+ }
+
+ // TODO internationalisation of the context menu strings
var map = new L.OSM.Map("map", {
zoomControl: false,
- layerControl: false
+ layerControl: false,
+ contextmenu: true,
+ contextmenuWidth: 140,
+ contextmenuItems: [{
+ text: 'Directions from here',
+ callback: context_directionsfrom
+ }, {
+ text: 'Directions to here',
+ callback: context_directionsto
+ }, '-', {
+ text: 'Add a note here',
+ callback: context_addnote
+ }, {
+ text: 'Show address',
+ callback: context_describe
+ }, {
+ text: 'Query features',
+ callback: context_queryhere
+ }, {
+ text: 'Centre map here',
+ callback: context_centrehere
+ }]
+ });
+
+ $(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();
+ }
});
map.attributionControl.setPrefix('');
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);
+ 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);
}
}
- $('.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);
$.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') {
+ if ($.cookie('_osm_welcome') === 'hide') {
$('.welcome').hide();
}
map.setView([params.lat, params.lon], params.zoom);
}
- var marker = L.marker([0, 0], {icon: getUserIcon()});
+ var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
if (params.marker) {
marker.setLatLng([params.mlat, params.mlon]).addTo(map);
marker.setLatLng(center).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?",
+ query = {
+ left: bbox.getWest() - 0.0001,
+ top: bbox.getNorth() + 0.0001,
+ right: bbox.getEast() + 0.0001,
+ bottom: bbox.getSouth() - 0.0001
+ };
+
+ 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);
};
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();
}
};
function addObject(type, id, center) {
- var bounds = map.addObject({type: type, id: parseInt(id)}, function(bounds) {
+ map.addObject({type: type, id: parseInt(id)}, function(bounds) {
if (!window.location.hash && bounds.isValid() &&
(center || !map.getBounds().contains(bounds))) {
OSM.router.withoutMoveListener(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.Changeset(map)
+ "/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();
- $("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("/");
- }
- });
-
- $(".describe_location").on("click", function(e) {
- e.preventDefault();
- var center = map.getCenter().wrap(),
- precision = OSM.zoomPrecision(map.getZoom());
- OSM.router.route("/search?query=" + encodeURIComponent(
- center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
- ));
- });
});
projects / rails.git / blobdiff