Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rectangle transform #676

Merged
merged 6 commits into from
Oct 14, 2021
Merged

Rectangle transform #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
867de8c
Added rectangle transfrom prototype
Oct 11, 2021
d99213a
Fixed stretch middle point
Oct 11, 2021
dfad1d2
Scale code refactored
Oct 12, 2021
4d21ddd
Code refactored
Oct 13, 2021
f69b8f7
Gulp dist
Oct 13, 2021
cc8faf3
Merged master
Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 81 additions & 6 deletions dist/ol-ext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* ol-ext - A set of cool extensions for OpenLayers (ol) in node modules structure
* @description ol3,openlayers,popup,menu,symbol,renderer,filter,canvas,interaction,split,statistic,charts,pie,LayerSwitcher,toolbar,animation
* @version v3.2.10
* @version v3.2.11
* @author Jean-Marc Viglino
* @see https://github.com/Viglino/ol-ext#,
* @license BSD-3-Clause
Expand Down Expand Up @@ -25422,6 +25422,8 @@ ol.interaction.Transform = function(options) {
this.set('hitTolerance', (options.hitTolerance || 0));
/* Enable view rotated transforms */
this.set('enableRotatedTransform', (options.enableRotatedTransform || false));
/* Keep rectangle angles 90 degrees */
this.set('keepAngles', (options.keepAngles || false));
// Force redraw when changed
this.on ('propertychange', function() {
this.drawSketch_();
Expand Down Expand Up @@ -25640,6 +25642,8 @@ ol.interaction.Transform.prototype.drawSketch_ = function(center) {
if (!this.selection_.getLength()) return;
var viewRotation = this.getMap().getView().getRotation();
var ext = this.getGeometryRotateToZero_(this.selection_.item(0)).getExtent();
var coords = this.getGeometryRotateToZero_(this.selection_.item(0)).getCoordinates()[0].slice(0, 4);
coords.unshift(coords[3]);
// Clone and extend
ext = ol.extent.buffer(ext, 0);
this.selection_.forEach(function (f) {
Expand All @@ -25665,7 +25669,7 @@ ol.interaction.Transform.prototype.drawSketch_ = function(center) {
this.getMap().getCoordinateFromPixel([p[0]+10, p[1]+10])
]);
}
geom = ol.geom.Polygon.fromExtent(ext);
geom = this.get('keepAngles') ? new Polygon([coords]) : ol.geom.Polygon.fromExtent(ext);
if (this.get('enableRotatedTransform') && viewRotation !== 0) {
geom.rotate(viewRotation, this.getMap().getView().getCenter())
}
Expand Down Expand Up @@ -25715,7 +25719,7 @@ ol.interaction.Transform.prototype.select = function(feature, add) {
this.selection_.push(feature);
} else {
var index = this.selection_.getArray().indexOf(feature);
this.selection_.removeAt(index);
this.selection_.removeAt(index);
}
this.ispt_ = (this.selection_.getLength()===1 ? (this.selection_.item(0).getGeometry().getType() == "Point") : false);
this.iscircle_ = (this.selection_.getLength()===1 ? (this.selection_.item(0).getGeometry().getType() == "Circle") : false);
Expand Down Expand Up @@ -25857,6 +25861,16 @@ ol.interaction.Transform.prototype.getCenter = function() {
ol.interaction.Transform.prototype.setCenter = function(c) {
return this.set('center', c);
}
function projectVectorOnVector(displacement_vector, base) {
var k = (displacement_vector[0] * base[0] + displacement_vector[1] * base[1]) / (base[0] * base[0] + base[1] * base[1]);
return [base[0] * k, base[1] * k];
}
function countVector(start, end) {
return [end[0] - start[0], end[1] - start[1]];
}
function movePoint(point, displacementVector) {
return [point[0]+displacementVector[0], point[1]+displacementVector[1]];
}
/**
* @param {ol.MapBrowserEvent} evt Map browser event.
* @private
Expand Down Expand Up @@ -25924,6 +25938,9 @@ ol.interaction.Transform.prototype.handleDragEvent_ = function(evt) {
}
center = extentCoordinates[(Number(this.opt_)+2)%4];
}
var keepAngles = this.get('keepAngles');
var stretch = this.constraint_;
var opt = this.opt_;
var downCoordinate = this.coordinate_;
var dragCoordinate = evt.coordinate;
if (this.get('enableRotatedTransform') && viewRotation !== 0) {
Expand All @@ -25936,6 +25953,7 @@ ol.interaction.Transform.prototype.handleDragEvent_ = function(evt) {
}
var scx = ((dragCoordinate)[0] - (center)[0]) / (downCoordinate[0] - (center)[0]);
var scy = ((dragCoordinate)[1] - (center)[1]) / (downCoordinate[1] - (center)[1]);
var displacementVector = [dragCoordinate[0] - downCoordinate[0], (dragCoordinate)[1] - downCoordinate[1]];
if (this.get('enableRotatedTransform') && viewRotation !== 0) {
var centerPoint = new ol.geom.Point(center);
centerPoint.rotate(viewRotation * -1, this.getMap().getView().getCenter());
Expand All @@ -25957,9 +25975,66 @@ ol.interaction.Transform.prototype.handleDragEvent_ = function(evt) {
geometry = (viewRotation === 0 || !this.get('enableRotatedTransform')) ? this.geoms_[i].clone() : this.rotatedGeoms_[i].clone();
geometry.applyTransform(function(g1, g2, dim) {
if (dim<2) return g2;
for (var j=0; j<g1.length; j+=dim) {
if (scx!=1) g2[j] = center[0] + (g1[j]-center[0])*scx;
if (scy!=1) g2[j+1] = center[1] + (g1[j+1]-center[1])*scy;
if (!keepAngles) {
for (var j=0; j<g1.length; j+=dim) {
if (scx!=1) g2[j] = center[0] + (g1[j]-center[0])*scx;
if (scy!=1) g2[j+1] = center[1] + (g1[j+1]-center[1])*scy;
}
} else {
var pointArray = [[6], [0, 8], [2], [4]]
var pointA = [g1[0], g1[1]];
var pointB = [g1[2], g1[3]];
var pointC = [g1[4], g1[5]];
var pointD = [g1[6], g1[7]];
var pointA1 = [g1[8], g1[9]];
if (stretch) {
var base = (opt % 2 === 0) ? countVector(pointA, pointB) : countVector(pointD, pointA);
var projectedVector = projectVectorOnVector(displacementVector, base);
var nextIndex = opt+1 < pointArray.length ? opt+1 : 0;
var coordsToChange = [...pointArray[opt], ...pointArray[nextIndex]];
for (var j = 0; j < g1.length; j += dim) {
g2[j] = coordsToChange.includes(j) ? g1[j] + projectedVector[0] : g1[j];
g2[j + 1] = coordsToChange.includes(j) ? g1[j + 1] + projectedVector[1] : g1[j + 1];
}
} else {
switch (opt) {
case 0:
displacementVector = countVector(pointD, dragCoordinate);
var projectedLeft = projectVectorOnVector(displacementVector, countVector(pointC, pointD));
var projectedRight = projectVectorOnVector(displacementVector, countVector(pointA, pointD));
[g2[0], g2[1]] = movePoint(pointA, projectedLeft);
[g2[4], g2[5]] = movePoint(pointC, projectedRight);
[g2[6], g2[7]] = movePoint(pointD, displacementVector);
[g2[8], g2[9]] = movePoint(pointA1, projectedLeft);
break;
case 1:
displacementVector = countVector(pointA, dragCoordinate);
var projectedLeft = projectVectorOnVector(displacementVector, countVector(pointD, pointA));
var projectedRight = projectVectorOnVector(displacementVector, countVector(pointB, pointA));
[g2[0], g2[1]] = movePoint(pointA, displacementVector);
[g2[2], g2[3]] = movePoint(pointB, projectedLeft);
[g2[6], g2[7]] = movePoint(pointD, projectedRight);
[g2[8], g2[9]] = movePoint(pointA1, displacementVector);
break;
case 2:
displacementVector = countVector(pointB, dragCoordinate);
var projectedLeft = projectVectorOnVector(displacementVector, countVector(pointA, pointB));
var projectedRight = projectVectorOnVector(displacementVector, countVector(pointC, pointB));
[g2[0], g2[1]] = movePoint(pointA, projectedRight);
[g2[2], g2[3]] = movePoint(pointB, displacementVector);
[g2[4], g2[5]] = movePoint(pointC, projectedLeft);
[g2[8], g2[9]] = movePoint(pointA1, projectedRight);
break;
case 3:
displacementVector = countVector(pointC, dragCoordinate);
var projectedLeft = projectVectorOnVector(displacementVector, countVector(pointB, pointC));
var projectedRight = projectVectorOnVector(displacementVector, countVector(pointD, pointC));
[g2[2], g2[3]] = movePoint(pointB, projectedRight);
[g2[4], g2[5]] = movePoint(pointC, displacementVector);
[g2[6], g2[7]] = movePoint(pointD, projectedLeft);
break;
}
}
}
// bug: ol, bad calculation circle geom extent
if (geometry.getType() == 'Circle') geometry.setCenterAndRadius(geometry.getCenter(), geometry.getRadius());
Expand Down
4 changes: 2 additions & 2 deletions dist/ol-ext.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

92 changes: 87 additions & 5 deletions src/interaction/Transform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import ol_style_RegularShape from 'ol/style/RegularShape'
import {fromExtent as ol_geom_Polygon_fromExtent} from 'ol/geom/Polygon'
import {boundingExtent as ol_extent_boundingExtent, buffer as ol_extent_buffer, createEmpty as ol_extent_createEmpty, extend as ol_extent_extend, getCenter as ol_extent_getCenter} from 'ol/extent'
import {unByKey as ol_Observable_unByKey} from 'ol/Observable'
import { Polygon } from 'ol/geom'

/** Interaction rotate
* @constructor
Expand Down Expand Up @@ -100,6 +101,8 @@ var ol_interaction_Transform = function(options) {
this.set('hitTolerance', (options.hitTolerance || 0));
/* Enable view rotated transforms */
this.set('enableRotatedTransform', (options.enableRotatedTransform || false));
/* Keep rectangle angles 90 degrees */
this.set('keepAngles', (options.keepAngles || false));


// Force redraw when changed
Expand Down Expand Up @@ -329,6 +332,8 @@ ol_interaction_Transform.prototype.drawSketch_ = function(center) {
if (!this.selection_.getLength()) return;
var viewRotation = this.getMap().getView().getRotation();
var ext = this.getGeometryRotateToZero_(this.selection_.item(0)).getExtent();
var coords = this.getGeometryRotateToZero_(this.selection_.item(0)).getCoordinates()[0].slice(0, 4);
coords.unshift(coords[3]);
// Clone and extend
ext = ol_extent_buffer(ext, 0);
this.selection_.forEach(function (f) {
Expand All @@ -355,7 +360,7 @@ ol_interaction_Transform.prototype.drawSketch_ = function(center) {
this.getMap().getCoordinateFromPixel([p[0]+10, p[1]+10])
]);
}
geom = ol_geom_Polygon_fromExtent(ext);
geom = this.get('keepAngles') ? new Polygon([coords]) : ol_geom_Polygon_fromExtent(ext);
if (this.get('enableRotatedTransform') && viewRotation !== 0) {
geom.rotate(viewRotation, this.getMap().getView().getCenter())
}
Expand Down Expand Up @@ -407,7 +412,7 @@ ol_interaction_Transform.prototype.select = function(feature, add) {
this.selection_.push(feature);
} else {
var index = this.selection_.getArray().indexOf(feature);
this.selection_.removeAt(index);
this.selection_.removeAt(index);
}
this.ispt_ = (this.selection_.getLength()===1 ? (this.selection_.item(0).getGeometry().getType() == "Point") : false);
this.iscircle_ = (this.selection_.getLength()===1 ? (this.selection_.item(0).getGeometry().getType() == "Circle") : false);
Expand Down Expand Up @@ -559,6 +564,19 @@ ol_interaction_Transform.prototype.setCenter = function(c) {
return this.set('center', c);
}

function projectVectorOnVector(displacement_vector, base) {
var k = (displacement_vector[0] * base[0] + displacement_vector[1] * base[1]) / (base[0] * base[0] + base[1] * base[1]);
return [base[0] * k, base[1] * k];
}

function countVector(start, end) {
return [end[0] - start[0], end[1] - start[1]];
}

function movePoint(point, displacementVector) {
return [point[0]+displacementVector[0], point[1]+displacementVector[1]];
}

/**
* @param {ol.MapBrowserEvent} evt Map browser event.
* @private
Expand Down Expand Up @@ -628,6 +646,9 @@ ol_interaction_Transform.prototype.handleDragEvent_ = function(evt) {
}
center = extentCoordinates[(Number(this.opt_)+2)%4];
}
var keepAngles = this.get('keepAngles');
var stretch = this.constraint_;
var opt = this.opt_;

var downCoordinate = this.coordinate_;
var dragCoordinate = evt.coordinate;
Expand All @@ -643,6 +664,7 @@ ol_interaction_Transform.prototype.handleDragEvent_ = function(evt) {

var scx = ((dragCoordinate)[0] - (center)[0]) / (downCoordinate[0] - (center)[0]);
var scy = ((dragCoordinate)[1] - (center)[1]) / (downCoordinate[1] - (center)[1]);
var displacementVector = [dragCoordinate[0] - downCoordinate[0], (dragCoordinate)[1] - downCoordinate[1]];

if (this.get('enableRotatedTransform') && viewRotation !== 0) {
var centerPoint = new ol_geom_Point(center);
Expand All @@ -669,10 +691,70 @@ ol_interaction_Transform.prototype.handleDragEvent_ = function(evt) {
geometry.applyTransform(function(g1, g2, dim) {
if (dim<2) return g2;

for (var j=0; j<g1.length; j+=dim) {
if (scx!=1) g2[j] = center[0] + (g1[j]-center[0])*scx;
if (scy!=1) g2[j+1] = center[1] + (g1[j+1]-center[1])*scy;
if (!keepAngles) {
for (var j=0; j<g1.length; j+=dim) {
if (scx!=1) g2[j] = center[0] + (g1[j]-center[0])*scx;
if (scy!=1) g2[j+1] = center[1] + (g1[j+1]-center[1])*scy;
}
} else {
var pointArray = [[6], [0, 8], [2], [4]]
var pointA = [g1[0], g1[1]];
var pointB = [g1[2], g1[3]];
var pointC = [g1[4], g1[5]];
var pointD = [g1[6], g1[7]];
var pointA1 = [g1[8], g1[9]];

if (stretch) {
var base = (opt % 2 === 0) ? countVector(pointA, pointB) : countVector(pointD, pointA);
var projectedVector = projectVectorOnVector(displacementVector, base);
var nextIndex = opt+1 < pointArray.length ? opt+1 : 0;
var coordsToChange = [...pointArray[opt], ...pointArray[nextIndex]];

for (var j = 0; j < g1.length; j += dim) {
g2[j] = coordsToChange.includes(j) ? g1[j] + projectedVector[0] : g1[j];
g2[j + 1] = coordsToChange.includes(j) ? g1[j + 1] + projectedVector[1] : g1[j + 1];
}
} else {
switch (opt) {
case 0:
displacementVector = countVector(pointD, dragCoordinate);
var projectedLeft = projectVectorOnVector(displacementVector, countVector(pointC, pointD));
var projectedRight = projectVectorOnVector(displacementVector, countVector(pointA, pointD));
[g2[0], g2[1]] = movePoint(pointA, projectedLeft);
[g2[4], g2[5]] = movePoint(pointC, projectedRight);
[g2[6], g2[7]] = movePoint(pointD, displacementVector);
[g2[8], g2[9]] = movePoint(pointA1, projectedLeft);
break;
case 1:
displacementVector = countVector(pointA, dragCoordinate);
var projectedLeft = projectVectorOnVector(displacementVector, countVector(pointD, pointA));
var projectedRight = projectVectorOnVector(displacementVector, countVector(pointB, pointA));
[g2[0], g2[1]] = movePoint(pointA, displacementVector);
[g2[2], g2[3]] = movePoint(pointB, projectedLeft);
[g2[6], g2[7]] = movePoint(pointD, projectedRight);
[g2[8], g2[9]] = movePoint(pointA1, displacementVector);
break;
case 2:
displacementVector = countVector(pointB, dragCoordinate);
var projectedLeft = projectVectorOnVector(displacementVector, countVector(pointA, pointB));
var projectedRight = projectVectorOnVector(displacementVector, countVector(pointC, pointB));
[g2[0], g2[1]] = movePoint(pointA, projectedRight);
[g2[2], g2[3]] = movePoint(pointB, displacementVector);
[g2[4], g2[5]] = movePoint(pointC, projectedLeft);
[g2[8], g2[9]] = movePoint(pointA1, projectedRight);
break;
case 3:
displacementVector = countVector(pointC, dragCoordinate);
var projectedLeft = projectVectorOnVector(displacementVector, countVector(pointB, pointC));
var projectedRight = projectVectorOnVector(displacementVector, countVector(pointD, pointC));
[g2[2], g2[3]] = movePoint(pointB, projectedRight);
[g2[4], g2[5]] = movePoint(pointC, displacementVector);
[g2[6], g2[7]] = movePoint(pointD, projectedLeft);
break;
}
}
}

// bug: ol, bad calculation circle geom extent
if (geometry.getType() == 'Circle') geometry.setCenterAndRadius(geometry.getCenter(), geometry.getRadius());
return g2;
Expand Down