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

Add named exports for sortByZIndex function

Browse Source
This commit is contained in:
Frederic Junod
2018-02-14 10:39:48 +01:00
parent 4657003811
commit 4f358f018b
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/Map.js
+2 -2
View File
@@ -336,7 +336,7 @@ MapRenderer.prototype.scheduleRemoveUnusedLayerRenderers = function(frameState)
* @param {ol.LayerState} state2 Second layer state. * @param {ol.LayerState} state2 Second layer state.
* @return {number} The zIndex difference. * @return {number} The zIndex difference.
*/ */
MapRenderer.sortByZIndex = function(state1, state2) { export function sortByZIndex(state1, state2) {
return state1.zIndex - state2.zIndex; return state1.zIndex - state2.zIndex;
}; }
export default MapRenderer; export default MapRenderer;
src/ol/renderer/canvas/Map.js
+2 -2
View File
@@ -13,7 +13,7 @@ import RenderEvent from '../../render/Event.js';
import RenderEventType from '../../render/EventType.js'; import RenderEventType from '../../render/EventType.js';
import _ol_render_canvas_ from '../../render/canvas.js'; import _ol_render_canvas_ from '../../render/canvas.js';
import CanvasImmediateRenderer from '../../render/canvas/Immediate.js'; import CanvasImmediateRenderer from '../../render/canvas/Immediate.js';
import MapRenderer from '../Map.js'; import MapRenderer, {sortByZIndex} from '../Map.js';
import RendererType from '../Type.js'; import RendererType from '../Type.js';
import SourceState from '../../source/State.js'; import SourceState from '../../source/State.js';
@@ -166,7 +166,7 @@ CanvasMapRenderer.prototype.renderFrame = function(frameState) {
this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, frameState); this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, frameState);
const layerStatesArray = frameState.layerStatesArray; const layerStatesArray = frameState.layerStatesArray;
stableSort(layerStatesArray, MapRenderer.sortByZIndex); stableSort(layerStatesArray, sortByZIndex);
if (rotation) { if (rotation) {
context.save(); context.save();
src/ol/renderer/webgl/Map.js
+2 -2
View File
@@ -12,7 +12,7 @@ import Layer from '../../layer/Layer.js';
import RenderEvent from '../../render/Event.js'; import RenderEvent from '../../render/Event.js';
import RenderEventType from '../../render/EventType.js'; import RenderEventType from '../../render/EventType.js';
import WebGLImmediateRenderer from '../../render/webgl/Immediate.js'; import WebGLImmediateRenderer from '../../render/webgl/Immediate.js';
import MapRenderer from '../Map.js'; import MapRenderer, {sortByZIndex} from '../Map.js';
import RendererType from '../Type.js'; import RendererType from '../Type.js';
import SourceState from '../../source/State.js'; import SourceState from '../../source/State.js';
import LRUCache from '../../structs/LRUCache.js'; import LRUCache from '../../structs/LRUCache.js';
@@ -444,7 +444,7 @@ WebGLMapRenderer.prototype.renderFrame = function(frameState) {
/** @type {Array.<ol.LayerState>} */ /** @type {Array.<ol.LayerState>} */
const layerStatesToDraw = []; const layerStatesToDraw = [];
const layerStatesArray = frameState.layerStatesArray; const layerStatesArray = frameState.layerStatesArray;
stableSort(layerStatesArray, MapRenderer.sortByZIndex); stableSort(layerStatesArray, sortByZIndex);
const viewResolution = frameState.viewState.resolution; const viewResolution = frameState.viewState.resolution;
let i, ii, layerRenderer, layerState; let i, ii, layerRenderer, layerState;
test/spec/ol/layer/group.test.js
+3 -3
View File
@@ -5,7 +5,7 @@ import * as _ol_extent_ from '../../../../src/ol/extent.js';
import LayerGroup from '../../../../src/ol/layer/Group.js'; import LayerGroup from '../../../../src/ol/layer/Group.js';
import Layer from '../../../../src/ol/layer/Layer.js'; import Layer from '../../../../src/ol/layer/Layer.js';
import {assign} from '../../../../src/ol/obj.js'; import {assign} from '../../../../src/ol/obj.js';
import MapRenderer from '../../../../src/ol/renderer/Map.js'; import {sortByZIndex} from '../../../../src/ol/renderer/Map.js';
import Source from '../../../../src/ol/source/Source.js'; import Source from '../../../../src/ol/source/Source.js';
@@ -451,7 +451,7 @@ describe('ol.layer.Group', function() {
const layerStatesArray = layerGroup.getLayerStatesArray(); const layerStatesArray = layerGroup.getLayerStatesArray();
const initialArray = layerStatesArray.slice(); const initialArray = layerStatesArray.slice();
stableSort(layerStatesArray, MapRenderer.sortByZIndex); stableSort(layerStatesArray, sortByZIndex);
expect(layerStatesArray[0]).to.eql(initialArray[0]); expect(layerStatesArray[0]).to.eql(initialArray[0]);
expect(layerStatesArray[1]).to.eql(initialArray[1]); expect(layerStatesArray[1]).to.eql(initialArray[1]);
@@ -479,7 +479,7 @@ describe('ol.layer.Group', function() {
const layerStatesArray = layerGroup.getLayerStatesArray(); const layerStatesArray = layerGroup.getLayerStatesArray();
const initialArray = layerStatesArray.slice(); const initialArray = layerStatesArray.slice();
stableSort(layerStatesArray, MapRenderer.sortByZIndex); stableSort(layerStatesArray, sortByZIndex);
expect(layerStatesArray[0]).to.eql(initialArray[3]); expect(layerStatesArray[0]).to.eql(initialArray[3]);
expect(layerStatesArray[1]).to.eql(initialArray[0]); expect(layerStatesArray[1]).to.eql(initialArray[0]);
expect(layerStatesArray[2]).to.eql(initialArray[2]); expect(layerStatesArray[2]).to.eql(initialArray[2]);