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

Merge pull request #6365 from gberaudo/public_enums_for_draw_modify_interactions

Browse Source 
Make enums for draw and modify interactions public
This commit is contained in:
Frédéric Junod
2017-01-31 16:57:47 +01:00
committed by GitHub
parent f0457bf075 67a4eaa9d5
commit 66722553a6
8 changed files with 124 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/draw.js
+6 -25
View File
@@ -18,6 +18,7 @@ goog.require('ol.geom.MultiPoint');
goog.require('ol.geom.MultiPolygon');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.interaction.DrawEventType');
goog.require('ol.interaction.Pointer');
goog.require('ol.interaction.Property');
goog.require('ol.layer.Vector');
@@ -483,7 +484,7 @@ ol.interaction.Draw.prototype.startDrawing_ = function(event) {
this.sketchFeature_.setGeometry(geometry);
this.updateSketchFeatures_();
this.dispatchEvent(new ol.interaction.Draw.Event(
ol.interaction.Draw.EventType_.DRAWSTART, this.sketchFeature_));
ol.interaction.DrawEventType.DRAWSTART, this.sketchFeature_));
};
@@ -609,7 +610,7 @@ ol.interaction.Draw.prototype.removeLastPoint = function() {
/**
* Stop drawing and add the sketch feature to the target layer.
* The {@link ol.interaction.Draw.EventType_.DRAWEND} event is dispatched before
* The {@link ol.interaction.DrawEventType.DRAWEND} event is dispatched before
* inserting the feature.
* @api
*/
@@ -639,7 +640,7 @@ ol.interaction.Draw.prototype.finishDrawing = function() {
// First dispatch event to allow full set up of feature
this.dispatchEvent(new ol.interaction.Draw.Event(
ol.interaction.Draw.EventType_.DRAWEND, sketchFeature));
ol.interaction.DrawEventType.DRAWEND, sketchFeature));
// Then insert feature
if (this.features_) {
@@ -686,7 +687,7 @@ ol.interaction.Draw.prototype.extend = function(feature) {
this.sketchCoords_.push(last.slice());
this.updateSketchFeatures_();
this.dispatchEvent(new ol.interaction.Draw.Event(
ol.interaction.Draw.EventType_.DRAWSTART, this.sketchFeature_));
ol.interaction.DrawEventType.DRAWSTART, this.sketchFeature_));
};
@@ -842,7 +843,7 @@ ol.interaction.Draw.Mode_ = {
* @constructor
* @extends {ol.events.Event}
* @implements {oli.DrawEvent}
* @param {ol.interaction.Draw.EventType_} type Type.
* @param {ol.interaction.DrawEventType} type Type.
* @param {ol.Feature} feature The feature drawn.
*/
ol.interaction.Draw.Event = function(type, feature) {
@@ -858,23 +859,3 @@ ol.interaction.Draw.Event = function(type, feature) {
};
ol.inherits(ol.interaction.Draw.Event, ol.events.Event);
/**
* @enum {string}
* @private
*/
ol.interaction.Draw.EventType_ = {
/**
* Triggered upon feature draw start
* @event ol.interaction.Draw.Event#drawstart
* @api stable
*/
DRAWSTART: 'drawstart',
/**
* Triggered upon feature draw end
* @event ol.interaction.Draw.Event#drawend
* @api stable
*/
DRAWEND: 'drawend'
};
src/ol/interaction/draweventtype.js
+20
View File
@@ -0,0 +1,20 @@
goog.provide('ol.interaction.DrawEventType');
/**
* @enum {string}
*/
ol.interaction.DrawEventType = {
/**
* Triggered upon feature draw start
* @event ol.interaction.Draw.Event#drawstart
* @api stable
*/
DRAWSTART: 'drawstart',
/**
* Triggered upon feature draw end
* @event ol.interaction.Draw.Event#drawend
* @api stable
*/
DRAWEND: 'drawend'
};
src/ol/interaction/modify.js
+5 -24
View File
@@ -15,6 +15,7 @@ goog.require('ol.events.condition');
goog.require('ol.extent');
goog.require('ol.geom.GeometryType');
goog.require('ol.geom.Point');
goog.require('ol.interaction.ModifyEventType');
goog.require('ol.interaction.Pointer');
goog.require('ol.layer.Vector');
goog.require('ol.source.Vector');
@@ -214,7 +215,7 @@ ol.interaction.Modify.prototype.willModifyFeatures_ = function(evt) {
if (!this.modified_) {
this.modified_ = true;
this.dispatchEvent(new ol.interaction.Modify.Event(
ol.interaction.Modify.EventType_.MODIFYSTART, this.features_, evt));
ol.interaction.ModifyEventType.MODIFYSTART, this.features_, evt));
}
};
@@ -633,7 +634,7 @@ ol.interaction.Modify.handleUpEvent_ = function(evt) {
}
if (this.modified_) {
this.dispatchEvent(new ol.interaction.Modify.Event(
ol.interaction.Modify.EventType_.MODIFYEND, this.features_, evt));
ol.interaction.ModifyEventType.MODIFYEND, this.features_, evt));
this.modified_ = false;
}
return false;
@@ -828,7 +829,7 @@ ol.interaction.Modify.prototype.removePoint = function() {
this.willModifyFeatures_(evt);
this.removeVertex_();
this.dispatchEvent(new ol.interaction.Modify.Event(
ol.interaction.Modify.EventType_.MODIFYEND, this.features_, evt));
ol.interaction.ModifyEventType.MODIFYEND, this.features_, evt));
this.modified_ = false;
return true;
}
@@ -1004,7 +1005,7 @@ ol.interaction.Modify.getDefaultStyleFunction = function() {
* @constructor
* @extends {ol.events.Event}
* @implements {oli.ModifyEvent}
* @param {ol.interaction.Modify.EventType_} type Type.
* @param {ol.interaction.ModifyEventType} type Type.
* @param {ol.Collection.<ol.Feature>} features The features modified.
* @param {ol.MapBrowserPointerEvent} mapBrowserPointerEvent Associated
* {@link ol.MapBrowserPointerEvent}.
@@ -1028,23 +1029,3 @@ ol.interaction.Modify.Event = function(type, features, mapBrowserPointerEvent) {
this.mapBrowserEvent = mapBrowserPointerEvent;
};
ol.inherits(ol.interaction.Modify.Event, ol.events.Event);
/**
* @enum {string}
* @private
*/
ol.interaction.Modify.EventType_ = {
/**
* Triggered upon feature modification start
* @event ol.interaction.Modify.Event#modifystart
* @api
*/
MODIFYSTART: 'modifystart',
/**
* Triggered upon feature modification end
* @event ol.interaction.Modify.Event#modifyend
* @api
*/
MODIFYEND: 'modifyend'
};
src/ol/interaction/modifyeventtype.js
+20
View File
@@ -0,0 +1,20 @@
goog.provide('ol.interaction.ModifyEventType');
/**
* @enum {string}
*/
ol.interaction.ModifyEventType = {
/**
* Triggered upon feature modification start
* @event ol.interaction.Modify.Event#modifystart
* @api
*/
MODIFYSTART: 'modifystart',
/**
* Triggered upon feature modification end
* @event ol.interaction.Modify.Event#modifyend
* @api
*/
MODIFYEND: 'modifyend'
};
src/ol/interaction/translate.js
+5 -30
View File
@@ -6,6 +6,7 @@ goog.require('ol.events.Event');
goog.require('ol.functions');
goog.require('ol.array');
goog.require('ol.interaction.Pointer');
goog.require('ol.interaction.TranslateEventType');
/**
@@ -101,7 +102,7 @@ ol.interaction.Translate.handleDownEvent_ = function(event) {
this.dispatchEvent(
new ol.interaction.Translate.Event(
ol.interaction.Translate.EventType_.TRANSLATESTART, features,
ol.interaction.TranslateEventType.TRANSLATESTART, features,
event.coordinate));
return true;
}
@@ -124,7 +125,7 @@ ol.interaction.Translate.handleUpEvent_ = function(event) {
this.dispatchEvent(
new ol.interaction.Translate.Event(
ol.interaction.Translate.EventType_.TRANSLATEEND, features,
ol.interaction.TranslateEventType.TRANSLATEEND, features,
event.coordinate));
return true;
}
@@ -154,7 +155,7 @@ ol.interaction.Translate.handleDragEvent_ = function(event) {
this.lastCoordinate_ = newCoordinate;
this.dispatchEvent(
new ol.interaction.Translate.Event(
ol.interaction.Translate.EventType_.TRANSLATING, features,
ol.interaction.TranslateEventType.TRANSLATING, features,
newCoordinate));
}
};
@@ -240,7 +241,7 @@ ol.interaction.Translate.prototype.setHitTolerance = function(hitTolerance) {
* @constructor
* @extends {ol.events.Event}
* @implements {oli.interaction.TranslateEvent}
* @param {ol.interaction.Translate.EventType_} type Type.
* @param {ol.interaction.TranslateEventType} type Type.
* @param {ol.Collection.<ol.Feature>} features The features translated.
* @param {ol.Coordinate} coordinate The event coordinate.
*/
@@ -264,29 +265,3 @@ ol.interaction.Translate.Event = function(type, features, coordinate) {
this.coordinate = coordinate;
};
ol.inherits(ol.interaction.Translate.Event, ol.events.Event);
/**
* @enum {string}
* @private
*/
ol.interaction.Translate.EventType_ = {
/**
* Triggered upon feature translation start.
* @event ol.interaction.Translate.Event#translatestart
* @api
*/
TRANSLATESTART: 'translatestart',
/**
* Triggered upon feature translation.
* @event ol.interaction.Translate.Event#translating
* @api
*/
TRANSLATING: 'translating',
/**
* Triggered upon feature translation end.
* @event ol.interaction.Translate.Event#translateend
* @api
*/
TRANSLATEEND: 'translateend'
};
src/ol/interaction/translateeventtype.js
+26
View File
@@ -0,0 +1,26 @@
goog.provide('ol.interaction.TranslateEventType');
/**
* @enum {string}
*/
ol.interaction.TranslateEventType = {
/**
* Triggered upon feature translation start.
* @event ol.interaction.Translate.Event#translatestart
* @api
*/
TRANSLATESTART: 'translatestart',
/**
* Triggered upon feature translation.
* @event ol.interaction.Translate.Event#translating
* @api
*/
TRANSLATING: 'translating',
/**
* Triggered upon feature translation end.
* @event ol.interaction.Translate.Event#translateend
* @api
*/
TRANSLATEEND: 'translateend'
};