ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for editing interior polygon rings

Browse Source
This commit is contained in:
ahocevar
2014-03-13 01:02:15 +01:00
parent 1fbdf47e2a
commit ecddcdd732
2 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/modify-features.js
View File

@@ -111,7 +111,8 @@ var testDataSource = new ol.source.GeoJSON(
'geometry': { 'geometry': {
'type': 'Polygon', 'type': 'Polygon',
'coordinates': [[[-5e6, -1e6], [-4e6, 1e6], 'coordinates': [[[-5e6, -1e6], [-4e6, 1e6],
[-3e6, -1e6], [-5e6, -1e6]]] [-3e6, -1e6], [-5e6, -1e6]], [[-4.5e6, -0.5e6],
[-3.5e6, -0.5e6], [-4e6, 0.5e6], [-4.5e6, -0.5e6]]]
} }
}, },
{ {

34
src/ol/interaction/modifyinteraction.js
View File

@@ -23,8 +23,9 @@ goog.require('ol.structs.RBush');
/** /**
* @typedef {{feature: ol.Feature, * @typedef {{depth: (Array.<number>|undefined),
* geometry: ol.geom.Geometry, * feature: ol.Feature,
* geometry: ol.geom.SimpleGeometry,
* index: (number|undefined), * index: (number|undefined),
* segment: Array.<ol.Extent>}} * segment: Array.<ol.Extent>}}
*/ */
@@ -257,18 +258,21 @@ ol.interaction.Modify.prototype.writeMultiLineStringGeometry_ =
ol.interaction.Modify.prototype.writePolygonGeometry_ = ol.interaction.Modify.prototype.writePolygonGeometry_ =
function(feature, geometry) { function(feature, geometry) {
var rings = geometry.getCoordinates(); var rings = geometry.getCoordinates();
var coordinates = rings[0]; var coordinates, i, ii, j, jj, segment, segmentData;
var i, ii, segment, segmentData; for (j = 0, jj = rings.length; j < jj; ++j) {
coordinates = rings[j];
for (i = 0, ii = coordinates.length - 1; i < ii; ++i) { for (i = 0, ii = coordinates.length - 1; i < ii; ++i) {
segment = coordinates.slice(i, i + 2); segment = coordinates.slice(i, i + 2);
segmentData = /** @type {ol.interaction.SegmentDataType} */ ({ segmentData = /** @type {ol.interaction.SegmentDataType} */ ({
feature: feature, feature: feature,
geometry: geometry, geometry: geometry,
depth: [j],
index: i, index: i,
segment: segment segment: segment
}); });
this.rBush_.insert(ol.extent.boundingExtent(segment), segmentData); this.rBush_.insert(ol.extent.boundingExtent(segment), segmentData);
} }
}
}; };
@@ -280,21 +284,24 @@ ol.interaction.Modify.prototype.writePolygonGeometry_ =
ol.interaction.Modify.prototype.writeMultiPolygonGeometry_ = ol.interaction.Modify.prototype.writeMultiPolygonGeometry_ =
function(feature, geometry) { function(feature, geometry) {
var polygons = geometry.getCoordinates(); var polygons = geometry.getCoordinates();
var coordinates, i, ii, j, jj, segment, segmentData; var coordinates, i, ii, j, jj, k, kk, rings, segment, segmentData;
for (j = 0, jj = polygons.length; j < jj; ++j) { for (k = 0, kk = polygons.length; k < kk; ++k) {
coordinates = polygons[j][0]; rings = polygons[k];
for (j = 0, jj = rings.length; j < jj; ++j) {
coordinates = rings[j];
for (i = 0, ii = coordinates.length - 1; i < ii; ++i) { for (i = 0, ii = coordinates.length - 1; i < ii; ++i) {
segment = coordinates.slice(i, i + 2); segment = coordinates.slice(i, i + 2);
segmentData = /** @type {ol.interaction.SegmentDataType} */ ({ segmentData = /** @type {ol.interaction.SegmentDataType} */ ({
feature: feature, feature: feature,
geometry: geometry, geometry: geometry,
depth: [j], depth: [j, k],
index: i, index: i,
segment: segment segment: segment
}); });
this.rBush_.insert(ol.extent.boundingExtent(segment), segmentData); this.rBush_.insert(ol.extent.boundingExtent(segment), segmentData);
} }
} }
}
}; };
@@ -430,11 +437,11 @@ ol.interaction.Modify.prototype.handleDrag = function(evt) {
segment[index] = vertex; segment[index] = vertex;
break; break;
case ol.geom.GeometryType.POLYGON: case ol.geom.GeometryType.POLYGON:
coordinates[0][segmentData.index + index] = vertex; coordinates[depth[0]][segmentData.index + index] = vertex;
segment[index] = vertex; segment[index] = vertex;
break; break;
case ol.geom.GeometryType.MULTI_POLYGON: case ol.geom.GeometryType.MULTI_POLYGON:
coordinates[depth[0]][0][segmentData.index + index] = vertex; coordinates[depth[1]][depth[0]][segmentData.index + index] = vertex;
segment[index] = vertex; segment[index] = vertex;
break; break;
} }
@@ -574,12 +581,12 @@ ol.interaction.Modify.prototype.insertVertex_ = function(segmentData, vertex) {
case ol.geom.GeometryType.POLYGON: case ol.geom.GeometryType.POLYGON:
goog.asserts.assertInstanceof(geometry, ol.geom.Polygon); goog.asserts.assertInstanceof(geometry, ol.geom.Polygon);
coordinates = geometry.getCoordinates(); coordinates = geometry.getCoordinates();
coordinates[0].splice(index + 1, 0, vertex); coordinates[depth[0]].splice(index + 1, 0, vertex);
break; break;
case ol.geom.GeometryType.MULTI_POLYGON: case ol.geom.GeometryType.MULTI_POLYGON:
goog.asserts.assertInstanceof(geometry, ol.geom.MultiPolygon); goog.asserts.assertInstanceof(geometry, ol.geom.MultiPolygon);
coordinates = geometry.getCoordinates(); coordinates = geometry.getCoordinates();
coordinates[depth[0]][0].splice(index + 1, 0, vertex); coordinates[depth[1]][depth[0]].splice(index + 1, 0, vertex);
break; break;
case ol.geom.GeometryType.LINE_STRING: case ol.geom.GeometryType.LINE_STRING:
goog.asserts.assertInstanceof(geometry, ol.geom.LineString); goog.asserts.assertInstanceof(geometry, ol.geom.LineString);
@@ -605,7 +612,8 @@ ol.interaction.Modify.prototype.insertVertex_ = function(segmentData, vertex) {
for (var i = 0, ii = segmentDataMatches.length; i < ii; ++i) { for (var i = 0, ii = segmentDataMatches.length; i < ii; ++i) {
var segmentDataMatch = segmentDataMatches[i]; var segmentDataMatch = segmentDataMatches[i];
if (segmentDataMatch.geometry === geometry && if (segmentDataMatch.geometry === geometry &&
segmentDataMatch.depth[0] == depth[0] && (!goog.isDef(depth) ||
goog.array.equals(segmentDataMatch.depth, depth)) &&
segmentDataMatch.index > index) { segmentDataMatch.index > index) {
++segmentDataMatch.index; ++segmentDataMatch.index;
} }