//= require leaflet.polyline
//= require leaflet.query
//= require leaflet.contextmenu
+//= require index/contextmenu
//= require index/search
//= require index/browse
//= require index/export
//= require index/changeset
//= require index/query
//= require router
+//= require bowser
$(document).ready(function () {
var loaderTimeout;
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,
- 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();
- }
+ contextmenu: true
});
map.attributionControl.setPrefix('');
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')
}
}).addTo(map);
+ 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.control.scale()
.addTo(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) {
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';
map.getLayersCode(),
map._object);
- $.removeCookie("_osm_location");
- $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
+ $.removeCookie('_osm_location');
+ $.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.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>')
projects / rails.git / blobdiff