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
src/ol/render/webgl/CircleReplay.js
View File

@@ -5,7 +5,7 @@ import {getUid, inherits} from '../../index.js';
import {equals} from '../../array.js';
import {asArray} from '../../color.js';
import {intersects} from '../../extent.js';
import _ol_obj_ from '../../obj.js';
import {isEmpty} from '../../obj.js';
import _ol_geom_flat_transform_ from '../../geom/flat/transform.js';
import _ol_render_webgl_circlereplay_defaultshader_ from '../webgl/circlereplay/defaultshader.js';
import _ol_render_webgl_circlereplay_defaultshader_Locations_ from '../webgl/circlereplay/defaultshader/Locations.js';
@@ -246,7 +246,7 @@ WebGLCircleReplay.prototype.shutDownProgram = function(gl, locations) {
* @inheritDoc
*/
WebGLCircleReplay.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hitDetection) {
if (!_ol_obj_.isEmpty(skippedFeaturesHash)) {
if (!isEmpty(skippedFeaturesHash)) {
this.drawReplaySkipping_(gl, context, skippedFeaturesHash);
} else {
//Draw by style groups to minimize drawElements() calls.

4
src/ol/render/webgl/LineStringReplay.js
View File

@@ -8,7 +8,7 @@ import {intersects} from '../../extent.js';
import _ol_geom_flat_orient_ from '../../geom/flat/orient.js';
import _ol_geom_flat_transform_ from '../../geom/flat/transform.js';
import _ol_geom_flat_topology_ from '../../geom/flat/topology.js';
import _ol_obj_ from '../../obj.js';
import {isEmpty} from '../../obj.js';
import _ol_render_webgl_ from '../webgl.js';
import WebGLReplay from '../webgl/Replay.js';
import _ol_render_webgl_linestringreplay_defaultshader_ from '../webgl/linestringreplay/defaultshader.js';
@@ -506,7 +506,7 @@ WebGLLineStringReplay.prototype.drawReplay = function(gl, context, skippedFeatur
gl.depthFunc(gl.NOTEQUAL);
}
if (!_ol_obj_.isEmpty(skippedFeaturesHash)) {
if (!isEmpty(skippedFeaturesHash)) {
this.drawReplaySkipping_(gl, context, skippedFeaturesHash);
} else {
//Draw by style groups to minimize drawElements() calls.

4
src/ol/render/webgl/PolygonReplay.js
View File

@@ -5,7 +5,7 @@ import {getUid, inherits} from '../../index.js';
import {equals} from '../../array.js';
import {asArray} from '../../color.js';
import {intersects} from '../../extent.js';
import _ol_obj_ from '../../obj.js';
import {isEmpty} from '../../obj.js';
import _ol_geom_flat_contains_ from '../../geom/flat/contains.js';
import _ol_geom_flat_orient_ from '../../geom/flat/orient.js';
import _ol_geom_flat_transform_ from '../../geom/flat/transform.js';
@@ -924,7 +924,7 @@ WebGLPolygonReplay.prototype.drawReplay = function(gl, context, skippedFeaturesH
gl.depthFunc(gl.NOTEQUAL);
}
if (!_ol_obj_.isEmpty(skippedFeaturesHash)) {
if (!isEmpty(skippedFeaturesHash)) {
this.drawReplaySkipping_(gl, context, skippedFeaturesHash);
} else {
//Draw by style groups to minimize drawElements() calls.

4
src/ol/render/webgl/ReplayGroup.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../../index.js';
import {numberSafeCompareFunction} from '../../array.js';
import {buffer, createOrUpdateFromCoordinate} from '../../extent.js';
import _ol_obj_ from '../../obj.js';
import {isEmpty} from '../../obj.js';
import _ol_render_replay_ from '../replay.js';
import ReplayGroup from '../ReplayGroup.js';
import WebGLCircleReplay from '../webgl/CircleReplay.js';
@@ -127,7 +127,7 @@ WebGLReplayGroup.prototype.getReplay = function(zIndex, replayType) {
* @inheritDoc
*/
WebGLReplayGroup.prototype.isEmpty = function() {
return _ol_obj_.isEmpty(this.replaysByZIndex_);
return isEmpty(this.replaysByZIndex_);
};

7
src/ol/render/webgl/TextureReplay.js
View File

@@ -3,7 +3,7 @@
*/
import {getUid, inherits} from '../../index.js';
import {intersects} from '../../extent.js';
import _ol_obj_ from '../../obj.js';
import {isEmpty} from '../../obj.js';
import _ol_render_webgl_texturereplay_defaultshader_ from '../webgl/texturereplay/defaultshader.js';
import _ol_render_webgl_texturereplay_defaultshader_Locations_ from '../webgl/texturereplay/defaultshader/Locations.js';
import WebGLReplay from '../webgl/Replay.js';
@@ -331,9 +331,8 @@ WebGLTextureReplay.prototype.drawReplay = function(gl, context, skippedFeaturesH
const textures = hitDetection ? this.getHitDetectionTextures() : this.getTextures();
const groupIndices = hitDetection ? this.hitDetectionGroupIndices : this.groupIndices;
if (!_ol_obj_.isEmpty(skippedFeaturesHash)) {
this.drawReplaySkipping(
gl, context, skippedFeaturesHash, textures, groupIndices);
if (!isEmpty(skippedFeaturesHash)) {
this.drawReplaySkipping(gl, context, skippedFeaturesHash, textures, groupIndices);
} else {
let i, ii, start;
for (i = 0, ii = textures.length, start = 0; i < ii; ++i) {