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

Merge pull request #7636 from marcjansen/named-exports-array

Browse Source 
Named exports from the ol/array module
This commit is contained in:
Marc Jansen
2017-12-19 22:32:14 +01:00
committed by GitHub
parent a06c8ebb6f 02002082bf
commit 8ef8f59cd9
47 changed files with 296 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/renderer/canvas/ImageLayer.js
View File

@@ -6,7 +6,7 @@ import {inherits} from '../../index.js';
import _ol_ImageCanvas_ from '../../ImageCanvas.js';
import LayerType from '../../LayerType.js';
import _ol_ViewHint_ from '../../ViewHint.js';
import _ol_array_ from '../../array.js';
import {equals} from '../../array.js';
import {getHeight, getIntersection, getWidth, isEmpty} from '../../extent.js';
import _ol_layer_VectorRenderType_ from '../../layer/VectorRenderType.js';
import _ol_obj_ from '../../obj.js';
@@ -149,7 +149,7 @@ _ol_renderer_canvas_ImageLayer_.prototype.prepareFrame = function(frameState, la
var skippedFeatures = Object.keys(imageFrameState.skippedFeatureUids).sort();
if (vectorRenderer.prepareFrame(imageFrameState, layerState) &&
(vectorRenderer.replayGroupChanged ||
!_ol_array_.equals(skippedFeatures, this.skippedFeatures_))) {
!equals(skippedFeatures, this.skippedFeatures_))) {
context.canvas.width = imageFrameState.size[0] * pixelRatio;
context.canvas.height = imageFrameState.size[1] * pixelRatio;
vectorRenderer.composeFrame(imageFrameState, layerState, context);

4
src/ol/renderer/canvas/Map.js
View File

@@ -5,7 +5,7 @@
import _ol_transform_ from '../../transform.js';
import {inherits} from '../../index.js';
import _ol_array_ from '../../array.js';
import {stableSort} from '../../array.js';
import {CLASS_UNSELECTABLE} from '../../css.js';
import {createCanvasContext2D} from '../../dom.js';
import _ol_layer_Layer_ from '../../layer/Layer.js';
@@ -166,7 +166,7 @@ _ol_renderer_canvas_Map_.prototype.renderFrame = function(frameState) {
this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, frameState);
var layerStatesArray = frameState.layerStatesArray;
_ol_array_.stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
if (rotation) {
context.save();

4
src/ol/renderer/webgl/Map.js
View File

@@ -3,7 +3,7 @@
*/
import {inherits} from '../../index.js';
import _ol_array_ from '../../array.js';
import {stableSort} from '../../array.js';
import {CLASS_UNSELECTABLE} from '../../css.js';
import {createCanvasContext2D} from '../../dom.js';
import _ol_events_ from '../../events.js';
@@ -443,7 +443,7 @@ _ol_renderer_webgl_Map_.prototype.renderFrame = function(frameState) {
/** @type {Array.<ol.LayerState>} */
var layerStatesToDraw = [];
var layerStatesArray = frameState.layerStatesArray;
_ol_array_.stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
var viewResolution = frameState.viewState.resolution;
var i, ii, layerRenderer, layerState;

4
src/ol/renderer/webgl/TileLayer.js
View File

@@ -8,7 +8,7 @@ import {inherits} from '../../index.js';
import LayerType from '../../LayerType.js';
import TileRange from '../../TileRange.js';
import _ol_TileState_ from '../../TileState.js';
import _ol_array_ from '../../array.js';
import {numberSafeCompareFunction} from '../../array.js';
import {createEmpty, intersects} from '../../extent.js';
import _ol_math_ from '../../math.js';
import RendererType from '../Type.js';
@@ -297,7 +297,7 @@ _ol_renderer_webgl_TileLayer_.prototype.prepareFrame = function(frameState, laye
/** @type {Array.<number>} */
var zs = Object.keys(tilesToDrawByZ).map(Number);
zs.sort(_ol_array_.numberSafeCompareFunction);
zs.sort(numberSafeCompareFunction);
var u_tileOffset = new Float32Array(4);
var i, ii, tileKey, tilesToDraw;
for (i = 0, ii = zs.length; i < ii; ++i) {