Merge pull request #4743 from camptocamp/api_fixes

Use single tile WMS for the overlays
camptocamp · Mar 13, 2019 · 3956b55 · 3956b55
2 parents 3c53c31 + cdb85be
commit 3956b55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/api/src/Themes.js b/api/src/Themes.js
@@ -1,7 +1,8 @@
 import WMTSCapabilities from 'ol/format/WMTSCapabilities.js';
-import TileWMS from 'ol/source/TileWMS.js';
+import ImageWMS from 'ol/source/ImageWMS.js';
 import WMTS, {optionsFromCapabilities} from 'ol/source/WMTS.js';
 import TileLayer from 'ol/layer/Tile.js';
+import ImageLayer from 'ol/layer/Image.js';
 
 import constants from './constants.js';
 
@@ -30,7 +31,7 @@ let overlayDefPromise;
 
 /**
  * @hidden
- * @returns {Promise<Array<TileLayer>>} Promise
+ * @returns {Promise<Array<TileLayer|ImageLayer>>} Promise
  */
 export function getBackgroundLayers() {
   return getThemesPromise().then((themes) => {
@@ -155,12 +156,12 @@ export function getOverlayLayers(layerNames) {
 /**
  * @param {import('gmf/themes.js').GmfLayerWMS} config Layer config (i.e. gmf layer node)
  * @param {import('gmf/themes.js').GmfOgcServer} ogcServer OGC server configuration used to create the layer.
- * @return {Promise<TileLayer>} Promise.
+ * @return {Promise<ImageLayer>} Promise.
  * @hidden
  */
 export function createWMSLayer(config, ogcServer) {
-  const layer = new TileLayer({
-    source: new TileWMS({
+  const layer = new ImageLayer({
+    source: new ImageWMS({
       url: ogcServer.url,
       projection: undefined, // should be removed in next OL version
       params: {

diff --git a/api/src/constants.js b/api/src/constants.js
@@ -1,11 +1,9 @@
 import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
-import EPSG2056 from '@geoblocks/proj/src/EPSG_2056.js';
 
 
 export default {
   themesUrl: undefined,
   projection: EPSG21781,
-  supportedProjections: [EPSG21781, EPSG2056],
   resolutions: [250, 100, 50, 20, 10, 5, 2, 1, 0.5, 0.25, 0.1, 0.05],
   extent: [420000, 30000, 660000, 350000],
   /**