added _calculateAngle to L.EditHandle

publiclab · May 20, 2019 · e65a5a3 · e65a5a3
1 parent d91b2d7
commit e65a5a3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 42 deletions.
diff --git a/src/edit/EditHandle.js b/src/edit/EditHandle.js
@@ -72,5 +72,19 @@ L.EditHandle = L.Marker.extend({
 
     this._handled._map.off("zoomend", this.updateHandle, this);
     this._handled.off("update", this.updateHandle, this);
-  }
+  },
+  /* Takes two latlngs and calculates the angle between them. */
+	_calculateAngle: function(latlngA, latlngB) {
+		var map = this._handled._map,
+
+			centerPoint = map.latLngToLayerPoint(this._handled.getCenter()),
+			formerPoint = map.latLngToLayerPoint(latlngA),
+			newPoint = map.latLngToLayerPoint(latlngB),
+
+			initialAngle = Math.atan2(centerPoint.y - formerPoint.y, centerPoint.x - formerPoint.x),
+			newAngle = Math.atan2(centerPoint.y - newPoint.y, centerPoint.x - newPoint.x);
+
+		return newAngle - initialAngle;
+	}
+
 });
diff --git a/src/edit/RotateHandle.js b/src/edit/RotateHandle.js
@@ -25,20 +25,6 @@ L.RotateHandle = L.EditHandle.extend({
 		this.setLatLng(this._handled._corners[this._corner]);
 	},
 
-	/* Takes two latlngs and calculates the angle between them. */
-	_calculateAngle: function(latlngA, latlngB) {
-		var map = this._handled._map,
-
-			centerPoint = map.latLngToLayerPoint(this._handled.getCenter()),
-			formerPoint = map.latLngToLayerPoint(latlngA),
-			newPoint = map.latLngToLayerPoint(latlngB),
-
-			initialAngle = Math.atan2(centerPoint.y - formerPoint.y, centerPoint.x - formerPoint.x),
-			newAngle = Math.atan2(centerPoint.y - newPoint.y, centerPoint.x - newPoint.x);
-
-		return newAngle - initialAngle;
-	},
-
 	/* Takes two latlngs and calculates the scaling difference. */
 	_calculateScalingFactor: function(latlngA, latlngB) {
 		var map = this._handled._map,

diff --git a/src/edit/RotateScaleHandle.js b/src/edit/RotateScaleHandle.js
@@ -41,20 +41,6 @@ L.RotateScaleHandle = L.EditHandle.extend({
 		this.setLatLng(this._handled._corners[this._corner]);
 	},
 
-	/* Takes two latlngs and calculates the angle between them. */
-	_calculateAngle: function(latlngA, latlngB) {
-		var map = this._handled._map,
-
-			centerPoint = map.latLngToLayerPoint(this._handled.getCenter()),
-			formerPoint = map.latLngToLayerPoint(latlngA),
-			newPoint = map.latLngToLayerPoint(latlngB),
-
-			initialAngle = Math.atan2(centerPoint.y - formerPoint.y, centerPoint.x - formerPoint.x),
-			newAngle = Math.atan2(centerPoint.y - newPoint.y, centerPoint.x - newPoint.x);
-
-		return newAngle - initialAngle;
-	},
-
 	/* Takes two latlngs and calculates the scaling difference. */
 	_calculateScalingFactor: function(latlngA, latlngB) {
 		var map = this._handled._map,

diff --git a/src/edit/ScaleHandle.js b/src/edit/ScaleHandle.js
@@ -26,19 +26,6 @@ L.ScaleHandle = L.EditHandle.extend({
 		this.setLatLng(this._handled._corners[this._corner]);
 	},
 
-	/* Takes two latlngs and calculates the angle between them. */
-	_calculateAngle: function(latlngA, latlngB) {
-		var map = this._handled._map,
-
-			centerPoint = map.latLngToLayerPoint(this._handled.getCenter()),
-			formerPoint = map.latLngToLayerPoint(latlngA),
-			newPoint = map.latLngToLayerPoint(latlngB),
-
-			initialAngle = Math.atan2(centerPoint.y - formerPoint.y, centerPoint.x - formerPoint.x),
-			newAngle = Math.atan2(centerPoint.y - newPoint.y, centerPoint.x - newPoint.x);
-
-		return newAngle - initialAngle;
-	},
 
 	/* Takes two latlngs and calculates the scaling difference. */
 	_calculateScalingFactor: function(latlngA, latlngB) {