Skip to content

Commit

Permalink
WFNEWS-2294
Browse files Browse the repository at this point in the history
  • Loading branch information
@ssylver93
ssylver93 committed Jul 11, 2024
1 parent 5647606 commit 4c7ac7a
Show file tree
Hide file tree
Showing 10 changed files with 74 additions and 54 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/android.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ jobs:
EMERGENCY_ALERT_URL: ${{ vars.EMERGENCY_ALERT_URL }}
DRIVE_BC_URL: ${{ vars.DRIVE_BC_URL}}
EVAC_SERVICES_URL: ${{ vars.EVAC_SERVICES_URL }}
DANGER_SUMMARY: ${{ vars.DANGER_SUMMARY }}
HIGH_RISK_ACTIVITIES: ${{ vars.HIGH_RISK_ACTIVITIES }}
YOUTUBE_API_KEY: ${{secrets.YOUTUBE_API_KEY}}
YOUTUBE_CHANNEL_ID: ${{secrets.YOUTUBE_CHANNEL_ID}}

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/generate-debuggable-zip-android.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ jobs:
EMERGENCY_ALERT_URL: ${{ vars.EMERGENCY_ALERT_URL }}
DRIVE_BC_URL: ${{ vars.DRIVE_BC_URL}}
EVAC_SERVICES_URL: ${{ vars.EVAC_SERVICES_URL }}
DANGER_SUMMARY: ${{ vars.DANGER_SUMMARY }}
HIGH_RISK_ACTIVITIES: ${{ vars.HIGH_RISK_ACTIVITIES }}
YOUTUBE_API_KEY: ${{secrets.YOUTUBE_API_KEY}}
YOUTUBE_CHANNEL_ID: ${{secrets.YOUTUBE_CHANNEL_ID}}

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ios.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ jobs:
LOCAL_GOV_URL: ${{ vars.LOCAL_GOV_URL }}
EMERGENCY_ALERT_URL: ${{ vars.EMERGENCY_ALERT_URL }}
DRIVE_BC_URL: ${{ vars.DRIVE_BC_URL}}
EVAC_SERVICES_URL: ${{ vars.EVAC_SERVICES_URL }}
EVAC_SERVICES_URL: ${{ vars.EVAC_SERVICES_URL }}
DANGER_SUMMARY: ${{ vars.DANGER_SUMMARY }}
HIGH_RISK_ACTIVITIES: ${{ vars.HIGH_RISK_ACTIVITIES }}
YOUTUBE_API_KEY: ${{secrets.YOUTUBE_API_KEY}}
YOUTUBE_CHANNEL_ID: ${{secrets.YOUTUBE_CHANNEL_ID}}

Expand Down
2 changes: 1 addition & 1 deletion ...incident-page/incident-info-header/danger-rating-header/danger-rating-header.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class DangerRatingHeaderComponent {
}

dangerDescription() {
return displayDangerRatingDes(this.dangerRating.attributes.DANGER_RATING_DESC);
return displayDangerRatingDes(this.dangerRating?.attributes?.DANGER_RATING_DESC);
}

}
41 changes: 20 additions & 21 deletions ...p/components/public-incident-page/incident-info-header/incident-header-panel.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,27 +378,26 @@ export class IncidentHeaderPanelComponent implements AfterViewInit, OnInit {
}

