Rollback tileGrid initialization

fix #239
ghettovoice · Oct 8, 2019 · 45f84d6 · 45f84d6
1 parent a9f206a
commit 45f84d6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/src/component/wmts-source/source.vue b/src/component/wmts-source/source.vue
@@ -84,29 +84,20 @@
           tileLoadFunction: this.tileLoadFunction,
         })
       },
-      /**
-       * @return {Promise}
-       * @protected
-       */
-      init () {
+      createTileGrid () {
         let extent = createExtentFromProjection(this.projection)
         let resolutions = this.resolutions ? this.resolutions : resolutionsFromExtent(extent, this.maxZoom, this.tileSize)
         let origin = this.origin ? this.origin : getExtentCorner(extent, EXTENT_CORNER.TOP_LEFT)
         let matrixIds = Array.from(range(this.minZoom, resolutions.length))
-        /**
-         * @type {module:ol/Tile~UrlFunction}
-         * @protected
-         */
-        this._tileGrid = new WMTSTileGrid({
+
+        return new WMTSTileGrid({
           extent,
           origin,
           resolutions,
           tileSize: this.tileSize,
           minZoom: this.minZoom,
           matrixIds,
         })
-
-        return this::tileSource.methods.init()
       },
     },
     watch: {

diff --git a/src/mixin/tile-source.js b/src/mixin/tile-source.js
@@ -101,6 +101,14 @@ export default {
     },
   },
   methods: {
+    createTileGrid () {
+      return createXyzGrid({
+        extent: createExtentFromProjection(this.projection),
+        maxZoom: this.maxZoom,
+        minZoom: this.minZoom,
+        tileSize: this.tileSize,
+      })
+    },
     /**
      * @return {Promise}
      * @protected
@@ -110,12 +118,7 @@ export default {
        * @type {module:ol/Tile~UrlFunction}
        * @protected
        */
-      this._tileGrid = createXyzGrid({
-        extent: createExtentFromProjection(this.projection),
-        maxZoom: this.maxZoom,
-        minZoom: this.minZoom,
-        tileSize: this.tileSize,
-      })
+      this._tileGrid = this.createTileGrid()
 
       return this::source.methods.init()
     },
@@ -124,6 +127,8 @@ export default {
      * @protected
      */
     deinit () {
+      this._tileGrid = undefined
+
       return this::source.methods.deinit()
     },
     /**