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

Add missing goog.requires; fix types and a typo

Browse Source
This commit is contained in:
ahocevar
2014-03-30 16:59:22 +02:00
parent 2cb045b0b3
commit 523b51d69a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/objectliterals.jsdoc
View File

@@ -487,9 +487,9 @@
/** /**
* @typedef {Object} olx.interaction.ModifyOptions * @typedef {Object} olx.interaction.ModifyOptions
* @property {ol.events.ConditionType} deleteCondition Condition that determines * @property {ol.events.ConditionType|undefined} deleteCondition Condition that
* which event results in a vertex deletion. Default is a `singleclick` * determines which event results in a vertex deletion. Default is a
* event with no modifier keys. * `singleclick` event with no modifier keys.
* @property {number|undefined} pixelTolerance Pixel tolerance for considering * @property {number|undefined} pixelTolerance Pixel tolerance for considering
* the pointer close enough to a segment or vertex for editing. Default is * the pointer close enough to a segment or vertex for editing. Default is
* 10 pixels. * 10 pixels.

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

@@ -3,6 +3,7 @@ goog.provide('ol.interaction.Modify');
goog.require('goog.array'); goog.require('goog.array');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.events'); goog.require('goog.events');
goog.require('goog.functions');
goog.require('ol.Collection'); goog.require('ol.Collection');
goog.require('ol.CollectionEventType'); goog.require('ol.CollectionEventType');
goog.require('ol.Feature'); goog.require('ol.Feature');
@@ -50,8 +51,10 @@ ol.interaction.Modify = function(options) {
* @private * @private
*/ */
this.deleteCondition_ = goog.isDef(options.deleteCondition) ? this.deleteCondition_ = goog.isDef(options.deleteCondition) ?
options.pixelTolerance : goog.functions.and( options.deleteCondition :
ol.events.condition.noModifierKeys, ol.events.condition.singleClick); /** @type {ol.events.ConditionType} */ (goog.functions.and(
ol.events.condition.noModifierKeys,
ol.events.condition.singleClick));
/** /**
* Editing vertex. * Editing vertex.
@@ -643,7 +646,8 @@ ol.interaction.Modify.prototype.insertVertex_ = function(segmentData, vertex) {
ol.interaction.Modify.prototype.removeVertex_ = function() { ol.interaction.Modify.prototype.removeVertex_ = function() {
var dragSegments = this.dragSegments_; var dragSegments = this.dragSegments_;
var segmentsByFeature = {}; var segmentsByFeature = {};
var component, coordinates, deleted, dragSegment, geometry, i, index, left; var deleted = false;
var component, coordinates, dragSegment, geometry, i, index, left;
var newIndex, newSegment, right, segmentData, uid; var newIndex, newSegment, right, segmentData, uid;
for (i = dragSegments.length - 1; i >= 0; --i) { for (i = dragSegments.length - 1; i >= 0; --i) {
dragSegment = dragSegments[i]; dragSegment = dragSegments[i];