fixes

visgl · Oct 8, 2023 · 37697d3 · 37697d3
1 parent 647b456
commit 37697d3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/modules/mvt/src/index.ts b/modules/mvt/src/index.ts
@@ -7,6 +7,8 @@ export type {TileJSON} from './lib/parse-tilejson';
 export type {TileJSONLoaderOptions} from './tilejson-loader';
 export {TileJSONLoader} from './tilejson-loader';
 
+export {MVTSource} from './mvt-source';
+
 // GeoJSONTiler
 
 export type {GeoJSONTilerOptions} from './lib/geojson-tiler/geojson-tiler';

diff --git a/modules/mvt/src/mvt-tiles-source.ts → modules/mvt/src/mvt-source.ts b/modules/mvt/src/mvt-tiles-source.ts → modules/mvt/src/mvt-source.ts
@@ -8,7 +8,7 @@ import {MVTLoader, MVTLoaderOptions, TileJSONLoader, TileJSON} from '@loaders.gl
 
 import {TileLoadParameters} from '@loaders.gl/loader-utils';
 
-export type MVTTilesSourceProps = DataSourceProps & {
+export type MVTSourceProps = DataSourceProps & {
   url: string;
   attributions?: string[];
 };
@@ -17,13 +17,13 @@ export type MVTTilesSourceProps = DataSourceProps & {
  * A PMTiles data source
  * @note Can be either a raster or vector tile source depending on the contents of the PMTiles file.
  */
-export class MVTTilesSource extends DataSource implements ImageTileSource, VectorTileSource {
-  props: MVTTilesSourceProps;
+export class MVTSource extends DataSource implements ImageTileSource, VectorTileSource {
+  props: MVTSourceProps;
   url: string;
   schema: 'tms' | 'xyz' = 'tms';
   metadata: Promise<TileJSON | null>;
 
-  constructor(props: MVTTilesSourceProps) {
+  constructor(props: MVTSourceProps) {
     super(props);
     this.props = props;
     this.url = resolvePath(props.url);
@@ -33,12 +33,12 @@ export class MVTTilesSource extends DataSource implements ImageTileSource, Vecto
 
   // @ts-ignore - Metadata type misalignment
   async getMetadata(): Promise<TileJSON | null> {
-    const metadataUrl = this.getMetadataUrl(); 
+    const metadataUrl = this.getMetadataUrl();
     const response = await this.fetch(metadataUrl);
     if (!response.ok) {
       return null;
     }
-    const tileJSON = await response.text()
+    const tileJSON = await response.text();
     const metadata = TileJSONLoader.parseTextSync?.(JSON.stringify(tileJSON)) || null;
     // metadata.attributions = [...this.props.attributions, ...(metadata.attributions || [])];
     return metadata;

diff --git a/modules/mvt/test/index.ts b/modules/mvt/test/index.ts
@@ -4,7 +4,7 @@ import './mvt-loader.spec';
 
 import './tilejson-loader.spec';
 
-import './mvt-tiles-source.spec';
+import './mvt-source.spec';
 
 // geojson-vt
 import './lib/geojson-tiler';
diff --git a/modules/mvt/test/mvt-tiles-source.spec.ts → modules/mvt/test/mvt-source.spec.ts b/modules/mvt/test/mvt-tiles-source.spec.ts → modules/mvt/test/mvt-source.spec.ts
@@ -4,16 +4,16 @@ import test from 'tape-promise/tape';
 import {isBrowser} from '@loaders.gl/core';
 
 import {TILESETS} from './data/tilesets';
-import {MVTTilesSource} from '@loaders.gl/mvt';
+import {MVTSource} from '@loaders.gl/mvt';
 
-test('MVTTilesSource#urls', async (t) => {
+test('MVTSource#urls', async (t) => {
   if (!isBrowser) {
-    t.comment('MVTTilesSource currently only supported in browser');
+    t.comment('MVTSource currently only supported in browser');
     t.end();
     return;
   }
   for (const tilesetUrl of TILESETS) {
-    const source = new MVTTilesSource({url: tilesetUrl});
+    const source = new MVTSource({url: tilesetUrl});
     t.ok(source);
     const metadata = await source.getMetadata();
     t.ok(metadata);
@@ -22,14 +22,14 @@ test('MVTTilesSource#urls', async (t) => {
   t.end();
 });
 
-test('MVTTilesSource#Blobs', async (t) => {
+test('MVTSource#Blobs', async (t) => {
   if (!isBrowser) {
-    t.comment('MVTTilesSource currently only supported in browser');
+    t.comment('MVTSource currently only supported in browser');
     t.end();
     return;
   }
   for (const tilesetUrl of TILESETS) {
-    const source = new MVTTilesSource({url: tilesetUrl});
+    const source = new MVTSource({url: tilesetUrl});
     t.ok(source);
     const metadata = await source.getMetadata();
     t.ok(metadata);