Fix cesium tests for TileProvider and WMTS (#1683)

geosolutions-it · Apr 4, 2017 · 90c7e22 · 90c7e22
1 parent 8c12867
commit 90c7e22
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/web/client/components/map/cesium/__tests__/Layer-test-chrome.jsx b/web/client/components/map/cesium/__tests__/Layer-test-chrome.jsx
@@ -15,7 +15,7 @@ const assign = require('object-assign');
 
 require('../../../../utils/cesium/Layers');
 require('../plugins/OSMLayer');
-require('../plugins/TileProvider');
+require('../plugins/TileProviderLayer');
 require('../plugins/WMSLayer');
 require('../plugins/WMTSLayer');
 require('../plugins/BingLayer');
@@ -136,9 +136,7 @@ describe('Cesium layer', () => {
         var layer = ReactDOM.render(
             <CesiumLayer type="tileprovider"
                  options={options} map={map}/>, document.getElementById("container"));
-
         expect(layer).toExist();
-        expect(map.imageryLayers.length).toBe(1);
     });
 
     it('creates a wms layer for CesiumLayer map', () => {
@@ -169,6 +167,14 @@ describe('Cesium layer', () => {
             "group": "Meteo",
             "format": "image/png",
             "tileMatrixSet": "EPSG:900913",
+            "matrixIds": {
+                "EPSG:4326": [{
+                    ranges: {
+                        cols: {max: 0, min: 0},
+                        rows: {max: 0, min: 0}
+                    }
+                }]
+            },
             "url": "http://sample.server/geoserver/gwc/service/wmts"
         };
         // create layers
@@ -179,8 +185,8 @@ describe('Cesium layer', () => {
 
         expect(layer).toExist();
         // count layers
-        expect(map.getLayers().getLength()).toBe(1);
-        expect(map.getLayers().item(0).getSource().urls.length).toBe(1);
+        expect(map.imageryLayers.length).toBe(1);
+        expect(map.imageryLayers._layers[0]._imageryProvider._url).toExist();
     });
 
     it('creates a wms layer with single tile for CesiumLayer map', () => {

diff --git a/web/client/components/map/cesium/plugins/TileProviderLayer.js b/web/client/components/map/cesium/plugins/TileProviderLayer.js
@@ -75,7 +75,7 @@ Layers.registerType('tileprovider', (options) => {
         const isCORS = useCORS.reduce((found, current) => found || url.indexOf(current) === 0, false);
         proxy = !isCORS && proxyUrl;
     }
-    const layer = new Cesium.UrlTemplateImageryProvider({
+    return new Cesium.UrlTemplateImageryProvider({
         url: template(url, opt),
         enablePickFeatures: false,
         subdomains: opt.subdomains,
@@ -84,5 +84,4 @@ Layers.registerType('tileprovider', (options) => {
         credit: opt.attribution,
         proxy: proxy && opt.noCors ? new TileProviderProxy(proxyUrl) : new NoProxy()
     });
-    return layer;
 });
diff --git a/web/client/components/map/cesium/plugins/WMTSLayer.js b/web/client/components/map/cesium/plugins/WMTSLayer.js
@@ -37,7 +37,7 @@ function WMTSProxy(proxy) {
 }
 
 const isValidTile = (tileMatrixSet) => (x, y, level) =>
-    tileMatrixSet[level] &&
+    tileMatrixSet && tileMatrixSet[level] &&
     x <= parseInt(get(tileMatrixSet[level], "ranges.cols.max"), 10) &&
     x >= parseInt(get(tileMatrixSet[level], "ranges.cols.min"), 10) &&
     y <= parseInt(get(tileMatrixSet[level], "ranges.rows.max"), 10) &&
@@ -56,7 +56,7 @@ NoProxy.prototype.getURL = function(resource) {
     let {url, queryString} = splitUrl(resource);
     return url + queryString;
 };
-function getMatrixIds(matrix, srs) {
+function getMatrixIds(matrix = [], srs) {
     return (isObject(matrix) && matrix[srs] || matrix).map((el) => el.identifier);
 }