From f2752eb01eb10bc8be99f9e7f32aaa6524041107 Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim@planet.com>
Date: Tue, 12 Dec 2017 16:15:10 -0700
Subject: [PATCH] Common tilegrid exports

---
 externs/olx.js                         |  2 +-
 src/ol/View.js                         |  3 ++-
 src/ol/index.js                        | 16 ----------------
 src/ol/source/Zoomify.js               |  3 ++-
 src/ol/tilegrid.js                     |  2 +-
 src/ol/tilegrid/TileGrid.js            |  2 +-
 src/ol/tilegrid/common.js              |  9 +++++++++
 test/spec/ol/source/zoomify.test.js    |  2 +-
 test/spec/ol/tilegrid/tilegrid.test.js |  2 +-
 9 files changed, 18 insertions(+), 23 deletions(-)
 create mode 100644 src/ol/tilegrid/common.js

diff --git a/externs/olx.js b/externs/olx.js
index 65bcf571c9..f2ecf7e07f 100644
--- a/externs/olx.js
+++ b/externs/olx.js
@@ -7443,7 +7443,7 @@ olx.source.ZoomifyOptions.prototype.transition;
 
 /**
  * Tile size. Same tile size is used for all zoom levels. Default value is
- * `OpenLayers.DEFAULT_TILE_SIZE`.
+ * `256`.
  * @type {number|undefined}
  * @api
  */
diff --git a/src/ol/View.js b/src/ol/View.js
index 88212a3699..9e90ae780d 100644
--- a/src/ol/View.js
+++ b/src/ol/View.js
@@ -1,7 +1,8 @@
 /**
  * @module ol/View
  */
-import {DEFAULT_MIN_ZOOM, DEFAULT_TILE_SIZE, inherits, getUid, nullFunction} from './index.js';
+import {DEFAULT_TILE_SIZE} from './tilegrid/common.js';
+import {DEFAULT_MIN_ZOOM, inherits, getUid, nullFunction} from './index.js';
 import _ol_CenterConstraint_ from './CenterConstraint.js';
 import _ol_Object_ from './Object.js';
 import _ol_ResolutionConstraint_ from './ResolutionConstraint.js';
diff --git a/src/ol/index.js b/src/ol/index.js
index 5c04cec288..2f787fd606 100644
--- a/src/ol/index.js
+++ b/src/ol/index.js
@@ -18,14 +18,6 @@ import webgl from './webgl.js';
 export var ASSUME_TOUCH = false;
 
 
-/**
- * TODO: rename this to something having to do with tile grids
- * see https://github.com/openlayers/openlayers/issues/2076
- * @type {number} Default maximum zoom for default tile grids.
- */
-export var DEFAULT_MAX_ZOOM = 42;
-
-
 /**
  * @type {number} Default min zoom level for the map view.  Default is `0`.
  */
@@ -39,12 +31,6 @@ export var DEFAULT_MIN_ZOOM = 0;
 export var DEFAULT_RASTER_REPROJECTION_ERROR_THRESHOLD = 0.5;
 
 
-/**
- * @type {number} Default tile size.
- */
-export var DEFAULT_TILE_SIZE = 256;
-
-
 /**
  * @type {string} Default WMS version.
  */
