Type fix

tentone · tentone · commit 7da45251966e · 2022-12-26T22:50:54.000Z
diff --git a/build/Main.d.ts b/build/Main.d.ts
@@ -16,13 +16,15 @@ export { HeightDebugProvider } from './providers/HeightDebugProvider';
 export { MapNodeGeometry } from './geometries/MapNodeGeometry';
 export { MapNodeHeightGeometry } from './geometries/MapNodeHeightGeometry';
 export { MapSphereNodeGeometry } from './geometries/MapSphereNodeGeometry';
-export { MapHeightNode } from './nodes/MapHeightNode';
 export { MapNode } from './nodes/MapNode';
+export { MapHeightNode } from './nodes/MapHeightNode';
 export { MapPlaneNode } from './nodes/MapPlaneNode';
 export { MapSphereNode } from './nodes/MapSphereNode';
 export { MapHeightNodeShader } from './nodes/MapHeightNodeShader';
 export { UnitsUtils } from './utils/UnitsUtils';
+export { CanvasUtils } from './utils/CanvasUtils';
 export { Geolocation } from './utils/Geolocation';
 export { GeolocationUtils } from './utils/GeolocationUtils';
 export { CancelablePromise } from './utils/CancelablePromise';
 export { XHRUtils } from './utils/XHRUtils';
