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.

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

feat: add Integrated alert layer #1251

Merged
merged 34 commits into from
Mar 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0f04b92
feat: added DatasetLayerConfigs to store all configurations for datas…
dstarrblueraster Feb 11, 2022
13a7497
feat: add integrated alert layer to resources.js
dstarrblueraster Feb 14, 2022
0dc068b
feat: add integrated alert layer to resources.js
dstarrblueraster Feb 14, 2022
acef1a8
feat: add integrated alert layer
dstarrblueraster Feb 15, 2022
53113d4
feat: setting up integrated alert layer
dstarrblueraster Feb 18, 2022
1594e57
working through decoding integrated layer
dstarrblueraster Feb 22, 2022
80f05c7
added comment in for pixel for loop
dstarrblueraster Feb 23, 2022
4066a0c
working through integrated alert layer
dstarrblueraster Feb 23, 2022
bedd3d4
simplifying GFW integrated layer code
dstarrblueraster Feb 25, 2022
a2235bb
delete dataset templates
dstarrblueraster Feb 28, 2022
e7a32d3
setup canvas pixels for gfw integrated tile layer using png js
dstarrblueraster Feb 28, 2022
1b6bf05
brought over canvas rendering from glad alert layer
dstarrblueraster Feb 28, 2022
25dba08
brought over canvas rendering from glad alert layer
dstarrblueraster Feb 28, 2022
38da02b
setup png js to decode pixels from tile layer canvas
dstarrblueraster Mar 1, 2022
2579790
setup filtering for integrated alert layer
dstarrblueraster Mar 1, 2022
aa73a3e
Merge branch 'develop' into integrated-alert-layer
dstarrblueraster Mar 1, 2022
ede52c8
setting up high confidence alert toggle
dstarrblueraster Mar 9, 2022
d3c7b6e
feat: setup date picker
dstarrblueraster Mar 9, 2022
6179b5c
feat: setting up timeslider
dstarrblueraster Mar 10, 2022
95215d9
feat: setup timeslider for GFW integrated layer
dstarrblueraster Mar 14, 2022
d667de5
feat: setup gfw layer toggle and geographic coverage toggle
dstarrblueraster Mar 14, 2022
99a3ef4
feat: setup geographic coverage layer
dstarrblueraster Mar 14, 2022
227a6fb
feat: setup timeslider, datepicker, and layer toggle for gfw layers
dstarrblueraster Mar 15, 2022
2065519
feat: filtered out GLAD Layers, added GLAD S2 and RADD alerts to reso…
dstarrblueraster Mar 15, 2022
5158a16
feat: setup subtitle for gfw layer toggle
dstarrblueraster Mar 15, 2022
4f52921
feat: setup info modal for gfw layers
dstarrblueraster Mar 16, 2022
33547ff
feat: setup high confidence toggle for gfw layers
dstarrblueraster Mar 16, 2022
0c15ec8
bug: fixed transparency toggle for gfw layers
dstarrblueraster Mar 18, 2022
4f76c4f
bug: fixed date return on timeslider
dstarrblueraster Mar 18, 2022
5774c5b
bug: fixed bug with blue outline when zooming in and out
dstarrblueraster Mar 18, 2022
345ff5f
Merge branch 'develop' into integrated-alert-layer
dstarrblueraster Mar 22, 2022
445222d
added gfw integrated alert layer to layer config due to bug
dstarrblueraster Mar 22, 2022
1311330
added gfw integrated alert layer to layer config due to bug
dstarrblueraster Mar 22, 2022
0f73154
added gfw integrated alert layer to layer config due to bug
dstarrblueraster Mar 22, 2022
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
39 changes: 39 additions & 0 deletions configs/layer-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const supportedLayers = [
'webtiled',
'imagery',
'glad',
'integrated-alert-layer',
'primed',
'tree-cover',
'tree-cover-height',
Expand All @@ -21,6 +22,27 @@ export const rDataLayer = [
type: 'remoteDataLayer',
uuid: '9e0c1e1e-a0a3-457f-a373-4104820f7a50',
groupId: 'GROUP_LC'
},
{
id: 'GFW_INTEGRATED_ALERTS',
order: 9,
type: 'remoteDataLayer',
uuid: 'bd58f25d-d3bb-4d59-9daa-cecddd27d9f4',
groupId: 'GROUP_LCD'
},
{
id: 'GLAD_S2_ALERTS',
order: 10,
type: 'remoteDataLayer',
uuid: '3b869953-48c4-48d0-8023-5c64a311f3dd',
groupId: 'GROUP_LCD'
},
{
id: 'RADD_ALERTS',
order: 11,
type: 'remoteDataLayer',
uuid: '440e53d0-36b3-47ad-993a-1c2018c3942c',
groupId: 'GROUP_LCD'
}
];
export const defaultAPIFlagshipLayers = [
Expand Down Expand Up @@ -272,3 +294,20 @@ export const drySpellMarks = {
style: {}
}
};
export const gfwMarks = {
'0': {
value: '0',
label: '2020-03-31',
style: {}
},
'365': {
value: '365',
label: '2021-03-31',
style: {}
},
'730': {
value: '730',
label: '2022-03-31',
style: {}
}
};
8 changes: 8 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"esri-loader": "^3.0.0",
"lodash-es": "^4.17.15",
"moment": "^2.29.1",
"png-ts": "0.0.3",
"rc-slider": "^9.7.1",
"react": "^17.0.2",
"react-beautiful-dnd": "^13.1.0",
Expand Down
57 changes: 45 additions & 12 deletions src/css/leftpanel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
left: 20px;
width: 300px;
background: $white;
box-shadow: 0px 1px 2px rgba(85, 85, 85, 0.25);
box-shadow: 0 1px 2px rgba(85, 85, 85, 0.25);
max-height: 50rem;
// overflow-y: scroll;

