v1.5.0 (#45)

* v1.3.0 (#24) * Update README.md * Added boundingBoxEN option to tile layerer (#30) Co-authored-by: Tom Cannon <[email protected]> * #1 Add Navigation Control (#31) * Bump v1.4.0 * Add initialCamera option (#33) * Update * #35 Ability to reorder clamped and tile layers after they've been created (#40) * Update (#36) * orderLayers * v1.4.2 * #37 Support larger radius (#43) * #37 Passably poor fix for radiusScale * #37 FarPlane support * #42 Annotations (#44) * #42 Annotations and visibility cutoffs * Bump v1.5.0 Co-authored-by: Thomas Cannon <[email protected]> Co-authored-by: Tom Cannon <[email protected]>
NASA-AMMOS · May 24, 2022 · 0a7f4fa · 0a7f4fa
1 parent 90bbf33
commit 0a7f4fa
Show file tree

Hide file tree

Showing 39 changed files with 1,239 additions and 426 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+* linguist-vendored
+src/* linguist-vendored=false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,31 @@
 
 [Official Releases](https://github.com/NASA-AMMOS/LithoSphere/releases)
 
+## v1.5.0
+
+_May 23, 2022_
+
+#### Added
+
+-   Support for clamped and vector layer annotations
+-   Support for clamped and vector layer visibility cutoffs
+
+#### Fixed
+
+-   Near-Far plane issues with large planetary radii.
+
+---
+
+## v1.4.2
+
+_May 5, 2022_
+
+#### Added
+
+-   New `orderLayers` function
+
+---
+
 ## v1.4.1
 
 _May 2, 2022_

diff --git a/README.md b/README.md
@@ -43,6 +43,7 @@ Head over to the **[Documentation](https://nasa-ammos.github.io/LithoSphere/)**
     -   Tile
     -   Tile3d
     -   Model
+    -   Curtain
 -   Adjustable planetary radii
 -   Scripts for tiling Digital Elevation Maps (DEM) and custom projections
 -   Various tile formats:
@@ -58,7 +59,7 @@ Head over to the **[Documentation](https://nasa-ammos.github.io/LithoSphere/)**
     -   Home
     -   Exaggerate
     -   Crop (upcoming?)
-    -   Controls (upcoming)
+    -   Controls
     -   Coordinates
     -   Link
 -   The ability to use custom parsers for your own tiled data formats

diff --git a/dist/lithosphere.js b/dist/lithosphere.js
diff --git a/dist/src/core/cameras.d.ts b/dist/src/core/cameras.d.ts
@@ -44,7 +44,7 @@ export default class Camera {
     onKeyDown: (event: KeyboardEvent) => void;
     onKeyUp: (event: KeyboardEvent) => void;
     updateSize: () => void;
-    setNearFarPlane: (farther: any, near: any, far: any, keepNear: any) => void;
+    setNearFarPlane: (scalar: number, farther: any, near: any, far: any, keepNear: any) => void;
     setFirstPersonHeight: (height: any) => void;
     getFirstPersonFocalLength: () => number;
     setFirstPersonFocalLength: (focalLength: any) => void;

diff --git a/dist/src/core/events.d.ts b/dist/src/core/events.d.ts
@@ -7,6 +7,10 @@ interface Private {
         x: number;
         y: number;
     };
+    oldPrevMouseXY: {
+        x: number;
+        y: number;
+    };
     containerXY: {
         x: number;
         y: number;
@@ -16,6 +20,8 @@ interface Private {
     zoomedSince: number;
     zoomWait: number;
     highlightTimeout: any;
+    rotationDampingInterval: any;
+    panned: boolean;
 }
 export default class Events {
     _: Private;
@@ -25,7 +31,7 @@ export default class Events {
     hoverInfo: HTMLElement;
     constructor(parent: any);
     _init(): void;
-    _rotateGlobe: (e: any, prevXY?: any) => void;
+    _rotateGlobe: (e: any, prevXY?: any, fromDamping?: boolean) => void;
     private _rotateAroundArbAxis;
     private _rotateGlobe_MouseDown;
     private _rotateGlobe_MouseUp;
@@ -46,6 +52,7 @@ export default class Events {
     private clearHoveredFeature;
     private setActiveFeature;
     private clearActiveFeature;
+    _setMissingElevation(mesh: any): void;
     _attenuate(): void;
 }
 export {};
diff --git a/dist/src/core/projection.d.ts b/dist/src/core/projection.d.ts
@@ -13,6 +13,7 @@ declare enum RadiusE {
 export default class Projection {
     _: Private;
     baseRadius: number;
+    radiusCutoff: number;
     radiusScale: number;
     radii: Radii;
     tileMapResource: TileMapResource;
@@ -22,7 +23,7 @@ export default class Projection {
     e: number;
     ep: number;
     flatteningFactor: number;
-    constructor(majorRadius?: number, minorRadius?: number, tileMapResource?: TileMapResource, trueTileResolution?: number);
+    constructor(majorRadius?: number, minorRadius?: number, tileMapResource?: TileMapResource, trueTileResolution?: number, radiusCutoff?: number);
     _reset(): void;
     setRadius: (radius: number, which?: RadiusE) => void;
     invertY: (y: number, z: number) => number;

diff --git a/dist/src/layers/clamped.d.ts b/dist/src/layers/clamped.d.ts
@@ -4,6 +4,7 @@ export default class ClampedLayerer {
     constructor(parent: any);
     add: (layerObj: any, callback?: Function) => void;
     toggle: (name: string, on?: boolean) => boolean;
+    orderLayers: (ordering: string[]) => boolean;
     setOpacity: (name: string, opacity: number) => boolean;
     remove: (name: string) => boolean;
     getClampedTexture: (i: number, xyz: XYZ) => any;

diff --git a/dist/src/layers/index.d.ts b/dist/src/layers/index.d.ts
@@ -17,7 +17,6 @@ interface Private {
 export default class Layers {
     _: Private;
     p: any;
-    baseStyle: any;
     tile3d: any;
     tile: any;
     clamped: any;
@@ -30,14 +29,17 @@ export default class Layers {
     addLayer: (type: string, layerObj: any, callback?: Function, sI?: number) => void;
     removeLayer: (name: string) => boolean;
     toggleLayer: (name: string, on?: boolean) => boolean;
+    orderLayers: (ordering: string[]) => boolean;
+    private getDesiredOrder;
     setLayerOpacity: (name: string, opacity: number) => boolean;
     setLayerFilterEffect: (name: string, filter: string, value: number) => boolean;
     setLayerSpecificOptions: (name: string, options: any) => boolean;
     findHighestMaxZoom: () => number;
     findLowestMinZoom: () => number;
-    private getFeatureStyleProp;
     getLayerByName: (layerName: string) => any;
     hasLayer: (layerName: string) => boolean;
+    private getFeatureStyleProp;
+    private getBaseStyle;
     getFeatureStyle: (layer: any, feature: any, isStrokeless?: boolean) => any;
     _onMouseMove: (intersectedLL: any, e: MouseEvent, obj: any, intersectionRaw: any, intersectionPoint: any) => void;
 }

diff --git a/dist/src/layers/tile.d.ts b/dist/src/layers/tile.d.ts
@@ -3,6 +3,7 @@ export default class TileLayerer {
     constructor(parent: any);
     add: (layerObj: any) => void;
     toggle: (name: string, on?: boolean) => boolean;
+    orderLayers: (ordering: string[]) => boolean;
     setOpacity: (name: string, opacity: number) => boolean;
     setFilterEffect: (name: string, filter: string, value: number) => boolean;
     remove: (name: string) => boolean;

diff --git a/dist/src/layers/vector.d.ts b/dist/src/layers/vector.d.ts
@@ -1,6 +1,5 @@
 export default class VectorLayerer {
     p: any;
-    baseStyle: any;
     constructor(parent: any);
     add: (layerObj: any, callback?: Function) => void;
     toggle: (name: string, on?: boolean) => boolean;

diff --git a/dist/src/lithosphere.d.ts b/dist/src/lithosphere.d.ts
@@ -30,7 +30,6 @@ interface Private {
     zCutOff: number;
     firstViewOverride: any;
     mouseIsInScene: boolean;
-    marsRadius: number;
 }
 export default class LithoSphere {
     _: Private;
@@ -41,6 +40,7 @@ export default class LithoSphere {
     addLayer: Function;
     removeLayer: Function;
     toggleLayer: Function;
+    orderLayers: Function;
     setLayerOpacity: Function;
     setLayerFilterEffect: Function;
     setLayerSpecificOptions: Function;

diff --git a/dist/src/secondary/sprites.d.ts b/dist/src/secondary/sprites.d.ts
@@ -1,8 +1,7 @@
 import { Sprite } from 'three';
 declare const Sprites: {
     spriteMaterials: {};
-    makeMarkerSprite: (parameters: any, id: any, forceNewMaterial?: boolean) => Sprite;
-    makeMarkerMaterial: (parameters: any, id: any, forceNewMaterial?: boolean) => any;
-    makeTextSprite: (message: any, parameters: any) => Sprite;
+    makeMarkerSprite: (parameters: any, id: any, options?: {}, forceNewMaterial?: boolean) => Sprite;
+    makeMarkerMaterial: (parameters: any, id: any, options: any, forceNewMaterial?: boolean) => any;
 };
 export default Sprites;
diff --git a/dist/src/utils/index.d.ts b/dist/src/utils/index.d.ts
@@ -6,6 +6,7 @@ declare const Utils: {
     findLowestMinZoom: (tileLayers: any) => number;
     isInExtent: (xyz: XYZ, bb: any, projection: any) => boolean;
     isInExtentEN: (xyz: XYZ, bb: any, proj: any, margin?: number) => boolean;
+    isInZoomRange: (minZoom: number, maxZoom: number, zoom: number) => boolean;
     clone: (obj: any) => any;
     capitalizeFirstLetter: (string: string) => string;
     getExtension: (string: string) => string;

diff --git a/docs/Gemfile b/docs/Gemfile
@@ -30,3 +30,5 @@ end
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
 
+
+gem "webrick", "~> 1.7"
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -1,13 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.7)
+    activesupport (6.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     coffee-script (2.4.1)
       coffee-script-source
@@ -16,26 +16,42 @@ GEM
     colorator (1.1.0)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.8)
-    dnsruby (1.61.5)
+    concurrent-ruby (1.1.10)
+    dnsruby (1.61.9)
       simpleidn (~> 0.1)
-    em-websocket (0.5.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    ethon (0.14.0)
+      http_parser.rb (~> 0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
+    eventmachine (1.2.7)
     eventmachine (1.2.7-x64-mingw32)
     execjs (2.8.1)
-    faraday (1.4.1)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      multipart-post (>= 1.2, < 3)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    ffi (1.15.0-x64-mingw32)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    ffi (1.15.5-x64-mingw-ucrt)
+    ffi (1.15.5-x64-mingw32)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
     github-pages (214)
@@ -88,10 +104,10 @@ GEM
       octokit (~> 4.0)
       public_suffix (>= 2.0.2, < 5.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.14.0)
+    html-pipeline (2.14.1)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.8.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jekyll (3.9.0)
@@ -209,35 +225,37 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.5.1)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
+    mini_portile2 (2.8.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.14.4)
+    minitest (5.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.11.3-x64-mingw32)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    octokit (4.21.0)
+    octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
-    racc (1.5.2)
-    rake (13.0.3)
-    rb-fsevent (0.11.0)
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
     rouge (3.26.0)
     ruby-enum (0.9.0)
       i18n
-    ruby2_keywords (0.0.4)
-    rubyzip (2.3.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -256,16 +274,18 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2021.1)
+    tzinfo-data (1.2022.1)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7-x64-mingw32)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8.1)
+    unicode-display_width (1.8.0)
     wdm (0.1.1)
-    zeitwerk (2.4.2)
+    webrick (1.7.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
+  x64-mingw-ucrt
   x64-mingw32
 
 DEPENDENCIES
@@ -277,6 +297,7 @@ DEPENDENCIES
   tzinfo (~> 1.2)
   tzinfo-data
   wdm (~> 0.1.1)
+  webrick (~> 1.7)
 
 BUNDLED WITH
-   2.2.17
+   2.3.13