Adding vertexmodified, sketchmodified, and sketchcomplete events to the vector layer. These are triggered by the DrawFeature and ModifyFeature controls and let listeners know about newly drawn features and modified features. r=ahocevar (closes #1904)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@8835 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -117,6 +117,12 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
*/
|
||||
mode: null,
|
||||
|
||||
/**
|
||||
* Property: modified
|
||||
* {Boolean} The currently selected feature has been modified.
|
||||
*/
|
||||
modified: false,
|
||||
|
||||
/**
|
||||
* Property: radiusHandle
|
||||
* {<OpenLayers.Feature.Vector>} A handle for rotating/resizing a feature.
|
||||
@@ -212,8 +218,8 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
onStart: function(feature, pixel) {
|
||||
control.dragStart.apply(control, [feature, pixel]);
|
||||
},
|
||||
onDrag: function(feature) {
|
||||
control.dragVertex.apply(control, [feature]);
|
||||
onDrag: function(feature, pixel) {
|
||||
control.dragVertex.apply(control, [feature, pixel]);
|
||||
},
|
||||
onComplete: function(feature) {
|
||||
control.dragComplete.apply(control, [feature]);
|
||||
@@ -304,6 +310,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
*/
|
||||
selectFeature: function(feature) {
|
||||
this.feature = feature;
|
||||
this.modified = false;
|
||||
this.resetVertices();
|
||||
this.dragControl.activate();
|
||||
this.onModificationStart(this.feature);
|
||||
@@ -332,8 +339,11 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
this.feature = null;
|
||||
this.dragControl.deactivate();
|
||||
this.onModificationEnd(feature);
|
||||
this.layer.events.triggerEvent("afterfeaturemodified",
|
||||
{feature: feature});
|
||||
this.layer.events.triggerEvent("afterfeaturemodified", {
|
||||
feature: feature,
|
||||
modified: this.modified
|
||||
});
|
||||
this.modified = false;
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -390,21 +400,28 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
*
|
||||
* Parameters:
|
||||
* vertex - {<OpenLayers.Feature.Vector>} The vertex being dragged.
|
||||
* pixel - {<OpenLayers.Pixel>} Pixel location of the mouse event.
|
||||
*/
|
||||
dragVertex: function(vertex) {
|
||||
dragVertex: function(vertex, pixel) {
|
||||
this.modified = true;
|
||||
/**
|
||||
* Five cases:
|
||||
* 1) dragging a simple point
|
||||
* 2) dragging a virtual vertex
|
||||
* 3) dragging a drag handle
|
||||
* 4) dragging a radius handle
|
||||
* 5) dragging a real vertex
|
||||
* 4) dragging a real vertex
|
||||
* 5) dragging a radius handle
|
||||
*/
|
||||
if(this.feature.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
|
||||
// dragging a simple point
|
||||
if(this.feature != vertex) {
|
||||
this.feature = vertex;
|
||||
}
|
||||
this.layer.events.triggerEvent("vertexmodified", {
|
||||
vertex: vertex.geometry,
|
||||
feature: this.feature,
|
||||
pixel: pixel
|
||||
});
|
||||
} else {
|
||||
if(vertex._index) {
|
||||
// dragging a virtual vertex
|
||||
@@ -422,9 +439,15 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
this.layer.destroyFeatures([this.radiusHandle], {silent: true});
|
||||
this.radiusHandle = null;
|
||||
}
|
||||
} else if(vertex !== this.radiusHandle) {
|
||||
// dragging a real vertex
|
||||
this.layer.events.triggerEvent("vertexmodified", {
|
||||
vertex: vertex.geometry,
|
||||
feature: this.feature,
|
||||
pixel: pixel
|
||||
});
|
||||
}
|
||||
// dragging a radius handle - no special treatment
|
||||
// dragging a real vertex - no special treatment
|
||||
if(this.virtualVertices.length > 0) {
|
||||
this.layer.destroyFeatures(this.virtualVertices, {silent: true});
|
||||
this.virtualVertices = [];
|
||||
@@ -556,6 +579,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
var i, vertex, component, len;
|
||||
if(geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
|
||||
vertex = new OpenLayers.Feature.Vector(geometry);
|
||||
vertex._sketch = true;
|
||||
control.vertices.push(vertex);
|
||||
} else {
|
||||
var numVert = geometry.components.length;
|
||||
@@ -566,6 +590,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
component = geometry.components[i];
|
||||
if(component.CLASS_NAME == "OpenLayers.Geometry.Point") {
|
||||
vertex = new OpenLayers.Feature.Vector(component);
|
||||
vertex._sketch = true;
|
||||
control.vertices.push(vertex);
|
||||
} else {
|
||||
collectComponentVertices(component);
|
||||
@@ -588,6 +613,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
// set the virtual parent and intended index
|
||||
point.geometry.parent = geometry;
|
||||
point._index = i + 1;
|
||||
point._sketch = true;
|
||||
control.virtualVertices.push(point);
|
||||
}
|
||||
}
|
||||
@@ -614,6 +640,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
OpenLayers.Geometry.Point.prototype.move.call(this, x, y);
|
||||
geometry.move(x, y);
|
||||
};
|
||||
origin._sketch = true;
|
||||
this.dragHandle = origin;
|
||||
this.layer.addFeatures([this.dragHandle], {silent: true});
|
||||
},
|
||||
@@ -654,6 +681,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
geometry.resize(l1 / l0, originGeometry);
|
||||
}
|
||||
};
|
||||
radius._sketch = true;
|
||||
this.radiusHandle = radius;
|
||||
this.layer.addFeatures([this.radiusHandle], {silent: true});
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user