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
+3 -3
View File
@@ -1,7 +1,7 @@
/**
* @module ol/renderer/canvas/ImageLayer
*/
import _ol_ from '../../index.js';
import {ENABLE_RASTER_REPROJECTION, inherits} from '../../index.js';
import _ol_ImageCanvas_ from '../../ImageCanvas.js';
import _ol_LayerType_ from '../../LayerType.js';
import _ol_ViewHint_ from '../../ViewHint.js';
@@ -49,7 +49,7 @@ var _ol_renderer_canvas_ImageLayer_ = function(imageLayer) {
};
_ol_.inherits(_ol_renderer_canvas_ImageLayer_, _ol_renderer_canvas_IntermediateCanvas_);
inherits(_ol_renderer_canvas_ImageLayer_, _ol_renderer_canvas_IntermediateCanvas_);
/**
@@ -128,7 +128,7 @@ _ol_renderer_canvas_ImageLayer_.prototype.prepareFrame = function(frameState, la
if (!hints[_ol_ViewHint_.ANIMATING] && !hints[_ol_ViewHint_.INTERACTING] &&
!_ol_extent_.isEmpty(renderedExtent)) {
var projection = viewState.projection;
if (!_ol_.ENABLE_RASTER_REPROJECTION) {
if (!ENABLE_RASTER_REPROJECTION) {
var sourceProjection = imageSource.getProjection();
if (sourceProjection) {
projection = sourceProjection;
+3 -3
View File
@@ -1,7 +1,7 @@
/**
* @module ol/renderer/canvas/IntermediateCanvas
*/
import _ol_ from '../../index.js';
import {inherits, nullFunction} from '../../index.js';
import _ol_coordinate_ from '../../coordinate.js';
import _ol_dom_ from '../../dom.js';
import _ol_extent_ from '../../extent.js';
@@ -32,7 +32,7 @@ var _ol_renderer_canvas_IntermediateCanvas_ = function(layer) {
};
_ol_.inherits(_ol_renderer_canvas_IntermediateCanvas_, _ol_renderer_canvas_Layer_);
inherits(_ol_renderer_canvas_IntermediateCanvas_, _ol_renderer_canvas_Layer_);
/**
@@ -123,7 +123,7 @@ _ol_renderer_canvas_IntermediateCanvas_.prototype.forEachLayerAtCoordinate = fun
return undefined;
}
if (this.getLayer().getSource().forEachFeatureAtCoordinate !== _ol_.nullFunction) {
if (this.getLayer().getSource().forEachFeatureAtCoordinate !== nullFunction) {
// for ImageCanvas sources use the original hit-detection logic,
// so that for example also transparent polygons are detected
return _ol_renderer_canvas_Layer_.prototype.forEachLayerAtCoordinate.apply(this, arguments);
+2 -2
View File
@@ -1,7 +1,7 @@
/**
* @module ol/renderer/canvas/Layer
*/
import _ol_ from '../../index.js';
import {inherits} from '../../index.js';
import _ol_extent_ from '../../extent.js';
import _ol_functions_ from '../../functions.js';
import _ol_render_Event_ from '../../render/Event.js';
@@ -35,7 +35,7 @@ var _ol_renderer_canvas_Layer_ = function(layer) {
};
_ol_.inherits(_ol_renderer_canvas_Layer_, _ol_renderer_Layer_);
inherits(_ol_renderer_canvas_Layer_, _ol_renderer_Layer_);
/**
+2 -2
View File
@@ -4,7 +4,7 @@
// FIXME offset panning
import _ol_transform_ from '../../transform.js';
import _ol_ from '../../index.js';
import {inherits} from '../../index.js';
import _ol_array_ from '../../array.js';
import _ol_css_ from '../../css.js';
import _ol_dom_ from '../../dom.js';
@@ -60,7 +60,7 @@ var _ol_renderer_canvas_Map_ = function(container, map) {
};
_ol_.inherits(_ol_renderer_canvas_Map_, _ol_renderer_Map_);
inherits(_ol_renderer_canvas_Map_, _ol_renderer_Map_);
/**
+4 -4
View File
@@ -1,7 +1,7 @@
/**
* @module ol/renderer/canvas/TileLayer
*/
import _ol_ from '../../index.js';
import {getUid, inherits} from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js';
import _ol_TileRange_ from '../../TileRange.js';
import _ol_TileState_ from '../../TileState.js';
@@ -78,7 +78,7 @@ var _ol_renderer_canvas_TileLayer_ = function(tileLayer) {
};
_ol_.inherits(_ol_renderer_canvas_TileLayer_, _ol_renderer_canvas_IntermediateCanvas_);
inherits(_ol_renderer_canvas_TileLayer_, _ol_renderer_canvas_IntermediateCanvas_);
/**
@@ -179,7 +179,7 @@ _ol_renderer_canvas_TileLayer_.prototype.prepareFrame = function(frameState, lay
tile = tile.getInterimTile();
}
if (this.isDrawableTile_(tile)) {
var uid = _ol_.getUid(this);
var uid = getUid(this);
if (tile.getState() == _ol_TileState_.LOADED) {
tilesToDrawByZ[z][tile.tileCoord.toString()] = tile;
var inTransition = tile.inTransition(uid);
@@ -314,7 +314,7 @@ _ol_renderer_canvas_TileLayer_.prototype.drawTileImage = function(tile, frameSta
if (!image) {
return;
}
var uid = _ol_.getUid(this);
var uid = getUid(this);
var alpha = transition ? tile.getAlpha(uid, frameState.time) : 1;
if (alpha === 1 && !this.getLayer().getSource().getOpaque(frameState.viewState.projection)) {
this.context.clearRect(x, y, w, h);
+3 -3
View File
@@ -1,7 +1,7 @@
/**
* @module ol/renderer/canvas/VectorLayer
*/
import _ol_ from '../../index.js';
import {getUid, inherits} from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js';
import _ol_ViewHint_ from '../../ViewHint.js';
import _ol_dom_ from '../../dom.js';
@@ -84,7 +84,7 @@ var _ol_renderer_canvas_VectorLayer_ = function(vectorLayer) {
};
_ol_.inherits(_ol_renderer_canvas_VectorLayer_, _ol_renderer_canvas_Layer_);
inherits(_ol_renderer_canvas_VectorLayer_, _ol_renderer_canvas_Layer_);
/**
@@ -263,7 +263,7 @@ _ol_renderer_canvas_VectorLayer_.prototype.forEachFeatureAtCoordinate = function
* @return {?} Callback result.
*/
function(feature) {
var key = _ol_.getUid(feature).toString();
var key = getUid(feature).toString();
if (!(key in features)) {
features[key] = true;
return callback.call(thisArg, feature, layer);
+3 -3
View File
@@ -1,7 +1,7 @@
/**
* @module ol/renderer/canvas/VectorTileLayer
*/
import _ol_ from '../../index.js';
import {getUid, inherits} from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js';
import _ol_TileState_ from '../../TileState.js';
import _ol_dom_ from '../../dom.js';
@@ -68,7 +68,7 @@ var _ol_renderer_canvas_VectorTileLayer_ = function(layer) {
};
_ol_.inherits(_ol_renderer_canvas_VectorTileLayer_, _ol_renderer_canvas_TileLayer_);
inherits(_ol_renderer_canvas_VectorTileLayer_, _ol_renderer_canvas_TileLayer_);
/**
@@ -303,7 +303,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.forEachFeatureAtCoordinate = func
* @return {?} Callback result.
*/
function(feature) {
var key = _ol_.getUid(feature).toString();
var key = getUid(feature).toString();
if (!(key in features)) {
features[key] = true;
return callback.call(thisArg, feature, layer);