bruce-cesium 0.3.6 → 0.3.7

package/dist/types/rendering/tile-render-engine.d.ts

@@ -1,4 +1,4 @@
-import { BruceApi, ProjectViewTileSource } from "bruce-models";
+import { ProjectViewTile, BruceApi, ProjectViewLegacyTile } from "bruce-models";
 import * as Cesium from "cesium";
 export declare namespace TileRenderEngine {
     /**
@@ -9,54 +9,70 @@ export declare namespace TileRenderEngine {
      */
     function CompareLegacyNames(nameA: string, nameB: string): boolean;
     namespace Map {
-        interface ILayerExt extends Cesium.ImageryLayer {
-            _bId?: string;
-            _bName?: string;
+        namespace V1 {
+            interface ILayerExt extends Cesium.ImageryLayer {
+                _bId?: string;
+                _bName?: string;
+            }
+            interface IViewParams {
+                bookmarkId: string;
+                viewId: string;
+                apiGetter: BruceApi.IGetter;
+                viewer: Cesium.Viewer;
+                ignoreIds?: string[];
+            }
+            interface IParams {
+                data: ProjectViewLegacyTile.IMapSource;
+                apiGetter: BruceApi.IGetter;
+                viewer: Cesium.Viewer;
+            }
+            function Render(params: IParams): ILayerExt;
+            function RenderView(params: IViewParams): Promise<void>;
         }
-        interface IParams {
-            apiGetter: BruceApi.IGetter;
-            tilesetIds: string[];
-            viewer: Cesium.Viewer;
-            ignoreIds?: string[];
+        namespace V2 {
+            interface IProviderExt extends Cesium.ImageryLayer {
+                _bMeta?: ProjectViewTile.ITileMeta;
+            }
+            interface IParams {
+                apiGetter: BruceApi.IGetter;
+                viewer: Cesium.Viewer;
+                sources: ProjectViewTile.IViewImagery[];
+                enabled: ProjectViewTile.IBookmarkImagery[];
+            }
+            function GetOrCreateLayer(viewer: Cesium.Viewer, apiGetter: BruceApi.IGetter, meta: ProjectViewTile.ITileMeta): Promise<Cesium.ImageryLayer>;
+            function Render(params: IParams): Promise<void>;
         }
-        interface ILegacyViewParams {
-            bookmarkId: string;
-            viewId: string;
-            apiGetter: BruceApi.IGetter;
-            viewer: Cesium.Viewer;
-            ignoreIds?: string[];
-        }
-        interface ILegacyParams {
-            data: ProjectViewTileSource.IMapSource;
-            apiGetter: BruceApi.IGetter;
-            viewer: Cesium.Viewer;
-        }
-        function Render(params: IParams): void;
-        function RenderLegacy(params: ILegacyParams): ILayerExt;
-        function RenderLegacyView(params: ILegacyViewParams): Promise<void>;
     }
     namespace Terrain {
-        interface IProviderExt extends Cesium.CesiumTerrainProvider {
-            _bId: string;
-            _bName: string;
-        }
-        interface IParams {
-            apiGetter: BruceApi.IGetter;
-            tilesetId: string;
-            viewer: Cesium.Viewer;
-        }
-        interface ILegacyParams {
-            data: ProjectViewTileSource.ITerrainSource;
-            viewer: Cesium.Viewer;
+        namespace V1 {
+            interface IProviderExt extends Cesium.CesiumTerrainProvider {
+                _bId: string;
+                _bName: string;
+            }
+            interface IParams {
+                data: ProjectViewLegacyTile.ITerrainSource;
+                viewer: Cesium.Viewer;
+            }
+            interface IViewParams {
+                bookmarkId: string;
+                viewId: string;
+                apiGetter: BruceApi.IGetter;
+                viewer: Cesium.Viewer;
+            }
+            function Render(params: IParams): void;
+            function RenderView(params: IViewParams): Promise<void>;
         }
-        interface ILegacyViewParams {
-            bookmarkId: string;
-            viewId: string;
-            apiGetter: BruceApi.IGetter;
-            viewer: Cesium.Viewer;
+        namespace V2 {
+            interface IProviderExt extends Cesium.CesiumTerrainProvider {
+                _bMeta?: ProjectViewTile.ITileMeta;
+            }
+            interface IParams {
+                apiGetter: BruceApi.IGetter;
+                viewer: Cesium.Viewer;
+                source: ProjectViewTile.IViewTerrain;
+                enabled: ProjectViewTile.IBookmarkTerrain;
+            }
+            function Render(params: IParams): Promise<void>;
         }
-        function Render(params: IParams): void;
-        function RenderLegacy(params: ILegacyParams): void;
-        function RenderLegacyView(params: ILegacyViewParams): Promise<void>;
     }
 }

package/dist/types/utils/view-utils.d.ts

@@ -1,6 +1,6 @@
 import { ProjectViewBookmark } from "bruce-models";
 import * as Cesium from "cesium";
 export declare namespace ViewUtils {
-    function GatherLegacyMapTiles(viewer: Cesium.Viewer): ProjectViewBookmark.IBookmarkImagery[];
+    function GatherLegacyMapTiles(viewer: Cesium.Viewer): ProjectViewBookmark.V1.IBookmarkImagery[];
     function GatherLegacyTerrainTile(viewer: Cesium.Viewer): string;
 }

package/package.json

@@ -1,73 +1,76 @@
-{
-  "name": "bruce-cesium",
-  "version": "0.3.6",
-  "description": "",
-  "keywords": [],
-  "main": "dist/bruce-cesium.umd.js",
-  "module": "dist/bruce-cesium.es5.js",
-  "typings": "dist/types/bruce-cesium.d.ts",
-  "files": [
-    "dist"
-  ],
-  "author": "MatveyL <matveylavrinovich@gmail.com>",
-  "repository": {
-    "type": "git",
-    "url": ""
-  },
-  "license": "ISC",
-  "engines": {
-    "node": ">=6.0.0"
-  },
-  "scripts": {
-    "prebuild": "rimraf dist",
-    "build": "tsc --module commonjs && rollup -c rollup.config.ts",
-    "docs": "typedoc --out docs --target es6 --theme minimal --mode file src",
-    "start": "rollup -c rollup.config.ts -w",
-    "test": "jest \"./test/unit\"",
-    "test-db": "jest \"./test/db\"",
-    "test:watch": "jest --watch",
-    "test:prod": "npm run test -- --no-cache"
-  },
-  "jest": {
-    "transform": {
-      ".(ts|tsx)": "ts-jest"
-    },
-    "testEnvironment": "node",
-    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js"
-    ],
-    "setupFiles": [
-      "./setup-jest.js"
-    ]
-  },
-  "devDependencies": {
-    "@types/jest": "^23.3.14",
-    "@types/node": "^10.11.0",
-    "bruce-models": "^0.7.5",
-    "cesium": "1.92.0",
-    "colors": "^1.3.2",
-    "coveralls": "^3.0.2",
-    "cross-env": "^5.2.0",
-    "husky": "^1.0.1",
-    "jest": "^23.6.0",
-    "jest-config": "^23.6.0",
-    "lodash.camelcase": "^4.3.0",
-    "prompt": "^1.0.0",
-    "replace-in-file": "^3.4.2",
-    "rimraf": "^2.6.2",
-    "rollup": "^0.67.0",
-    "rollup-plugin-commonjs": "^9.1.8",
-    "rollup-plugin-json": "^3.1.0",
-    "rollup-plugin-node-resolve": "^3.4.0",
-    "rollup-plugin-sourcemaps": "^0.4.2",
-    "rollup-plugin-typescript2": "^0.18.0",
-    "shelljs": "^0.8.3",
-    "ts-jest": "^23.10.2",
-    "ts-node": "^7.0.1",
-    "typedoc": "^0.12.0",
-    "typescript": "^3.9.10"
-  }
-}
+{
+  "name": "bruce-cesium",
+  "version": "0.3.7",
+  "description": "",
+  "keywords": [],
+  "main": "dist/bruce-cesium.umd.js",
+  "module": "dist/bruce-cesium.es5.js",
+  "typings": "dist/types/bruce-cesium.d.ts",
+  "files": [
+    "dist"
+  ],
+  "author": "MatveyL <matveylavrinovich@gmail.com>",
+  "repository": {
+    "type": "git",
+    "url": ""
+  },
+  "license": "ISC",
+  "engines": {
+    "node": ">=6.0.0"
+  },
+  "scripts": {
+    "prebuild": "rimraf dist",
+    "build": "tsc --module commonjs && rollup -c rollup.config.ts",
+    "docs": "typedoc --out docs --target es6 --theme minimal --mode file src",
+    "start": "rollup -c rollup.config.ts -w",
+    "test": "jest \"./test/unit\"",
+    "test-db": "jest \"./test/db\"",
+    "test:watch": "jest --watch",
+    "test:prod": "npm run test -- --no-cache"
+  },
+  "jest": {
+    "transform": {
+      ".(ts|tsx)": "ts-jest"
+    },
+    "testEnvironment": "node",
+    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js"
+    ],
+    "setupFiles": [
+      "./setup-jest.js"
+    ]
+  },
+  "devDependencies": {
+    "@types/jest": "^23.3.14",
+    "@types/node": "^10.11.0",
+    "cesium": "1.92.0",
+    "colors": "^1.3.2",
+    "coveralls": "^3.0.2",
+    "cross-env": "^5.2.0",
+    "husky": "^1.0.1",
+    "jest": "^23.6.0",
+    "jest-config": "^23.6.0",
+    "lodash.camelcase": "^4.3.0",
+    "prompt": "^1.0.0",
+    "replace-in-file": "^3.4.2",
+    "rimraf": "^2.6.2",
+    "rollup": "^0.67.0",
+    "rollup-plugin-commonjs": "^9.1.8",
+    "rollup-plugin-json": "^3.1.0",
+    "rollup-plugin-node-resolve": "^3.4.0",
+    "rollup-plugin-sourcemaps": "^0.4.2",
+    "rollup-plugin-typescript2": "^0.18.0",
+    "shelljs": "^0.8.3",
+    "ts-jest": "^23.10.2",
+    "ts-node": "^7.0.1",
+    "typedoc": "^0.12.0",
+    "typescript": "^3.9.10"
+  },
+  "dependencies": {
+    "bruce-models": "^0.7.6",
+    "tslib": "^2.4.1"
+  }
+}