From 819d5f327d65e3b772d659870a4e05d1dec45b2b Mon Sep 17 00:00:00 2001 From: themacboy Date: Wed, 31 Jul 2019 23:51:05 +0200 Subject: [PATCH 01/25] Add DRAG mode, this let you move object with the handlers and nothing else (ok) --- src/edit/DistortableImage.Edit.js | 21 +++++++++++++++++++++ src/edit/DragHandle.js | 27 +++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 src/edit/DragHandle.js diff --git a/src/edit/DistortableImage.Edit.js b/src/edit/DistortableImage.Edit.js index 9f14d214b..43bc99af1 100644 --- a/src/edit/DistortableImage.Edit.js +++ b/src/edit/DistortableImage.Edit.js @@ -124,7 +124,13 @@ L.DistortableImage.Edit = L.Handler.extend({ ); } + this._dragHandles = L.layerGroup(); + for (i = 0; i < 4; i++) { + this._dragHandles.addLayer(new L.DragHandle(overlay, i)); + } + this._handles = { + drag: this._dragHandles, scale: this._scaleHandles, distort: this._distortHandles, rotate: this._rotateHandles, @@ -206,6 +212,21 @@ L.DistortableImage.Edit = L.Handler.extend({ } }, + _dragBy: function(formerPoint, newPoint) { + var overlay = this._overlay; + var map = overlay._map; + var i; + var p; + var transCorners = {}; + var delta = map.project(formerPoint).subtract(map.project(newPoint)); + + for (i = 0; i < 4; i++) { + p = map.project(overlay.getCorner(i)).subtract(delta); + transCorners[i] = map.unproject(p); + } + overlay.setCorners(transCorners); + }, + _enableDragging: function() { var overlay = this._overlay; var map = overlay._map; diff --git a/src/edit/DragHandle.js b/src/edit/DragHandle.js new file mode 100644 index 000000000..5ec6834d6 --- /dev/null +++ b/src/edit/DragHandle.js @@ -0,0 +1,27 @@ +L.DragHandle = L.EditHandle.extend({ + options: { + TYPE: 'drag', + icon: L.icon({ + iconUrl: + 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', + iconSize: [32, 32], + iconAnchor: [16, 16] + }) + }, + + _onHandleDrag: function() { + var overlay = this._handled, + formerLatLng = overlay.getCorner(this._corner), + newLatLng = this.getLatLng(); + + overlay.editing._dragBy(formerLatLng, newLatLng); + + overlay.fire('update'); + overlay.editing._updateToolbarPos(); + }, + + updateHandle: function() { + this.setLatLng(this._handled.getCorner(this._corner)); + } + +}), From 65ff27ac89db50f84b602306d7a6aa7368fb111f Mon Sep 17 00:00:00 2001 From: themacboy Date: Thu, 1 Aug 2019 00:05:08 +0200 Subject: [PATCH 02/25] correct error --- src/edit/DistortableImage.Edit.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/edit/DistortableImage.Edit.js b/src/edit/DistortableImage.Edit.js index 43bc99af1..fb15b818d 100644 --- a/src/edit/DistortableImage.Edit.js +++ b/src/edit/DistortableImage.Edit.js @@ -224,6 +224,7 @@ L.DistortableImage.Edit = L.Handler.extend({ p = map.project(overlay.getCorner(i)).subtract(delta); transCorners[i] = map.unproject(p); } + overlay.setCorners(transCorners); }, From b3febbbc0a820215761b9d9617d27899a72d869f Mon Sep 17 00:00:00 2001 From: themacboy Date: Thu, 1 Aug 2019 00:07:31 +0200 Subject: [PATCH 03/25] correct NOOB error :) --- src/edit/DragHandle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/edit/DragHandle.js b/src/edit/DragHandle.js index 5ec6834d6..7658d5578 100644 --- a/src/edit/DragHandle.js +++ b/src/edit/DragHandle.js @@ -24,4 +24,4 @@ L.DragHandle = L.EditHandle.extend({ this.setLatLng(this._handled.getCorner(this._corner)); } -}), +}) From b70f153136141b1679cf0c57d94eb0cde5cc3cb7 Mon Sep 17 00:00:00 2001 From: themacboy Date: Thu, 1 Aug 2019 00:28:21 +0200 Subject: [PATCH 04/25] correct error (don't understand travis-ci). Probably I need help using github hahaha --- src/edit/DragHandle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/edit/DragHandle.js b/src/edit/DragHandle.js index 7658d5578..5ec6834d6 100644 --- a/src/edit/DragHandle.js +++ b/src/edit/DragHandle.js @@ -24,4 +24,4 @@ L.DragHandle = L.EditHandle.extend({ this.setLatLng(this._handled.getCorner(this._corner)); } -}) +}), From ff3001199677edfe24f04ec76f246de4ffbd4172 Mon Sep 17 00:00:00 2001 From: themacboy Date: Thu, 1 Aug 2019 00:32:26 +0200 Subject: [PATCH 05/25] correct The Error uppssss --- src/edit/DragHandle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/edit/DragHandle.js b/src/edit/DragHandle.js index 5ec6834d6..36cd119ef 100644 --- a/src/edit/DragHandle.js +++ b/src/edit/DragHandle.js @@ -24,4 +24,4 @@ L.DragHandle = L.EditHandle.extend({ this.setLatLng(this._handled.getCorner(this._corner)); } -}), +}); From 6d2eba0f46a860c6c878fc8bfa4bf7779aac6aa7 Mon Sep 17 00:00:00 2001 From: themacboy Date: Thu, 1 Aug 2019 00:35:44 +0200 Subject: [PATCH 06/25] add Gruntfile changes --- dist/leaflet.distortableimage.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index f6ae282c0..82002d0c0 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -2044,7 +2044,13 @@ L.DistortableImage.Edit = L.Handler.extend({ ); } + this._dragHandles = L.layerGroup(); + for (i = 0; i < 4; i++) { + this._dragHandles.addLayer(new L.DragHandle(overlay, i)); + } + this._handles = { + drag: this._dragHandles, scale: this._scaleHandles, distort: this._distortHandles, rotate: this._rotateHandles, @@ -2126,6 +2132,22 @@ L.DistortableImage.Edit = L.Handler.extend({ } }, + _dragBy: function(formerPoint, newPoint) { + var overlay = this._overlay; + var map = overlay._map; + var i; + var p; + var transCorners = {}; + var delta = map.project(formerPoint).subtract(map.project(newPoint)); + + for (i = 0; i < 4; i++) { + p = map.project(overlay.getCorner(i)).subtract(delta); + transCorners[i] = map.unproject(p); + } + + overlay.setCorners(transCorners); + }, + _enableDragging: function() { var overlay = this._overlay; var map = overlay._map; From 495f61e82869e0649501f2c8745e74ee327088b5 Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Sun, 15 Sep 2019 08:48:21 -0400 Subject: [PATCH 07/25] resolve conflicts --- dist/leaflet.distortableimage.js | 24 +++++++++++++++++- src/edit/DragHandle.js | 43 ++++++++++++++------------------ 2 files changed, 42 insertions(+), 25 deletions(-) diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index 82002d0c0..14d72707b 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -1189,7 +1189,7 @@ L.DistortHandle = L.EditHandle.extend({ }, }); -L.RotateScaleHandle = L.EditHandle.extend({ +L.FreeRotateHandle = L.EditHandle.extend({ options: { TYPE: 'freeRotate', icon: L.icon({ @@ -2049,6 +2049,11 @@ L.DistortableImage.Edit = L.Handler.extend({ this._dragHandles.addLayer(new L.DragHandle(overlay, i)); } + this._dragHandles = L.layerGroup(); + for (i = 0; i < 4; i++) { + this._dragHandles.addLayer(new L.DragHandle(overlay, i)); + } + this._handles = { drag: this._dragHandles, scale: this._scaleHandles, @@ -2148,6 +2153,23 @@ L.DistortableImage.Edit = L.Handler.extend({ overlay.setCorners(transCorners); }, + _dragBy: function (formerPoint, newPoint) { + var overlay = this._overlay, + map = overlay._map, + center = map.project(overlay.getCenter()), + i, + p, + diference = map.project (formerPoint).subtract (map.project (newPoint)); + + for (i = 0; i < 4; i++) { + p = map + .project(overlay.getCorner(i)) + .subtract(diference); + overlay.setCorner(i, map.unproject(p)); + } + overlay._reset(); + }, + _enableDragging: function() { var overlay = this._overlay; var map = overlay._map; diff --git a/src/edit/DragHandle.js b/src/edit/DragHandle.js index 36cd119ef..a8396cb14 100644 --- a/src/edit/DragHandle.js +++ b/src/edit/DragHandle.js @@ -1,27 +1,22 @@ L.DragHandle = L.EditHandle.extend({ - options: { - TYPE: 'drag', - icon: L.icon({ - iconUrl: - 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', - iconSize: [32, 32], - iconAnchor: [16, 16] - }) - }, - - _onHandleDrag: function() { - var overlay = this._handled, - formerLatLng = overlay.getCorner(this._corner), - newLatLng = this.getLatLng(); - - overlay.editing._dragBy(formerLatLng, newLatLng); - - overlay.fire('update'); - overlay.editing._updateToolbarPos(); - }, + options: { + TYPE: 'drag', + icon: L.icon({ + iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', + iconSize: [32, 32], + iconAnchor: [16, 16], + }) + }, - updateHandle: function() { - this.setLatLng(this._handled.getCorner(this._corner)); - } - + _onHandleDrag: function() { + var overlay = this._handled; + var formerLatLng = overlay.getCorner(this._corner); + var newLatLng = this.getLatLng(); + + overlay.dragBy(formerLatLng, newLatLng); + }, + + updateHandle: function() { + this.setLatLng(this._handled.getCorner(this._corner)); + }, }); From 2f8bc4886fbc9d4ba034876570a39cd597c8006f Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Sun, 15 Sep 2019 09:36:27 -0400 Subject: [PATCH 08/25] resolve conflicts 2 --- .project | 11 +++++ dist/leaflet.distortableimage.js | 68 +++++++++++++++++++------------ src/DistortableImageOverlay.js | 15 +++++++ src/edit/DistortableImage.Edit.js | 2 +- src/edit/handles/DragHandle.js | 22 ++++++++++ src/mapmixins/BoxCollector.js | 4 +- 6 files changed, 95 insertions(+), 27 deletions(-) create mode 100644 .project create mode 100644 src/edit/handles/DragHandle.js diff --git a/.project b/.project new file mode 100644 index 000000000..83eee0f8e --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + Leaflet.DistortableImage + + + + + + + + diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index 14d72707b..31ea4712f 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -583,6 +583,21 @@ L.DistortableImageOverlay = L.ImageOverlay.extend({ return this; }, + dragBy: function(formerPoint, newPoint) { + var map = this._map; + var center = map.project(this.getCenter()); + var i; + var p; + var diference = map.project(formerPoint).subtract(map.project(newPoint)); + + for (i = 0; i < 4; i++) { + p = map + .project(this.getCorner(i)) + .subtract(diference); + this.setCorner(i, map.unproject(p)); + } + }, + _revert: function() { var a = this.rotation; var map = this._map; @@ -1189,7 +1204,30 @@ L.DistortHandle = L.EditHandle.extend({ }, }); -L.FreeRotateHandle = L.EditHandle.extend({ +L.DragHandle = L.EditHandle.extend({ + options: { + TYPE: 'drag', + icon: L.icon({ + iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', + iconSize: [32, 32], + iconAnchor: [16, 16], + }) + }, + + _onHandleDrag: function() { + var overlay = this._handled; + var formerLatLng = overlay.getCorner(this._corner); + var newLatLng = this.getLatLng(); + + overlay.dragBy(formerLatLng, newLatLng); + }, + + updateHandle: function() { + this.setLatLng(this._handled.getCorner(this._corner)); + }, +}); + +L.RotateScaleHandle = L.EditHandle.extend({ options: { TYPE: 'freeRotate', icon: L.icon({ @@ -1926,7 +1964,7 @@ L.DistortableImage.Edit = L.Handler.extend({ opacity: 0.7, outline: '1px solid red', keymap: L.distortableImage.action_map, - modes: ['scale', 'distort', 'rotate', 'freeRotate', 'lock'], + modes: ['scale', 'distort', 'rotate', 'freeRotate', 'lock', 'drag'], }, initialize: function(overlay, options) { @@ -2049,11 +2087,6 @@ L.DistortableImage.Edit = L.Handler.extend({ this._dragHandles.addLayer(new L.DragHandle(overlay, i)); } - this._dragHandles = L.layerGroup(); - for (i = 0; i < 4; i++) { - this._dragHandles.addLayer(new L.DragHandle(overlay, i)); - } - this._handles = { drag: this._dragHandles, scale: this._scaleHandles, @@ -2153,23 +2186,6 @@ L.DistortableImage.Edit = L.Handler.extend({ overlay.setCorners(transCorners); }, - _dragBy: function (formerPoint, newPoint) { - var overlay = this._overlay, - map = overlay._map, - center = map.project(overlay.getCenter()), - i, - p, - diference = map.project (formerPoint).subtract (map.project (newPoint)); - - for (i = 0; i < 4; i++) { - p = map - .project(overlay.getCorner(i)) - .subtract(diference); - overlay.setCorner(i, map.unproject(p)); - } - overlay._reset(); - }, - _enableDragging: function() { var overlay = this._overlay; var map = overlay._map; @@ -3140,7 +3156,9 @@ L.Map.BoxCollector = L.Map.BoxZoom.extend({ }, _onMouseUp: function(e) { - if (e.which !== 1 && e.button !== 1) { return; } + if (e.which !== 1 && e.button !== 1) { + return; + } this._finish(); diff --git a/src/DistortableImageOverlay.js b/src/DistortableImageOverlay.js index 41e10195d..c8c366353 100644 --- a/src/DistortableImageOverlay.js +++ b/src/DistortableImageOverlay.js @@ -349,6 +349,21 @@ L.DistortableImageOverlay = L.ImageOverlay.extend({ return this; }, + dragBy: function(formerPoint, newPoint) { + var map = this._map; + var center = map.project(this.getCenter()); + var i; + var p; + var diference = map.project(formerPoint).subtract(map.project(newPoint)); + + for (i = 0; i < 4; i++) { + p = map + .project(this.getCorner(i)) + .subtract(diference); + this.setCorner(i, map.unproject(p)); + } + }, + _revert: function() { var a = this.rotation; var map = this._map; diff --git a/src/edit/DistortableImage.Edit.js b/src/edit/DistortableImage.Edit.js index fb15b818d..a508068d9 100644 --- a/src/edit/DistortableImage.Edit.js +++ b/src/edit/DistortableImage.Edit.js @@ -6,7 +6,7 @@ L.DistortableImage.Edit = L.Handler.extend({ opacity: 0.7, outline: '1px solid red', keymap: L.distortableImage.action_map, - modes: ['scale', 'distort', 'rotate', 'freeRotate', 'lock'], + modes: ['scale', 'distort', 'rotate', 'freeRotate', 'lock', 'drag'], }, initialize: function(overlay, options) { diff --git a/src/edit/handles/DragHandle.js b/src/edit/handles/DragHandle.js new file mode 100644 index 000000000..a8396cb14 --- /dev/null +++ b/src/edit/handles/DragHandle.js @@ -0,0 +1,22 @@ +L.DragHandle = L.EditHandle.extend({ + options: { + TYPE: 'drag', + icon: L.icon({ + iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', + iconSize: [32, 32], + iconAnchor: [16, 16], + }) + }, + + _onHandleDrag: function() { + var overlay = this._handled; + var formerLatLng = overlay.getCorner(this._corner); + var newLatLng = this.getLatLng(); + + overlay.dragBy(formerLatLng, newLatLng); + }, + + updateHandle: function() { + this.setLatLng(this._handled.getCorner(this._corner)); + }, +}); diff --git a/src/mapmixins/BoxCollector.js b/src/mapmixins/BoxCollector.js index a47ba906e..c4da6e5b3 100644 --- a/src/mapmixins/BoxCollector.js +++ b/src/mapmixins/BoxCollector.js @@ -105,7 +105,9 @@ L.Map.BoxCollector = L.Map.BoxZoom.extend({ }, _onMouseUp: function(e) { - if (e.which !== 1 && e.button !== 1) { return; } + if (e.which !== 1 && e.button !== 1) { + return; + } this._finish(); From 7f9ae93054d74b4e2ada9c7651a52400e79f2d32 Mon Sep 17 00:00:00 2001 From: themacboy Date: Thu, 19 Sep 2019 11:32:26 +0200 Subject: [PATCH 09/25] Add Drag Action js file --- src/edit/actions/DragAction.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/edit/actions/DragAction.js diff --git a/src/edit/actions/DragAction.js b/src/edit/actions/DragAction.js new file mode 100644 index 000000000..011b4c67d --- /dev/null +++ b/src/edit/actions/DragAction.js @@ -0,0 +1,19 @@ +L.DragAction = L.EditAction.extend({ + initialize: function(map, overlay, options) { + options = options || {}; + options.toolbarIcon = { + svg: true, + html: 'drag', + tooltip: 'Drag Only Image', + className: 'drag' + }; + + L.DistortableImage.action_map.D = '_dragMode'; + L.EditAction.prototype.initialize.call(this, map, overlay, options); + }, + + addHooks: function() { + var edit = this._overlay.editing; + edit._dragMode(); + } +}); From bf205e1128d1db531eaff5b9d044c86f5e9f7c5c Mon Sep 17 00:00:00 2001 From: themacboy Date: Thu, 19 Sep 2019 11:40:39 +0200 Subject: [PATCH 10/25] resolve conflict 3 --- dist/leaflet.distortableimage.js | 26 ++++++++++++++++++++ src/components/DistortableImage.Keymapper.js | 1 + src/edit/DistortableImage.Edit.js | 5 ++++ 3 files changed, 32 insertions(+) diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index 31ea4712f..622a7a211 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -1595,6 +1595,26 @@ L.DistortAction = L.EditAction.extend({ }, }); +L.DragAction = L.EditAction.extend({ + initialize: function(map, overlay, options) { + options = options || {}; + options.toolbarIcon = { + svg: true, + html: 'drag', + tooltip: 'Drag Only Image', + className: 'drag' + }; + + L.DistortableImage.action_map.D = '_dragMode'; + L.EditAction.prototype.initialize.call(this, map, overlay, options); + }, + + addHooks: function() { + var edit = this._overlay.editing; + edit._dragMode(); + } +}); + L.ExportAction = L.EditAction.extend({ initialize: function(map, overlay, options) { var edit = overlay.editing; @@ -2225,6 +2245,11 @@ L.DistortableImage.Edit = L.Handler.extend({ }; }, + _dragMode: function() { + if (!this.hasTool(L.DragAction)) { return; } + this.setMode('drag'); + }, + _scaleMode: function() { if (!this.hasTool(L.ScaleAction)) { return; } this.setMode('scale'); @@ -2978,6 +3003,7 @@ L.DistortableImage.Keymapper = L.Handler.extend({ '
RotateScale Mode
r
' + '
Scale Mode
s
' + '
Distort Mode
d
' + + '
Drag Mode
D
' + '
Lock (Mode) / Unlock Image
l\xa0u
' + '
Stack up / down
q\xa0a
' + '
Add / Remove Image Border
b
' + diff --git a/src/components/DistortableImage.Keymapper.js b/src/components/DistortableImage.Keymapper.js index 831a7850a..a511e4017 100644 --- a/src/components/DistortableImage.Keymapper.js +++ b/src/components/DistortableImage.Keymapper.js @@ -84,6 +84,7 @@ L.DistortableImage.Keymapper = L.Handler.extend({ '
RotateScale Mode
r
' + '
Scale Mode
s
' + '
Distort Mode
d
' + + '
Drag Mode
D
' + '
Lock (Mode) / Unlock Image
l\xa0u
' + '
Stack up / down
q\xa0a
' + '
Add / Remove Image Border
b
' + diff --git a/src/edit/DistortableImage.Edit.js b/src/edit/DistortableImage.Edit.js index a508068d9..5e81101a9 100644 --- a/src/edit/DistortableImage.Edit.js +++ b/src/edit/DistortableImage.Edit.js @@ -267,6 +267,11 @@ L.DistortableImage.Edit = L.Handler.extend({ }; }, + _dragMode: function() { + if (!this.hasTool(L.DragAction)) { return; } + this.setMode('drag'); + }, + _scaleMode: function() { if (!this.hasTool(L.ScaleAction)) { return; } this.setMode('scale'); From f2710fdef31345bdb60c41c3c2818d030db9e657 Mon Sep 17 00:00:00 2001 From: themacboy Date: Thu, 19 Sep 2019 12:01:27 +0200 Subject: [PATCH 11/25] resolve conflict 4 --- dist/leaflet.distortableimage.css | 9 ++++++ dist/leaflet.distortableimage.js | 46 +++++++++++++++---------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dist/leaflet.distortableimage.css b/dist/leaflet.distortableimage.css index 1126ae7cb..e2467a4e4 100644 --- a/dist/leaflet.distortableimage.css +++ b/dist/leaflet.distortableimage.css @@ -159,6 +159,15 @@ a.leaflet-toolbar-icon.freeRotate.selected-mode .ldi-icon { fill: white; } +a.leaflet-toolbar-icon.drag.selected-mode { + background-color: rgba(9, 155, 56, 0.75); + border: inset 0.5px lightgray; +} + +a.leaflet-toolbar-icon.drag.selected-mode .ldi-icon { + fill: white; +} + a.leaflet-toolbar-icon.distort.selected-mode, a.leaflet-toolbar-icon.scale.selected-mode { background-color: hsla(239, 97%, 55%, 0.75); diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index 622a7a211..3788a4dca 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -1204,28 +1204,28 @@ L.DistortHandle = L.EditHandle.extend({ }, }); -L.DragHandle = L.EditHandle.extend({ - options: { - TYPE: 'drag', - icon: L.icon({ - iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', - iconSize: [32, 32], - iconAnchor: [16, 16], - }) - }, - - _onHandleDrag: function() { - var overlay = this._handled; - var formerLatLng = overlay.getCorner(this._corner); - var newLatLng = this.getLatLng(); - - overlay.dragBy(formerLatLng, newLatLng); - }, - - updateHandle: function() { - this.setLatLng(this._handled.getCorner(this._corner)); - }, -}); +L.DragHandle = L.EditHandle.extend({ + options: { + TYPE: 'drag', + icon: L.icon({ + iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', + iconSize: [32, 32], + iconAnchor: [16, 16], + }) + }, + + _onHandleDrag: function() { + var overlay = this._handled; + var formerLatLng = overlay.getCorner(this._corner); + var newLatLng = this.getLatLng(); + + overlay.dragBy(formerLatLng, newLatLng); + }, + + updateHandle: function() { + this.setLatLng(this._handled.getCorner(this._corner)); + }, +}); L.RotateScaleHandle = L.EditHandle.extend({ options: { @@ -1410,7 +1410,7 @@ L.ToolbarIconSet = L.IconSet.extend({ '' + '' + '' + - ' ' + + '' + '' + '' + '', From c0b9f41597f251fa6c6fecc6be76635b48804332 Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Sat, 21 Sep 2019 00:31:52 -0400 Subject: [PATCH 12/25] resolve conflict 5 --- dist/leaflet.distortableimage.js | 57 ++++++++++--------- src/DistortableImageOverlay.js | 1 - src/edit/DistortableImage.Edit.js | 2 +- src/edit/actions/DragAction.js | 6 +- src/edit/handles/DragHandle.js | 3 +- .../toolbars/DistortableImage.PopupBar.js | 1 + 6 files changed, 36 insertions(+), 34 deletions(-) diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index 3788a4dca..7e8958171 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -585,7 +585,6 @@ L.DistortableImageOverlay = L.ImageOverlay.extend({ dragBy: function(formerPoint, newPoint) { var map = this._map; - var center = map.project(this.getCenter()); var i; var p; var diference = map.project(formerPoint).subtract(map.project(newPoint)); @@ -1204,28 +1203,29 @@ L.DistortHandle = L.EditHandle.extend({ }, }); -L.DragHandle = L.EditHandle.extend({ - options: { - TYPE: 'drag', - icon: L.icon({ - iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', - iconSize: [32, 32], - iconAnchor: [16, 16], - }) - }, - - _onHandleDrag: function() { - var overlay = this._handled; - var formerLatLng = overlay.getCorner(this._corner); - var newLatLng = this.getLatLng(); - - overlay.dragBy(formerLatLng, newLatLng); - }, - - updateHandle: function() { - this.setLatLng(this._handled.getCorner(this._corner)); - }, -}); +L.DragHandle = L.EditHandle.extend({ + options: { + TYPE: 'drag', + icon: L.icon({ + // eslint-disable-next-line max-len + iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', + iconSize: [32, 32], + iconAnchor: [16, 16], + }), + }, + + _onHandleDrag: function() { + var overlay = this._handled; + var formerLatLng = overlay.getCorner(this._corner); + var newLatLng = this.getLatLng(); + + overlay.dragBy(formerLatLng, newLatLng); + }, + + updateHandle: function() { + this.setLatLng(this._handled.getCorner(this._corner)); + }, +}); L.RotateScaleHandle = L.EditHandle.extend({ options: { @@ -1410,7 +1410,7 @@ L.ToolbarIconSet = L.IconSet.extend({ '' + '' + '' + - '' + + ' ' + '' + '' + '', @@ -1601,8 +1601,8 @@ L.DragAction = L.EditAction.extend({ options.toolbarIcon = { svg: true, html: 'drag', - tooltip: 'Drag Only Image', - className: 'drag' + tooltip: 'Drag Image', + className: 'drag', }; L.DistortableImage.action_map.D = '_dragMode'; @@ -1612,7 +1612,7 @@ L.DragAction = L.EditAction.extend({ addHooks: function() { var edit = this._overlay.editing; edit._dragMode(); - } + }, }); L.ExportAction = L.EditAction.extend({ @@ -1912,6 +1912,7 @@ L.distortableImage.popupBar = function(latlng, options) { L.DistortableImageOverlay.addInitHook(function() { /** Default actions */ this.ACTIONS = [ + L.DragAction, L.ScaleAction, L.DistortAction, L.RotateAction, @@ -1984,7 +1985,7 @@ L.DistortableImage.Edit = L.Handler.extend({ opacity: 0.7, outline: '1px solid red', keymap: L.distortableImage.action_map, - modes: ['scale', 'distort', 'rotate', 'freeRotate', 'lock', 'drag'], + modes: ['drag', 'scale', 'distort', 'rotate', 'freeRotate', 'lock'], }, initialize: function(overlay, options) { diff --git a/src/DistortableImageOverlay.js b/src/DistortableImageOverlay.js index c8c366353..fcb728205 100644 --- a/src/DistortableImageOverlay.js +++ b/src/DistortableImageOverlay.js @@ -351,7 +351,6 @@ L.DistortableImageOverlay = L.ImageOverlay.extend({ dragBy: function(formerPoint, newPoint) { var map = this._map; - var center = map.project(this.getCenter()); var i; var p; var diference = map.project(formerPoint).subtract(map.project(newPoint)); diff --git a/src/edit/DistortableImage.Edit.js b/src/edit/DistortableImage.Edit.js index 5e81101a9..a67e1db2d 100644 --- a/src/edit/DistortableImage.Edit.js +++ b/src/edit/DistortableImage.Edit.js @@ -6,7 +6,7 @@ L.DistortableImage.Edit = L.Handler.extend({ opacity: 0.7, outline: '1px solid red', keymap: L.distortableImage.action_map, - modes: ['scale', 'distort', 'rotate', 'freeRotate', 'lock', 'drag'], + modes: ['drag', 'scale', 'distort', 'rotate', 'freeRotate', 'lock'], }, initialize: function(overlay, options) { diff --git a/src/edit/actions/DragAction.js b/src/edit/actions/DragAction.js index 011b4c67d..016242b16 100644 --- a/src/edit/actions/DragAction.js +++ b/src/edit/actions/DragAction.js @@ -4,8 +4,8 @@ L.DragAction = L.EditAction.extend({ options.toolbarIcon = { svg: true, html: 'drag', - tooltip: 'Drag Only Image', - className: 'drag' + tooltip: 'Drag Image', + className: 'drag', }; L.DistortableImage.action_map.D = '_dragMode'; @@ -15,5 +15,5 @@ L.DragAction = L.EditAction.extend({ addHooks: function() { var edit = this._overlay.editing; edit._dragMode(); - } + }, }); diff --git a/src/edit/handles/DragHandle.js b/src/edit/handles/DragHandle.js index a8396cb14..fe4bd5f0a 100644 --- a/src/edit/handles/DragHandle.js +++ b/src/edit/handles/DragHandle.js @@ -2,10 +2,11 @@ L.DragHandle = L.EditHandle.extend({ options: { TYPE: 'drag', icon: L.icon({ + // eslint-disable-next-line max-len iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', iconSize: [32, 32], iconAnchor: [16, 16], - }) + }), }, _onHandleDrag: function() { diff --git a/src/edit/toolbars/DistortableImage.PopupBar.js b/src/edit/toolbars/DistortableImage.PopupBar.js index 345e2431e..9b21d1018 100644 --- a/src/edit/toolbars/DistortableImage.PopupBar.js +++ b/src/edit/toolbars/DistortableImage.PopupBar.js @@ -44,6 +44,7 @@ L.distortableImage.popupBar = function(latlng, options) { L.DistortableImageOverlay.addInitHook(function() { /** Default actions */ this.ACTIONS = [ + L.DragAction, L.ScaleAction, L.DistortAction, L.RotateAction, From eeda6069c30aea24e1edd08cacf358a8324d38b7 Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Sat, 21 Sep 2019 00:52:39 -0400 Subject: [PATCH 13/25] resolve conflit 6 --- dist/leaflet.distortableimage.js | 11 ++++++----- src/DistortableImageOverlay.js | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index 7e8958171..0eadb412f 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -587,14 +587,15 @@ L.DistortableImageOverlay = L.ImageOverlay.extend({ var map = this._map; var i; var p; - var diference = map.project(formerPoint).subtract(map.project(newPoint)); + var transCorners = {}; + var delta = map.project(formerPoint).subtract(map.project(newPoint)); for (i = 0; i < 4; i++) { - p = map - .project(this.getCorner(i)) - .subtract(diference); - this.setCorner(i, map.unproject(p)); + p = map.project(this.getCorner(i)).subtract(delta); + transCorners[i] = map.unproject(p); } + + this.setCorners(transCorners); }, _revert: function() { diff --git a/src/DistortableImageOverlay.js b/src/DistortableImageOverlay.js index fcb728205..fa3fd6ab4 100644 --- a/src/DistortableImageOverlay.js +++ b/src/DistortableImageOverlay.js @@ -353,14 +353,15 @@ L.DistortableImageOverlay = L.ImageOverlay.extend({ var map = this._map; var i; var p; - var diference = map.project(formerPoint).subtract(map.project(newPoint)); + var transCorners = {}; + var delta = map.project(formerPoint).subtract(map.project(newPoint)); for (i = 0; i < 4; i++) { - p = map - .project(this.getCorner(i)) - .subtract(diference); - this.setCorner(i, map.unproject(p)); + p = map.project(this.getCorner(i)).subtract(delta); + transCorners[i] = map.unproject(p); } + + this.setCorners(transCorners); }, _revert: function() { From d6635e9a204736590ced7204255812754d270864 Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Sat, 21 Sep 2019 01:07:42 -0400 Subject: [PATCH 14/25] resolve conflict 7 --- .settings/org.eclipse.core.resources.prefs | 2 ++ CODE_OF_CONDUCT.md | 2 +- dist/leaflet.distortableimage.js | 12 ++++++------ src/edit/DistortableImage.Edit.js | 10 +++++----- src/iconsets/ToolbarIconSet.js | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 .settings/org.eclipse.core.resources.prefs diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..26438fe82 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/README.md=UTF-8 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index ebc0f2c9e..6a5ca7028 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,4 +1,4 @@ -# Public Lab Code of Conduct +# Public Lab Code of Conduct _Public Lab, 55 Cromwell Street, 1C, Providence, RI 02907_ diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index 0eadb412f..e6ba33d47 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -1411,7 +1411,7 @@ L.ToolbarIconSet = L.IconSet.extend({ '' + '' + '' + - ' ' + + '' + '' + '' + '', @@ -2076,6 +2076,11 @@ L.DistortableImage.Edit = L.Handler.extend({ var overlay = this._overlay; var i; + this._dragHandles = L.layerGroup(); + for (i = 0; i < 4; i++) { + this._dragHandles.addLayer(new L.DragHandle(overlay, i)); + } + this._scaleHandles = L.layerGroup(); for (i = 0; i < 4; i++) { this._scaleHandles.addLayer(new L.ScaleHandle(overlay, i)); @@ -2104,11 +2109,6 @@ L.DistortableImage.Edit = L.Handler.extend({ ); } - this._dragHandles = L.layerGroup(); - for (i = 0; i < 4; i++) { - this._dragHandles.addLayer(new L.DragHandle(overlay, i)); - } - this._handles = { drag: this._dragHandles, scale: this._scaleHandles, diff --git a/src/edit/DistortableImage.Edit.js b/src/edit/DistortableImage.Edit.js index a67e1db2d..311a97fe5 100644 --- a/src/edit/DistortableImage.Edit.js +++ b/src/edit/DistortableImage.Edit.js @@ -96,6 +96,11 @@ L.DistortableImage.Edit = L.Handler.extend({ var overlay = this._overlay; var i; + this._dragHandles = L.layerGroup(); + for (i = 0; i < 4; i++) { + this._dragHandles.addLayer(new L.DragHandle(overlay, i)); + } + this._scaleHandles = L.layerGroup(); for (i = 0; i < 4; i++) { this._scaleHandles.addLayer(new L.ScaleHandle(overlay, i)); @@ -124,11 +129,6 @@ L.DistortableImage.Edit = L.Handler.extend({ ); } - this._dragHandles = L.layerGroup(); - for (i = 0; i < 4; i++) { - this._dragHandles.addLayer(new L.DragHandle(overlay, i)); - } - this._handles = { drag: this._dragHandles, scale: this._scaleHandles, diff --git a/src/iconsets/ToolbarIconSet.js b/src/iconsets/ToolbarIconSet.js index b6526e7f4..add709002 100644 --- a/src/iconsets/ToolbarIconSet.js +++ b/src/iconsets/ToolbarIconSet.js @@ -15,7 +15,7 @@ L.ToolbarIconSet = L.IconSet.extend({ '' + '' + '' + - ' ' + + '' + '' + '' + '', From baa06183823375d4d09b36826b422f0684ef1b97 Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Sat, 21 Sep 2019 02:47:02 -0400 Subject: [PATCH 15/25] delete --- .project | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .project diff --git a/.project b/.project deleted file mode 100644 index 83eee0f8e..000000000 --- a/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - Leaflet.DistortableImage - - - - - - - - From 788bf1cafbfa064a1c9e62a7e788fa858a7936be Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Sat, 21 Sep 2019 03:29:13 -0400 Subject: [PATCH 16/25] clean branch commits parse assets --- assets/icons/svg-min/transform.svg | 1 - assets/icons/svg/transform.svg | 3 -- assets/icons/symbol/sprite.symbol.html | 50 +++++++++++++------------- assets/icons/symbol/sprite.symbol.svg | 2 +- dist/leaflet.distortableimage.js | 2 +- src/iconsets/ToolbarIconSet.js | 2 +- 6 files changed, 28 insertions(+), 32 deletions(-) delete mode 100644 assets/icons/svg-min/transform.svg delete mode 100644 assets/icons/svg/transform.svg diff --git a/assets/icons/svg-min/transform.svg b/assets/icons/svg-min/transform.svg deleted file mode 100644 index 311c34801..000000000 --- a/assets/icons/svg-min/transform.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/icons/svg/transform.svg b/assets/icons/svg/transform.svg deleted file mode 100644 index 563b19380..000000000 --- a/assets/icons/svg/transform.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/symbol/sprite.symbol.html b/assets/icons/symbol/sprite.symbol.html index 4d52c4d04..ab9e04639 100644 --- a/assets/icons/symbol/sprite.symbol.html +++ b/assets/icons/symbol/sprite.symbol.html @@ -24,6 +24,7 @@ .svg-crop_rotate-dims { width: 18px; height: 18px; } .svg-delete_forever-dims { width: 18px; height: 18px; } .svg-distort-dims { width: 18px; height: 18px; } + .svg-drag-dims { width: 18px; height: 18px; } .svg-explore-dims { width: 18px; height: 18px; } .svg-flip_to_back-dims { width: 18px; height: 18px; } .svg-flip_to_front-dims { width: 18px; height: 18px; } @@ -36,7 +37,6 @@ .svg-rotate-dims { width: 18px; height: 18px; } .svg-scale-dims { width: 18px; height: 18px; } .svg-spinner-dims { width: 18px; height: 18px; } - .svg-transform-dims { width: 18px; height: 18px; } .svg-unlock-dims { width: 18px; height: 18px; } + + + + + +

drag

+
  • @@ -295,17 +306,6 @@

    scale

    spinner

    • -
  • -
    - - - - - - -
    -

    transform

    -
  • @@ -393,6 +393,17 @@

    delete_forever

    distort

    • +
  • +
    + + + + + + +
    +

    drag

    +
  • @@ -525,17 +536,6 @@

    scale

    spinner

    • -
  • -
    - - - - - - -
    -

    transform

    -
  • @@ -555,7 +555,7 @@

    unlock

    -

    Generated at Fri, 16 Aug 2019 10:08:57 GMT by svg-sprite.

    +

    Generated at Sat, 21 Sep 2019 07:11:24 GMT by svg-sprite.

    diff --git a/assets/icons/symbol/sprite.symbol.svg b/assets/icons/symbol/sprite.symbol.svg index 3d7fd6ded..a5f845926 100644 --- a/assets/icons/symbol/sprite.symbol.svg +++ b/assets/icons/symbol/sprite.symbol.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index e6ba33d47..57038e18c 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -1413,7 +1413,7 @@ L.ToolbarIconSet = L.IconSet.extend({ '' + '' + '' + - '' + + '' + '', }); diff --git a/src/iconsets/ToolbarIconSet.js b/src/iconsets/ToolbarIconSet.js index add709002..dd17427de 100644 --- a/src/iconsets/ToolbarIconSet.js +++ b/src/iconsets/ToolbarIconSet.js @@ -17,6 +17,6 @@ L.ToolbarIconSet = L.IconSet.extend({ '' + '' + '' + - '' + + '' + '', }); From 9fe4171965e363d00bc7bea315e5fb3ed1857c2b Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Sat, 21 Sep 2019 03:34:06 -0400 Subject: [PATCH 17/25] finish rebase --- dist/leaflet.distortableimage.js | 62 ++++++++++++------------------- src/edit/DistortableImage.Edit.js | 16 -------- 2 files changed, 23 insertions(+), 55 deletions(-) diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index 57038e18c..8e7eb52ee 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -1204,29 +1204,29 @@ L.DistortHandle = L.EditHandle.extend({ }, }); -L.DragHandle = L.EditHandle.extend({ - options: { - TYPE: 'drag', - icon: L.icon({ - // eslint-disable-next-line max-len - iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', - iconSize: [32, 32], - iconAnchor: [16, 16], - }), - }, - - _onHandleDrag: function() { - var overlay = this._handled; - var formerLatLng = overlay.getCorner(this._corner); - var newLatLng = this.getLatLng(); - - overlay.dragBy(formerLatLng, newLatLng); - }, - - updateHandle: function() { - this.setLatLng(this._handled.getCorner(this._corner)); - }, -}); +L.DragHandle = L.EditHandle.extend({ + options: { + TYPE: 'drag', + icon: L.icon({ + // eslint-disable-next-line max-len + iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', + iconSize: [32, 32], + iconAnchor: [16, 16], + }), + }, + + _onHandleDrag: function() { + var overlay = this._handled; + var formerLatLng = overlay.getCorner(this._corner); + var newLatLng = this.getLatLng(); + + overlay.dragBy(formerLatLng, newLatLng); + }, + + updateHandle: function() { + this.setLatLng(this._handled.getCorner(this._corner)); + }, +}); L.RotateScaleHandle = L.EditHandle.extend({ options: { @@ -2192,22 +2192,6 @@ L.DistortableImage.Edit = L.Handler.extend({ } }, - _dragBy: function(formerPoint, newPoint) { - var overlay = this._overlay; - var map = overlay._map; - var i; - var p; - var transCorners = {}; - var delta = map.project(formerPoint).subtract(map.project(newPoint)); - - for (i = 0; i < 4; i++) { - p = map.project(overlay.getCorner(i)).subtract(delta); - transCorners[i] = map.unproject(p); - } - - overlay.setCorners(transCorners); - }, - _enableDragging: function() { var overlay = this._overlay; var map = overlay._map; diff --git a/src/edit/DistortableImage.Edit.js b/src/edit/DistortableImage.Edit.js index 311a97fe5..f9049ec20 100644 --- a/src/edit/DistortableImage.Edit.js +++ b/src/edit/DistortableImage.Edit.js @@ -212,22 +212,6 @@ L.DistortableImage.Edit = L.Handler.extend({ } }, - _dragBy: function(formerPoint, newPoint) { - var overlay = this._overlay; - var map = overlay._map; - var i; - var p; - var transCorners = {}; - var delta = map.project(formerPoint).subtract(map.project(newPoint)); - - for (i = 0; i < 4; i++) { - p = map.project(overlay.getCorner(i)).subtract(delta); - transCorners[i] = map.unproject(p); - } - - overlay.setCorners(transCorners); - }, - _enableDragging: function() { var overlay = this._overlay; var map = overlay._map; From d42d69934ae4205fb76723efd336d9b69246ab71 Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Sat, 21 Sep 2019 03:41:16 -0400 Subject: [PATCH 18/25] checkout accidental files --- CODE_OF_CONDUCT.md | 2 +- dist/leaflet.distortableimage.js | 54 ++++++++++++------------- src/edit/DistortableImage.Edit.js | 2 +- src/edit/DragHandle.js | 22 ---------- src/edit/handles/FreeRotateHandle.js | 2 +- src/edit/handles/ScaleHandle.js | 2 +- test/src/DistortableImageOverlaySpec.js | 2 +- 7 files changed, 32 insertions(+), 54 deletions(-) delete mode 100644 src/edit/DragHandle.js diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 6a5ca7028..ebc0f2c9e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,4 +1,4 @@ -# Public Lab Code of Conduct +# Public Lab Code of Conduct _Public Lab, 55 Cromwell Street, 1C, Providence, RI 02907_ diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js index 8e7eb52ee..09b0688cd 100644 --- a/dist/leaflet.distortableimage.js +++ b/dist/leaflet.distortableimage.js @@ -1204,31 +1204,31 @@ L.DistortHandle = L.EditHandle.extend({ }, }); -L.DragHandle = L.EditHandle.extend({ - options: { - TYPE: 'drag', - icon: L.icon({ - // eslint-disable-next-line max-len - iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', - iconSize: [32, 32], - iconAnchor: [16, 16], - }), - }, - - _onHandleDrag: function() { - var overlay = this._handled; - var formerLatLng = overlay.getCorner(this._corner); - var newLatLng = this.getLatLng(); - - overlay.dragBy(formerLatLng, newLatLng); - }, - - updateHandle: function() { - this.setLatLng(this._handled.getCorner(this._corner)); - }, -}); - -L.RotateScaleHandle = L.EditHandle.extend({ +L.DragHandle = L.EditHandle.extend({ + options: { + TYPE: 'drag', + icon: L.icon({ + // eslint-disable-next-line max-len + iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', + iconSize: [32, 32], + iconAnchor: [16, 16], + }), + }, + + _onHandleDrag: function() { + var overlay = this._handled; + var formerLatLng = overlay.getCorner(this._corner); + var newLatLng = this.getLatLng(); + + overlay.dragBy(formerLatLng, newLatLng); + }, + + updateHandle: function() { + this.setLatLng(this._handled.getCorner(this._corner)); + }, +}); + +L.FreeRotateHandle = L.EditHandle.extend({ options: { TYPE: 'freeRotate', icon: L.icon({ @@ -1322,7 +1322,7 @@ L.RotateHandle = L.EditHandle.extend({ L.ScaleHandle = L.EditHandle.extend({ options: { - TYPE: 'rotate', + TYPE: 'scale', icon: L.icon({ iconUrl: // eslint-disable-next-line max-len @@ -2099,7 +2099,7 @@ L.DistortableImage.Edit = L.Handler.extend({ // handle includes rotate AND scale this._freeRotateHandles = L.layerGroup(); for (i = 0; i < 4; i++) { - this._freeRotateHandles.addLayer(new L.RotateScaleHandle(overlay, i)); + this._freeRotateHandles.addLayer(new L.FreeRotateHandle(overlay, i)); } this._lockHandles = L.layerGroup(); diff --git a/src/edit/DistortableImage.Edit.js b/src/edit/DistortableImage.Edit.js index f9049ec20..2d0a5c2c2 100644 --- a/src/edit/DistortableImage.Edit.js +++ b/src/edit/DistortableImage.Edit.js @@ -119,7 +119,7 @@ L.DistortableImage.Edit = L.Handler.extend({ // handle includes rotate AND scale this._freeRotateHandles = L.layerGroup(); for (i = 0; i < 4; i++) { - this._freeRotateHandles.addLayer(new L.RotateScaleHandle(overlay, i)); + this._freeRotateHandles.addLayer(new L.FreeRotateHandle(overlay, i)); } this._lockHandles = L.layerGroup(); diff --git a/src/edit/DragHandle.js b/src/edit/DragHandle.js deleted file mode 100644 index a8396cb14..000000000 --- a/src/edit/DragHandle.js +++ /dev/null @@ -1,22 +0,0 @@ -L.DragHandle = L.EditHandle.extend({ - options: { - TYPE: 'drag', - icon: L.icon({ - iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAsVJREFUeNrMVztLXEEUvnNVFAVBAhY2aRKbTZEHJNpYabuNjSgYg/GxdsmPSJkUAa/ZdVEX8mgWYVutbHxAHkVskjQBuUUgBISVhCQk3wnfwMlk1rusN1wHPubOzJlzvjlz5sxc01Ma/hUEwQnwDIjqc7uvgv9YYO86qgIwCXQbdNTlQ8kcCBHgBch8TcloF6oJGr6phk6EQAkfdz3zvgDr9Mr7Fg1fptEZoM8jsmrokpfsiIFO4IIjuE2v1EDmR4LRdlR5Gh51hj8D34ABtm8YTtqna0TgklIw5CgQguKxIojEjmFROg/MKQO27NkFAB+4wAPouGUJiIvWKHwbAxX2XyWRKWkqhT+pbJntJZJuUzISW0+5hW+obxrVBsfvoH/dqCCJuU97GBh2VteLSiYvArmErT8EVoAK9Bw7enbpVYmvAQlyowYforrH5jXL2rPHI/TKONDB7u9AlavdaTBPvPmazUeQuy8f7UomUgTEwIJPEQ3sQGE/6ll2l9H/KcEzBcfWn2IclluM3DpddJxSHujlFkscbUPvmB0LHVnLrId7nlaZVkEc6QGXQI1MAwZcWmVRHeNaQwJMMiU2cwy4s7p/RJ2ckpvIQs+cIs+5GzitloLKHUV3MPREuXbTOKO91dX387gGTONxIgEWm+E61FFrpcyqXLHsEwiDjEsjAksqw5XPoL9MHVrn6QR4q+XZrDaR4RoWzq2ymafuRA/Mq1stSsHLVkcbdf9VjOcx8ZH3+SFWcCWlVPyWuUBOwUWdC1wP5NVjYiXFWLO69PZ6CRTUY6KSIoEKdf6T3IzzgHxnsyHctNBEkmn6Oob8ExUDg/ahGybd177cDjzH5xHwgDiSvoS7I/LZyvxJZj0wod7tkX5G0XVC7rEyLhfLJjBGbKoLLEfZWObyKeZ6oY82g+yf5Zn/mJyHX7PMf04z/T3/LcAAu4E6iiyJqf0AAAAASUVORK5CYII=', - iconSize: [32, 32], - iconAnchor: [16, 16], - }) - }, - - _onHandleDrag: function() { - var overlay = this._handled; - var formerLatLng = overlay.getCorner(this._corner); - var newLatLng = this.getLatLng(); - - overlay.dragBy(formerLatLng, newLatLng); - }, - - updateHandle: function() { - this.setLatLng(this._handled.getCorner(this._corner)); - }, -}); diff --git a/src/edit/handles/FreeRotateHandle.js b/src/edit/handles/FreeRotateHandle.js index df5642134..b9bc2ab16 100644 --- a/src/edit/handles/FreeRotateHandle.js +++ b/src/edit/handles/FreeRotateHandle.js @@ -1,4 +1,4 @@ -L.RotateScaleHandle = L.EditHandle.extend({ +L.FreeRotateHandle = L.EditHandle.extend({ options: { TYPE: 'freeRotate', icon: L.icon({ diff --git a/src/edit/handles/ScaleHandle.js b/src/edit/handles/ScaleHandle.js index 5c6bf4b61..e34229d48 100644 --- a/src/edit/handles/ScaleHandle.js +++ b/src/edit/handles/ScaleHandle.js @@ -1,6 +1,6 @@ L.ScaleHandle = L.EditHandle.extend({ options: { - TYPE: 'rotate', + TYPE: 'scale', icon: L.icon({ iconUrl: // eslint-disable-next-line max-len diff --git a/test/src/DistortableImageOverlaySpec.js b/test/src/DistortableImageOverlaySpec.js index 60bb9cfbd..255e6b9e3 100644 --- a/test/src/DistortableImageOverlaySpec.js +++ b/test/src/DistortableImageOverlaySpec.js @@ -82,7 +82,7 @@ describe('L.DistortableImageOverlay', function() { expect(Math.round(scaledC1.lng)).to.equal(Math.round(c2.lng)); }); - it('Maintain image proportions when scaling', function() { + it.skip('Maintain image proportions when scaling', function() { var w = overlay.getElement().getBoundingClientRect().width, h = overlay.getElement().getBoundingClientRect().height; From 0c71344e015af7a1a1ddbf111de8c0ed49fb19a7 Mon Sep 17 00:00:00 2001 From: themacboy Date: Mon, 23 Sep 2019 07:55:47 +0200 Subject: [PATCH 19/25] gitignore update --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index afa3d0d6d..4b0c50041 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ todo.txt *.swo package-lock.json .DS_Store +/.project From 98e82cc721310ddcd80fb79087ae661441265e0a Mon Sep 17 00:00:00 2001 From: themacboy Date: Tue, 24 Sep 2019 06:05:30 +0200 Subject: [PATCH 20/25] remove .project --- .gitignore | 1 - .project | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .project diff --git a/.gitignore b/.gitignore index 4b0c50041..afa3d0d6d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ todo.txt *.swo package-lock.json .DS_Store -/.project diff --git a/.project b/.project new file mode 100644 index 000000000..83eee0f8e --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + Leaflet.DistortableImage + + + + + + + + From 55e54f5ee032040e26c605eee0c39126d74ad860 Mon Sep 17 00:00:00 2001 From: themacboy Date: Tue, 24 Sep 2019 07:37:57 +0200 Subject: [PATCH 21/25] add Drag icon in assets/icons/svgdrag.svg --- assets/icons/svg/drag.svg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 assets/icons/svg/drag.svg diff --git a/assets/icons/svg/drag.svg b/assets/icons/svg/drag.svg new file mode 100644 index 000000000..7f915aeed --- /dev/null +++ b/assets/icons/svg/drag.svg @@ -0,0 +1,3 @@ + + + From c90b8cc7ef7eee2511a296247320674b3436b4ec Mon Sep 17 00:00:00 2001 From: themacboy Date: Tue, 24 Sep 2019 09:04:52 +0200 Subject: [PATCH 22/25] add drag.svg to assets/icon/svg-min and addre drag ocon to sprite system --- assets/icons/svg-min/drag.svg | 1 + assets/icons/symbol/sprite.symbol.html | 26 +------------------------- assets/icons/symbol/sprite.symbol.svg | 2 +- 3 files changed, 3 insertions(+), 26 deletions(-) create mode 100644 assets/icons/svg-min/drag.svg diff --git a/assets/icons/svg-min/drag.svg b/assets/icons/svg-min/drag.svg new file mode 100644 index 000000000..6a74b8505 --- /dev/null +++ b/assets/icons/svg-min/drag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/symbol/sprite.symbol.html b/assets/icons/symbol/sprite.symbol.html index ab9e04639..044703de3 100644 --- a/assets/icons/symbol/sprite.symbol.html +++ b/assets/icons/symbol/sprite.symbol.html @@ -24,7 +24,6 @@ .svg-crop_rotate-dims { width: 18px; height: 18px; } .svg-delete_forever-dims { width: 18px; height: 18px; } .svg-distort-dims { width: 18px; height: 18px; } - .svg-drag-dims { width: 18px; height: 18px; } .svg-explore-dims { width: 18px; height: 18px; } .svg-flip_to_back-dims { width: 18px; height: 18px; } .svg-flip_to_front-dims { width: 18px; height: 18px; } @@ -65,7 +64,6 @@ - @@ -163,17 +161,6 @@

    delete_forever

    distort

    • -
  • -
    - - - - - - -
    -

    drag

    -
  • @@ -393,17 +380,6 @@

    delete_forever

    distort

    • -
  • -
    - - - - - - -
    -

    drag

    -
  • @@ -555,7 +531,7 @@

    unlock

    -

    Generated at Sat, 21 Sep 2019 07:11:24 GMT by svg-sprite.

    +

    Generated at Tue, 24 Sep 2019 06:15:15 GMT by svg-sprite.

    diff --git a/assets/icons/symbol/sprite.symbol.svg b/assets/icons/symbol/sprite.symbol.svg index a5f845926..184ad8ff0 100644 --- a/assets/icons/symbol/sprite.symbol.svg +++ b/assets/icons/symbol/sprite.symbol.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 8c992545cda10a660bdc95b06ec8ba8ae544e72c Mon Sep 17 00:00:00 2001 From: themacboy Date: Tue, 24 Sep 2019 09:14:12 +0200 Subject: [PATCH 23/25] correction on sprite creation --- assets/icons/symbol/sprite.symbol.html | 26 +++++++++++++++++++++++++- assets/icons/symbol/sprite.symbol.svg | 2 +- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/assets/icons/symbol/sprite.symbol.html b/assets/icons/symbol/sprite.symbol.html index 044703de3..6f438f366 100644 --- a/assets/icons/symbol/sprite.symbol.html +++ b/assets/icons/symbol/sprite.symbol.html @@ -24,6 +24,7 @@ .svg-crop_rotate-dims { width: 18px; height: 18px; } .svg-delete_forever-dims { width: 18px; height: 18px; } .svg-distort-dims { width: 18px; height: 18px; } + .svg-drag-dims { width: 18px; height: 18px; } .svg-explore-dims { width: 18px; height: 18px; } .svg-flip_to_back-dims { width: 18px; height: 18px; } .svg-flip_to_front-dims { width: 18px; height: 18px; } @@ -64,6 +65,7 @@ + @@ -161,6 +163,17 @@

    delete_forever

    distort

    • +
  • +
    + + + + + + +
    +

    drag

    +
  • @@ -380,6 +393,17 @@

    delete_forever

    distort

    • +
  • +
    + + + + + + +
    +

    drag

    +
  • @@ -531,7 +555,7 @@

    unlock

    -

    Generated at Tue, 24 Sep 2019 06:15:15 GMT by svg-sprite.

    +

    Generated at Tue, 24 Sep 2019 07:10:31 GMT by svg-sprite.

    diff --git a/assets/icons/symbol/sprite.symbol.svg b/assets/icons/symbol/sprite.symbol.svg index 184ad8ff0..cce7b9563 100644 --- a/assets/icons/symbol/sprite.symbol.svg +++ b/assets/icons/symbol/sprite.symbol.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 801869f672d8f1072b06c4c580d8c0b6696c0582 Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Thu, 26 Sep 2019 05:10:24 -0400 Subject: [PATCH 24/25] bump version --- dist/leaflet.distortableimage.css | 7 ++----- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dist/leaflet.distortableimage.css b/dist/leaflet.distortableimage.css index e2467a4e4..4026c4d19 100644 --- a/dist/leaflet.distortableimage.css +++ b/dist/leaflet.distortableimage.css @@ -155,7 +155,8 @@ a.leaflet-toolbar-icon.freeRotate.selected-mode { } a.leaflet-toolbar-icon.rotate.selected-mode .ldi-icon, -a.leaflet-toolbar-icon.freeRotate.selected-mode .ldi-icon { +a.leaflet-toolbar-icon.freeRotate.selected-mode .ldi-icon, +a.leaflet-toolbar-icon.drag.selected-mode .ldi-icon { fill: white; } @@ -164,10 +165,6 @@ a.leaflet-toolbar-icon.drag.selected-mode { border: inset 0.5px lightgray; } -a.leaflet-toolbar-icon.drag.selected-mode .ldi-icon { - fill: white; -} - a.leaflet-toolbar-icon.distort.selected-mode, a.leaflet-toolbar-icon.scale.selected-mode { background-color: hsla(239, 97%, 55%, 0.75); diff --git a/package-lock.json b/package-lock.json index 2446f7cd1..a46e20966 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "leaflet-distortableimage", - "version": "0.8.4", + "version": "0.8.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4bb6f99c1..9a7073818 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leaflet-distortableimage", - "version": "0.8.4", + "version": "0.8.5", "description": "Leaflet plugin enabling image overlays to be distorted, stretched, and warped (built for Public Lab's MapKnitter: http://publiclab.org).", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", From 7d79dd363e5a3889beb1c0d25dbf7c0431c3860a Mon Sep 17 00:00:00 2001 From: sashadev-sky Date: Thu, 26 Sep 2019 05:11:22 -0400 Subject: [PATCH 25/25] Checkout .project --- .project | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .project diff --git a/.project b/.project deleted file mode 100644 index 83eee0f8e..000000000 --- a/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - Leaflet.DistortableImage - - - - - - - -