@basemaps/lambda-tiler 6.29.0 → 6.32.0

package/build/tile.set.vector.d.ts

@@ -1,25 +0,0 @@
-import { ConfigTileSetVector, TileSetNameComponents, TileSetType } from '@basemaps/config';
-import { TileMatrixSet, VectorFormat } from '@basemaps/geo';
-import { TileDataXyz } from '@basemaps/shared';
-import { Cotar } from '@cotar/core';
-import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
-declare class CotarCache {
-    cache: Map<string, Promise<Cotar | null>>;
-    get(uri: string): Promise<Cotar | null>;
-}
-export declare const Layers: CotarCache;
-export declare class TileSetVector {
-    type: TileSetType.Vector;
-    components: TileSetNameComponents;
-    tileMatrix: TileMatrixSet;
-    tileSet: ConfigTileSetVector;
-    constructor(name: string, tileMatrix: TileMatrixSet);
-    init(record: ConfigTileSetVector): Promise<void>;
-    /** What format does tile set use */
-    get format(): VectorFormat;
-    get id(): string;
-    get fullName(): string;
-    tile(req: LambdaHttpRequest, xyz: TileDataXyz): Promise<LambdaHttpResponse>;
-}
-export {};
-//# sourceMappingURL=tile.set.vector.d.ts.map

package/build/tile.set.vector.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tile.set.vector.d.ts","sourceRoot":"","sources":["../src/tile.set.vector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAqB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9G,OAAO,EAAa,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAO,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKnF,cAAM,UAAU;IACd,KAAK,qCAA4C;IAEjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;CAUxC;AAED,eAAO,MAAM,MAAM,YAAmB,CAAC;AAEvC,qBAAa,aAAa;IACxB,IAAI,EAAE,WAAW,CAAC,MAAM,CAAsB;IAC9C,UAAU,EAAE,qBAAqB,CAAC;IAClC,UAAU,EAAE,aAAa,CAAC;IAC1B,OAAO,EAAE,mBAAmB,CAAC;gBACjB,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa;IAK7C,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,oCAAoC;IACpC,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAEK,IAAI,CAAC,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAyBlF"}

package/build/tile.set.vector.js

@@ -1,71 +0,0 @@
-import { TileSetNameParser, TileSetType } from '@basemaps/config';
-import { GoogleTms, VectorFormat } from '@basemaps/geo';
-import { fsa } from '@basemaps/shared';
-import { Cotar } from '@cotar/core';
-import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
-import { NotFound } from './routes/response.js';
-import { TileSets } from './tile.set.cache.js';
-import { St } from './source.tracer.js';
-class CotarCache {
-    constructor() {
-        this.cache = new Map();
-    }
-    get(uri) {
-        let cotar = this.cache.get(uri);
-        if (cotar == null) {
-            const source = fsa.source(uri);
-            St.trace(source);
-            cotar = Cotar.fromTar(source);
-            this.cache.set(uri, cotar);
-        }
-        return cotar;
-    }
-}
-export const Layers = new CotarCache();
-export class TileSetVector {
-    constructor(name, tileMatrix) {
-        this.type = TileSetType.Vector;
-        this.components = TileSetNameParser.parse(name);
-        this.tileMatrix = tileMatrix;
-    }
-    async init(record) {
-        this.tileSet = record;
-    }
-    /** What format does tile set use */
-    get format() {
-        return VectorFormat.MapboxVectorTiles;
-    }
-    get id() {
-        return TileSets.id(this.fullName, this.tileMatrix);
-    }
-    get fullName() {
-        return TileSetNameParser.componentsToName(this.components);
-    }
-    async tile(req, xyz) {
-        if (xyz.ext !== VectorFormat.MapboxVectorTiles)
-            return NotFound;
-        if (xyz.tileMatrix.identifier !== GoogleTms.identifier)
-            return NotFound;
-        if (this.tileSet.layers.length > 1)
-            return new LambdaHttpResponse(500, 'Too many layers in tileset');
-        const [layer] = this.tileSet.layers;
-        if (layer[3857] == null)
-            return new LambdaHttpResponse(500, 'Layer url not found from tileset Config');
-        req.timer.start('cotar:load');
-        const cotar = await Layers.get(layer[3857]);
-        if (cotar == null)
-            return new LambdaHttpResponse(500, 'Failed to load VectorTiles');
-        req.timer.end('cotar:load');
-        // Flip Y coordinate because MBTiles files are TMS.
-        const y = (1 << xyz.z) - 1 - xyz.y;
-        req.timer.start('cotar:tile');
-        const tile = await cotar.get(`tiles/${xyz.z}/${xyz.x}/${y}.pbf.gz`);
-        if (tile == null)
-            return NotFound;
-        req.timer.end('cotar:tile');
-        const response = new LambdaHttpResponse(200, 'Ok');
-        response.buffer(Buffer.from(tile), 'application/x-protobuf');
-        response.header(HttpHeader.ContentEncoding, 'gzip');
-        return response;
-    }
-}

