file "images/#{image}", "https://unpkg.com/leaflet@1.6.0/dist/images/#{image}"
end
- from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.5.0' do
+ from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.5.1' do
file 'leaflet.contextmenu.js', 'dist/leaflet.contextmenu.js'
file 'leaflet.contextmenu.css', 'dist/leaflet.contextmenu.css'
end
folder 'img', 'src/img'
end
- from 'git://github.com/domoritz/leaflet-locatecontrol.git', :tag => 'v0.66.0' do
+ from 'git://github.com/domoritz/leaflet-locatecontrol.git', :tag => 'v0.71.0' do
file 'leaflet.locate.js', 'src/L.Control.Locate.js'
end
file 'leaflet.osm.js', 'leaflet-osm.js'
end
- from 'git://github.com/jieter/Leaflet.encoded.git', :tag => '0.0.8' do
+ from 'git://github.com/jieter/Leaflet.encoded.git', :tag => '0.0.9' do
file 'leaflet.polyline.js', 'Polyline.encoded.js'
end
end
L.Map.ContextMenu = L.Handler.extend({
_touchstart: L.Browser.msPointer ? 'MSPointerDown' : L.Browser.pointer ? 'pointerdown' : 'touchstart',
-
+
statics: {
BASE_CLS: 'leaflet-contextmenu'
},
-
+
initialize: function (map) {
L.Handler.prototype.initialize.call(this, map);
-
+
this._items = [];
this._visible = false;
this._map.on({
contextmenu: this._show,
mousedown: this._hide,
- movestart: this._hide,
zoomstart: this._hide
}, this);
},
this._map.off({
contextmenu: this._show,
mousedown: this._hide,
- movestart: this._hide,
zoomstart: this._hide
}, this);
},
return;
}
+ var map = me._map,
+ containerPoint = me._showLocation.containerPoint,
+ layerPoint = map.containerPointToLayerPoint(containerPoint),
+ latlng = map.layerPointToLatLng(layerPoint),
+ relatedTarget = me._showLocation.relatedTarget,
+ data = {
+ containerPoint: containerPoint,
+ layerPoint: layerPoint,
+ latlng: latlng,
+ relatedTarget: relatedTarget
+ };
+
if (hideOnSelect) {
me._hide();
}
if (func) {
- func.call(context || map, me._showLocation);
+ func.call(context || map, data);
}
me._map.fire('contextmenu.select', {
_showAtPoint: function (pt, data) {
if (this._items.length) {
var map = this._map,
- layerPoint = map.containerPointToLayerPoint(pt),
- latlng = map.layerPointToLatLng(layerPoint),
event = L.extend(data || {}, {contextmenu: this});
this._showLocation = {
- latlng: latlng,
- layerPoint: layerPoint,
containerPoint: pt
};
'<path d="'+path+'" style="'+style+'" />'+
'</svg>';
return {
- className: 'leafet-control-locate-heading',
+ className: 'leaflet-control-locate-heading',
svg: svg,
w: w,
h: h
setView: 'untilPanOrZoom',
/** Keep the current map zoom level when setting the view and only pan. */
keepCurrentZoomLevel: false,
+ /** After activating the plugin by clicking on the icon, zoom to the selected zoom level, even when keepCurrentZoomLevel is true. Set to 'false' to disable this feature. */
+ initialZoomLevel: false,
/**
* This callback can be used to override the viewport tracking
* This function should return a LatLngBounds object.
this._map.on('zoomstart', this._onZoom, this);
this._map.on('zoomend', this._onZoomEnd, this);
if (this.options.showCompass) {
- if ('ondeviceorientationabsolute' in window) {
- L.DomEvent.on(window, 'deviceorientationabsolute', this._onDeviceOrientation, this);
- } else if ('ondeviceorientation' in window) {
- L.DomEvent.on(window, 'deviceorientation', this._onDeviceOrientation, this);
+ var oriAbs = 'ondeviceorientationabsolute' in window;
+ if (oriAbs || ('ondeviceorientation' in window)) {
+ var _this = this;
+ var deviceorientation = function () {
+ L.DomEvent.on(window, oriAbs ? 'deviceorientationabsolute' : 'deviceorientation', _this._onDeviceOrientation, _this);
+ };
+ if (DeviceOrientationEvent && typeof DeviceOrientationEvent.requestPermission === 'function') {
+ DeviceOrientationEvent.requestPermission().then(function (permissionState) {
+ if (permissionState === 'granted') {
+ deviceorientation();
+ }
+ })
+ } else {
+ deviceorientation();
+ }
}
}
}
this._event = undefined; // clear the current location so we can get back into the bounds
this.options.onLocationOutsideMapBounds(this);
} else {
+ if (this._justClicked && this.options.initialZoomLevel !== false) {
+ var f = this.options.flyTo ? this._map.flyTo : this._map.setView;
+ f.bind(this._map)([this._event.latitude, this._event.longitude], this.options.initialZoomLevel);
+ } else
if (this.options.keepCurrentZoomLevel) {
var f = this.options.flyTo ? this._map.flyTo : this._map.panTo;
f.bind(this._map)([this._event.latitude, this._event.longitude]);
*
*/
_drawCompass: function() {
+ if (!this._event) {
+ return;
+ }
+
var latlng = this._event.latlng;
if (this.options.showCompass && latlng && this._compassHeading !== null) {
this._drawCompass();
var t = this.options.strings.popup;
+ function getPopupText() {
+ if (typeof t === 'string') {
+ return L.Util.template(t, {distance: distance, unit: unit});
+ } else if (typeof t === 'function') {
+ return t({distance: distance, unit: unit});
+ } else {
+ return t;
+ }
+ }
if (this.options.showPopup && t && this._marker) {
this._marker
- .bindPopup(L.Util.template(t, {distance: distance, unit: unit}))
+ .bindPopup(getPopupText())
._popup.setLatLng(latlng);
}
if (this.options.showPopup && t && this._compass) {
this._compass
- .bindPopup(L.Util.template(t, {distance: distance, unit: unit}))
+ .bindPopup(getPopupText())
._popup.setLatLng(latlng);
}
},
if (this._event && !this._ignoreEvent) {
// If we have zoomed in and out and ended up sideways treat it as a pan
- if (!this._map.getBounds().pad(-.3).contains(this._marker.getLatLng())) {
+ if (this._marker && !this._map.getBounds().pad(-.3).contains(this._marker.getLatLng())) {
this._userPanned = true;
this._updateContainerStyle();
this._drawMarker();
projects / rails.git / commitdiff