Remove type cast in ol/interaction/Snap

This commit is contained in:
Frederic Junod
2018-12-12 14:43:51 +01:00
parent 4010a644c0
commit 701e19c1c9
+19 -21
View File
@@ -451,13 +451,11 @@ class Snap extends PointerInteraction {
vertexPixel = [Math.round(vertexPixel[0]), Math.round(vertexPixel[1])]; vertexPixel = [Math.round(vertexPixel[0]), Math.round(vertexPixel[1])];
} }
} }
return ( return {
/** @type {Result} */ ({ snapped: snapped,
snapped: snapped, vertex: vertex,
vertex: vertex, vertexPixel: vertexPixel
vertexPixel: vertexPixel };
})
);
} }
/** /**
@@ -479,10 +477,10 @@ class Snap extends PointerInteraction {
const coordinates = polygon.getCoordinates()[0]; const coordinates = polygon.getCoordinates()[0];
for (let i = 0, ii = coordinates.length - 1; i < ii; ++i) { for (let i = 0, ii = coordinates.length - 1; i < ii; ++i) {
const segment = coordinates.slice(i, i + 2); const segment = coordinates.slice(i, i + 2);
const segmentData = /** @type {SegmentData} */ ({ const segmentData = {
feature: feature, feature: feature,
segment: segment segment: segment
}); };
this.rBush_.insert(boundingExtent(segment), segmentData); this.rBush_.insert(boundingExtent(segment), segmentData);
} }
} }
@@ -511,10 +509,10 @@ class Snap extends PointerInteraction {
const coordinates = geometry.getCoordinates(); const coordinates = geometry.getCoordinates();
for (let i = 0, ii = coordinates.length - 1; i < ii; ++i) { for (let i = 0, ii = coordinates.length - 1; i < ii; ++i) {
const segment = coordinates.slice(i, i + 2); const segment = coordinates.slice(i, i + 2);
const segmentData = /** @type {SegmentData} */ ({ const segmentData = {
feature: feature, feature: feature,
segment: segment segment: segment
}); };
this.rBush_.insert(boundingExtent(segment), segmentData); this.rBush_.insert(boundingExtent(segment), segmentData);
} }
} }
@@ -530,10 +528,10 @@ class Snap extends PointerInteraction {
const coordinates = lines[j]; const coordinates = lines[j];
for (let i = 0, ii = coordinates.length - 1; i < ii; ++i) { for (let i = 0, ii = coordinates.length - 1; i < ii; ++i) {
const segment = coordinates.slice(i, i + 2); const segment = coordinates.slice(i, i + 2);
const segmentData = /** @type {SegmentData} */ ({ const segmentData = {
feature: feature, feature: feature,
segment: segment segment: segment
}); };
this.rBush_.insert(boundingExtent(segment), segmentData); this.rBush_.insert(boundingExtent(segment), segmentData);
} }
} }
@@ -548,10 +546,10 @@ class Snap extends PointerInteraction {
const points = geometry.getCoordinates(); const points = geometry.getCoordinates();
for (let i = 0, ii = points.length; i < ii; ++i) { for (let i = 0, ii = points.length; i < ii; ++i) {
const coordinates = points[i]; const coordinates = points[i];
const segmentData = /** @type {SegmentData} */ ({ const segmentData = {
feature: feature, feature: feature,
segment: [coordinates, coordinates] segment: [coordinates, coordinates]
}); };
this.rBush_.insert(geometry.getExtent(), segmentData); this.rBush_.insert(geometry.getExtent(), segmentData);
} }
} }
@@ -569,10 +567,10 @@ class Snap extends PointerInteraction {
const coordinates = rings[j]; const coordinates = rings[j];
for (let i = 0, ii = coordinates.length - 1; i < ii; ++i) { for (let i = 0, ii = coordinates.length - 1; i < ii; ++i) {
const segment = coordinates.slice(i, i + 2); const segment = coordinates.slice(i, i + 2);
const segmentData = /** @type {SegmentData} */ ({ const segmentData = {
feature: feature, feature: feature,
segment: segment segment: segment
}); };
this.rBush_.insert(boundingExtent(segment), segmentData); this.rBush_.insert(boundingExtent(segment), segmentData);
} }
} }
@@ -586,10 +584,10 @@ class Snap extends PointerInteraction {
*/ */
writePointGeometry_(feature, geometry) { writePointGeometry_(feature, geometry) {
const coordinates = geometry.getCoordinates(); const coordinates = geometry.getCoordinates();
const segmentData = /** @type {SegmentData} */ ({ const segmentData = {
feature: feature, feature: feature,
segment: [coordinates, coordinates] segment: [coordinates, coordinates]
}); };
this.rBush_.insert(geometry.getExtent(), segmentData); this.rBush_.insert(geometry.getExtent(), segmentData);
} }
@@ -604,10 +602,10 @@ class Snap extends PointerInteraction {
const coordinates = rings[j]; const coordinates = rings[j];
for (let i = 0, ii = coordinates.length - 1; i < ii; ++i) { for (let i = 0, ii = coordinates.length - 1; i < ii; ++i) {
const segment = coordinates.slice(i, i + 2); const segment = coordinates.slice(i, i + 2);
const segmentData = /** @type {SegmentData} */ ({ const segmentData = {
feature: feature, feature: feature,
segment: segment segment: segment
}); };
this.rBush_.insert(boundingExtent(segment), segmentData); this.rBush_.insert(boundingExtent(segment), segmentData);
} }
} }