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.

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

added tms support #19

Merged
merged 10 commits into from
Mar 25, 2024
Merged

added tms support #19

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
220ffb6
added tms support
Modif93 Mar 19, 2024
b4f0873
added tms support
Modif93 Mar 19, 2024
ab94a66
chg tms arg loc & fixed lint
Modif93 Mar 25, 2024
cb1f091
Merge branch 'main' into tms-support
Modif93 Mar 25, 2024
9a2c0c5
Merge pull request #1 from Modif93/tms-support
Modif93 Mar 25, 2024
a7ca9f5
fixed lint(3)
Modif93 Mar 25, 2024
e1fa963
updated README.md
Modif93 Mar 25, 2024
8828049
fixed some typo on README.md
Modif93 Mar 25, 2024
42fc34d
Update base.ts
JinIgarashi Mar 25, 2024
e4661d8
Update base.ts
JinIgarashi Mar 25, 2024
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
11 changes: 8 additions & 3 deletions src/tile/base.ts
View file
Open in desktop
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,lngLatToTile } from 'global-mercator';
import { lngLatToGoogle, lngLatToTile } from 'global-mercator';

import PNG from '../png';

/**
Expand All @@ -17,20 +18,24 @@

protected maxzoom: number;

protected tms: boolean;

/**
* 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, tms: boolean, 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 @@ -50,11 +55,11 @@
} else if (z < this.minzoom) {
zoom = this.minzoom;
}
const tile = this.tms?lngLatToTile([lng, lat], zoom):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())

Check failure on line 60 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 8 spaces but found 10
.replace(/{y}/g, tile[1].toString())

Check failure on line 61 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 8 spaces but found 10
.replace(/{z}/g, tile[2].toString());

Check failure on line 62 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 8 spaces but found 10
let ext = this.getUrlExtension(url);
// console.log(ext)
if (!ext) {
Expand All @@ -65,16 +70,16 @@
axios.get(url, {
responseType: 'arraybuffer',
})
.then((res) => {

Check failure on line 73 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 12 spaces but found 14
const binary = Buffer.from(res.data, 'binary');

Check failure on line 74 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 14 spaces but found 16
const value = this.getValueFromPNG(binary, tile, lng, lat);

Check failure on line 75 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 14 spaces but found 16
resolve(value);

Check failure on line 76 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 14 spaces but found 16
})

Check failure on line 77 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 12 spaces but found 14
.catch((err) => reject(err));

Check failure on line 78 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 12 spaces but found 14
break;
case 'webp':
loadBinaryData(url)
.then((binary) => {

Check failure on line 82 in src/tile/base.ts

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 12 spaces but found 14
this.getValueFromWEBP(binary, tile, lng, lat).then((value: number) => {
resolve(value);
}).catch((err) => reject(err));
Expand Down Expand Up @@ -138,7 +143,7 @@
* @param b blue
* @param a alfa
*/
protected abstract calc(r: number, g: number, b: number, a: number): number;

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

View workflow job for this annotation

GitHub Actions / build 

'r' is defined but never used

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

View workflow job for this annotation

GitHub Actions / build 

'g' is defined but never used

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

View workflow job for this annotation

GitHub Actions / build 

'b' is defined but never used

Check warning on line 146 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
4 changes: 2 additions & 2 deletions src/tile/terrainrgb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class TerrainRGB extends BaseTile {
* @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, tms:boolean = false, minzoom = 5, maxzoom = 15) {
super(url, tileSize, tms, minzoom, maxzoom);
constructor(url: string, tileSize: number, minzoom = 5, maxzoom = 15, tms = false) {
super(url, tileSize, minzoom, maxzoom, tms);
}

/**
Expand Down
Loading