+export { TextureUtils } from './utils/TextureUtils';
diff --git a/build/examples/providers.d.ts b/build/examples/providers.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/build/examples/transition.d.ts b/build/examples/transition.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/build/geo-three.cjs b/build/geo-three.cjs
@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var three = require('three');
 
 /*! *****************************************************************************
@@ -388,7 +386,7 @@ class UnitsUtils {
         return new three.Vector3(-Math.cos(rotX + Math.PI) * cos, Math.sin(rotY), Math.sin(rotX + Math.PI) * cos);
     }
     static mapboxAltitude(color) {
-        return ((color.r * 255.0 * 65536.0 + color.g * 255.0 * 256.0 + color.b * 255.0) * 0.1) - 10000.0;
+        return (color.r * 255.0 * 65536.0 + color.g * 255.0 * 256.0 + color.b * 255.0) * 0.1 - 10000.0;
     }
 }
 UnitsUtils.EARTH_RADIUS = 6371008;
@@ -1616,14 +1614,14 @@ class GoogleMapsProvider extends MapProvider {
 }
 
 class HereMapsProvider extends MapProvider {
-    constructor(appId, appCode, style, scheme, format, size) {
+    constructor(appId = '', appCode = '', style = 'base', scheme = 'normal.day', format = 'png', size = 512) {
         super();
-        this.appId = appId !== undefined ? appId : '';
-        this.appCode = appCode !== undefined ? appCode : '';
-        this.style = style !== undefined ? style : 'base';
-        this.scheme = scheme !== undefined ? scheme : 'normal.day';
-        this.format = format !== undefined ? format : 'png';
-        this.size = size !== undefined ? size : 512;
+        this.appId = appId;
+        this.appCode = appCode;
+        this.style = style;
+        this.scheme = scheme;
+        this.format = format;
+        this.size = size;
         this.version = 'newest';
         this.server = 1;
     }
@@ -1905,6 +1903,7 @@ class CancelablePromise {
 
 exports.BingMapsProvider = BingMapsProvider;
 exports.CancelablePromise = CancelablePromise;
+exports.CanvasUtils = CanvasUtils;
 exports.DebugProvider = DebugProvider;
 exports.Geolocation = Geolocation;
 exports.GeolocationUtils = GeolocationUtils;
@@ -1928,5 +1927,6 @@ exports.MapTilerProvider = MapTilerProvider;
 exports.MapView = MapView;
 exports.OpenMapTilesProvider = OpenMapTilesProvider;
 exports.OpenStreetMapsProvider = OpenStreetMapsProvider;
+exports.TextureUtils = TextureUtils;
 exports.UnitsUtils = UnitsUtils;
 exports.XHRUtils = XHRUtils;
diff --git a/build/geo-three.js b/build/geo-three.js
@@ -388,7 +388,7 @@
 	        return new three.Vector3(-Math.cos(rotX + Math.PI) * cos, Math.sin(rotY), Math.sin(rotX + Math.PI) * cos);
 	    }
 	    static mapboxAltitude(color) {
-	        return ((color.r * 255.0 * 65536.0 + color.g * 255.0 * 256.0 + color.b * 255.0) * 0.1) - 10000.0;
+	        return (color.r * 255.0 * 65536.0 + color.g * 255.0 * 256.0 + color.b * 255.0) * 0.1 - 10000.0;
 	    }
 	}
 	UnitsUtils.EARTH_RADIUS = 6371008;
@@ -1616,14 +1616,14 @@
 	}
 
 	class HereMapsProvider extends MapProvider {
-	    constructor(appId, appCode, style, scheme, format, size) {
+	    constructor(appId = '', appCode = '', style = 'base', scheme = 'normal.day', format = 'png', size = 512) {
 	        super();
-	        this.appId = appId !== undefined ? appId : '';
-	        this.appCode = appCode !== undefined ? appCode : '';
-	        this.style = style !== undefined ? style : 'base';
-	        this.scheme = scheme !== undefined ? scheme : 'normal.day';
-	        this.format = format !== undefined ? format : 'png';
-	        this.size = size !== undefined ? size : 512;
+	        this.appId = appId;
+	        this.appCode = appCode;
+	        this.style = style;
+	        this.scheme = scheme;
+	        this.format = format;
+	        this.size = size;
 	        this.version = 'newest';
 	        this.server = 1;
 	    }
@@ -1905,6 +1905,7 @@
 
 	exports.BingMapsProvider = BingMapsProvider;
 	exports.CancelablePromise = CancelablePromise;
+	exports.CanvasUtils = CanvasUtils;
 	exports.DebugProvider = DebugProvider;
 	exports.Geolocation = Geolocation;
 	exports.GeolocationUtils = GeolocationUtils;
@@ -1928,9 +1929,8 @@
 	exports.MapView = MapView;
 	exports.OpenMapTilesProvider = OpenMapTilesProvider;
 	exports.OpenStreetMapsProvider = OpenStreetMapsProvider;
+	exports.TextureUtils = TextureUtils;
 	exports.UnitsUtils = UnitsUtils;
 	exports.XHRUtils = XHRUtils;
 
-	Object.defineProperty(exports, '__esModule', { value: true });
-
 }));
diff --git a/build/geo-three.module.js b/build/geo-three.module.js
@@ -384,7 +384,7 @@ class UnitsUtils {
         return new Vector3(-Math.cos(rotX + Math.PI) * cos, Math.sin(rotY), Math.sin(rotX + Math.PI) * cos);
     }
     static mapboxAltitude(color) {
-        return ((color.r * 255.0 * 65536.0 + color.g * 255.0 * 256.0 + color.b * 255.0) * 0.1) - 10000.0;
+        return (color.r * 255.0 * 65536.0 + color.g * 255.0 * 256.0 + color.b * 255.0) * 0.1 - 10000.0;
     }
 }
 UnitsUtils.EARTH_RADIUS = 6371008;
@@ -1612,14 +1612,14 @@ class GoogleMapsProvider extends MapProvider {
 }
 
 class HereMapsProvider extends MapProvider {
-    constructor(appId, appCode, style, scheme, format, size) {
+    constructor(appId = '', appCode = '', style = 'base', scheme = 'normal.day', format = 'png', size = 512) {
         super();
-        this.appId = appId !== undefined ? appId : '';
-        this.appCode = appCode !== undefined ? appCode : '';
-        this.style = style !== undefined ? style : 'base';
-        this.scheme = scheme !== undefined ? scheme : 'normal.day';
-        this.format = format !== undefined ? format : 'png';
-        this.size = size !== undefined ? size : 512;
+        this.appId = appId;
+        this.appCode = appCode;
+        this.style = style;
+        this.scheme = scheme;
+        this.format = format;
+        this.size = size;
         this.version = 'newest';
         this.server = 1;
     }
@@ -1899,4 +1899,4 @@ class CancelablePromise {
     }
 }
 
-export { BingMapsProvider, CancelablePromise, DebugProvider, Geolocation, GeolocationUtils, GoogleMapsProvider, HeightDebugProvider, HereMapsProvider, LODFrustum, LODRadial, LODRaycast, MapBoxProvider, MapHeightNode, MapHeightNodeShader, MapNode, MapNodeGeometry, MapNodeHeightGeometry, MapPlaneNode, MapProvider, MapSphereNode, MapSphereNodeGeometry, MapTilerProvider, MapView, OpenMapTilesProvider, OpenStreetMapsProvider, UnitsUtils, XHRUtils };
+export { BingMapsProvider, CancelablePromise, CanvasUtils, DebugProvider, Geolocation, GeolocationUtils, GoogleMapsProvider, HeightDebugProvider, HereMapsProvider, LODFrustum, LODRadial, LODRaycast, MapBoxProvider, MapHeightNode, MapHeightNodeShader, MapNode, MapNodeGeometry, MapNodeHeightGeometry, MapPlaneNode, MapProvider, MapSphereNode, MapSphereNodeGeometry, MapTilerProvider, MapView, OpenMapTilesProvider, OpenStreetMapsProvider, TextureUtils, UnitsUtils, XHRUtils };
diff --git a/build/providers/HereMapsProvider.d.ts b/build/providers/HereMapsProvider.d.ts
@@ -9,7 +9,7 @@ export declare class HereMapsProvider extends MapProvider {
     size: number;
     version: string;
     server: number;
-    constructor(appId: string, appCode: string, style: string, scheme: string, format: string, size: number);
+    constructor(appId?: string, appCode?: string, style?: string, scheme?: string, format?: string, size?: number);
     nextServer(): void;
     getMetaData(): Promise<void>;
     fetchTile(zoom: number, x: number, y: number): Promise<any>;
diff --git a/build/utils/CanvasUtils.d.ts b/build/utils/CanvasUtils.d.ts
@@ -1,4 +1,3 @@
-/// <reference types="offscreencanvas" />
 export declare class CanvasUtils {
     static createOffscreenCanvas(width: number, height: number): (HTMLCanvasElement | OffscreenCanvas);
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -4,9 +4,12 @@ import typescript from '@rollup/plugin-typescript';
 export default [
 	{
 		input: 'source/Main.ts',
+	
 		external: ['three'],
 		plugins: [
-			typescript({ tsconfig: './tsconfig.json' }),
+			typescript({
+				tsconfig: './tsconfig.json'
+			}),
 			strip({
 				functions: ['assert.*', 'debug', 'alert', 'console.*']
 			})
diff --git a/rollup.example.js b/rollup.example.js
@@ -24,6 +24,7 @@ export default [
 			resolve(),
 			typescript({
 				declaration: false
+				
 			})
 		],
 		output: [
diff --git a/source/nodes/MapHeightNode.ts b/source/nodes/MapHeightNode.ts
@@ -1,12 +1,11 @@
-import {LinearFilter, Material, MeshPhongMaterial, BufferGeometry, RGBAFormat, Texture, Vector3, Raycaster, Intersection} from 'three';
+import {Material, MeshPhongMaterial, BufferGeometry, Vector3, Raycaster, Intersection} from 'three';
 import {MapNodeGeometry} from '../geometries/MapNodeGeometry';
 import {MapNode, QuadTreePosition} from './MapNode';
 import {MapPlaneNode} from './MapPlaneNode';
 import {UnitsUtils} from '../utils/UnitsUtils';
 import {MapView} from '../MapView';
 import {MapNodeHeightGeometry} from '../geometries/MapNodeHeightGeometry';
 import {CanvasUtils} from '../utils/CanvasUtils';
-import {TextureUtils} from '../utils/TextureUtils';
 
 /**
  * Represents a height map tile node that can be subdivided into other height nodes.
@@ -131,7 +130,7 @@ export class MapHeightNode extends MapNode
 
 			const canvas = CanvasUtils.createOffscreenCanvas(this.geometrySize + 1, this.geometrySize + 1);
 
-			const context = canvas.getContext('2d');
+			const context = canvas.getContext('2d') as CanvasRenderingContext2D;
 			context.imageSmoothingEnabled = false;
 			context.drawImage(image, 0, 0, MapHeightNode.tileSize, MapHeightNode.tileSize, 0, 0, canvas.width, canvas.height);
 
diff --git a/source/nodes/MapMartiniHeightNode.ts b/source/nodes/MapMartiniHeightNode.ts
@@ -291,7 +291,7 @@ export class MapMartiniHeightNode extends MapHeightNode
 		const gridSize = tileSize + 1;
 		var canvas = CanvasUtils.createOffscreenCanvas(tileSize, tileSize);
 
-		var context = canvas.getContext('2d');
+		var context = canvas.getContext('2d') as CanvasRenderingContext2D;
 		context.imageSmoothingEnabled = false;
 		context.drawImage(image, 0, 0, tileSize, tileSize, 0, 0, canvas.width, canvas.height);
 		
diff --git a/source/providers/DebugProvider.ts b/source/providers/DebugProvider.ts
@@ -15,7 +15,7 @@ export class DebugProvider extends MapProvider
 	public fetchTile(zoom: number, x: number, y: number): Promise<any>
 	{
 		const canvas = CanvasUtils.createOffscreenCanvas(this.resolution, this.resolution);
-		const context = canvas.getContext('2d');
+		const context = canvas.getContext('2d') as CanvasRenderingContext2D;
 
 		const green = new Color(0x00ff00);
 		const red = new Color(0xff0000);
diff --git a/source/providers/HeightDebugProvider.ts b/source/providers/HeightDebugProvider.ts
@@ -37,7 +37,7 @@ export class HeightDebugProvider extends MapProvider
 		const resolution = 256;
 
 		const canvas = CanvasUtils.createOffscreenCanvas(resolution, resolution);
-		const context = canvas.getContext('2d');
+		const context = canvas.getContext('2d') as CanvasRenderingContext2D;
 
 		context.drawImage(image, 0, 0, resolution, resolution, 0, 0, resolution, resolution);
 
diff --git a/tsconfig.json b/tsconfig.json
@@ -32,8 +32,9 @@
     "source/**/*"
   ],
   "exclude": [
+    "source/examples/**/*",
     "node_modules/**/*",
     "docs/**/*",
-    "build/**/*"
+    "build/**/*",
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ class UnitsUtils {`
`384`	`384`	`return new Vector3(-Math.cos(rotX + Math.PI) * cos, Math.sin(rotY), Math.sin(rotX + Math.PI) * cos);`
`385`	`385`	`}`
`386`	`386`	`static mapboxAltitude(color) {`
`387`		`- return ((color.r * 255.0 * 65536.0 + color.g * 255.0 * 256.0 + color.b * 255.0) * 0.1) - 10000.0;`
	`387`	`+ return (color.r * 255.0 * 65536.0 + color.g * 255.0 * 256.0 + color.b * 255.0) * 0.1 - 10000.0;`
`388`	`388`	`}`
`389`	`389`	`}`
`390`	`390`	`UnitsUtils.EARTH_RADIUS = 6371008;`
`@@ -1612,14 +1612,14 @@ class GoogleMapsProvider extends MapProvider {`
`1612`	`1612`	`}`
`1613`	`1613`
`1614`	`1614`	`class HereMapsProvider extends MapProvider {`
`1615`		`- constructor(appId, appCode, style, scheme, format, size) {`
	`1615`	`+ constructor(appId = '', appCode = '', style = 'base', scheme = 'normal.day', format = 'png', size = 512) {`
`1616`	`1616`	`super();`
`1617`		`- this.appId = appId !== undefined ? appId : '';`
`1618`		`- this.appCode = appCode !== undefined ? appCode : '';`
`1619`		`- this.style = style !== undefined ? style : 'base';`
`1620`		`- this.scheme = scheme !== undefined ? scheme : 'normal.day';`
`1621`		`- this.format = format !== undefined ? format : 'png';`
`1622`		`- this.size = size !== undefined ? size : 512;`
	`1617`	`+ this.appId = appId;`
	`1618`	`+ this.appCode = appCode;`
	`1619`	`+ this.style = style;`
	`1620`	`+ this.scheme = scheme;`
	`1621`	`+ this.format = format;`
	`1622`	`+ this.size = size;`
`1623`	`1623`	`this.version = 'newest';`
`1624`	`1624`	`this.server = 1;`
`1625`	`1625`	`}`
`@@ -1899,4 +1899,4 @@ class CancelablePromise {`
`1899`	`1899`	`}`
`1900`	`1900`	`}`
`1901`	`1901`
`1902`		`-export { BingMapsProvider, CancelablePromise, DebugProvider, Geolocation, GeolocationUtils, GoogleMapsProvider, HeightDebugProvider, HereMapsProvider, LODFrustum, LODRadial, LODRaycast, MapBoxProvider, MapHeightNode, MapHeightNodeShader, MapNode, MapNodeGeometry, MapNodeHeightGeometry, MapPlaneNode, MapProvider, MapSphereNode, MapSphereNodeGeometry, MapTilerProvider, MapView, OpenMapTilesProvider, OpenStreetMapsProvider, UnitsUtils, XHRUtils };`
	`1902`	`+export { BingMapsProvider, CancelablePromise, CanvasUtils, DebugProvider, Geolocation, GeolocationUtils, GoogleMapsProvider, HeightDebugProvider, HereMapsProvider, LODFrustum, LODRadial, LODRaycast, MapBoxProvider, MapHeightNode, MapHeightNodeShader, MapNode, MapNodeGeometry, MapNodeHeightGeometry, MapPlaneNode, MapProvider, MapSphereNode, MapSphereNodeGeometry, MapTilerProvider, MapView, OpenMapTilesProvider, OpenStreetMapsProvider, TextureUtils, UnitsUtils, XHRUtils };`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/// <reference types="offscreencanvas" />`
`2`	`1`	`export declare class CanvasUtils {`
`3`	`2`	`static createOffscreenCanvas(width: number, height: number): (HTMLCanvasElement \| OffscreenCanvas);`
`4`	`3`	`}`