Better code indentation

This commit is contained in:
Frederic Junod
2018-02-16 13:39:16 +01:00
parent 7747f4f40d
commit 4cad77089a
12 changed files with 29 additions and 56 deletions
+1 -2
View File
@@ -55,8 +55,7 @@ DoubleClickZoom.handleEvent = function(mapBrowserEvent) {
const anchor = mapBrowserEvent.coordinate;
const delta = browserEvent.shiftKey ? -this.delta_ : this.delta_;
const view = map.getView();
Interaction.zoomByDelta(
view, delta, anchor, this.duration_);
Interaction.zoomByDelta(view, delta, anchor, this.duration_);
mapBrowserEvent.preventDefault();
stopEvent = true;
}
+1 -2
View File
@@ -67,8 +67,7 @@ inherits(DragPan, PointerInteraction);
*/
function handleDragEvent(mapBrowserEvent) {
const targetPointers = this.targetPointers;
const centroid =
PointerInteraction.centroid(targetPointers);
const centroid = PointerInteraction.centroid(targetPointers);
if (targetPointers.length == this.lastPointersCount_) {
if (this.kinetic_) {
this.kinetic_.update(centroid[0], centroid[1]);
+8 -14
View File
@@ -298,8 +298,8 @@ Modify.prototype.removeFeatureSegmentData_ = function(feature) {
const /** @type {Array.<ol.ModifySegmentDataType>} */ nodesToRemove = [];
rBush.forEach(
/**
* @param {ol.ModifySegmentDataType} node RTree node.
*/
* @param {ol.ModifySegmentDataType} node RTree node.
*/
function(node) {
if (feature === node.feature) {
nodesToRemove.push(node);
@@ -563,8 +563,7 @@ Modify.prototype.writeCircleGeometry_ = function(feature, geometry) {
Modify.prototype.writeGeometryCollectionGeometry_ = function(feature, geometry) {
const geometries = geometry.getGeometriesArray();
for (let i = 0; i < geometries.length; ++i) {
this.SEGMENT_WRITERS_[geometries[i].getType()].call(
this, feature, geometries[i]);
this.SEGMENT_WRITERS_[geometries[i].getType()].call(this, feature, geometries[i]);
}
};
@@ -805,8 +804,7 @@ Modify.handleEvent = function(mapBrowserEvent) {
this.handlePointerMove_(mapBrowserEvent);
}
if (this.vertexFeature_ && this.deleteCondition_(mapBrowserEvent)) {
if (mapBrowserEvent.type != MapBrowserEventType.SINGLECLICK ||
!this.ignoreNextSingleClick_) {
if (mapBrowserEvent.type != MapBrowserEventType.SINGLECLICK || !this.ignoreNextSingleClick_) {
handled = this.removePoint();
} else {
handled = true;
@@ -817,8 +815,7 @@ Modify.handleEvent = function(mapBrowserEvent) {
this.ignoreNextSingleClick_ = false;
}
return PointerInteraction.handleEvent.call(this, mapBrowserEvent) &&
!handled;
return PointerInteraction.handleEvent.call(this, mapBrowserEvent) && !handled;
};
@@ -872,8 +869,7 @@ Modify.prototype.handlePointerAtPixel_ = function(pixel, map) {
dist = Math.sqrt(Math.min(squaredDist1, squaredDist2));
this.snappedToVertex_ = dist <= this.pixelTolerance_;
if (this.snappedToVertex_) {
vertex = squaredDist1 > squaredDist2 ?
closestSegment[1] : closestSegment[0];
vertex = squaredDist1 > squaredDist2 ? closestSegment[1] : closestSegment[0];
}
this.createOrUpdateVertexFeature_(vertex);
let segment;
@@ -1008,8 +1004,7 @@ Modify.prototype.insertVertex_ = function(segmentData, vertex) {
depth: depth,
index: index + 1
});
rTree.insert(boundingExtent(newSegmentData2.segment),
newSegmentData2);
rTree.insert(boundingExtent(newSegmentData2.segment), newSegmentData2);
this.dragSegments_.push([newSegmentData2, 0]);
this.ignoreNextSingleClick_ = true;
};
@@ -1024,8 +1019,7 @@ Modify.prototype.removePoint = function() {
const evt = this.lastPointerEvent_;
this.willModifyFeatures_(evt);
this.removeVertex_();
this.dispatchEvent(new Modify.Event(
ModifyEventType.MODIFYEND, this.features_, evt));
this.dispatchEvent(new Modify.Event(ModifyEventType.MODIFYEND, this.features_, evt));
this.modified_ = false;
return true;
}
+3 -6
View File
@@ -377,8 +377,7 @@ Snap.prototype.snapTo = function(pixel, pixelCoordinate, map) {
snappedToVertex = dist <= this.pixelTolerance_;
if (snappedToVertex) {
snapped = true;
vertex = squaredDist1 > squaredDist2 ?
closestSegment[1] : closestSegment[0];
vertex = squaredDist1 > squaredDist2 ? closestSegment[1] : closestSegment[0];
vertexPixel = map.getPixelFromCoordinate(vertex);
}
} else if (this.edge_) {
@@ -386,8 +385,7 @@ Snap.prototype.snapTo = function(pixel, pixelCoordinate, map) {
vertex = closestOnCircle(pixelCoordinate,
/** @type {ol.geom.Circle} */ (segments[0].feature.getGeometry()));
} else {
vertex = (closestOnSegment(pixelCoordinate,
closestSegment));
vertex = closestOnSegment(pixelCoordinate, closestSegment);
}
vertexPixel = map.getPixelFromCoordinate(vertex);
if (coordinateDistance(pixel, vertexPixel) <= this.pixelTolerance_) {
@@ -400,8 +398,7 @@ Snap.prototype.snapTo = function(pixel, pixelCoordinate, map) {
dist = Math.sqrt(Math.min(squaredDist1, squaredDist2));
snappedToVertex = dist <= this.pixelTolerance_;
if (snappedToVertex) {
vertex = squaredDist1 > squaredDist2 ?
closestSegment[1] : closestSegment[0];
vertex = squaredDist1 > squaredDist2 ? closestSegment[1] : closestSegment[0];
vertexPixel = map.getPixelFromCoordinate(vertex);
}
}