@@ -278,10 +264,8 @@ export default {
   inherits: inherits,
   VERSION: VERSION,
   ASSUME_TOUCH: ASSUME_TOUCH,
-  DEFAULT_MAX_ZOOM: DEFAULT_MAX_ZOOM,
   DEFAULT_MIN_ZOOM: DEFAULT_MIN_ZOOM,
   DEFAULT_RASTER_REPROJECTION_ERROR_THRESHOLD: DEFAULT_RASTER_REPROJECTION_ERROR_THRESHOLD,
-  DEFAULT_TILE_SIZE: DEFAULT_TILE_SIZE,
   DEFAULT_WMS_VERSION: DEFAULT_WMS_VERSION,
   ENABLE_CANVAS: ENABLE_CANVAS,
   ENABLE_PROJ4JS: ENABLE_PROJ4JS,
diff --git a/src/ol/source/Zoomify.js b/src/ol/source/Zoomify.js
index d9e1179252..807fa0fd55 100644
--- a/src/ol/source/Zoomify.js
+++ b/src/ol/source/Zoomify.js
@@ -1,7 +1,8 @@
 /**
  * @module ol/source/Zoomify
  */
-import {DEFAULT_TILE_SIZE, inherits} from '../index.js';
+import {DEFAULT_TILE_SIZE} from '../tilegrid/common.js';
+import {inherits} from '../index.js';
 import _ol_ImageTile_ from '../ImageTile.js';
 import _ol_TileState_ from '../TileState.js';
 import _ol_TileUrlFunction_ from '../TileUrlFunction.js';
diff --git a/src/ol/tilegrid.js b/src/ol/tilegrid.js
index 30fcb5fd11..4c9e7ba0e6 100644
--- a/src/ol/tilegrid.js
+++ b/src/ol/tilegrid.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/tilegrid
  */
-import {DEFAULT_MAX_ZOOM, DEFAULT_TILE_SIZE} from './index.js';
+import {DEFAULT_MAX_ZOOM, DEFAULT_TILE_SIZE} from './tilegrid/common.js';
 import _ol_size_ from './size.js';
 import _ol_extent_ from './extent.js';
 import _ol_extent_Corner_ from './extent/Corner.js';
diff --git a/src/ol/tilegrid/TileGrid.js b/src/ol/tilegrid/TileGrid.js
index e57728e603..edab2d53de 100644
--- a/src/ol/tilegrid/TileGrid.js
+++ b/src/ol/tilegrid/TileGrid.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/tilegrid/TileGrid
  */
-import {DEFAULT_TILE_SIZE} from '../index.js';
+import {DEFAULT_TILE_SIZE} from './common.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_TileRange_ from '../TileRange.js';
 import _ol_array_ from '../array.js';
diff --git a/src/ol/tilegrid/common.js b/src/ol/tilegrid/common.js
new file mode 100644
index 0000000000..e003fba738
--- /dev/null
+++ b/src/ol/tilegrid/common.js
@@ -0,0 +1,9 @@
+/**
+ * @type {number} Default maximum zoom for default tile grids.
+ */
+export var DEFAULT_MAX_ZOOM = 42;
+
+/**
+ * @type {number} Default tile size.
+ */
+export var DEFAULT_TILE_SIZE = 256;
diff --git a/test/spec/ol/source/zoomify.test.js b/test/spec/ol/source/zoomify.test.js
index 3d21657ca7..a6b7d364b3 100644
--- a/test/spec/ol/source/zoomify.test.js
+++ b/test/spec/ol/source/zoomify.test.js
@@ -1,4 +1,4 @@
-import {DEFAULT_TILE_SIZE} from '../../../../src/ol/index.js';
+import {DEFAULT_TILE_SIZE} from '../../../../src/ol/tilegrid/common.js';
 import _ol_events_ from '../../../../src/ol/events.js';
 import _ol_proj_Projection_ from '../../../../src/ol/proj/Projection.js';
 import _ol_source_Zoomify_ from '../../../../src/ol/source/Zoomify.js';
diff --git a/test/spec/ol/tilegrid/tilegrid.test.js b/test/spec/ol/tilegrid/tilegrid.test.js
index 346c9d8b95..86a6bf3886 100644
--- a/test/spec/ol/tilegrid/tilegrid.test.js
+++ b/test/spec/ol/tilegrid/tilegrid.test.js
@@ -1,4 +1,4 @@
-import {DEFAULT_MAX_ZOOM, DEFAULT_TILE_SIZE} from '../../../../src/ol/index.js';
+import {DEFAULT_MAX_ZOOM, DEFAULT_TILE_SIZE} from '../../../../src/ol/tilegrid/common.js';
 import _ol_TileRange_ from '../../../../src/ol/TileRange.js';
 import _ol_extent_ from '../../../../src/ol/extent.js';
 import _ol_proj_ from '../../../../src/ol/proj.js';