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

Rename _ol_interaction_DragBox_ to DragBox

Browse Source
This commit is contained in:
Marc Jansen
2017-12-15 10:26:17 +01:00
committed by Tim Schaub
parent 41d417b0fc
commit 5d688d2417
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/box-selection.js
View File

@@ -2,7 +2,7 @@ import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js'; import _ol_View_ from '../src/ol/View.js';
import _ol_events_condition_ from '../src/ol/events/condition.js'; import _ol_events_condition_ from '../src/ol/events/condition.js';
import _ol_format_GeoJSON_ from '../src/ol/format/GeoJSON.js'; import _ol_format_GeoJSON_ from '../src/ol/format/GeoJSON.js';
import _ol_interaction_DragBox_ from '../src/ol/interaction/DragBox.js'; import DragBox from '../src/ol/interaction/DragBox.js';
import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -39,7 +39,7 @@ map.addInteraction(select);
var selectedFeatures = select.getFeatures(); var selectedFeatures = select.getFeatures();
// a DragBox interaction used to select features by drawing boxes // a DragBox interaction used to select features by drawing boxes
var dragBox = new _ol_interaction_DragBox_({ var dragBox = new DragBox({
condition: _ol_events_condition_.platformModifierKeyOnly condition: _ol_events_condition_.platformModifierKeyOnly
}); });

39
src/ol/interaction/DragBox.js
View File

