From f403a069672ee247c061327caf87916c68bf5b4d Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 12 Dec 2017 17:30:59 -0700 Subject: [PATCH] Move ENABLE_RASTER_REPROJECTION to a temporary place --- src/ol/index.js | 8 -------- src/ol/renderer/canvas/ImageLayer.js | 3 ++- src/ol/renderer/webgl/ImageLayer.js | 3 ++- src/ol/reproj/common.js | 7 +++++++ src/ol/source/Image.js | 3 ++- src/ol/source/TileImage.js | 3 ++- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/ol/index.js b/src/ol/index.js index d2924a56a8..04be982456 100644 --- a/src/ol/index.js +++ b/src/ol/index.js @@ -11,13 +11,6 @@ import webgl from './webgl.js'; export var DEFAULT_WMS_VERSION = '1.3.0'; -/** - * @type {boolean} Enable automatic reprojection of raster sources. Default is - * `true`. - */ -export var ENABLE_RASTER_REPROJECTION = true; - - /** * @type {boolean} Include debuggable shader sources. Default is `true`. * This should be set to `false` for production builds. @@ -136,7 +129,6 @@ export default { inherits: inherits, VERSION: VERSION, DEFAULT_WMS_VERSION: DEFAULT_WMS_VERSION, - ENABLE_RASTER_REPROJECTION: ENABLE_RASTER_REPROJECTION, DEBUG_WEBGL: DEBUG_WEBGL, HAS_WEBGL: HAS_WEBGL, WEBGL_MAX_TEXTURE_SIZE: WEBGL_MAX_TEXTURE_SIZE, diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index ab01e9a8a1..3e36728ef4 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -1,7 +1,8 @@ /** * @module ol/renderer/canvas/ImageLayer */ -import {ENABLE_RASTER_REPROJECTION, inherits} from '../../index.js'; +import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js'; +import {inherits} from '../../index.js'; import _ol_ImageCanvas_ from '../../ImageCanvas.js'; import _ol_LayerType_ from '../../LayerType.js'; import _ol_ViewHint_ from '../../ViewHint.js'; diff --git a/src/ol/renderer/webgl/ImageLayer.js b/src/ol/renderer/webgl/ImageLayer.js index d67457c8c2..9b29331f77 100644 --- a/src/ol/renderer/webgl/ImageLayer.js +++ b/src/ol/renderer/webgl/ImageLayer.js @@ -1,7 +1,8 @@ /** * @module ol/renderer/webgl/ImageLayer */ -import {ENABLE_RASTER_REPROJECTION, inherits, nullFunction} from '../../index.js'; +import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js'; +import {inherits, nullFunction} from '../../index.js'; import _ol_LayerType_ from '../../LayerType.js'; import _ol_ViewHint_ from '../../ViewHint.js'; import _ol_dom_ from '../../dom.js'; diff --git a/src/ol/reproj/common.js b/src/ol/reproj/common.js index 664f13d9b7..524358e314 100644 --- a/src/ol/reproj/common.js +++ b/src/ol/reproj/common.js @@ -3,3 +3,10 @@ * reprojection triangulation. */ export var ERROR_THRESHOLD = 0.5; + +/** + * TODO: decide if we want to expose this as a build flag or remove it + * @type {boolean} Enable automatic reprojection of raster sources. Default is + * `true`. + */ +export var ENABLE_RASTER_REPROJECTION = true; diff --git a/src/ol/source/Image.js b/src/ol/source/Image.js index 1f9dc15919..db0fb79b6e 100644 --- a/src/ol/source/Image.js +++ b/src/ol/source/Image.js @@ -1,7 +1,8 @@ /** * @module ol/source/Image */ -import {ENABLE_RASTER_REPROJECTION, inherits} from '../index.js'; +import {ENABLE_RASTER_REPROJECTION} from '../reproj/common.js'; +import {inherits} from '../index.js'; import _ol_ImageState_ from '../ImageState.js'; import _ol_array_ from '../array.js'; import _ol_events_Event_ from '../events/Event.js'; diff --git a/src/ol/source/TileImage.js b/src/ol/source/TileImage.js index 56ae68cd6d..c827ef15c0 100644 --- a/src/ol/source/TileImage.js +++ b/src/ol/source/TileImage.js @@ -1,7 +1,8 @@ /** * @module ol/source/TileImage */ -import {ENABLE_RASTER_REPROJECTION, getUid, inherits} from '../index.js'; +import {ENABLE_RASTER_REPROJECTION} from '../reproj/common.js'; +import {getUid, inherits} from '../index.js'; import _ol_ImageTile_ from '../ImageTile.js'; import _ol_TileCache_ from '../TileCache.js'; import _ol_TileState_ from '../TileState.js';