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/render/canvas/ImageReplay
*/
import _ol_ from '../../index.js';
import {inherits} from '../../index.js';
import _ol_render_canvas_Instruction_ from '../canvas/Instruction.js';
import _ol_render_canvas_Replay_ from '../canvas/Replay.js';
@@ -107,7 +107,7 @@ var _ol_render_canvas_ImageReplay_ = function(
};
_ol_.inherits(_ol_render_canvas_ImageReplay_, _ol_render_canvas_Replay_);
inherits(_ol_render_canvas_ImageReplay_, _ol_render_canvas_Replay_);
/**

View File

@@ -5,7 +5,7 @@
// FIXME need to handle large thick features (where pixel size matters)
// FIXME add offset and end to ol.geom.flat.transform.transform2D?
import _ol_ from '../../index.js';
import {inherits} from '../../index.js';
import _ol_array_ from '../../array.js';
import _ol_colorlike_ from '../../colorlike.js';
import _ol_extent_ from '../../extent.js';
@@ -238,7 +238,7 @@ var _ol_render_canvas_Immediate_ = function(context, pixelRatio, extent, transfo
};
_ol_.inherits(_ol_render_canvas_Immediate_, _ol_render_VectorContext_);
inherits(_ol_render_canvas_Immediate_, _ol_render_VectorContext_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/render/canvas/LineStringReplay
*/
import _ol_ from '../../index.js';
import {inherits} from '../../index.js';
import _ol_render_canvas_Instruction_ from '../canvas/Instruction.js';
import _ol_render_canvas_Replay_ from '../canvas/Replay.js';
@@ -22,7 +22,7 @@ var _ol_render_canvas_LineStringReplay_ = function(
tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
};
_ol_.inherits(_ol_render_canvas_LineStringReplay_, _ol_render_canvas_Replay_);
inherits(_ol_render_canvas_LineStringReplay_, _ol_render_canvas_Replay_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/render/canvas/PolygonReplay
*/
import _ol_ from '../../index.js';
import {inherits} from '../../index.js';
import _ol_color_ from '../../color.js';
import _ol_geom_flat_simplify_ from '../../geom/flat/simplify.js';
import _ol_render_canvas_ from '../canvas.js';
@@ -25,7 +25,7 @@ var _ol_render_canvas_PolygonReplay_ = function(
tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
};
_ol_.inherits(_ol_render_canvas_PolygonReplay_, _ol_render_canvas_Replay_);
inherits(_ol_render_canvas_PolygonReplay_, _ol_render_canvas_Replay_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/render/canvas/Replay
*/
import _ol_ from '../../index.js';
import {getUid, inherits, nullFunction} from '../../index.js';
import _ol_array_ from '../../array.js';
import _ol_colorlike_ from '../../colorlike.js';
import _ol_extent_ from '../../extent.js';
@@ -167,7 +167,7 @@ var _ol_render_canvas_Replay_ = function(tolerance, maxExtent, resolution, pixel
this.resetTransform_ = _ol_transform_.create();
};
_ol_.inherits(_ol_render_canvas_Replay_, _ol_render_VectorContext_);
inherits(_ol_render_canvas_Replay_, _ol_render_VectorContext_);
/**
@@ -584,7 +584,7 @@ _ol_render_canvas_Replay_.prototype.replay_ = function(
case _ol_render_canvas_Instruction_.BEGIN_GEOMETRY:
feature = /** @type {ol.Feature|ol.render.Feature} */ (instruction[1]);
if ((skipFeatures &&
skippedFeaturesHash[_ol_.getUid(feature).toString()]) ||
skippedFeaturesHash[getUid(feature).toString()]) ||
!feature.getGeometry()) {
i = /** @type {number} */ (instruction[2]);
} else if (opt_hitExtent !== undefined && !_ol_extent_.intersects(
@@ -1048,7 +1048,7 @@ _ol_render_canvas_Replay_.prototype.endGeometry = function(geometry, feature) {
/**
* FIXME empty description for jsdoc
*/
_ol_render_canvas_Replay_.prototype.finish = _ol_.nullFunction;
_ol_render_canvas_Replay_.prototype.finish = nullFunction;
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/render/canvas/ReplayGroup
*/
import _ol_ from '../../index.js';
import {inherits} from '../../index.js';
import _ol_array_ from '../../array.js';
import _ol_dom_ from '../../dom.js';
import _ol_extent_ from '../../extent.js';
@@ -102,7 +102,7 @@ var _ol_render_canvas_ReplayGroup_ = function(
this.hitDetectionTransform_ = _ol_transform_.create();
};
_ol_.inherits(_ol_render_canvas_ReplayGroup_, _ol_render_ReplayGroup_);
inherits(_ol_render_canvas_ReplayGroup_, _ol_render_ReplayGroup_);
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/render/canvas/TextReplay
*/
import _ol_ from '../../index.js';
import {getUid, inherits} from '../../index.js';
import _ol_colorlike_ from '../../colorlike.js';
import _ol_dom_ from '../../dom.js';
import _ol_extent_ from '../../extent.js';
@@ -134,7 +134,7 @@ var _ol_render_canvas_TextReplay_ = function(
};
_ol_.inherits(_ol_render_canvas_TextReplay_, _ol_render_canvas_Replay_);
inherits(_ol_render_canvas_TextReplay_, _ol_render_canvas_Replay_);
/**
@@ -533,13 +533,13 @@ _ol_render_canvas_TextReplay_.prototype.setTextStyle = function(textStyle, declu
this.textRotation_ = textRotation === undefined ? 0 : textRotation;
this.strokeKey_ = strokeState ?
(typeof strokeState.strokeStyle == 'string' ? strokeState.strokeStyle : _ol_.getUid(strokeState.strokeStyle)) +
(typeof strokeState.strokeStyle == 'string' ? strokeState.strokeStyle : getUid(strokeState.strokeStyle)) +
strokeState.lineCap + strokeState.lineDashOffset + '|' + strokeState.lineWidth +
strokeState.lineJoin + strokeState.miterLimit + '[' + strokeState.lineDash.join() + ']' :
'';
this.textKey_ = textState.font + textState.scale + (textState.textAlign || '?');
this.fillKey_ = fillState ?
(typeof fillState.fillStyle == 'string' ? fillState.fillStyle : ('|' + _ol_.getUid(fillState.fillStyle))) :
(typeof fillState.fillStyle == 'string' ? fillState.fillStyle : ('|' + getUid(fillState.fillStyle))) :
'';
}
};