Skip to content

Commit

Permalink
chore(cesium): update version to 1.73
Browse files Browse the repository at this point in the history
  • Loading branch information
pwambach committed Sep 9, 2020
1 parent 29eb9fa commit a0974fc
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 26 deletions.
20 changes: 3 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"dependencies": {
"@types/react-router-dom": "^5.1.3",
"@types/redux-logger": "^3.0.7",
"cesium": "^1.66.0",
"cesium": "^1.73.0",
"cross-zip": "^3.0.0",
"electron-is-dev": "^1.2.0",
"framer-motion": "^1.8.4",
Expand All @@ -61,7 +61,6 @@
"redux-thunk": "^2.3.0"
},
"devDependencies": {
"@types/cesium": "^1.66.0",
"@types/classnames": "^2.2.9",
"@types/lodash.debounce": "^4.0.6",
"@types/lodash.intersection": "^4.4.6",
Expand Down
7 changes: 4 additions & 3 deletions src/scripts/components/main/globe/globe.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import {
ScreenSpaceEventHandler,
ScreenSpaceEventType,
TileMapServiceImageryProvider,
Viewer
Viewer,
ImageryLayer
} from 'cesium';

import {
Expand Down Expand Up @@ -72,7 +73,7 @@ interface Props {
}

// keep a reference to the current basemap layer
let basemapLayer: Cesium.ImageryLayer | null = null;
let basemapLayer: ImageryLayer | null = null;

function getBasemapUrl(id: BasemapId | null) {
if (!id || !config.basemapUrls[id]) {
Expand Down Expand Up @@ -181,7 +182,7 @@ const Globe: FunctionComponent<Props> = ({

// Zoom distances in meters -> min: 1500km above ground, max: 30.000km above ground.
// min/max is opposite of how we usually use it.
scopedViewer.scene.screenSpaceCameraController.minimumZoomDistance = 1500000;
scopedViewer.scene.screenSpaceCameraController.minimumZoomDistance = 1000000;
scopedViewer.scene.screenSpaceCameraController.maximumZoomDistance = 30000000;

// save viewer reference
Expand Down
11 changes: 7 additions & 4 deletions src/scripts/hooks/use-globe-layer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@ import {
UrlTemplateImageryProvider,
TextureMinificationFilter,
TextureMagnificationFilter,
SingleTileImageryProvider
SingleTileImageryProvider,
Viewer,
ImageryLayer,
ImageryLayerCollection
} from 'cesium';

import {GlobeImageLayerData} from '../types/globe-image-layer-data';
import {LayerType} from '../types/globe-layer-type';

// update layer image when url changes
export function useGlobeLayer(
viewer: Cesium.Viewer | null,
viewer: Viewer | null,
imageLayer: GlobeImageLayerData | null
) {
useEffect(() => {
Expand Down Expand Up @@ -45,7 +48,7 @@ export function useGlobeLayer(
// remove and destroy old layers if they exist
// we do not clean it up in the useEffect clean function because we want
// to wait until the new layer is ready to prevent flickering
const layersToRemove: Cesium.ImageryLayer[] = [];
const layersToRemove: ImageryLayer[] = [];

for (let i = 0; i < layers.length; i++) {
const layer = layers.get(i);
Expand Down Expand Up @@ -90,7 +93,7 @@ function getImageProvider(imageLayer: GlobeImageLayerData) {
: new SingleTileImageryProvider({url: imageLayer.url});
}

function removeAllLayers(layers: Cesium.ImageryLayerCollection) {
function removeAllLayers(layers: ImageryLayerCollection) {
for (let i = 1; i < layers.length; i++) {
const layer = layers.get(i);
layers.remove(layer, true);
Expand Down

0 comments on commit a0974fc

Please sign in to comment.