Merge pull request #10 from NASA-AMMOS/development

1.0.3
NASA-AMMOS · Sep 1, 2021 · b864679 · b864679
2 parents b79cde2 + 7e017be
commit b864679
Show file tree

Hide file tree

Showing 41 changed files with 2,360 additions and 284 deletions.
diff --git a/dist/lithosphere.js b/dist/lithosphere.js
diff --git a/dist/src/constants.d.ts b/dist/src/constants.d.ts
diff --git a/dist/src/controls/altitude.d.ts b/dist/src/controls/altitude.d.ts
diff --git a/dist/src/controls/compass.d.ts b/dist/src/controls/compass.d.ts
diff --git a/dist/src/controls/controls.d.ts b/dist/src/controls/controls.d.ts
diff --git a/dist/src/controls/coordinates.d.ts b/dist/src/controls/coordinates.d.ts
diff --git a/dist/src/controls/crop.d.ts b/dist/src/controls/crop.d.ts
diff --git a/dist/src/controls/exaggerate.d.ts b/dist/src/controls/exaggerate.d.ts
diff --git a/dist/src/controls/home.d.ts b/dist/src/controls/home.d.ts
diff --git a/dist/src/controls/index.d.ts b/dist/src/controls/index.d.ts
diff --git a/dist/src/controls/layers.d.ts b/dist/src/controls/layers.d.ts
diff --git a/dist/src/controls/link.d.ts b/dist/src/controls/link.d.ts
diff --git a/dist/src/controls/observe.d.ts b/dist/src/controls/observe.d.ts
diff --git a/dist/src/controls/walk.d.ts b/dist/src/controls/walk.d.ts
diff --git a/dist/src/core/renderer.d.ts b/dist/src/core/renderer.d.ts
diff --git a/dist/src/core/shaders.d.ts b/dist/src/core/shaders.d.ts
diff --git a/dist/src/layers/curtain.d.ts b/dist/src/layers/curtain.d.ts
diff --git a/dist/src/layers/model.d.ts b/dist/src/layers/model.d.ts
diff --git a/dist/src/layers/overlay.d.ts b/dist/src/layers/overlay.d.ts
diff --git a/dist/src/layers/tile.d.ts b/dist/src/layers/tile.d.ts
diff --git a/dist/src/layers/vector.d.ts b/dist/src/layers/vector.d.ts
diff --git a/dist/src/parsers/demt.d.ts b/dist/src/parsers/demt.d.ts
diff --git a/dist/src/parsers/index.d.ts b/dist/src/parsers/index.d.ts
@@ -1 +1 @@
-export default function load(customParsers: any, tilePath: string, layerObj?: any, xyz?: any, tileResolution?: number, numberOfVertices?: number): Promise<number[]>;
+export default function load(customParsers: any, tilePath: string, layerObj?: any, xyz?: any, tileResolution?: number, numberOfVertices?: number, forceParserType?: string): Promise<number[]>;
diff --git a/dist/src/parsers/rgba.d.ts b/dist/src/parsers/rgba.d.ts
diff --git a/dist/src/parsers/tif.d.ts b/dist/src/parsers/tif.d.ts
diff --git a/dist/src/secondary/OrbitControls.d.ts b/dist/src/secondary/OrbitControls.d.ts
diff --git a/dist/src/secondary/PNG/png.d.ts b/dist/src/secondary/PNG/png.d.ts
diff --git a/dist/src/secondary/PNG/zlib.d.ts b/dist/src/secondary/PNG/zlib.d.ts
diff --git a/dist/src/secondary/PointerLockControls.d.ts b/dist/src/secondary/PointerLockControls.d.ts
diff --git a/dist/src/secondary/loadingScreen.d.ts b/dist/src/secondary/loadingScreen.d.ts
diff --git a/dist/src/secondary/sprites.d.ts b/dist/src/secondary/sprites.d.ts
diff --git a/dist/src/utils/index.d.ts b/dist/src/utils/index.d.ts
@@ -1,6 +1,6 @@
 import { XY, XYZ } from '../generalTypes';
 declare const Utils: {
-    getIn: (obj: any, keyArray: string[], notSetValue?: any) => any;
+    getIn: (obj: any, keyArray: any, notSetValue?: any) => any;
     mod: (n: number, m: number) => number;
     findHighestMaxZoom: (tileLayers: any) => number;
     findLowestMinZoom: (tileLayers: any) => number;

diff --git a/docs/pages/Constructor/constructor.markdown b/docs/pages/Constructor/constructor.markdown
@@ -35,6 +35,7 @@ new LithoSphere(containerId, options)
 |    **minorRadius**     | _integer_  |                                    majorRadius                                     |                         Minor planetary radius in meters                         |
 |   **loadingScreen**    | _boolean_  |                                        true                                        |    If true, shows a loading screen until all lithosphere content first loads     |
 |   **customParsers**    |  _object_  |                     See [Parsers]({{ site.baseurl }}/parsers)                      |                 Allows the use of custom elevation tile parsers                  |
+|    **demFallback**     |  _object_  |     See [demFallback]({{ site.baseurl }}/constructor#optionsdemfallback) below     |                  A DEM to fallback to if any layer's DEM fails                   |
 |  **tileMapResource**   |  _object_  | See [tileMapResource]({{ site.baseurl }}/constructor#optionstilemapresource) below |                              Configures projections                              |
 |   **radiusOfTiles**    | _integer_  |                                         4                                          |         How many tiles outward from the center to use for the base tiles         |
 |   **wireframeMode**    | _boolean_  |                                       false                                        |            If true, all tiles are rendered with a wireframe material             |
@@ -71,6 +72,28 @@ The latitude, longitude, and zoom LithoSphere first starts at.
 }
 ```
 
+### options.demFallback
+
+If a tile layer has a `demPath` set and one of its tile dem request fails for whatever reason (such as a 404) or does not have a `demPath` set, it will try to get the corresponding DEM tile specified in `demFallback`.
+
+|   Parameter    |   Type   | Default |            Description            |
+| :------------: | :------: | :-----: | :-------------------------------: |
+|  **demPath**   | _string_ |         |  Path for the fallback DEM tiles  |
+|   **format**   | _string_ |  'tms'  | Tile format: 'tms', 'wmts', 'wms' |
+| **parserType** | _string_ | 'rgba'  |  Which parser to use for demPath  |
+
+#### Example
+
+```javascript
+{
+    demFallback: {
+        demPath:
+            'https://domain.com/Missions/MSL/Layers/Gale_HiRISE/MSL_Gale_DEM_Mosaic_1m_v3/{z}/{x}/{y}.png',
+        parserType: 'rgba',
+    },
+}
+```
+
 ### options.tileMapResource
 
 Representative of the tilemapresource.xml file outputted following tile generation.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export default function load(customParsers: any, tilePath: string, layerObj?: any, xyz?: any, tileResolution?: number, numberOfVertices?: number): Promise<number[]>;
		export default function load(customParsers: any, tilePath: string, layerObj?: any, xyz?: any, tileResolution?: number, numberOfVertices?: number, forceParserType?: string): Promise<number[]>;