@@ -25,12 +25,12 @@ import _ol_render_Box_ from '../render/Box.js';
* @param {olx.interaction.DragBoxOptions=} opt_options Options. * @param {olx.interaction.DragBoxOptions=} opt_options Options.
* @api * @api
*/ */
var _ol_interaction_DragBox_ = function(opt_options) { var DragBox = function(opt_options) {
_ol_interaction_Pointer_.call(this, { _ol_interaction_Pointer_.call(this, {
handleDownEvent: _ol_interaction_DragBox_.handleDownEvent_, handleDownEvent: DragBox.handleDownEvent_,
handleDragEvent: _ol_interaction_DragBox_.handleDragEvent_, handleDragEvent: DragBox.handleDragEvent_,
handleUpEvent: _ol_interaction_DragBox_.handleUpEvent_ handleUpEvent: DragBox.handleUpEvent_
}); });
var options = opt_options ? opt_options : {}; var options = opt_options ? opt_options : {};
@@ -65,10 +65,10 @@ var _ol_interaction_DragBox_ = function(opt_options) {
* @type {ol.DragBoxEndConditionType} * @type {ol.DragBoxEndConditionType}
*/ */
this.boxEndCondition_ = options.boxEndCondition ? this.boxEndCondition_ = options.boxEndCondition ?
options.boxEndCondition : _ol_interaction_DragBox_.defaultBoxEndCondition; options.boxEndCondition : DragBox.defaultBoxEndCondition;
}; };
inherits(_ol_interaction_DragBox_, _ol_interaction_Pointer_); inherits(DragBox, _ol_interaction_Pointer_);
/** /**
@@ -81,7 +81,7 @@ inherits(_ol_interaction_DragBox_, _ol_interaction_Pointer_);
* @return {boolean} Whether or not the boxend condition should be fired. * @return {boolean} Whether or not the boxend condition should be fired.
* @this {ol.interaction.DragBox} * @this {ol.interaction.DragBox}
*/ */
_ol_interaction_DragBox_.defaultBoxEndCondition = function(mapBrowserEvent, startPixel, endPixel) { DragBox.defaultBoxEndCondition = function(mapBrowserEvent, startPixel, endPixel) {
var width = endPixel[0] - startPixel[0]; var width = endPixel[0] - startPixel[0];
var height = endPixel[1] - startPixel[1]; var height = endPixel[1] - startPixel[1];
return width * width + height * height >= this.minArea_; return width * width + height * height >= this.minArea_;
@@ -93,14 +93,14 @@ _ol_interaction_DragBox_.defaultBoxEndCondition = function(mapBrowserEvent, star
* @this {ol.interaction.DragBox} * @this {ol.interaction.DragBox}
* @private * @private
*/ */
_ol_interaction_DragBox_.handleDragEvent_ = function(mapBrowserEvent) { DragBox.handleDragEvent_ = function(mapBrowserEvent) {
if (!_ol_events_condition_.mouseOnly(mapBrowserEvent)) { if (!_ol_events_condition_.mouseOnly(mapBrowserEvent)) {
return; return;
} }
this.box_.setPixels(this.startPixel_, mapBrowserEvent.pixel); this.box_.setPixels(this.startPixel_, mapBrowserEvent.pixel);
this.dispatchEvent(new _ol_interaction_DragBox_.Event(_ol_interaction_DragBox_.EventType_.BOXDRAG, this.dispatchEvent(new DragBox.Event(DragBox.EventType_.BOXDRAG,
mapBrowserEvent.coordinate, mapBrowserEvent)); mapBrowserEvent.coordinate, mapBrowserEvent));
}; };
@@ -110,7 +110,7 @@ _ol_interaction_DragBox_.handleDragEvent_ = function(mapBrowserEvent) {
* @return {ol.geom.Polygon} Geometry. * @return {ol.geom.Polygon} Geometry.
* @api * @api
*/ */
_ol_interaction_DragBox_.prototype.getGeometry = function() { DragBox.prototype.getGeometry = function() {
return this.box_.getGeometry(); return this.box_.getGeometry();
}; };
@@ -121,7 +121,7 @@ _ol_interaction_DragBox_.prototype.getGeometry = function() {
* @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event. * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
* @protected * @protected
*/ */
_ol_interaction_DragBox_.prototype.onBoxEnd = nullFunction; DragBox.prototype.onBoxEnd = nullFunction;
/** /**
@@ -130,7 +130,7 @@ _ol_interaction_DragBox_.prototype.onBoxEnd = nullFunction;
* @this {ol.interaction.DragBox} * @this {ol.interaction.DragBox}
* @private * @private
*/ */
_ol_interaction_DragBox_.handleUpEvent_ = function(mapBrowserEvent) { DragBox.handleUpEvent_ = function(mapBrowserEvent) {
if (!_ol_events_condition_.mouseOnly(mapBrowserEvent)) { if (!_ol_events_condition_.mouseOnly(mapBrowserEvent)) {
return true; return true;
} }
@@ -140,7 +140,7 @@ _ol_interaction_DragBox_.handleUpEvent_ = function(mapBrowserEvent) {
if (this.boxEndCondition_(mapBrowserEvent, if (this.boxEndCondition_(mapBrowserEvent,
this.startPixel_, mapBrowserEvent.pixel)) { this.startPixel_, mapBrowserEvent.pixel)) {
this.onBoxEnd(mapBrowserEvent); this.onBoxEnd(mapBrowserEvent);
this.dispatchEvent(new _ol_interaction_DragBox_.Event(_ol_interaction_DragBox_.EventType_.BOXEND, this.dispatchEvent(new DragBox.Event(DragBox.EventType_.BOXEND,
mapBrowserEvent.coordinate, mapBrowserEvent)); mapBrowserEvent.coordinate, mapBrowserEvent));
} }
return false; return false;
@@ -153,7 +153,7 @@ _ol_interaction_DragBox_.handleUpEvent_ = function(mapBrowserEvent) {
* @this {ol.interaction.DragBox} * @this {ol.interaction.DragBox}
* @private * @private
*/ */
_ol_interaction_DragBox_.handleDownEvent_ = function(mapBrowserEvent) { DragBox.handleDownEvent_ = function(mapBrowserEvent) {
if (!_ol_events_condition_.mouseOnly(mapBrowserEvent)) { if (!_ol_events_condition_.mouseOnly(mapBrowserEvent)) {
return false; return false;
} }
@@ -163,7 +163,7 @@ _ol_interaction_DragBox_.handleDownEvent_ = function(mapBrowserEvent) {
this.startPixel_ = mapBrowserEvent.pixel; this.startPixel_ = mapBrowserEvent.pixel;
this.box_.setMap(mapBrowserEvent.map); this.box_.setMap(mapBrowserEvent.map);
this.box_.setPixels(this.startPixel_, this.startPixel_); this.box_.setPixels(this.startPixel_, this.startPixel_);
this.dispatchEvent(new _ol_interaction_DragBox_.Event(_ol_interaction_DragBox_.EventType_.BOXSTART, this.dispatchEvent(new DragBox.Event(DragBox.EventType_.BOXSTART,
mapBrowserEvent.coordinate, mapBrowserEvent)); mapBrowserEvent.coordinate, mapBrowserEvent));
return true; return true;
} else { } else {
@@ -176,7 +176,7 @@ _ol_interaction_DragBox_.handleDownEvent_ = function(mapBrowserEvent) {
* @enum {string} * @enum {string}
* @private * @private
*/ */
_ol_interaction_DragBox_.EventType_ = { DragBox.EventType_ = {
/** /**
* Triggered upon drag box start. * Triggered upon drag box start.
* @event ol.interaction.DragBox.Event#boxstart * @event ol.interaction.DragBox.Event#boxstart
@@ -212,7 +212,7 @@ _ol_interaction_DragBox_.EventType_ = {
* @constructor * @constructor
* @implements {oli.DragBoxEvent} * @implements {oli.DragBoxEvent}
*/ */
_ol_interaction_DragBox_.Event = function(type, coordinate, mapBrowserEvent) { DragBox.Event = function(type, coordinate, mapBrowserEvent) {
Event.call(this, type); Event.call(this, type);
/** /**
@@ -231,5 +231,6 @@ _ol_interaction_DragBox_.Event = function(type, coordinate, mapBrowserEvent) {
this.mapBrowserEvent = mapBrowserEvent; this.mapBrowserEvent = mapBrowserEvent;
}; };
inherits(_ol_interaction_DragBox_.Event, Event); inherits(DragBox.Event, Event);
export default _ol_interaction_DragBox_;
export default DragBox;

6
src/ol/interaction/DragZoom.js
View File

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import {easeOut} from '../easing.js'; import {easeOut} from '../easing.js';
import _ol_events_condition_ from '../events/condition.js'; import _ol_events_condition_ from '../events/condition.js';
import {createOrUpdateFromCoordinates, getBottomLeft, getCenter, getTopRight, scaleFromCenter} from '../extent.js'; import {createOrUpdateFromCoordinates, getBottomLeft, getCenter, getTopRight, scaleFromCenter} from '../extent.js';
import _ol_interaction_DragBox_ from '../interaction/DragBox.js'; import DragBox from '../interaction/DragBox.js';
/** /**
* @classdesc * @classdesc
@@ -39,14 +39,14 @@ var _ol_interaction_DragZoom_ = function(opt_options) {
*/ */
this.out_ = options.out !== undefined ? options.out : false; this.out_ = options.out !== undefined ? options.out : false;
_ol_interaction_DragBox_.call(this, { DragBox.call(this, {
condition: condition, condition: condition,
className: options.className || 'ol-dragzoom' className: options.className || 'ol-dragzoom'
}); });
}; };
inherits(_ol_interaction_DragZoom_, _ol_interaction_DragBox_); inherits(_ol_interaction_DragZoom_, DragBox);
/** /**