From 9819aa38f5fc7826e81be8398a91aa2d7a34add1 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Mon, 29 Feb 2016 14:50:46 +0100
Subject: [PATCH] Remove ol.DEFAULT_TILE_CACHE_HIGH_WATER_MARK

---
 changelog/upgrade-notes.md        | 14 ++++++++++++++
 src/ol/ol.js                      |  6 ------
 src/ol/source/vectortilesource.js |  5 +----
 src/ol/tilecache.js               |  4 +---
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/changelog/upgrade-notes.md b/changelog/upgrade-notes.md
index 7ed9288d43..a835d4a556 100644
--- a/changelog/upgrade-notes.md
+++ b/changelog/upgrade-notes.md
@@ -1,5 +1,19 @@
 ## Upgrade notes
 
+### v3.15.0
+
+#### Removal of `ol.DEFAULT_TILE_CACHE_HIGH_WATER_MARK`
+
+The `ol.DEFAULT_TILE_CACHE_HIGH_WATER_MARK` define has been removed. The size of the cache can now be defined on every tile based `ol.source`:
+```js
+new ol.layer.Tile({
+  source: new ol.source.OSM({
+    cacheSize: 128
+  })
+})
+```
+The default cache size is `2048`.
+
 ### v3.14.0
 
 #### Internet Explorer 9 support
diff --git a/src/ol/ol.js b/src/ol/ol.js
index 67f3cc5ddc..f91947d59b 100644
--- a/src/ol/ol.js
+++ b/src/ol/ol.js
@@ -35,12 +35,6 @@ ol.DEFAULT_MIN_ZOOM = 0;
 ol.DEFAULT_RASTER_REPROJECTION_ERROR_THRESHOLD = 0.5;
 
 
-/**
- * @define {number} Default high water mark.
- */
-ol.DEFAULT_TILE_CACHE_HIGH_WATER_MARK = 2048;
-
-
 /**
  * @define {number} Default tile size.
  */
diff --git a/src/ol/source/vectortilesource.js b/src/ol/source/vectortilesource.js
index 252e1b38fe..bbb6a825d6 100644
--- a/src/ol/source/vectortilesource.js
+++ b/src/ol/source/vectortilesource.js
@@ -26,12 +26,9 @@ goog.require('ol.source.UrlTile');
  */
 ol.source.VectorTile = function(options) {
 
-  var cacheSize = options.cacheSize !== undefined ?
-      options.cacheSize : ol.DEFAULT_TILE_CACHE_HIGH_WATER_MARK / 16;
-
   goog.base(this, {
     attributions: options.attributions,
-    cacheSize: cacheSize,
+    cacheSize: options.cacheSize !== undefined ? options.cacheSize : 128,
     extent: options.extent,
     logo: options.logo,
     opaque: options.opaque,
diff --git a/src/ol/tilecache.js b/src/ol/tilecache.js
index 0726171e38..8fe0e5ac68 100644
--- a/src/ol/tilecache.js
+++ b/src/ol/tilecache.js
@@ -1,6 +1,5 @@
 goog.provide('ol.TileCache');
 
-goog.require('ol');
 goog.require('ol.TileRange');
 goog.require('ol.structs.LRUCache');
 goog.require('ol.tilecoord');
@@ -20,8 +19,7 @@ ol.TileCache = function(opt_highWaterMark) {
    * @private
    * @type {number}
    */
-  this.highWaterMark_ = opt_highWaterMark !== undefined ?
-      opt_highWaterMark : ol.DEFAULT_TILE_CACHE_HIGH_WATER_MARK;
+  this.highWaterMark_ = opt_highWaterMark !== undefined ? opt_highWaterMark : 2048;
 
 };
 goog.inherits(ol.TileCache, ol.structs.LRUCache);