Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: map refactoring #1837

Merged
merged 8 commits into from
Dec 18, 2023
Merged

feat: map refactoring #1837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9ac4cce
Refactor Map component to remove numerous useEffect
w1nklr Dec 8, 2023
da2c97a
Fix triggerHome, fix prettier and compilation
w1nklr Dec 15, 2023
5d5aa6e
Fix lint, tentative to fix prettier
w1nklr Dec 15, 2023
d7c90d9
Fix lint
w1nklr Dec 15, 2023
b9a997e
Fix compilation
w1nklr Dec 18, 2023
4f3308e
Fix eol
w1nklr Dec 18, 2023
d631f95
Fix test snapshots
w1nklr Dec 18, 2023
bf38d52
Fix Map tests (both crash and snapshots).
w1nklr Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions typescript/packages/subsurface-viewer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"test": "jest --coverage",
"test:update": "npm test -- --u",
"test:watch": "npm test -- --watch",
"test:debug": "node --inspect-brk ../../node_modules/jest/bin/jest.js --coverage=false --runInBand",
"doc": "git clean -xdff docs && typedoc src"
},
"author": "Equinor <[email protected]>",
Expand Down
39 changes: 39 additions & 0 deletions typescript/packages/subsurface-viewer/src/__snapshots__/SubsurfaceViewer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@ exports[`Test Map component snapshot test 1`] = `
style="left: 0px; top: 0px; width: 100%; position: absolute; height: 100%;"
/>
</div>
<div
style="position: absolute; left: 10px; top: 10px;"
>
<label
style="left: 10px; top: 10px;"
>
3
km
</label>
<div
style="width: 100px; height: 4px; border: 2px solid; display: inline-block; margin-left: 3px;"
/>
</div>
<div>
<svg
aria-valuemax="100"
Expand Down Expand Up @@ -108,6 +121,19 @@ exports[`Test Map component snapshot test with edited data 1`] = `
style="left: 0px; top: 0px; width: 100%; position: absolute; height: 100%;"
/>
</div>
<div
style="position: absolute; left: 10px; top: 10px;"
>
<label
style="left: 10px; top: 10px;"
>
3
km
</label>
<div
style="width: 100px; height: 4px; border: 2px solid; display: inline-block; margin-left: 3px;"
/>
</div>
<div>
<svg
aria-valuemax="100"
Expand Down Expand Up @@ -185,6 +211,19 @@ exports[`Test Map component snapshot test with invalid array length 1`] = `
style="left: 0px; top: 0px; width: 100%; position: absolute; height: 100%;"
/>
</div>
<div
style="position: absolute; left: 10px; top: 10px;"
>
<label
style="left: 10px; top: 10px;"
>
3
km
</label>
<div
style="width: 100px; height: 4px; border: 2px solid; display: inline-block; margin-left: 3px;"
/>
</div>
<div>
<svg
aria-valuemax="100"
Expand Down
3 changes: 2 additions & 1 deletion typescript/packages/subsurface-viewer/src/components/Map.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type { LayersList } from "@deck.gl/core/typed";
import Map from "./Map";
import { EmptyWrapper } from "../test/TestWrapper";
import { colorTables } from "@emerson-eps/color-tables";
import type { colorTablesArray } from "@emerson-eps/color-tables/";
import {
ColormapLayer,
DrawingLayer,
Expand All @@ -21,7 +22,7 @@ import {

import mapData from "../../../../../example-data/deckgl-map.json";
import type { Unit } from "convert-units";
const colorTablesData = colorTables;
const colorTablesData = colorTables as colorTablesArray;
const testBounds = [432205, 6475078, 437720, 6481113] as [
number,
number,
Expand Down
Loading