Move things specific to the atlas manager to AtlasManager.js

This commit is contained in:
Tim Schaub
2017-12-12 16:24:53 -07:00
parent c40d9634bb
commit 6afd7b4783
3 changed files with 16 additions and 34 deletions

View File

@@ -8612,8 +8612,7 @@ olx.style.AtlasManagerOptions;
/** /**
* The size in pixels of the first atlas image. If no value is given the * The size in pixels of the first atlas image. Default is `256`.
* `ol.INITIAL_ATLAS_SIZE` compile-time constant will be used.
* @type {number|undefined} * @type {number|undefined}
* @api * @api
*/ */
@@ -8621,11 +8620,8 @@ olx.style.AtlasManagerOptions.prototype.initialSize;
/** /**
* The maximum size in pixels of atlas images. If no value is given then * The maximum size in pixels of atlas images. Default is
* the `ol.MAX_ATLAS_SIZE` compile-time constant will be used. And if * `WEBGL_MAX_TEXTURE_SIZE` or 2048 if WebGL is not supported.
* `ol.MAX_ATLAS_SIZE` is set to `-1` (the default) then
* `ol.WEBGL_MAX_TEXTURE_SIZE` will used if WebGL is supported. Otherwise
* 2048 is used.
* @type {number|undefined} * @type {number|undefined}
* @api * @api
*/ */

View File

@@ -5,13 +5,6 @@
import webgl from './webgl.js'; import webgl from './webgl.js';
/**
* Constants defined with the define tag cannot be changed in application
* code, but can be set at compile time.
* Some reduce the size of the build in advanced compile mode.
*/
/** /**
* @type {boolean} Assume touch. Default is `false`. * @type {boolean} Assume touch. Default is `false`.
*/ */
@@ -69,23 +62,6 @@ export var ENABLE_WEBGL = true;
export var DEBUG_WEBGL = true; export var DEBUG_WEBGL = true;
/**
* TODO: get rid of this or move it to AtlasManager.js
* @type {number} The size in pixels of the first atlas image. Default is
* `256`.
*/
export var INITIAL_ATLAS_SIZE = 256;
/**
* TODO: get rid of this or move it to AtlasManager.js
* @type {number} The maximum size in pixels of atlas images. Default is
* `-1`, meaning it is not used (and `WEBGL_MAX_TEXTURE_SIZE` is
* used instead).
*/
export var MAX_ATLAS_SIZE = -1;
/** /**
* TODO: move this to MouseWheelZoom.js * TODO: move this to MouseWheelZoom.js
* @type {number} Maximum mouse wheel delta. * @type {number} Maximum mouse wheel delta.
@@ -265,8 +241,6 @@ export default {
ENABLE_RASTER_REPROJECTION: ENABLE_RASTER_REPROJECTION, ENABLE_RASTER_REPROJECTION: ENABLE_RASTER_REPROJECTION,
ENABLE_WEBGL: ENABLE_WEBGL, ENABLE_WEBGL: ENABLE_WEBGL,
DEBUG_WEBGL: DEBUG_WEBGL, DEBUG_WEBGL: DEBUG_WEBGL,
INITIAL_ATLAS_SIZE: INITIAL_ATLAS_SIZE,
MAX_ATLAS_SIZE: MAX_ATLAS_SIZE,
MOUSEWHEELZOOM_MAXDELTA: MOUSEWHEELZOOM_MAXDELTA, MOUSEWHEELZOOM_MAXDELTA: MOUSEWHEELZOOM_MAXDELTA,
OVERVIEWMAP_MAX_RATIO: OVERVIEWMAP_MAX_RATIO, OVERVIEWMAP_MAX_RATIO: OVERVIEWMAP_MAX_RATIO,
OVERVIEWMAP_MIN_RATIO: OVERVIEWMAP_MIN_RATIO, OVERVIEWMAP_MIN_RATIO: OVERVIEWMAP_MIN_RATIO,

View File

@@ -1,9 +1,21 @@
/** /**
* @module ol/style/AtlasManager * @module ol/style/AtlasManager
*/ */
import {INITIAL_ATLAS_SIZE, MAX_ATLAS_SIZE, WEBGL_MAX_TEXTURE_SIZE, nullFunction} from '../index.js'; import {WEBGL_MAX_TEXTURE_SIZE, nullFunction} from '../index.js';
import _ol_style_Atlas_ from '../style/Atlas.js'; import _ol_style_Atlas_ from '../style/Atlas.js';
/**
* @type {number} The size in pixels of the first atlas image.
*/
var INITIAL_ATLAS_SIZE = 256;
/**
* @type {number} The maximum size in pixels of atlas images.
*/
var MAX_ATLAS_SIZE = -1;
/** /**
* Manages the creation of image atlases. * Manages the creation of image atlases.
* *