package/build/validate.d.ts

@@ -1,16 +0,0 @@
-import { TileDataXyz } from '@basemaps/shared';
-import { LambdaHttpRequest } from '@linzjs/lambda';
-export declare const ValidateTilePath: {
-    /**
-     * Validate that the tile request is somewhat valid
-     * - Valid projection
-     * - Valid range
-     *
-     * @throws LambdaHttpResponse for tile requests that are not valid
-     *
-     * @param req request to validate
-     * @param xyzData
-     */
-    validate(req: LambdaHttpRequest, xyzData: TileDataXyz): void;
-};
-//# sourceMappingURL=validate.d.ts.map

package/build/validate.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAsB,MAAM,gBAAgB,CAAC;AAEvE,eAAO,MAAM,gBAAgB;IAC3B;;;;;;;;;OASG;kBACW,iBAAiB,WAAW,WAAW,GAAG,IAAI;CAiB7D,CAAC"}

package/build/validate.js

@@ -1,31 +0,0 @@
-import { Projection } from '@basemaps/shared';
-import { LambdaHttpResponse } from '@linzjs/lambda';
-export const ValidateTilePath = {
-    /**
-     * Validate that the tile request is somewhat valid
-     * - Valid projection
-     * - Valid range
-     *
-     * @throws LambdaHttpResponse for tile requests that are not valid
-     *
-     * @param req request to validate
-     * @param xyzData
-     */
-    validate(req, xyzData) {
-        const { tileMatrix, x, y, z, ext } = xyzData;
-        req.set('xyz', { x, y, z });
-        req.set('projection', tileMatrix.projection.code);
-        req.set('tileMatrix', tileMatrix.identifier);
-        req.set('extension', ext);
-        req.set('tileSet', xyzData.name);
-        if (z > tileMatrix.maxZoom || z < 0)
-            throw new LambdaHttpResponse(404, `Zoom not found: ${z}`);
-        const zoom = tileMatrix.zooms[z];
-        if (x < 0 || x > zoom.matrixWidth)
-            throw new LambdaHttpResponse(404, `X not found: ${x}`);
-        if (y < 0 || y > zoom.matrixHeight)
-            throw new LambdaHttpResponse(404, `Y not found: ${y}`);
-        const latLon = Projection.tileCenterToLatLon(tileMatrix, xyzData);
-        req.set('location', latLon);
-    },
-};

package/src/__tests__/route.test.ts

@@ -1,24 +0,0 @@
-import { Router } from '../router.js';
-import o from 'ospec';
-import { LambdaHttpRequest } from '@linzjs/lambda';
-
-o.spec('Router', () => {
-  function request(p: string): LambdaHttpRequest {
-    return { path: p } as any;
-  }
-  o('should decode UTF8 correctly', () => {
-    o(Router.action(request('/v1/version'))).deepEquals({ version: 'v1', name: 'version', rest: [] });
-  });
-
-  o('should ignore encoded paths', () => {
-    o(Router.action(request('/v1/version%2fbar'))).deepEquals({ version: 'v1', name: 'version/bar', rest: [] });
-    o(Router.action(request('/v1/tiles/%C5%8Dtorohanga%2fbar'))).deepEquals({
-      version: 'v1',
-      name: 'tiles',
-      rest: ['ōtorohanga/bar'],
-    });
-
-    const uri = encodeURI('/v1/🌈/🦄.tiff');
-    o(Router.action(request(uri))).deepEquals({ version: 'v1', name: '🌈', rest: ['🦄.tiff'] });
-  });
-});

package/src/__tests__/tiff.cache.test.ts

