Update build

tentone · tentone · commit 9ad8dbc3788c · 2022-11-11T11:36:52.000Z
diff --git a/build/geo-three.cjs b/build/geo-three.cjs
@@ -180,7 +180,7 @@ class MapNodeGeometry extends three.BufferGeometry {
 
 class CanvasUtils {
     static createOffscreenCanvas(width, height) {
-        if (OffscreenCanvas) {
+        if (typeof OffscreenCanvas !== 'undefined') {
             return new OffscreenCanvas(width, height);
         }
         else {
@@ -320,7 +320,7 @@ class UnitsUtils {
         return { latitude: latitude, longitude: longitude };
     }
 }
-UnitsUtils.EARTH_RADIUS = 6378137;
+UnitsUtils.EARTH_RADIUS = 6371008;
 UnitsUtils.EARTH_PERIMETER = 2 * Math.PI * UnitsUtils.EARTH_RADIUS;
 UnitsUtils.EARTH_ORIGIN = UnitsUtils.EARTH_PERIMETER / 2.0;
 
@@ -1398,12 +1398,7 @@ class XHRUtils {
         if (onProgress !== undefined) {
             xhr.onprogress = onProgress;
         }
-        if (body !== undefined) {
-            xhr.send(body);
-        }
-        else {
-            xhr.send(null);
-        }
+        xhr.send(body !== undefined ? body : null);
         return xhr;
     }
 }
@@ -1420,7 +1415,7 @@ class BingMapsProvider extends MapProvider {
         this.maxZoom = 19;
     }
     getMetaData() {
-        const address = 'http://dev.virtualearth.net/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;
+        const address = BingMapsProvider.ADDRESS + '/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;
         XHRUtils.get(address, function (data) {
             JSON.parse(data);
         });
@@ -1454,6 +1449,7 @@ class BingMapsProvider extends MapProvider {
         });
     }
 }
+BingMapsProvider.ADDRESS = "https://dev.virtualearth.net";
 BingMapsProvider.AERIAL = 'a';
 BingMapsProvider.ROAD = 'r';
 BingMapsProvider.AERIAL_LABELS = 'h';
diff --git a/build/geo-three.js b/build/geo-three.js
@@ -180,7 +180,7 @@
 
 	class CanvasUtils {
 	    static createOffscreenCanvas(width, height) {
-	        if (OffscreenCanvas) {
+	        if (typeof OffscreenCanvas !== 'undefined') {
 	            return new OffscreenCanvas(width, height);
 	        }
 	        else {
@@ -320,7 +320,7 @@
 	        return { latitude: latitude, longitude: longitude };
 	    }
 	}
-	UnitsUtils.EARTH_RADIUS = 6378137;
+	UnitsUtils.EARTH_RADIUS = 6371008;
 	UnitsUtils.EARTH_PERIMETER = 2 * Math.PI * UnitsUtils.EARTH_RADIUS;
 	UnitsUtils.EARTH_ORIGIN = UnitsUtils.EARTH_PERIMETER / 2.0;
 
@@ -1398,12 +1398,7 @@
 	        if (onProgress !== undefined) {
 	            xhr.onprogress = onProgress;
 	        }
-	        if (body !== undefined) {
-	            xhr.send(body);
-	        }
-	        else {
-	            xhr.send(null);
-	        }
+	        xhr.send(body !== undefined ? body : null);
 	        return xhr;
 	    }
 	}
@@ -1420,7 +1415,7 @@
 	        this.maxZoom = 19;
 	    }
 	    getMetaData() {
-	        const address = 'http://dev.virtualearth.net/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;
+	        const address = BingMapsProvider.ADDRESS + '/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;
 	        XHRUtils.get(address, function (data) {
 	            JSON.parse(data);
 	        });
@@ -1454,6 +1449,7 @@
 	        });
 	    }
 	}
