Skip to content

Commit b3f6ad4

Browse files
committed
wmp fixes
Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>
1 parent 61eed9d commit b3f6ad4

6 files changed

Lines changed: 48 additions & 9 deletions

File tree

src/components/src/modals/tilesets-modals/load-tileset.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import JSONPretty from 'react-json-pretty';
77
import {AutoSizer} from 'react-virtualized';
88
import styled from 'styled-components';
99

10-
import {VectorTileIcon, RasterTileIcon} from '@kepler.gl/layers';
10+
import {VectorTileIcon, RasterTileIcon, WMSLayerIcon} from '@kepler.gl/layers';
1111
import {getError, getApplicationConfig} from '@kepler.gl/utils';
1212

1313
import {MetaResponse} from './common';
@@ -16,7 +16,6 @@ import TilesetIcon from './tileset-icon';
1616
import TilesetVectorForm from './tileset-vector-form';
1717
import TilesetRasterForm from './tileset-raster-form';
1818

19-
import WMSLayerIcon from 'src/layers/src/wms-layer/wms-layer-icon';
2019
import TilesetWMSForm from './tileset-wms-form';
2120

2221
const WIDTH_ICON = '70px';

src/components/src/modals/tilesets-modals/tileset-wms-form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const TilesetWMSForm: React.FC<WMSTileFormProps> = ({setResponse}) => {
5959
)) as WMSCapabilities;
6060

6161
// Extract name or title from GetCapabilities response
62-
const serviceTitle = data?.title;
62+
const serviceTitle = data?.title || data?.name;
6363
if (serviceTitle && !layerName) {
6464
setLayerName(serviceTitle);
6565
}

src/deckgl-layers/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ export {default as RasterLayer} from './raster/raster-layer/raster-layer';
1818
export {default as RasterMeshLayer} from './raster/raster-mesh-layer/raster-mesh-layer';
1919
export * as RasterWebGL from './raster/webgl';
2020

21+
export {default as WMSLayer} from './wms/wms-layer';
22+
2123
export * from './layer-utils/shader-utils';
2224

2325
export * from './3d-building-layer/types';
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// SPDX-License-Identifier: MIT
2+
// Copyright contributors to the kepler.gl project
3+
4+
// @ts-expect-error
5+
import {_WMSLayer as DeckWMSLayer} from '@deck.gl/geo-layers';
6+
import {LayerProps as DeckLayerProps} from '@deck.gl/core/typed';
7+
8+
export interface ExtendedWMSLayerProps extends DeckLayerProps {
9+
/** Base URL to the WMS service or URL template */
10+
data: string;
11+
12+
/** Type of service - 'wms', 'template', or 'auto' */
13+
serviceType?: 'wms' | 'template' | 'auto';
14+
15+
/** Array of layer names to visualize from the WMS service */
16+
layers?: string[];
17+
}
18+
19+
// TODO
20+
21+
export default class ExtendedWMSLayer extends DeckWMSLayer<ExtendedWMSLayerProps> {
22+
static defaultProps = {
23+
...DeckWMSLayer.defaultProps,
24+
serviceType: 'auto' as const,
25+
layers: [],
26+
srs: 'auto' as const,
27+
format: 'png' as const
28+
};
29+
30+
constructor(props: ExtendedWMSLayerProps) {
31+
super(props);
32+
}
33+
}

src/layers/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ export {getCategoricalColormapDataUrl} from './raster-tile/image';
6262
export * from './raster-tile/types';
6363
export * from './raster-tile/raster-tile-utils';
6464

65+
export {default as WMSLayerIcon} from './wms-layer/wms-layer-icon';
66+
6567
import {LAYER_TYPES} from '@kepler.gl/constants';
6668
export {parseGeoJsonRawFeature} from './geojson-layer/geojson-utils';
6769
// base layer

src/layers/src/wms-layer/wms-layer.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Imports
2-
// @ts-expect-error
3-
import {_WMSLayer as DeckWMSLayer} from '@deck.gl/geo-layers';
1+
// SPDX-License-Identifier: MIT
2+
// Copyright contributors to the kepler.gl project
3+
44
import {
55
Field,
66
LayerBaseConfig,
@@ -11,13 +11,16 @@ import {
1111
import TileDataset from '../vector-tile/common-tile/tile-dataset';
1212
import WMSLayerIcon from './wms-layer-icon';
1313
import {FindDefaultLayerPropsReturnValue} from '../layer-utils';
14-
import {DatasetType, LAYER_TYPES} from '@kepler.gl/constants';
15-
import {KeplerTable as KeplerDataset} from '@kepler.gl/table';
14+
1615
import AbstractTileLayer, {
1716
AbstractTileLayerVisConfigSettings,
1817
LayerData
1918
} from '../vector-tile/abstract-tile-layer';
19+
20+
import {DatasetType, LAYER_TYPES} from '@kepler.gl/constants';
2021
import {notNullorUndefined} from '@kepler.gl/common-utils';
22+
import {WMSLayer as DeckWMSLayer} from '@kepler.gl/deckgl-layers';
23+
import {KeplerTable as KeplerDataset} from '@kepler.gl/table';
2124

2225
// Types
2326
export type WMSTile = {
@@ -79,7 +82,7 @@ export default class WMSLayer extends AbstractTileLayer<WMSTile, any[]> {
7982
this.updateLayerVisConfig({
8083
opacity: 0.8, // Default opacity
8184
wmsLayer: defaultWmsLayer,
82-
transparent: false
85+
transparent: true
8386
});
8487
}
8588

0 commit comments

Comments
 (0)