if (this.dangerRating) {
let rating = this.convertDangerRating(this.dangerRating.attributes?.DANGER_RATING_DESC);
const rating = this.convertDangerRating(this.dangerRating.attributes?.DANGER_RATING_DESC);

Promise.all([
this.http
.get('assets/js/smk/' + rating + '-danger-rating.sld', { responseType: 'text' })
.toPromise(),
]).then((dangerRating) => {
L.tileLayer
.wms(databcUrl, {
layers: 'WHSE_LAND_AND_NATURAL_RESOURCE.PROT_DANGER_RATING_SP',
format: 'image/png',
transparent: true,
version: '1.1.1',
opacity: 0.8,
tileSize: 1000,
bounds: bounds,
style: '7734',
sld_body: dangerRating,
this.http
.get('assets/js/smk/' + rating + '-danger-rating.sld', { responseType: 'text' })
.toPromise()
.then((dangerRating) => {
L.tileLayer
.wms(databcUrl, {
layers: 'WHSE_LAND_AND_NATURAL_RESOURCE.PROT_DANGER_RATING_SP',
format: 'image/png',
transparent: true,
version: '1.1.1',
opacity: 0.8,
tileSize: 1000,
bounds: bounds,
style: '7734',
sld_body: dangerRating,
})
.addTo(this.map);
})
.addTo(this.map);
})
}
const icon = L.icon({
iconUrl: '/assets/images/local_fire_department.png',
Expand Down Expand Up @@ -490,8 +489,8 @@ export class IncidentHeaderPanelComponent implements AfterViewInit, OnInit {
case 'High':
return 'high';
case 'Extreme':
return 'extreme';
default:
return 'extreme';
default:
return null;
}
}
Expand Down
15 changes: 9 additions & 6 deletions client/wfnews-war/src/main/angular/src/assets/js/smk/extreme-danger-rating.sld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#8FAA50</CssParameter>
<CssParameter name="stroke">#6b8749</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#a6c96d</CssParameter>
Expand All @@ -70,7 +70,7 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#F3ED46</CssParameter>
<CssParameter name="stroke">#d1c708</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#f4fc03</CssParameter>
Expand All @@ -95,12 +95,10 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#DA5449</CssParameter>
<CssParameter name="stroke-width">10</CssParameter>
<CssParameter name="stroke-opacity">1</CssParameter>
<CssParameter name="stroke">#995c00</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#DBA350</CssParameter>
<CssParameter name="fill">#ff9900</CssParameter>
<CssParameter name="fill-opacity">0.8</CssParameter>
</Fill>
</PolygonSymbolizer>
Expand All @@ -118,6 +116,11 @@
<Fill>
<CssParameter name="fill">#FF9080</CssParameter>
</Fill>
<Stroke>
<CssParameter name="stroke">#f55a42</CssParameter>
<CssParameter name="stroke-opacity">1</CssParameter>
<CssParameter name="stroke-width">10</CssParameter>
</Stroke>
</PolygonSymbolizer>
</Rule>
</FeatureTypeStyle>
Expand Down
19 changes: 11 additions & 8 deletions client/wfnews-war/src/main/angular/src/assets/js/smk/high-danger-rating.sld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#8FAA50</CssParameter>
<CssParameter name="stroke">#6b8749</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#a6c96d</CssParameter>
Expand All @@ -70,7 +70,7 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#F3ED46</CssParameter>
<CssParameter name="stroke">#d1c708</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#f4fc03</CssParameter>
Expand All @@ -94,15 +94,15 @@
</And>
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#DBA350</CssParameter>
<CssParameter name="stroke-width">10</CssParameter>
<CssParameter name="stroke-opacity">1</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#DBA350</CssParameter>
<CssParameter name="fill">#ff9900</CssParameter>
<CssParameter name="fill-opacity">0.8</CssParameter>
</Fill>
<Stroke>
<CssParameter name="stroke">#995c00</CssParameter>
<CssParameter name="stroke-width">8</CssParameter>
<CssParameter name="stroke-opacity">1</CssParameter>
</Stroke>
</PolygonSymbolizer>
</Rule>
<Rule>
Expand All @@ -118,6 +118,9 @@
<Fill>
<CssParameter name="fill">#FF9080</CssParameter>
</Fill>
<Stroke>
<CssParameter name="stroke">#f55a42</CssParameter>
</Stroke>
</PolygonSymbolizer>
</Rule>
</FeatureTypeStyle>
Expand Down
13 changes: 8 additions & 5 deletions client/wfnews-war/src/main/angular/src/assets/js/smk/low-danger-rating.sld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#8FAA50</CssParameter>
<CssParameter name="stroke-width">10</CssParameter>
<CssParameter name="stroke">#6b8749</CssParameter>
<CssParameter name="stroke-width">8</CssParameter>
<CssParameter name="stroke-opacity">1</CssParameter>
</Stroke>
<Fill>
Expand All @@ -72,7 +72,7 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#F3ED46</CssParameter>
<CssParameter name="stroke">#d1c708</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-opacity">1</CssParameter>
</Stroke>
Expand All @@ -99,10 +99,10 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#DBA350</CssParameter>
<CssParameter name="stroke">#995c00</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#DBA350</CssParameter>
<CssParameter name="fill">#ff9900</CssParameter>
<CssParameter name="fill-opacity">0.8</CssParameter>
</Fill>
</PolygonSymbolizer>
Expand All @@ -120,6 +120,9 @@
<Fill>
<CssParameter name="fill">#FF9080</CssParameter>
</Fill>
<Stroke>
<CssParameter name="stroke">#f55a42</CssParameter>
</Stroke>
</PolygonSymbolizer>
</Rule>
</FeatureTypeStyle>
Expand Down
16 changes: 10 additions & 6 deletions client/wfnews-war/src/main/angular/src/assets/js/smk/moderate-danger-rating.sld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#8FAA50</CssParameter>
<CssParameter name="stroke">#6b8749</CssParameter>
<CssParameter name="stroke-opacity">0</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#a6c96d</CssParameter>
Expand All @@ -70,9 +71,8 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#F3ED46</CssParameter>
<CssParameter name="stroke-width">10</CssParameter>
<CssParameter name="stroke-opacity">1</CssParameter>
<CssParameter name="stroke">#d1c708</CssParameter>
<CssParameter name="stroke-width">8</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#f4fc03</CssParameter>
Expand All @@ -97,10 +97,11 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#DBA350</CssParameter>
<CssParameter name="stroke">#995c00</CssParameter>
<CssParameter name="stroke-opacity">0</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#DBA350</CssParameter>
<CssParameter name="fill">#ff9900</CssParameter>
<CssParameter name="fill-opacity">0.8</CssParameter>
</Fill>
</PolygonSymbolizer>
Expand All @@ -118,6 +119,9 @@
<Fill>
<CssParameter name="fill">#FF9080</CssParameter>
</Fill>
<Stroke>
<CssParameter name="stroke">#f55a42</CssParameter>
</Stroke>
</PolygonSymbolizer>
</Rule>
</FeatureTypeStyle>
Expand Down
14 changes: 8 additions & 6 deletions client/wfnews-war/src/main/angular/src/assets/js/smk/very-low-danger-rating.sld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#415FC1</CssParameter>
<CssParameter name="stroke-width">10</CssParameter>
<CssParameter name="stroke-opacity">1</CssParameter>
<CssParameter name="stroke-width">8</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#647efc</CssParameter>
Expand All @@ -47,7 +46,7 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#8FAA50</CssParameter>
<CssParameter name="stroke">#6b8749</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-opacity">1</CssParameter>
</Stroke>
Expand All @@ -74,7 +73,7 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#F3ED46</CssParameter>
<CssParameter name="stroke">#d1c708</CssParameter>
<CssParameter name="stroke-width">2</CssParameter>
<CssParameter name="stroke-opacity">1</CssParameter>
</Stroke>
Expand All @@ -101,10 +100,10 @@
</Filter>
<PolygonSymbolizer>
<Stroke>
<CssParameter name="stroke">#DBA350</CssParameter>
<CssParameter name="stroke">#995c00</CssParameter>
</Stroke>
<Fill>
<CssParameter name="fill">#DBA350</CssParameter>
<CssParameter name="fill">#ff9900</CssParameter>
<CssParameter name="fill-opacity">0.8</CssParameter>
</Fill>
</PolygonSymbolizer>
Expand All @@ -122,6 +121,9 @@
<Fill>
<CssParameter name="fill">#FF9080</CssParameter>
</Fill>
<Stroke>
<CssParameter name="stroke">#f55a42</CssParameter>
</Stroke>
</PolygonSymbolizer>
</Rule>
</FeatureTypeStyle>
Expand Down

0 comments on commit 4c7ac7a

Please sign in to comment.