@@ -1,73 +0,0 @@
-import { SourceMemory } from '@chunkd/core';
-import { CogTiff } from '@cogeotiff/core';
-import o from 'ospec';
-import { TiffCache } from '../tiff.cache.js';
-
-/** convert number to megabytes */
-const MegaBytes = (num: number): number => num * 1024 * 1024;
-
-o.spec('TiffCache', () => {
-  o.beforeEach(() => TiffCache.clear());
-
-  o('should cache items', () => {
-    const source = new SourceMemory('fake', Buffer.from('foo'));
-    const tiff = new CogTiff(source);
-
-    o(TiffCache.get('fake')).equals(null);
-    TiffCache.set('fake', tiff);
-    o(TiffCache.get('fake')?.source.uri).equals(tiff.source.uri);
-
-    TiffCache.check();
-    o(TiffCache.get('fake')?.source.uri).equals(tiff.source.uri);
-  });
-
-  o('should expire cached object if size gets too large', () => {
-    const source = new SourceMemory('fake', Buffer.from('foo'));
-    const sourceB = new SourceMemory('fakeB', Buffer.from('foo'));
-
-    // Override chunk size to say there is 500 mb of items
-    source.chunkSize = MegaBytes(257);
-    sourceB.chunkSize = MegaBytes(257);
-
-    const tiff = new CogTiff(source);
-    const tiffB = new CogTiff(sourceB);
-
-    o(TiffCache.get('fake')).equals(null);
-
-    TiffCache.set('fake', tiff);
-    o(TiffCache.get('fake')?.source.uri).equals(tiff.source.uri);
-
-    TiffCache.check();
-    o(TiffCache.cacheA.get('fake')?.source.uri).equals(undefined);
-    o(TiffCache.cacheB.get('fake')?.source.uri).equals(tiff.source.uri);
-
-    // Should evict the cache
-    TiffCache.set('fakeB', tiffB);
-    TiffCache.check();
-
-    o(TiffCache.cacheA.get('fake')?.source.uri).equals(undefined);
-    o(TiffCache.cacheB.get('fake')?.source.uri).equals(undefined);
-  });
-
-  o('should allow multiple items in the cache', () => {
-    const source = new SourceMemory('fake', Buffer.from('foo'));
-    const tiff = new CogTiff(source);
-
-    TiffCache.set('fake', tiff);
-    const oneMb = MegaBytes(1);
-    source.chunkSize = oneMb;
-
-    for (let i = 1; i < 256; i++) {
-      o(TiffCache.currentSize).equals(i * oneMb);
-      source.chunks.set(i, source.chunks.get(0)!);
-    }
-    // should not have overflown
-    TiffCache.check();
-    o(TiffCache.cacheA.size).equals(1);
-    // Overflow the cache
-    source.chunks.set(257, source.chunks.get(0)!);
-
-    TiffCache.check();
-    o(TiffCache.cacheA.size).equals(0);
-  });
-});

package/src/__tests__/tile.cache.key.test.ts

@@ -1,56 +0,0 @@
-import { GoogleTms, Nztm2000Tms, ImageFormat } from '@basemaps/geo';
-import { TileDataXyz, TileType } from '@basemaps/shared';
-import { TestTiff } from '@basemaps/test';
-import { Composition } from '@basemaps/tiler';
-import o from 'ospec';
-import { TileEtag } from '../routes/tile.etag.js';
-
-o.spec('TileCacheKey', () => {
-  const oldRenderId = TileEtag.RenderId;
-
-  const xyzData: TileDataXyz = {
-    x: 0,
-    y: 0,
-    z: 0,
-    tileMatrix: GoogleTms,
-    name: 'foo',
-    ext: ImageFormat.Png,
-    type: TileType.Tile,
-  };
-
-  o.afterEach(() => {
-    TileEtag.RenderId = oldRenderId;
-  });
-
-  o('should generate a cachekey', async () => {
-    const tiff = await TestTiff.Google.init();
-    const comp: Composition = {
-      tiff,
-      source: {
-        x: 0,
-        y: 0,
-        imageId: 0,
-        width: 512,
-        height: 512,
-      },
-      x: 5,
-      y: 5,
-    };
-    const firstKey = TileEtag.generate([comp], xyzData);
-    o(firstKey).equals('8eJ7XnUeEGBI2d7mfAaK5o8KbUc0+CVaIoPzqCvkoDk=');
-
-    // Different layers should generate different keys
-    o(TileEtag.generate([comp, comp], xyzData)).notEquals(firstKey);
-
-    // Different projections should generate different keys
-    xyzData.tileMatrix = Nztm2000Tms;
-    o(TileEtag.generate([comp], xyzData)).notEquals(firstKey);
-  });
-
-  o('should change if the renderId changes', () => {
-    const keyA = TileEtag.generate([], { tileMatrix: {} } as any);
-    TileEtag.RenderId = 2;
-    const KeyB = TileEtag.generate([], { tileMatrix: {} } as any);
-    o(keyA).notEquals(KeyB);
-  });
-});

