Use named exports from ol/index.js

This commit is contained in:
Tim Schaub
2017-12-12 10:24:58 -07:00
parent fce644556b
commit 87295a74dd
250 changed files with 874 additions and 887 deletions

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/DoubleClickZoom
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
@@ -36,7 +36,7 @@ var _ol_interaction_DoubleClickZoom_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_DoubleClickZoom_, _ol_interaction_Interaction_);
inherits(_ol_interaction_DoubleClickZoom_, _ol_interaction_Interaction_);
/**

View File

@@ -3,7 +3,7 @@
*/
// FIXME should handle all geo-referenced data, not just vector data
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_functions_ from '../functions.js';
import _ol_events_ from '../events.js';
import _ol_events_Event_ from '../events/Event.js';
@@ -63,7 +63,7 @@ var _ol_interaction_DragAndDrop_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_DragAndDrop_, _ol_interaction_Interaction_);
inherits(_ol_interaction_DragAndDrop_, _ol_interaction_Interaction_);
/**
@@ -277,5 +277,5 @@ _ol_interaction_DragAndDrop_.Event = function(type, file, opt_features, opt_proj
this.projection = opt_projection;
};
_ol_.inherits(_ol_interaction_DragAndDrop_.Event, _ol_events_Event_);
inherits(_ol_interaction_DragAndDrop_.Event, _ol_events_Event_);
export default _ol_interaction_DragAndDrop_;

View File

@@ -3,7 +3,7 @@
*/
// FIXME draw drag box
import _ol_events_Event_ from '../events/Event.js';
import _ol_ from '../index.js';
import {inherits, nullFunction} from '../index.js';
import _ol_events_condition_ from '../events/condition.js';
import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
import _ol_render_Box_ from '../render/Box.js';
@@ -68,7 +68,7 @@ var _ol_interaction_DragBox_ = function(opt_options) {
options.boxEndCondition : _ol_interaction_DragBox_.defaultBoxEndCondition;
};
_ol_.inherits(_ol_interaction_DragBox_, _ol_interaction_Pointer_);
inherits(_ol_interaction_DragBox_, _ol_interaction_Pointer_);
/**
@@ -121,7 +121,7 @@ _ol_interaction_DragBox_.prototype.getGeometry = function() {
* @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
* @protected
*/
_ol_interaction_DragBox_.prototype.onBoxEnd = _ol_.nullFunction;
_ol_interaction_DragBox_.prototype.onBoxEnd = nullFunction;
/**
@@ -231,5 +231,5 @@ _ol_interaction_DragBox_.Event = function(type, coordinate, mapBrowserEvent) {
this.mapBrowserEvent = mapBrowserEvent;
};
_ol_.inherits(_ol_interaction_DragBox_.Event, _ol_events_Event_);
inherits(_ol_interaction_DragBox_.Event, _ol_events_Event_);
export default _ol_interaction_DragBox_;

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/DragPan
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_ViewHint_ from '../ViewHint.js';
import _ol_coordinate_ from '../coordinate.js';
import _ol_easing_ from '../easing.js';
@@ -59,7 +59,7 @@ var _ol_interaction_DragPan_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_DragPan_, _ol_interaction_Pointer_);
inherits(_ol_interaction_DragPan_, _ol_interaction_Pointer_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/DragRotate
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_RotationConstraint_ from '../RotationConstraint.js';
import _ol_ViewHint_ from '../ViewHint.js';
import _ol_events_condition_ from '../events/condition.js';
@@ -52,7 +52,7 @@ var _ol_interaction_DragRotate_ = function(opt_options) {
this.duration_ = options.duration !== undefined ? options.duration : 250;
};
_ol_.inherits(_ol_interaction_DragRotate_, _ol_interaction_Pointer_);
inherits(_ol_interaction_DragRotate_, _ol_interaction_Pointer_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/DragRotateAndZoom
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_RotationConstraint_ from '../RotationConstraint.js';
import _ol_ViewHint_ from '../ViewHint.js';
import _ol_events_condition_ from '../events/condition.js';
@@ -66,7 +66,7 @@ var _ol_interaction_DragRotateAndZoom_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_DragRotateAndZoom_, _ol_interaction_Pointer_);
inherits(_ol_interaction_DragRotateAndZoom_, _ol_interaction_Pointer_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/DragZoom
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_easing_ from '../easing.js';
import _ol_events_condition_ from '../events/condition.js';
import _ol_extent_ from '../extent.js';
@@ -46,7 +46,7 @@ var _ol_interaction_DragZoom_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_DragZoom_, _ol_interaction_DragBox_);
inherits(_ol_interaction_DragZoom_, _ol_interaction_DragBox_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/Draw
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js';
import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
import _ol_Object_ from '../Object.js';
@@ -290,7 +290,7 @@ var _ol_interaction_Draw_ = function(options) {
};
_ol_.inherits(_ol_interaction_Draw_, _ol_interaction_Pointer_);
inherits(_ol_interaction_Draw_, _ol_interaction_Pointer_);
/**
@@ -899,5 +899,5 @@ _ol_interaction_Draw_.Event = function(type, feature) {
this.feature = feature;
};
_ol_.inherits(_ol_interaction_Draw_.Event, _ol_events_Event_);
inherits(_ol_interaction_Draw_.Event, _ol_events_Event_);
export default _ol_interaction_Draw_;

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/Extent
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js';
import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
import _ol_MapBrowserPointerEvent_ from '../MapBrowserPointerEvent.js';
@@ -123,7 +123,7 @@ var _ol_interaction_Extent_ = function(opt_options) {
}
};
_ol_.inherits(_ol_interaction_Extent_, _ol_interaction_Pointer_);
inherits(_ol_interaction_Extent_, _ol_interaction_Pointer_);
/**
* @param {ol.MapBrowserEvent} mapBrowserEvent Event.
@@ -464,5 +464,5 @@ _ol_interaction_Extent_.Event = function(extent) {
this.extent = extent;
};
_ol_.inherits(_ol_interaction_Extent_.Event, _ol_events_Event_);
inherits(_ol_interaction_Extent_.Event, _ol_events_Event_);
export default _ol_interaction_Extent_;

View File

@@ -3,7 +3,7 @@
*/
// FIXME factor out key precondition (shift et. al)
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_Object_ from '../Object.js';
import _ol_easing_ from '../easing.js';
import _ol_interaction_Property_ from '../interaction/Property.js';
@@ -45,7 +45,7 @@ var _ol_interaction_Interaction_ = function(options) {
};
_ol_.inherits(_ol_interaction_Interaction_, _ol_Object_);
inherits(_ol_interaction_Interaction_, _ol_Object_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/KeyboardPan
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_coordinate_ from '../coordinate.js';
import _ol_events_EventType_ from '../events/EventType.js';
import _ol_events_KeyCode_ from '../events/KeyCode.js';
@@ -65,7 +65,7 @@ var _ol_interaction_KeyboardPan_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_KeyboardPan_, _ol_interaction_Interaction_);
inherits(_ol_interaction_KeyboardPan_, _ol_interaction_Interaction_);
/**
* Handles the {@link ol.MapBrowserEvent map browser event} if it was a

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/KeyboardZoom
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_events_EventType_ from '../events/EventType.js';
import _ol_events_condition_ from '../events/condition.js';
import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
@@ -52,7 +52,7 @@ var _ol_interaction_KeyboardZoom_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_KeyboardZoom_, _ol_interaction_Interaction_);
inherits(_ol_interaction_KeyboardZoom_, _ol_interaction_Interaction_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/Modify
*/
import _ol_ from '../index.js';
import {getUid, inherits} from '../index.js';
import _ol_Collection_ from '../Collection.js';
import _ol_CollectionEventType_ from '../CollectionEventType.js';
import _ol_Feature_ from '../Feature.js';
@@ -227,7 +227,7 @@ var _ol_interaction_Modify_ = function(options) {
};
_ol_.inherits(_ol_interaction_Modify_, _ol_interaction_Pointer_);
inherits(_ol_interaction_Modify_, _ol_interaction_Pointer_);
/**
@@ -627,7 +627,7 @@ _ol_interaction_Modify_.handleDownEvent_ = function(evt) {
for (var i = 0, ii = segmentDataMatches.length; i < ii; ++i) {
var segmentDataMatch = segmentDataMatches[i];
var segment = segmentDataMatch.segment;
var uid = _ol_.getUid(segmentDataMatch.feature);
var uid = getUid(segmentDataMatch.feature);
var depth = segmentDataMatch.depth;
if (depth) {
uid += '-' + depth.join('-'); // separate feature components
@@ -662,7 +662,7 @@ _ol_interaction_Modify_.handleDownEvent_ = function(evt) {
this.dragSegments_.push([segmentDataMatch, 1]);
componentSegments[uid][1] = segmentDataMatch;
} else if (this.insertVertexCondition_(evt) && _ol_.getUid(segment) in this.vertexSegments_ &&
} else if (this.insertVertexCondition_(evt) && getUid(segment) in this.vertexSegments_ &&
(!componentSegments[uid][0] && !componentSegments[uid][1])) {
insertVertices.push([segmentDataMatch, vertex]);
}
@@ -890,14 +890,14 @@ _ol_interaction_Modify_.prototype.handlePointerAtPixel_ = function(pixel, map) {
_ol_coordinate_.equals(closestSegment[1], segment[1]) ||
(_ol_coordinate_.equals(closestSegment[0], segment[1]) &&
_ol_coordinate_.equals(closestSegment[1], segment[0])))) {
vertexSegments[_ol_.getUid(segment)] = true;
vertexSegments[getUid(segment)] = true;
} else {
break;
}
}
}
vertexSegments[_ol_.getUid(closestSegment)] = true;
vertexSegments[getUid(closestSegment)] = true;
this.vertexSegments_ = vertexSegments;
return;
}
@@ -1053,7 +1053,7 @@ _ol_interaction_Modify_.prototype.removeVertex_ = function() {
for (i = dragSegments.length - 1; i >= 0; --i) {
dragSegment = dragSegments[i];
segmentData = dragSegment[0];
uid = _ol_.getUid(segmentData.feature);
uid = getUid(segmentData.feature);
if (segmentData.depth) {
// separate feature components
uid += '-' + segmentData.depth.join('-');
@@ -1232,5 +1232,5 @@ _ol_interaction_Modify_.Event = function(type, features, mapBrowserPointerEvent)
*/
this.mapBrowserEvent = mapBrowserPointerEvent;
};
_ol_.inherits(_ol_interaction_Modify_.Event, _ol_events_Event_);
inherits(_ol_interaction_Modify_.Event, _ol_events_Event_);
export default _ol_interaction_Modify_;

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/MouseWheelZoom
*/
import _ol_ from '../index.js';
import {MOUSEWHEELZOOM_MAXDELTA, inherits} from '../index.js';
import _ol_ViewHint_ from '../ViewHint.js';
import _ol_easing_ from '../easing.js';
import _ol_events_EventType_ from '../events/EventType.js';
@@ -108,7 +108,7 @@ var _ol_interaction_MouseWheelZoom_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_MouseWheelZoom_, _ol_interaction_Interaction_);
inherits(_ol_interaction_MouseWheelZoom_, _ol_interaction_Interaction_);
/**
@@ -252,7 +252,7 @@ _ol_interaction_MouseWheelZoom_.prototype.handleWheelZoom_ = function(map) {
if (view.getAnimating()) {
view.cancelAnimations();
}
var maxDelta = _ol_.MOUSEWHEELZOOM_MAXDELTA;
var maxDelta = MOUSEWHEELZOOM_MAXDELTA;
var delta = _ol_math_.clamp(this.delta_, -maxDelta, maxDelta);
_ol_interaction_Interaction_.zoomByDelta(view, -delta, this.lastAnchor_,
this.duration_);

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/PinchRotate
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_ViewHint_ from '../ViewHint.js';
import _ol_functions_ from '../functions.js';
import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
@@ -66,7 +66,7 @@ var _ol_interaction_PinchRotate_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_PinchRotate_, _ol_interaction_Pointer_);
inherits(_ol_interaction_PinchRotate_, _ol_interaction_Pointer_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/PinchZoom
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_ViewHint_ from '../ViewHint.js';
import _ol_functions_ from '../functions.js';
import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
@@ -59,7 +59,7 @@ var _ol_interaction_PinchZoom_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_PinchZoom_, _ol_interaction_Pointer_);
inherits(_ol_interaction_PinchZoom_, _ol_interaction_Pointer_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/Pointer
*/
import _ol_ from '../index.js';
import {inherits, nullFunction} from '../index.js';
import _ol_functions_ from '../functions.js';
import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
import _ol_MapBrowserPointerEvent_ from '../MapBrowserPointerEvent.js';
@@ -82,7 +82,7 @@ var _ol_interaction_Pointer_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_Pointer_, _ol_interaction_Interaction_);
inherits(_ol_interaction_Pointer_, _ol_interaction_Interaction_);
/**
@@ -142,7 +142,7 @@ _ol_interaction_Pointer_.prototype.updateTrackedPointers_ = function(mapBrowserE
* @param {ol.MapBrowserPointerEvent} mapBrowserEvent Event.
* @this {ol.interaction.Pointer}
*/
_ol_interaction_Pointer_.handleDragEvent = _ol_.nullFunction;
_ol_interaction_Pointer_.handleDragEvent = nullFunction;
/**
@@ -165,7 +165,7 @@ _ol_interaction_Pointer_.handleDownEvent = _ol_functions_.FALSE;
* @param {ol.MapBrowserPointerEvent} mapBrowserEvent Event.
* @this {ol.interaction.Pointer}
*/
_ol_interaction_Pointer_.handleMoveEvent = _ol_.nullFunction;
_ol_interaction_Pointer_.handleMoveEvent = nullFunction;
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/Select
*/
import _ol_ from '../index.js';
import {getUid, inherits} from '../index.js';
import _ol_CollectionEventType_ from '../CollectionEventType.js';
import _ol_array_ from '../array.js';
import _ol_events_ from '../events.js';
@@ -143,7 +143,7 @@ var _ol_interaction_Select_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_Select_, _ol_interaction_Interaction_);
inherits(_ol_interaction_Select_, _ol_interaction_Interaction_);
/**
@@ -152,7 +152,7 @@ _ol_.inherits(_ol_interaction_Select_, _ol_interaction_Interaction_);
* @private
*/
_ol_interaction_Select_.prototype.addFeatureLayerAssociation_ = function(feature, layer) {
var key = _ol_.getUid(feature);
var key = getUid(feature);
this.featureLayerAssociation_[key] = layer;
};
@@ -187,7 +187,7 @@ _ol_interaction_Select_.prototype.getHitTolerance = function() {
* @api
*/
_ol_interaction_Select_.prototype.getLayer = function(feature) {
var key = _ol_.getUid(feature);
var key = getUid(feature);
return /** @type {ol.layer.Vector} */ (this.featureLayerAssociation_[key]);
};
@@ -372,7 +372,7 @@ _ol_interaction_Select_.prototype.removeFeature_ = function(evt) {
* @private
*/
_ol_interaction_Select_.prototype.removeFeatureLayerAssociation_ = function(feature) {
var key = _ol_.getUid(feature);
var key = getUid(feature);
delete this.featureLayerAssociation_[key];
};
@@ -415,7 +415,7 @@ _ol_interaction_Select_.Event = function(type, selected, deselected, mapBrowserE
*/
this.mapBrowserEvent = mapBrowserEvent;
};
_ol_.inherits(_ol_interaction_Select_.Event, _ol_events_Event_);
inherits(_ol_interaction_Select_.Event, _ol_events_Event_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/Snap
*/
import _ol_ from '../index.js';
import {getUid, inherits} from '../index.js';
import _ol_Collection_ from '../Collection.js';
import _ol_CollectionEventType_ from '../CollectionEventType.js';
import _ol_coordinate_ from '../coordinate.js';
@@ -149,7 +149,7 @@ var _ol_interaction_Snap_ = function(opt_options) {
};
};
_ol_.inherits(_ol_interaction_Snap_, _ol_interaction_Pointer_);
inherits(_ol_interaction_Snap_, _ol_interaction_Pointer_);
/**
@@ -161,7 +161,7 @@ _ol_.inherits(_ol_interaction_Snap_, _ol_interaction_Pointer_);
*/
_ol_interaction_Snap_.prototype.addFeature = function(feature, opt_listen) {
var listen = opt_listen !== undefined ? opt_listen : true;
var feature_uid = _ol_.getUid(feature);
var feature_uid = getUid(feature);
var geometry = feature.getGeometry();
if (geometry) {
var segmentWriter = this.SEGMENT_WRITERS_[geometry.getType()];
@@ -251,7 +251,7 @@ _ol_interaction_Snap_.prototype.handleFeatureRemove_ = function(evt) {
_ol_interaction_Snap_.prototype.handleFeatureChange_ = function(evt) {
var feature = /** @type {ol.Feature} */ (evt.target);
if (this.handlingDownUpSequence) {
var uid = _ol_.getUid(feature);
var uid = getUid(feature);
if (!(uid in this.pendingFeatures_)) {
this.pendingFeatures_[uid] = feature;
}
@@ -270,7 +270,7 @@ _ol_interaction_Snap_.prototype.handleFeatureChange_ = function(evt) {
*/
_ol_interaction_Snap_.prototype.removeFeature = function(feature, opt_unlisten) {
var unlisten = opt_unlisten !== undefined ? opt_unlisten : true;
var feature_uid = _ol_.getUid(feature);
var feature_uid = getUid(feature);
var extent = this.indexedFeaturesExtents_[feature_uid];
if (extent) {
var rBush = this.rBush_;

View File

@@ -1,7 +1,7 @@
/**
* @module ol/interaction/Translate
*/
import _ol_ from '../index.js';
import {inherits} from '../index.js';
import _ol_Collection_ from '../Collection.js';
import _ol_Object_ from '../Object.js';
import _ol_events_ from '../events.js';
@@ -85,7 +85,7 @@ var _ol_interaction_Translate_ = function(opt_options) {
};
_ol_.inherits(_ol_interaction_Translate_, _ol_interaction_Pointer_);
inherits(_ol_interaction_Translate_, _ol_interaction_Pointer_);
/**
@@ -293,5 +293,5 @@ _ol_interaction_Translate_.Event = function(type, features, coordinate) {
*/
this.coordinate = coordinate;
};
_ol_.inherits(_ol_interaction_Translate_.Event, _ol_events_Event_);
inherits(_ol_interaction_Translate_.Event, _ol_events_Event_);
export default _ol_interaction_Translate_;