Expand Down Expand Up @@ -373,7 +373,7 @@
height: 560px;
color: $dark-grey;
overflow-y: auto;
overflow-x: hidden;
overflow-x: visible;
}

.tab-header-container {
Expand Down Expand Up @@ -473,7 +473,7 @@
display: grid;
grid-template-columns: 1fr;
justify-items: left;
margin: 5px 0px 10px 10px;
margin: 5px 0 10px 10px;
font-size: 11px;
p {
margin: 0;
Expand Down Expand Up @@ -502,7 +502,8 @@
}
}

.glad-control-container {
.glad-control-container,
.gfw-control-container {
display: grid;
grid-template-columns: auto 1fr;
align-items: center;
Expand Down Expand Up @@ -619,14 +620,12 @@
border-radius: 35px;
text-align: center;
cursor: pointer;
padding: 0rem 0.5rem;
padding: 0 0.5rem;
background-color: white;
}

.title-wrapper {
.layer-label {
font-size: 0.8rem;
margin-left: 0.5rem;
font-size: 0.8rem;
margin-left: 0.5rem;
max-width: 12rem;
Expand All @@ -652,7 +651,10 @@
display: flex;
padding: 0 1rem;
align-items: center;
margin: 0rem 0rem 1rem 0rem;
margin: 0 0 1rem 0;
padding-bottom: 10px;
position: relative;
left: -10px;

button {
color: $base-yellow;
Expand All @@ -663,9 +665,18 @@
}

.rc-slider {
.rc-slider-tooltip {
position: absolute;
.rc-slider-tooltip-inner {
min-width: 79px;
}
}
&.playing {
background-color: #e9e9e9;
}
.rc-slider-mark-text {
width: 63px;
}
}
}

Expand Down Expand Up @@ -918,7 +929,7 @@
display: block;
white-space: pre;
min-height: 1.2em;
padding: 0px 2px 1px;
padding: 0 2px 1px;
}
option:after {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
Expand Down Expand Up @@ -1002,7 +1013,29 @@
color: #fff;
}
}

.gfw-alert-picker-wrapper {
text-align: center;
span {
font-size: 12px;
}
.toggle {
position: relative;
background: transparent;
width: 11rem;
padding: 5px;
font-size: 16px;
line-height: 1;
height: 1.5rem;
border-radius: 16px;
-webkit-appearance: none;
margin-top: auto;
margin-bottom: auto;
border: 1px solid $base-yellow;
background-color: $white;
color: $dark-grey;
font-size: 11px;
}
}
.recent-imagery-container {
font-family: $fira-sans;
color: #555;
Expand All @@ -1015,7 +1048,7 @@
background-color: #fff;
border-radius: 2px;
border: 0.5px solid #80808033;
box-shadow: 1px 2px 1px 0px rgba(85, 85, 85, 0.18);
box-shadow: 1px 2px 1px 0 rgba(85, 85, 85, 0.18);

p {
margin: 0;
Expand Down Expand Up @@ -1050,7 +1083,7 @@
border-radius: 35px;
text-align: center;
cursor: pointer;
padding: 0rem 0.5rem;
padding: 0 0.5rem;
}

.date-filters {
Expand Down
Loading