package/src/__tests__/tile.set.cache.test.ts

@@ -1,146 +0,0 @@
-import { ConfigImagery, ConfigTileSetRaster, TileSetType } from '@basemaps/config';
-import { Epsg, GoogleTms, Nztm2000Tms } from '@basemaps/geo';
-import { Config, TileSetName } from '@basemaps/shared';
-import o from 'ospec';
-import sinon from 'sinon';
-import { TileSets } from '../tile.set.cache.js';
-import { TileSetRaster } from '../tile.set.raster.js';
-const sandbox = sinon.createSandbox();
-o.spec('TileSetCache', () => {
-  const imageOne = {
-    id: 'im_id1',
-    name: 'tasman_rural_2018-19_0-3m',
-    bounds: { x: 123, y: 456, width: 200, height: 300 },
-    files: [{ name: 'foo', x: 123, y: 456, width: 200, height: 300 }],
-    uri: 's3://foo/bar',
-  } as ConfigImagery;
-
-  const imageTwo = {
-    id: 'im_id2',
-    name: 'wellington_urban_2018-19_0-3m',
-    bounds: { x: 123, y: 456, width: 200, height: 300 },
-    files: [{ name: 'foo', x: 123, y: 456, width: 200, height: 300 }],
-    uri: 's3://foo/bar',
-  } as ConfigImagery;
-
-  const imgMap = new Map<string, ConfigImagery>();
-  imgMap.set(imageOne.id, imageOne);
-
-  o.afterEach(() => {
-    TileSets.cache.clear();
-    sandbox.restore();
-  });
-
-  o.spec('loadTileSet', () => {
-    o('load individual set', async () => {
-      TileSets.add(new TileSetRaster('aerial@head', GoogleTms));
-
-      const parentTileSet = await TileSets.get('aerial@head', GoogleTms);
-      if (parentTileSet == null || parentTileSet.type === TileSetType.Vector) throw new Error('null parentTileSet');
-      parentTileSet.imagery = imgMap;
-      parentTileSet.tileSet = {
-        name: 'parent',
-        title: 'parent aerial title',
-        background: { r: 200, g: 50, b: 100, alpha: 0.5 },
-      } as ConfigTileSetRaster;
-
-      const subTileSet = await TileSets.get('aerial@head:tasman_rural_2018-19_0-3m', GoogleTms);
-      if (subTileSet == null || subTileSet.type === TileSetType.Vector) throw new Error('null subTileSet');
-
-      o(subTileSet.title).equals('parent aerial title Tasman rural 2018-19 0.3m');
-      o(subTileSet.fullName).equals('aerial@head:tasman_rural_2018-19_0-3m');
-      o([...subTileSet.imagery.values()]).deepEquals([imageOne]);
-      const [firstLayer] = subTileSet.tileSet.layers;
-      o(firstLayer).deepEquals({
-        name: firstLayer.name,
-        [3857]: 'im_id1',
-        minZoom: 0,
-        maxZoom: 100,
-      });
-      o(subTileSet.tileSet.background).equals(undefined);
-
-      o(parentTileSet.tileSet.background).deepEquals({ r: 200, g: 50, b: 100, alpha: 0.5 });
-
-      const noTiffs = subTileSet.getTiffsForTile({ x: 0, y: 0, z: 1 });
-      o(noTiffs).deepEquals([]);
-
-      const aTiff = subTileSet.getTiffsForTile({ x: 0, y: 0, z: 0 });
-      o(aTiff.length).equals(1);
-      o(aTiff[0].source.uri).equals('s3://foo/bar/foo.tiff');
-
-      TileSets.cache.delete(subTileSet.id);
-      delete parentTileSet.tileSet.title;
-      const subTileSetB = await TileSets.get('aerial@head:tasman_rural_2018-19_0-3m', GoogleTms);
-      if (subTileSetB == null || subTileSetB.type === TileSetType.Vector) throw new Error('null subTileSetB');
-      o(subTileSetB.title).equals('parent Tasman rural 2018-19 0.3m');
-    });
-
-    o('should not throw if child does not exist', async () => {
-      TileSets.add(new TileSetRaster('aerial@head', GoogleTms));
-
-      const parentTileSet = await TileSets.get('aerial@head', GoogleTms);
-      if (parentTileSet == null || parentTileSet.type === TileSetType.Vector) throw new Error('null parentTileSet');
-      parentTileSet.imagery = imgMap;
-
-      const subTileSet = await TileSets.get('aerial@head:fake', GoogleTms);
-      o(subTileSet).equals(null);
-    });
-  });
-
-  o.spec('loadTileSets', () => {
-    o('load all', async () => {
-      sandbox.stub(Config.TileSet, 'get');
-
-      TileSets.add(new TileSetRaster('aerial', GoogleTms));
-      TileSets.add(new TileSetRaster('aerial', Nztm2000Tms));
-      const tileSets = await TileSets.getAll('aerial', null);
-
-      o(tileSets.length).deepEquals(2);
-
-      o(tileSets[0].fullName).equals(TileSetName.aerial);
-      o(tileSets[0].components.name).equals(TileSetName.aerial);
-      o(tileSets[0].tileMatrix.projection.code).equals(3857);
-
-      o(tileSets[1].fullName).equals(TileSetName.aerial);
-      o(tileSets[1].components.name).equals(TileSetName.aerial);
-      o(tileSets[1].tileMatrix.projection.code).equals(2193);
-    });
-
-    o('load all subset projections', async () => {
-      sandbox.stub(Config.TileSet, 'get');
-
-      const ts1 = new TileSetRaster('aerial@head', Nztm2000Tms);
-      ts1.imagery = imgMap;
-      TileSets.add(ts1);
-      const ts2 = new TileSetRaster('aerial@head', GoogleTms);
-      ts2.imagery = imgMap;
-      TileSets.add(ts2);
-      const tileSets = await TileSets.getAll('aerial@head:tasman_rural_2018-19_0-3m', null);
-
-      o(tileSets.length).deepEquals(2);
-
-      o(tileSets[0].fullName).equals('aerial@head:tasman_rural_2018-19_0-3m');
-      o(tileSets[0].tileMatrix.projection).equals(Epsg.Google);
-      o(tileSets[1].fullName).equals('aerial@head:tasman_rural_2018-19_0-3m');
-      o(tileSets[1].tileMatrix.projection).equals(Epsg.Nztm2000);
-    });
-
-    o('load all @tag', async () => {
-      sandbox.stub(Config.TileSet, 'get');
-      const imgMap = new Map();
-      imgMap.set(imageOne.id, imageOne);
-      imgMap.set(imageTwo.id, imageTwo);
-      const ts1 = new TileSetRaster('aerial@head', Nztm2000Tms);
-      ts1.imagery = imgMap;
-      TileSets.add(ts1);
-
-      const tileSets = await TileSets.getAll('aerial@head', null);
-
-      o(tileSets.length).deepEquals(3);
-
-      o(tileSets[0].fullName).equals('aerial@head');
-      o(tileSets[1].fullName).equals('aerial@head:tasman_rural_2018-19_0-3m');
-      o(tileSets[2].fullName).equals('aerial@head:wellington_urban_2018-19_0-3m');
-    });
-  });
-});

package/src/__tests__/tile.set.test.ts

@@ -1,12 +0,0 @@
-import { GoogleTms, Nztm2000Tms } from '@basemaps/geo';
-import o from 'ospec';
-import { TileSetRaster } from '../tile.set.raster.js';
-
-o.spec('tile.set', () => {
-  o('extent', () => {
-    o(new TileSetRaster('google', GoogleTms).extent.toBbox()).deepEquals([
-      -20037508.3427892, -20037508.3427892, 20037508.3427892, 20037508.3427892,
-    ]);
-    o(new TileSetRaster('nztm', Nztm2000Tms).extent.toBbox()).deepEquals([274000, 3087000, 3327000, 7173000]);
-  });
-});