Skip to content

[feat] custom zoom offset for raster tile layer #3207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
igorDykhta wants to merge 1 commit into from
Closed

[feat] custom zoom offset for raster tile layer #3207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/src/side-panel/layer-panel/raster-tile-layer-configurator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,12 +355,13 @@
</>
);

// For PMTiles in raster format, only show opacity and terrain options for now
// For PMTiles in raster format, only show opacity, zoom offset and terrain options for now
if (stac.pmtilesType === PMTilesType.RASTER) {
return (
<StyledLayerConfigurator>
<LayerConfigGroup {...visConfiguratorProps} label="Visual Settings" collapsible={false}>
<VisConfigSlider {...layer.visConfigSettings.opacity} {...visConfiguratorProps} />
<VisConfigSlider {...layer.visConfigSettings.zoomOffset} {...visConfiguratorProps} />

Check failure on line 364 in src/components/src/side-panel/layer-panel/raster-tile-layer-configurator.tsx

View workflow job for this annotation

GitHub Actions / build (18.x) 

Property 'zoomOffset' does not exist on type 'RasterTileLayerVisConfigSettings'.
</LayerConfigGroup>
{elevationUI}
</StyledLayerConfigurator>
Expand Down Expand Up @@ -487,6 +488,7 @@

<LayerConfigGroup {...visConfiguratorProps} label="Visual Settings" collapsible={false}>
<VisConfigSlider {...layer.visConfigSettings.opacity} {...visConfiguratorProps} />
<VisConfigSlider {...layer.visConfigSettings.zoomOffset} {...visConfiguratorProps} />

Check failure on line 491 in src/components/src/side-panel/layer-panel/raster-tile-layer-configurator.tsx

View workflow job for this annotation

GitHub Actions / build (18.x) 

Property 'zoomOffset' does not exist on type 'RasterTileLayerVisConfigSettings'.
{colormapAllowed && (
<SidePanelSection>
<PanelLabel>Colormap</PanelLabel>
Expand Down
10 changes: 10 additions & 0 deletions src/layers/src/raster-tile/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,16 @@ export const rasterVisConfigs = {
step: 0.05,
type: 'number'
} as VisConfigNumber,
zoomOffset: {
defaultValue: 0,
// group: "tiles"
isRanged: false,
label: 'Zoom Offset',
property: 'zoomOffset',
range: [-2, 2],
step: 1,
type: 'number'
} as VisConfigNumber,
_stacQuery: {
defaultValue: null,
type: 'input'
Expand Down
10 changes: 6 additions & 4 deletions src/layers/src/raster-tile/raster-tile-layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,10 +493,11 @@ export default class RasterTileLayer extends KeplerLayer {
};

const tileLayer = new TileLayer<any, RenderSubLayersProps>({
id,
id, // : id + '_' + visConfig.zoomOffset,
minZoom,
maxZoom,
tileSize: 512 / devicePixelRatio,
zoomOffset: visConfig.zoomOffset,
getTileData: (args: any) => this.getTileData({...args, ...getTileDataCustomProps}),
onViewportLoad: this.onViewportLoad.bind(this),
// @ts-expect-error - TS doesn't know we'll pass appropriate props here
Expand All @@ -507,6 +508,7 @@ export default class RasterTileLayer extends KeplerLayer {
updateTriggers: {
getTileData: [
shouldLoadTerrain,
// visConfig.zoomOffset,
// Colormap has changed
colormapId,
// assets to be loaded has changed
Expand Down Expand Up @@ -570,7 +572,7 @@ export default class RasterTileLayer extends KeplerLayer {

return [
new TileLayer<any, RasterTileLayerVisConfigCommonSettings>({
id,
id, // : id + '_' + visConfig.zoomOffset,
getTileData: (args: any) =>
this.getTileDataPMTiles({...args, shouldLoadTerrain, metadata}, tileSource),

Expand All @@ -585,7 +587,7 @@ export default class RasterTileLayer extends KeplerLayer {
minZoom,
maxZoom,
tileSize: 512 / devicePixelRatio,
zoomOffset: devicePixelRatio === 1 ? -1 : 0,
zoomOffset: devicePixelRatio === 1 ? -1 : 0, // + (visConfig.zoomOffset as unknown as number),
// @ts-expect-error - TS doesn't know we'll pass appropriate props here
renderSubLayers: renderSubLayersPMTiles,

Expand All @@ -596,7 +598,7 @@ export default class RasterTileLayer extends KeplerLayer {
opacity,

updateTriggers: {
getTileData: [shouldLoadTerrain]
getTileData: [shouldLoadTerrain /*, visConfig.zoomOffset*/]
},
// Props for 3D mode
...(shouldLoadTerrain
Expand Down
Loading