+	BingMapsProvider.ADDRESS = "https://dev.virtualearth.net";
 	BingMapsProvider.AERIAL = 'a';
 	BingMapsProvider.ROAD = 'r';
 	BingMapsProvider.AERIAL_LABELS = 'h';
diff --git a/build/geo-three.module.js b/build/geo-three.module.js
@@ -176,7 +176,7 @@ class MapNodeGeometry extends BufferGeometry {
 
 class CanvasUtils {
     static createOffscreenCanvas(width, height) {
-        if (OffscreenCanvas) {
+        if (typeof OffscreenCanvas !== 'undefined') {
             return new OffscreenCanvas(width, height);
         }
         else {
@@ -316,7 +316,7 @@ class UnitsUtils {
         return { latitude: latitude, longitude: longitude };
     }
 }
-UnitsUtils.EARTH_RADIUS = 6378137;
+UnitsUtils.EARTH_RADIUS = 6371008;
 UnitsUtils.EARTH_PERIMETER = 2 * Math.PI * UnitsUtils.EARTH_RADIUS;
 UnitsUtils.EARTH_ORIGIN = UnitsUtils.EARTH_PERIMETER / 2.0;
 
@@ -1394,12 +1394,7 @@ class XHRUtils {
         if (onProgress !== undefined) {
             xhr.onprogress = onProgress;
         }
-        if (body !== undefined) {
-            xhr.send(body);
-        }
-        else {
-            xhr.send(null);
-        }
+        xhr.send(body !== undefined ? body : null);
         return xhr;
     }
 }
@@ -1416,7 +1411,7 @@ class BingMapsProvider extends MapProvider {
         this.maxZoom = 19;
     }
     getMetaData() {
-        const address = 'http://dev.virtualearth.net/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;
+        const address = BingMapsProvider.ADDRESS + '/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;
         XHRUtils.get(address, function (data) {
             JSON.parse(data);
         });
@@ -1450,6 +1445,7 @@ class BingMapsProvider extends MapProvider {
         });
     }
 }
+BingMapsProvider.ADDRESS = "https://dev.virtualearth.net";
 BingMapsProvider.AERIAL = 'a';
 BingMapsProvider.ROAD = 'r';
 BingMapsProvider.AERIAL_LABELS = 'h';
diff --git a/build/providers/BingMapsProvider.d.ts b/build/providers/BingMapsProvider.d.ts
@@ -1,5 +1,6 @@
 import { MapProvider } from './MapProvider';
 export declare class BingMapsProvider extends MapProvider {
+    static ADDRESS: string;
     maxZoom: number;
     apiKey: string;
     type: string;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "geo-three",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"type": "module",
 	"description": "geo-three is library for tile based geographic map layers in with three.js supporting selective loading/unloading of real-time generated 3D tiles",
 	"main": "build/Main.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ class MapNodeGeometry extends three.BufferGeometry {`
`180`	`180`
`181`	`181`	`class CanvasUtils {`
`182`	`182`	`static createOffscreenCanvas(width, height) {`
`183`		`- if (OffscreenCanvas) {`
	`183`	`+ if (typeof OffscreenCanvas !== 'undefined') {`
`184`	`184`	`return new OffscreenCanvas(width, height);`
`185`	`185`	`}`
`186`	`186`	`else {`
`@@ -320,7 +320,7 @@ class UnitsUtils {`
`320`	`320`	`return { latitude: latitude, longitude: longitude };`
`321`	`321`	`}`
`322`	`322`	`}`
`323`		`-UnitsUtils.EARTH_RADIUS = 6378137;`
	`323`	`+UnitsUtils.EARTH_RADIUS = 6371008;`
`324`	`324`	`UnitsUtils.EARTH_PERIMETER = 2 * Math.PI * UnitsUtils.EARTH_RADIUS;`
`325`	`325`	`UnitsUtils.EARTH_ORIGIN = UnitsUtils.EARTH_PERIMETER / 2.0;`
`326`	`326`
`@@ -1398,12 +1398,7 @@ class XHRUtils {`
`1398`	`1398`	`if (onProgress !== undefined) {`
`1399`	`1399`	`xhr.onprogress = onProgress;`
`1400`	`1400`	`}`
`1401`		`- if (body !== undefined) {`
`1402`		`- xhr.send(body);`
`1403`		`- }`
`1404`		`- else {`
`1405`		`- xhr.send(null);`
`1406`		`- }`
	`1401`	`+ xhr.send(body !== undefined ? body : null);`
`1407`	`1402`	`return xhr;`
`1408`	`1403`	`}`
`1409`	`1404`	`}`
`@@ -1420,7 +1415,7 @@ class BingMapsProvider extends MapProvider {`
`1420`	`1415`	`this.maxZoom = 19;`
`1421`	`1416`	`}`
`1422`	`1417`	`getMetaData() {`
`1423`		`- const address = 'http://dev.virtualearth.net/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;`
	`1418`	`+ const address = BingMapsProvider.ADDRESS + '/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;`
`1424`	`1419`	`XHRUtils.get(address, function (data) {`
`1425`	`1420`	`JSON.parse(data);`
`1426`	`1421`	`});`
`@@ -1454,6 +1449,7 @@ class BingMapsProvider extends MapProvider {`
`1454`	`1449`	`});`
`1455`	`1450`	`}`
`1456`	`1451`	`}`
	`1452`	`+BingMapsProvider.ADDRESS = "https://dev.virtualearth.net";`
`1457`	`1453`	`BingMapsProvider.AERIAL = 'a';`
`1458`	`1454`	`BingMapsProvider.ROAD = 'r';`
`1459`	`1455`	`BingMapsProvider.AERIAL_LABELS = 'h';`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@`
`180`	`180`
`181`	`181`	`class CanvasUtils {`
`182`	`182`	`static createOffscreenCanvas(width, height) {`
`183`		`- if (OffscreenCanvas) {`
	`183`	`+ if (typeof OffscreenCanvas !== 'undefined') {`
`184`	`184`	`return new OffscreenCanvas(width, height);`
`185`	`185`	`}`
`186`	`186`	`else {`
`@@ -320,7 +320,7 @@`
`320`	`320`	`return { latitude: latitude, longitude: longitude };`
`321`	`321`	`}`
`322`	`322`	`}`
`323`		`- UnitsUtils.EARTH_RADIUS = 6378137;`
	`323`	`+ UnitsUtils.EARTH_RADIUS = 6371008;`
`324`	`324`	`UnitsUtils.EARTH_PERIMETER = 2 * Math.PI * UnitsUtils.EARTH_RADIUS;`
`325`	`325`	`UnitsUtils.EARTH_ORIGIN = UnitsUtils.EARTH_PERIMETER / 2.0;`
`326`	`326`
`@@ -1398,12 +1398,7 @@`
`1398`	`1398`	`if (onProgress !== undefined) {`
`1399`	`1399`	`xhr.onprogress = onProgress;`
`1400`	`1400`	`}`
`1401`		`- if (body !== undefined) {`
`1402`		`- xhr.send(body);`
`1403`		`- }`
`1404`		`- else {`
`1405`		`- xhr.send(null);`
`1406`		`- }`
	`1401`	`+ xhr.send(body !== undefined ? body : null);`
`1407`	`1402`	`return xhr;`
`1408`	`1403`	`}`
`1409`	`1404`	`}`
`@@ -1420,7 +1415,7 @@`
`1420`	`1415`	`this.maxZoom = 19;`
`1421`	`1416`	`}`
`1422`	`1417`	`getMetaData() {`
`1423`		`- const address = 'http://dev.virtualearth.net/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;`
	`1418`	`+ const address = BingMapsProvider.ADDRESS + '/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;`
`1424`	`1419`	`XHRUtils.get(address, function (data) {`
`1425`	`1420`	`JSON.parse(data);`
`1426`	`1421`	`});`
`@@ -1454,6 +1449,7 @@`
`1454`	`1449`	`});`
`1455`	`1450`	`}`
`1456`	`1451`	`}`
	`1452`	`+ BingMapsProvider.ADDRESS = "https://dev.virtualearth.net";`
`1457`	`1453`	`BingMapsProvider.AERIAL = 'a';`
`1458`	`1454`	`BingMapsProvider.ROAD = 'r';`
`1459`	`1455`	`BingMapsProvider.AERIAL_LABELS = 'h';`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ class MapNodeGeometry extends BufferGeometry {`
`176`	`176`
`177`	`177`	`class CanvasUtils {`
`178`	`178`	`static createOffscreenCanvas(width, height) {`
`179`		`- if (OffscreenCanvas) {`
	`179`	`+ if (typeof OffscreenCanvas !== 'undefined') {`
`180`	`180`	`return new OffscreenCanvas(width, height);`
`181`	`181`	`}`
`182`	`182`	`else {`
`@@ -316,7 +316,7 @@ class UnitsUtils {`
`316`	`316`	`return { latitude: latitude, longitude: longitude };`
`317`	`317`	`}`
`318`	`318`	`}`
`319`		`-UnitsUtils.EARTH_RADIUS = 6378137;`
	`319`	`+UnitsUtils.EARTH_RADIUS = 6371008;`
`320`	`320`	`UnitsUtils.EARTH_PERIMETER = 2 * Math.PI * UnitsUtils.EARTH_RADIUS;`
`321`	`321`	`UnitsUtils.EARTH_ORIGIN = UnitsUtils.EARTH_PERIMETER / 2.0;`
`322`	`322`
`@@ -1394,12 +1394,7 @@ class XHRUtils {`
`1394`	`1394`	`if (onProgress !== undefined) {`
`1395`	`1395`	`xhr.onprogress = onProgress;`
`1396`	`1396`	`}`
`1397`		`- if (body !== undefined) {`
`1398`		`- xhr.send(body);`
`1399`		`- }`
`1400`		`- else {`
`1401`		`- xhr.send(null);`
`1402`		`- }`
	`1397`	`+ xhr.send(body !== undefined ? body : null);`
`1403`	`1398`	`return xhr;`
`1404`	`1399`	`}`
`1405`	`1400`	`}`
`@@ -1416,7 +1411,7 @@ class BingMapsProvider extends MapProvider {`
`1416`	`1411`	`this.maxZoom = 19;`
`1417`	`1412`	`}`
`1418`	`1413`	`getMetaData() {`
`1419`		`- const address = 'http://dev.virtualearth.net/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;`
	`1414`	`+ const address = BingMapsProvider.ADDRESS + '/REST/V1/Imagery/Metadata/RoadOnDemand?output=json&include=ImageryProviders&key=' + this.apiKey;`
`1420`	`1415`	`XHRUtils.get(address, function (data) {`
`1421`	`1416`	`JSON.parse(data);`
`1422`	`1417`	`});`
`@@ -1450,6 +1445,7 @@ class BingMapsProvider extends MapProvider {`
`1450`	`1445`	`});`
`1451`	`1446`	`}`
`1452`	`1447`	`}`
	`1448`	`+BingMapsProvider.ADDRESS = "https://dev.virtualearth.net";`
`1453`	`1449`	`BingMapsProvider.AERIAL = 'a';`
`1454`	`1450`	`BingMapsProvider.ROAD = 'r';`
`1455`	`1451`	`BingMapsProvider.AERIAL_LABELS = 'h';`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "geo-three",`
`3`		`- "version": "0.1.1",`
	`3`	`+ "version": "0.1.2",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "geo-three is library for tile based geographic map layers in with three.js supporting selective loading/unloading of real-time generated 3D tiles",`
`6`	`6`	`"main": "build/Main.d.ts",`