Add options for RLayerTileWMS

mmomtchev · Sep 12, 2024 · 7a48527 · 7a48527
1 parent b60b817
commit 7a48527
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/layer/RLayer.tsx b/src/layer/RLayer.tsx
@@ -4,6 +4,7 @@ import {Source} from 'ol/source';
 import LayerRenderer from 'ol/renderer/Layer';
 import BaseEvent from 'ol/events/Event';
 import {ProjectionLike} from 'ol/proj';
+import {AttributionLike} from 'ol/source/Source';
 
 import {RContext, RContextType} from '../context';
 import {RlayersBase} from '../REvent';
@@ -28,7 +29,7 @@ export interface RLayerProps extends PropsWithChildren<unknown> {
     /** Maximum zoom level which the layer is not rendered */
     maxZoom?: number;
     /** Custom attributions string */
-    attributions?: string;
+    attributions?: AttributionLike;
     /** Initial tile cache size */
     cacheSize?: number | undefined;
     /** Wrap features around the antimeridian */

diff --git a/src/layer/RLayerTileWMS.tsx b/src/layer/RLayerTileWMS.tsx
@@ -1,5 +1,5 @@
 import TileLayer from 'ol/layer/Tile';
-import TileWMS from 'ol/source/TileWMS';
+import TileWMS, {Options} from 'ol/source/TileWMS';
 
 import React from 'react';
 import {RContextType} from '../context';
@@ -9,10 +9,7 @@ import {default as RLayerRaster, RLayerRasterProps} from './RLayerRaster';
 /**
  * @propsfor RLayerTileWMS
  */
-export interface RLayerTileWMSProps extends RLayerRasterProps {
-    params?: Record<string, unknown>;
-    url: string;
-}
+export interface RLayerTileWMSProps extends RLayerRasterProps, Options {}
 
 /**
  * Tiled layer using WMS
@@ -24,13 +21,31 @@ export default class RLayerTileWMS extends RLayerRaster<RLayerTileWMSProps> {
     constructor(props: Readonly<RLayerTileWMSProps>, context?: React.Context<RContextType>) {
         super(props, context);
         this.createSource();
-        this.ol = new TileLayer({source: this.source});
+        this.ol = new TileLayer({source: this.source, cacheSize: this.props.cacheSize});
         this.eventSources = [this.ol, this.source];
     }
 
     protected createSource(): void {
-        const {params, url, projection} = this.props;
-        const options = {params, url, projection};
+        const options = {
+            attributions: this.props.attributions,
+            attributionsCollapsible: this.props.attributionsCollapsible,
+            crossOrigin: this.props.crossOrigin,
+            interpolate: this.props.interpolate,
+            params: this.props.params,
+            gutter: this.props.gutter,
+            hidpi: this.props.hidpi,
+            projection: this.props.projection,
+            reprojectionErrorThreshold: this.props.reprojectionErrorThreshold,
+            tileClass: this.props.tileClass,
+            tileGrid: this.props.tileGrid,
+            serverType: this.props.serverType,
+            tileLoadFunction: this.props.tileLoadFunction,
+            url: this.props.url,
+            urls: this.props.urls,
+            wrapX: this.props.wrapX,
+            transition: this.props.transition,
+            zDirection: this.props.zDirection
+        };
 
         this.source = new TileWMS(options);
         this.eventSources = [this.ol, this.source];