Skip to content
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.

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

added tms support #19

Merged
merged 10 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,19 @@ import {TerrainRGB} from '@watergis/terrain-rgb';

const url = 'https://wasac.github.io/rw-terrain/tiles/{z}/{x}/{y}.png';
const trgb = new TerrainRGB(url, 512);

const elevation = await trgb.getElevation([30.0529622, -1.9575129], 15);
console.log(elevation);
```

TMS(Tile Map Service) tiles are also supported with

```ts
const trgb = new TerrainRGB(url, 512, 5, 15, true);
```


If it can't find tile, it will return 404 error.

If its terrain RGB tilesets was resampled by gdal2tiles, the result of elevation might not be the same with original DEM image.

13 changes: 10 additions & 3 deletions src/tile/base.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import axios from 'axios';
import { WebpMachine, loadBinaryData } from 'webp-hero';
import { lngLatToGoogle } from 'global-mercator';
import { lngLatToGoogle, lngLatToTile } from 'global-mercator';

import PNG from '../png';

/**
Expand All @@ -11,6 +12,8 @@

protected tileSize: number;

protected tms: boolean;

protected minzoom: number;

protected maxzoom: number;
Expand All @@ -19,14 +22,18 @@
* Constructor
* @param url URL for terrain RGB raster tilesets
* @param tileSize size of tile. 256 or 512
* @param tms whether it is Tile Map Service
* @param minzoom minzoom for terrain RGB raster tilesets
* @param maxzoom maxzoom for terrain RGB raster tilesets
* @param tms whether it is Tile Map Service
*/
constructor(url: string, tileSize: number, minzoom: number, maxzoom: number) {
constructor(url: string, tileSize: number, minzoom: number, maxzoom: number, tms: boolean) {
this.url = url;
this.tileSize = tileSize;
this.tms = tms;
this.minzoom = minzoom;
this.maxzoom = maxzoom;
this.tms = tms;
}

/**
Expand All @@ -46,7 +53,7 @@
} else if (z < this.minzoom) {
zoom = this.minzoom;
}
const tile = lngLatToGoogle([lng, lat], zoom);
const tile = this.tms ? lngLatToTile([lng, lat], zoom) : lngLatToGoogle([lng, lat], zoom);
const url: string = this.url
.replace(/{x}/g, tile[0].toString())
.replace(/{y}/g, tile[1].toString())
Expand Down Expand Up @@ -134,7 +141,7 @@
* @param b blue
* @param a alfa
*/
protected abstract calc(r: number, g: number, b: number, a: number): number;

Check warning on line 144 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build

'r' is defined but never used

Check warning on line 144 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build

'g' is defined but never used

Check warning on line 144 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build

'b' is defined but never used

Check warning on line 144 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build

'a' is defined but never used

/**
* Get RGBA values from coordinates information
Expand Down
5 changes: 3 additions & 2 deletions src/tile/terrainrgb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ class TerrainRGB extends BaseTile {
* Constructor
* @param url URL for terrain RGB raster tilesets
* @param tileSize size of tile. 256 or 512
* @param tms whether it is Tile Map Service
* @param minzoom minzoom for terrain RGB raster tilesets. default is 5
* @param maxzoom maxzoom for terrain RGB raster tilesets. default is 15
*/
constructor(url: string, tileSize: number, minzoom = 5, maxzoom = 15) {
super(url, tileSize, minzoom, maxzoom);
constructor(url: string, tileSize: number, minzoom = 5, maxzoom = 15, tms = false) {
super(url, tileSize, minzoom, maxzoom, tms);
}

/**
Expand Down
Loading