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

Named exports from ol/obj

Browse Source
This commit is contained in:
Frederic Junod
2018-01-16 14:14:17 +01:00
parent 40f97eed85
commit 31e30d28b7
60 changed files with 174 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/rendering/ol/layer/image.test.js
View File

@@ -1,7 +1,7 @@
import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js';
import ImageLayer from '../../../../src/ol/layer/Image.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
import {assign} from '../../../../src/ol/obj.js';
import {get as getProjection, transform, transformExtent} from '../../../../src/ol/proj.js';
import Static from '../../../../src/ol/source/ImageStatic.js';
import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
@@ -56,7 +56,7 @@ describe('ol.rendering.layer.Image', function() {
const options = {
source: source
};
_ol_obj_.assign(options, layerOptions);
assign(options, layerOptions);
map.addLayer(new ImageLayer(options));
});
}

4
test/rendering/ol/layer/tile.test.js
View File

@@ -3,7 +3,7 @@ import View from '../../../../src/ol/View.js';
import * as _ol_extent_ from '../../../../src/ol/extent.js';
import Point from '../../../../src/ol/geom/Point.js';
import TileLayer from '../../../../src/ol/layer/Tile.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
import {assign} from '../../../../src/ol/obj.js';
import {transform} from '../../../../src/ol/proj.js';
import TileImage from '../../../../src/ol/source/TileImage.js';
import XYZ from '../../../../src/ol/source/XYZ.js';
@@ -65,7 +65,7 @@ describe('ol.rendering.layer.Tile', function() {
const options = {
source: source
};
_ol_obj_.assign(options, layerOptions[i] || layerOptions);
assign(options, layerOptions[i] || layerOptions);
map.addLayer(new TileLayer(options));
});
}

4
test/rendering/ol/layer/vectortile.test.js
View File

