leaflet-rotate 0.1.4 → 0.2.1

package/src/map/handler/CompassBearing.js

@@ -1,34 +1,30 @@
-/*
- * L.Map.CompassBearing will rotate the map according to a smartphone's compass.
+/**
+ * Rotates the map according to a smartphone's compass.
+ * 
+ * @typedef L.Map.CompassBearing
  */
 
 L.Map.CompassBearing = L.Handler.extend({
 
     initialize: function(map) {
-        if (!window.DeviceOrientationEvent) {
-            this._capable = false;
-            return;
-        }
-        this._capable = true;
         this._map = map;
-
         this._throttled = L.Util.throttle(this._onDeviceOrientation, 1000, this);
     },
 
     addHooks: function() {
-        if (this._capable && this._map._rotate) {
+        if (this._map._rotate && window.DeviceOrientationEvent) {
             L.DomEvent.on(window, 'deviceorientation', this._throttled, this);
         }
     },
 
     removeHooks: function() {
-        if (this._capable && this._map._rotate) {
+        if (this._map._rotate && window.DeviceOrientationEvent) {
             L.DomEvent.off(window, 'deviceorientation', this._throttled, this);
         }
     },
 
     _onDeviceOrientation: function(event) {
-        if (event.alpha !== null) {
+        if (event.alpha !== null && window.orientation !== undefined) {
             this._map.setBearing(event.alpha - window.orientation);
         }
     },

package/src/map/handler/ContainerMutation.js

@@ -1,5 +1,7 @@
-/*
- * L.Handler.ContainerMutation triggers `invalidateResize` when the map's DOM container mutates.
+/**
+ * Triggers `invalidateResize` when the map's DOM container mutates.
+ * 
+ * @typedef L.Map.ContainerMutation
  */
 
 // @namespace Map
@@ -17,9 +19,10 @@ L.Map.mergeOptions({
 L.Map.ContainerMutation = L.Handler.extend({
 
     addHooks: function() {
-        if (!L.Browser.mutation) {
-            return;
-        }
+        /** @TODO check again this property. Will likely be added in future releases (leaflet > v1.9.3) */
+        // if (!L.Browser.mutation) {
+        //     return;
+        // }
 
         if (!this._observer) {
             this._observer = new MutationObserver(L.Util.bind(this._onMutation, this));
@@ -35,9 +38,10 @@ L.Map.ContainerMutation = L.Handler.extend({
     },
 
     removeHooks: function() {
-        if (!L.Browser.mutation) {
-            return;
-        }
+        /** @TODO check again this property. Will likely be added in future releases (leaflet > v1.9.3) */
+        // if (!L.Browser.mutation) {
+        //     return;
+        // }
         this._observer.disconnect();
     },
 

package/src/map/handler/ShiftKeyRotate.js

@@ -1,5 +1,8 @@
-/*
- * L.Handler.ShiftKeyRotate is used by L.Map to add shift-wheel rotation.
+
+/**
+ * Rotates the map on shift key + mouseheel scrolling (desktop).
+ * 
+ * @typedef L.Map.ShiftKeyRotate
  */
 
 // @namespace Map

package/src/map/handler/TouchGestures.js

@@ -1,5 +1,10 @@
-/*
- * L.Handler.TouchGestures is both TouchZoom plus TouchRotate.
+/**
+ * TouchGestures is both TouchZoom plus TouchRotate
+ * 
+ * @see https://github.com/fnicollet/Leaflet/commit/a77af51a6b10f308d1b9a16552091d1d0aee8834
+ * @see https://github.com/Leaflet/Leaflet/blob/v1.9.3/src/map/handler/Map.TouchZoom.js
+ * 
+ * @typedef L.Map.TouchGestures
  */
 
 // @namespace Map
@@ -63,11 +68,11 @@ L.Map.TouchGestures = L.Handler.extend({
 
         this._moved = false;
 
-        map.stop();
+        map._stop();
 
         L.DomEvent
             .on(document, 'touchmove', this._onTouchMove, this)
-            .on(document, 'touchend', this._onTouchEnd, this);
+            .on(document, 'touchend touchcancel', this._onTouchEnd, this);
 
         L.DomEvent.preventDefault(e);
     },
@@ -118,20 +123,20 @@ L.Map.TouchGestures = L.Handler.extend({
         }
 
         if (!this._moved) {
-            map._moveStart(true);
+            map._moveStart(true, false);
             this._moved = true;
         }
 
         L.Util.cancelAnimFrame(this._animRequest);
 
-        var moveFn = L.bind(map._move, map, this._center, this._zoom, { pinch: true, round: false });
+        var moveFn = map._move.bind(map, this._center, this._zoom, { pinch: true, round: false }, undefined);
         this._animRequest = L.Util.requestAnimFrame(moveFn, this, true);
 
         L.DomEvent.preventDefault(e);
     },
 
     _onTouchEnd: function() {
-        if (!this._moved || !this._zooming) {
+        if (!this._moved || !(this._zooming || this._rotating)) {
             this._zooming = false;
             return;
         }
@@ -141,13 +146,13 @@ L.Map.TouchGestures = L.Handler.extend({
         L.Util.cancelAnimFrame(this._animRequest);
 
         L.DomEvent
-            .off(document, 'touchmove', this._onTouchMove)
-            .off(document, 'touchend', this._onTouchEnd);
+            .off(document, 'touchmove', this._onTouchMove, this)
+            .off(document, 'touchend touchcancel', this._onTouchEnd, this);
 
         if (this.zoom) {
-            // Pinch updates GridLayers' levels only when snapZoom is off, so snapZoom becomes noUpdate.
+            // Pinch updates GridLayers' levels only when zoomSnap is off, so zoomSnap becomes noUpdate.
             if (this._map.options.zoomAnimation) {
-                this._map._animateZoom(this._center, this._map._limitZoom(this._zoom), true, this._map.options.snapZoom);
+                this._map._animateZoom(this._center, this._map._limitZoom(this._zoom), true, this._map.options.zoomSnap);
             } else {
                 this._map._resetView(this._center, this._map._limitZoom(this._zoom));
             }

package/src/map/handler/TouchRotate.js

@@ -1,5 +1,7 @@
-/*
- * L.Handler.TouchRotate is used by L.Map to add two-finger rotation gestures.
+/**
+ * Rotates the map on two-finger (touch devices).
+ * 
+ * @typedef L.Map.TouchRotate
  */
 
 // @namespace Map

package/src/map/handler/TouchZoom.js

@@ -1,5 +1,9 @@
-/*
- * L.Handler.TouchZoom is used by L.Map to add pinch zoom on supported mobile browsers.
+/**
+ * Adds pinch zoom rotation on mobile browsers
+ * 
+ * @see https://github.com/Leaflet/Leaflet/blob/v1.9.3/src/map/handler/Map.TouchZoom.js
+ * 
+ * @external L.Map.TouchZoom
  */
 
 // @namespace Map
@@ -11,10 +15,18 @@ L.Map.mergeOptions({
     // Whether the map can be zoomed by touch-dragging with two fingers. If
     // passed `'center'`, it will zoom to the center of the view regardless of
     // where the touch events (fingers) were. Enabled for touch-capable web
-    // browsers except for old Androids.
-    touchZoom: L.Browser.touch && !L.Browser.android23,
+    // browsers.
+    touchZoom: L.Browser.touch,
 
+    /**
+     * @TODO check if this is a duplicate of `L.Map.TouchGestures::bounceAtZoomLimits`
+     */
+
+    // @option bounceAtZoomLimits: Boolean = true
+    // Set it to false if you don't want the map to zoom beyond min/max zoom
+    // and then bounce back when pinch-zooming.
     bounceAtZoomLimits: false,
+
 });
 
 L.Map.TouchZoom = L.Handler.extend({

package/test/index.html

@@ -7,8 +7,8 @@
 		<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
 
 		<!-- Leaflet JS / CSS -->
-		<script src="https://unpkg.com/leaflet@1.7/dist/leaflet-src.js"></script>
-		<link rel="stylesheet" href="https://unpkg.com/leaflet@1.7/dist/leaflet.css">
+		<script src="https://unpkg.com/leaflet@1.9/dist/leaflet-src.js"></script>
+		<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9/dist/leaflet.css">
 
 		<!-- Leaflet-Rotate -->
 		<script src="../dist/leaflet-rotate-src.js"></script>
@@ -26,6 +26,11 @@
 				border: 1px solid #ccc;
 				max-height: 50vh;
 			}
+			/* TODO: fix incorrect map corners position when map has some margin */
+			html, body {
+				/* margin: 0; */
+				/* padding: 0; */
+			}
 		</style>
 	</head>
 
@@ -58,12 +63,14 @@
 				maxZoom: 24,
 				maxNativeZoom: 18,
 				attribution: 'Tiles &copy; Esri &mdash; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community',
+				// noWrap: true
 			});
 
 			var osm = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 				maxZoom: 24,
 				maxNativeZoom: 19,
 				attribution: '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+				// noWrap: true
 			});
 
 			var map = L.map('map', {
@@ -71,17 +78,34 @@
 				zoom: 2,
 				layers: [esri],
 				// worldCopyJump: true,
+				// preferCanvas: false,
 				rotate: true,
-				touchRotate: true,
 				rotateControl: {
-					closeOnZeroBearing: false
+					closeOnZeroBearing: false,
+					// position: 'bottomleft',
 				},
 				bearing: 30,
+				// attributionControl: false,
+				// zoomControl: false,
+				// compassBearing: false,
+				// trackContainerMutation: false,
+				// shiftKeyRotate: false,
+				// touchGestures: true,
+				touchRotate: true,
+				// touchZoom: true
 			});
 
-			// map.setBearing(30);
+			// map.setBearing(90);
 			// map.touchRotate.enable();
 
+			// map.touchZoom.disable()
+			// map.compassBearing.disable()
+			// map.touchGestures.enable()
+
+			// map.zoomControl.setPosition('bottomleft');
+			// map.rotateControl.setPosition('bottomleft');
+			// map.setMaxBounds([[-90,-180], [90,180]]);
+
 			var layers = L.control.layers({
 				'Empty': L.tileLayer(''),
 				'Streets': osm,
@@ -127,4 +151,4 @@
 
 	</body>
 
-</html>
+</html>

package/build/rollup.config.min.js

@@ -1,2 +0,0 @@
-'use strict';import{terser}from"rollup-plugin-terser";import resolve from"rollup-plugin-node-resolve";import commonJS from"rollup-plugin-commonjs";let plugin=require("../package.json");let input="src/index.js";let output={file:"dist/"+plugin.name+"-src.js",format:"umd",sourcemap:true,name:plugin.name};let plugins=[resolve(),commonJS({include:"../node_modules/**"})];
-export default[{input:input,output:output,plugins:plugins},{input:input,output:Object.assign({},output,{file:"dist/"+plugin.name+".js"}),plugins:plugins.concat(terser())}];

package/src/map/handler/ShiftKeyRotate.min.js

@@ -1 +0,0 @@
-L.Map.mergeOptions({shiftKeyRotate:!0}),L.Map.ShiftKeyRotate=L.Handler.extend({addHooks:function(){L.DomEvent.on(this._map._container,"wheel",this._handleShiftScroll,this),this._map.shiftKeyRotate.rotate=!0},removeHooks:function(){L.DomEvent.off(this._map._container,"wheel",this._handleShiftScroll,this),this._map.shiftKeyRotate.rotate=!1},_handleShiftScroll:function(e){e.shiftKey?(e.preventDefault(),this._map.scrollWheelZoom.disable(),this._map.setBearing(this._map._bearing*L.DomUtil.RAD_TO_DEG+5*Math.sign(e.deltaY))):this._map.scrollWheelZoom.enable()}}),L.Map.addInitHook("addHandler","shiftKeyRotate",L.Map.ShiftKeyRotate),L.Map.addInitHook((function(){this.scrollWheelZoom.enabled()&&this.shiftKeyRotate.enabled()&&(this.scrollWheelZoom.disable(),this.scrollWheelZoom.enable())}));