@@ -5,7 +5,7 @@ import MVT from '../../../../src/ol/format/MVT.js';
import Point from '../../../../src/ol/geom/Point.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import VectorTileLayer from '../../../../src/ol/layer/VectorTile.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
import {assign} from '../../../../src/ol/obj.js';
import VectorSource from '../../../../src/ol/source/Vector.js';
import VectorTileSource from '../../../../src/ol/source/VectorTile.js';
import CircleStyle from '../../../../src/ol/style/Circle.js';
@@ -61,7 +61,7 @@ describe('ol.rendering.layer.VectorTile', function() {
const options = {
source: source
};
_ol_obj_.assign(options, layerOptions);
assign(options, layerOptions);
map.addLayer(new VectorTileLayer(options));
}

4
test/spec/ol/feature.test.js
View File

@@ -1,6 +1,6 @@
import Feature from '../../../src/ol/Feature.js';
import Point from '../../../src/ol/geom/Point.js';
import _ol_obj_ from '../../../src/ol/obj.js';
import {isEmpty} from '../../../src/ol/obj.js';
import Style from '../../../src/ol/style/Style.js';
@@ -85,7 +85,7 @@ describe('ol.Feature', function() {
it('is empty by default', function() {
const feature = new Feature();
const properties = feature.getProperties();
expect(_ol_obj_.isEmpty(properties)).to.be(true);
expect(isEmpty(properties)).to.be(true);
});
});

12
test/spec/ol/layer/group.test.js
View File

@@ -4,7 +4,7 @@ import Collection from '../../../../src/ol/Collection.js';
import * as _ol_extent_ from '../../../../src/ol/extent.js';
import LayerGroup from '../../../../src/ol/layer/Group.js';
import Layer from '../../../../src/ol/layer/Layer.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
import {assign} from '../../../../src/ol/obj.js';
import MapRenderer from '../../../../src/ol/renderer/Map.js';
import Source from '../../../../src/ol/source/Source.js';
@@ -373,9 +373,9 @@ describe('ol.layer.Group', function() {
expect(layerStatesArray[0]).to.eql(layer1.getLayerState());
// layer state should match except for layer reference
const layerState = _ol_obj_.assign({}, layerStatesArray[0]);
const layerState = assign({}, layerStatesArray[0]);
delete layerState.layer;
const groupState = _ol_obj_.assign({}, layerGroup.getLayerState());
const groupState = assign({}, layerGroup.getLayerState());
delete groupState.layer;
expect(layerState).to.eql(groupState);
@@ -421,14 +421,14 @@ describe('ol.layer.Group', function() {
// compare layer state to group state
// layer state should match except for layer reference
let layerState = _ol_obj_.assign({}, layerStatesArray[0]);
let layerState = assign({}, layerStatesArray[0]);
delete layerState.layer;
const groupState = _ol_obj_.assign({}, layerGroup.getLayerState());
const groupState = assign({}, layerGroup.getLayerState());
delete groupState.layer;
expect(layerState).to.eql(groupState);
// layer state should be transformed (and we ignore layer reference)
layerState = _ol_obj_.assign({}, layerStatesArray[1]);
layerState = assign({}, layerStatesArray[1]);
delete layerState.layer;
expect(layerState).to.eql({
opacity: 0.25,

24
test/spec/ol/objectutil.test.js
View File

@@ -1,11 +1,11 @@
import _ol_obj_ from '../../../src/ol/obj.js';
import {assign, clear, isEmpty, getValues} from '../../../src/ol/obj.js';
describe('ol.obj.assign()', function() {
it('is an alias for Object.assign() where available', function() {
if (typeof Object.assign === 'function') {
expect(_ol_obj_.assign).to.be(Object.assign);
expect(assign).to.be(Object.assign);
}
});
@@ -21,7 +21,7 @@ describe('ol.obj.assign()', function() {
targetProp1: 'targetValue1'
};
const assigned = _ol_obj_.assign(target, source);
const assigned = assign(target, source);
expect(assigned).to.be(target);
expect(assigned.sourceProp1).to.be('sourceValue1');
expect(assigned.sourceProp2).to.be('sourceValue2');
@@ -30,13 +30,13 @@ describe('ol.obj.assign()', function() {
});
it('throws a TypeError with `undefined` as target', function() {
expect(_ol_obj_.assign).withArgs(undefined).to.throwException(function(e) {
expect(assign).withArgs(undefined).to.throwException(function(e) {
expect(e).to.be.a(TypeError);
});
});
it('throws a TypeError with `null` as target', function() {
expect(_ol_obj_.assign).withArgs(null).to.throwException(function(e) {
expect(assign).withArgs(null).to.throwException(function(e) {
expect(e).to.be.a(TypeError);
});
});
@@ -46,8 +46,6 @@ describe('ol.obj.assign()', function() {
describe('ol.obj.clear()', function() {
it('removes all properties from an object', function() {
const clear = _ol_obj_.clear;
const isEmpty = _ol_obj_.isEmpty;
expect(isEmpty(clear({foo: 'bar'}))).to.be(true);
expect(isEmpty(clear({foo: 'bar', num: 42}))).to.be(true);
expect(isEmpty(clear({}))).to.be(true);
@@ -59,8 +57,8 @@ describe('ol.obj.clear()', function() {
describe('ol.obj.getValues()', function() {
it('gets a list of property values from an object', function() {
expect(_ol_obj_.getValues({foo: 'bar', num: 42}).sort()).to.eql([42, 'bar']);
expect(_ol_obj_.getValues(null)).to.eql([]);
expect(getValues({foo: 'bar', num: 42}).sort()).to.eql([42, 'bar']);
expect(getValues(null)).to.eql([]);
});
});
@@ -68,10 +66,10 @@ describe('ol.obj.getValues()', function() {
describe('ol.obj.isEmpty()', function() {
it('checks if an object has any properties', function() {
expect(_ol_obj_.isEmpty({})).to.be(true);
expect(_ol_obj_.isEmpty(null)).to.be(true);
expect(_ol_obj_.isEmpty({foo: 'bar'})).to.be(false);
expect(_ol_obj_.isEmpty({foo: false})).to.be(false);
expect(isEmpty({})).to.be(true);
expect(isEmpty(null)).to.be(true);
expect(isEmpty({foo: 'bar'})).to.be(false);
expect(isEmpty({foo: false})).to.be(false);
});
});

5
test/spec/ol/pointer/touchsource.test.js
View File

@@ -2,8 +2,9 @@ import _ol_events_ from '../../../../src/ol/events.js';
import Event from '../../../../src/ol/events/Event.js';
import EventTarget from '../../../../src/ol/events/EventTarget.js';
import _ol_has_ from '../../../../src/ol/has.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
import {assign} from '../../../../src/ol/obj.js';
import PointerEventHandler from '../../../../src/ol/pointer/PointerEventHandler.js';
describe('ol.pointer.TouchSource', function() {
let handler;
let target;
@@ -123,7 +124,7 @@ describe('ol.pointer.TouchSource', function() {
touches = touches !== undefined ? touches : changedTouches;
const event = new Event(type);
_ol_obj_.assign(event, {
assign(event, {
touches: touches,
changedTouches: changedTouches
});

4
test/spec/ol/render/canvas/index.test.js
View File

@@ -1,5 +1,5 @@
import _ol_events_ from '../../../../../src/ol/events.js';
import _ol_obj_ from '../../../../../src/ol/obj.js';
import {clear} from '../../../../../src/ol/obj.js';
import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
@@ -13,7 +13,7 @@ describe('ol.render.canvas', function() {
describe('ol.render.canvas.checkFont()', function() {
beforeEach(function() {
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
clear(_ol_render_canvas_.checkedFonts_);
_ol_render_canvas_.getMeasureContext();
_ol_render_canvas_.measureTextHeight('12px sans-serif');
});

8
test/spec/ol/renderer/canvas/vectorlayer.test.js
View File

@@ -5,7 +5,7 @@ import View from '../../../../../src/ol/View.js';
import * as _ol_extent_ from '../../../../../src/ol/extent.js';
import Point from '../../../../../src/ol/geom/Point.js';
import VectorLayer from '../../../../../src/ol/layer/Vector.js';
import _ol_obj_ from '../../../../../src/ol/obj.js';
import {clear} from '../../../../../src/ol/obj.js';
import {get as getProjection} from '../../../../../src/ol/proj.js';
import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
import CanvasVectorLayerRenderer from '../../../../../src/ol/renderer/canvas/VectorLayer.js';
@@ -85,7 +85,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
});
it('does not re-render for unavailable fonts', function(done) {
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
clear(_ol_render_canvas_.checkedFonts_);
const map = new Map({
view: new View({
center: [0, 0],
@@ -116,7 +116,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
});
it('does not re-render for available fonts', function(done) {
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
clear(_ol_render_canvas_.checkedFonts_);
const map = new Map({
view: new View({
center: [0, 0],
@@ -147,7 +147,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
});
it('re-renders for fonts that become available', function(done) {
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
clear(_ol_render_canvas_.checkedFonts_);
head.appendChild(font);
const map = new Map({
view: new View({

8
test/spec/ol/renderer/canvas/vectortilelayer.test.js
View File

@@ -1,5 +1,5 @@
import {getUid, inherits} from '../../../../../src/ol/index.js';
import _ol_obj_ from '../../../../../src/ol/obj.js';
import {clear} from '../../../../../src/ol/obj.js';
import Feature from '../../../../../src/ol/Feature.js';
import Map from '../../../../../src/ol/Map.js';
import TileState from '../../../../../src/ol/TileState.js';
@@ -154,7 +154,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
it('does not re-render for unavailable fonts', function(done) {
map.renderSync();
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
clear(_ol_render_canvas_.checkedFonts_);
layerStyle[0].getText().setFont('12px "Unavailable font",sans-serif');
layer.changed();
const revision = layer.getRevision();
@@ -166,7 +166,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
it('does not re-render for available fonts', function(done) {
map.renderSync();
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
clear(_ol_render_canvas_.checkedFonts_);
layerStyle[0].getText().setFont('12px sans-serif');
layer.changed();
const revision = layer.getRevision();
@@ -178,7 +178,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
it('re-renders for fonts that become available', function(done) {
map.renderSync();
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
clear(_ol_render_canvas_.checkedFonts_);
head.appendChild(font);
layerStyle[0].getText().setFont('12px "Dancing Script",sans-serif');
layer.changed();