-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into ac/upgrade-eslint
- Loading branch information
Showing
8 changed files
with
521 additions
and
295 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import {useSuspenseQuery} from '@tanstack/react-query'; | ||
| import {useActiveProject} from '../../contexts/ActiveProjectContext'; | ||
|
|
||
| export const REMOTE_DETECTION_ALERTS_KEY = 'alerts'; | ||
|
|
||
| export function useRemoteDetectionAlerts() { | ||
| const {projectId, projectApi} = useActiveProject(); | ||
|
|
||
| return useSuspenseQuery({ | ||
| queryFn: async () => { | ||
| return await projectApi.remoteDetectionAlert.getMany(); | ||
| }, | ||
| queryKey: [REMOTE_DETECTION_ALERTS_KEY, projectId], | ||
| }); | ||
| } |
8 changes: 4 additions & 4 deletions
8
...screens/MapScreen/ObservationMapLayer.tsx → ...pScreen/MapLayers/ObservationMapLayer.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
src/frontend/screens/MapScreen/MapLayers/RemoteDetectionAlertsLayer.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| import React from 'react'; | ||
| import MapboxGL from '@rnmapbox/maps'; | ||
|
|
||
| import {RemoteDetectionAlert} from '@comapeo/schema'; | ||
| import {FeatureCollection} from 'geojson'; | ||
| import {useRemoteDetectionAlerts} from '../../../hooks/server/remoteDetectionAlert'; | ||
|
|
||
| const LABEL_FILTER = [ | ||
| 'all', | ||
| [ | ||
| 'in', | ||
| '$type', | ||
| 'Polygon', | ||
| 'LineString', | ||
| 'Point', | ||
| 'MultiLineString', | ||
| 'MultiPolygon', | ||
| 'MultiPoint', | ||
| ], | ||
| ['has', 'alertType'], | ||
| ['has', 'monthDetec'], | ||
| ['has', 'yearDetec'], | ||
| ]; | ||
|
|
||
| const POINT_FILTER = ['in', '$type', 'Point', 'MultiPoint']; | ||
|
|
||
| const LINESTRING_FILTER = ['in', '$type', 'LineString', 'MultiLineString']; | ||
|
|
||
| const POLYGON_STROKE_FILTER = ['in', '$type', 'Polygon', 'MultiPolygon']; | ||
|
|
||
| const POLYGON_FILL_FILTER = ['in', '$type', 'Polygon', 'MultiPolygon']; | ||
|
|
||
| export const RemoteDetectionAlertsMapLayer = () => { | ||
| const {data: alerts} = useRemoteDetectionAlerts(); | ||
|
|
||
| if (!alerts) { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <MapboxGL.ShapeSource | ||
| id="alerts-source" | ||
| shape={convertRemoteDetectionAlertsToFeatures(alerts)}> | ||
| {/* Symbol Layer for Labels */} | ||
| <MapboxGL.SymbolLayer | ||
| id="comapeo-alerts-label" | ||
| filter={LABEL_FILTER} | ||
| style={{ | ||
| textField: [ | ||
| 'concat', | ||
| ['get', 'alertType'], | ||
| ' (', | ||
| ['get', 'monthDetec'], | ||
| '-', | ||
| ['get', 'yearDetec'], | ||
| ')', | ||
| ], | ||
| textFont: ['Open Sans Regular'], | ||
| textOffset: [0, 0.5], | ||
| textAnchor: 'top', | ||
| textColor: '#FFFFFF', | ||
| textHaloColor: '#000000', | ||
| textHaloWidth: 1, | ||
| textHaloBlur: 1, | ||
| }} | ||
| /> | ||
|
|
||
| {/* Circle Layer for Points */} | ||
| <MapboxGL.CircleLayer | ||
| id="comapeo-alerts-point" | ||
| filter={POINT_FILTER} | ||
| style={{ | ||
| circleRadius: 5, | ||
| circleColor: '#FF0000', | ||
| }} | ||
| /> | ||
|
|
||
| {/* Line Layer for LineStrings and MultiLineStrings */} | ||
| <MapboxGL.LineLayer | ||
| id="comapeo-alerts-linestring" | ||
| filter={LINESTRING_FILTER} | ||
| style={{ | ||
| lineColor: '#FF0000', | ||
| lineWidth: 3, | ||
| lineOpacity: 0.8, | ||
| }} | ||
| /> | ||
|
|
||
| {/* Line Layer for Polygon Stroke */} | ||
| <MapboxGL.LineLayer | ||
| id="comapeo-alerts-polygon-stroke" | ||
| filter={POLYGON_STROKE_FILTER} | ||
| style={{ | ||
| lineColor: '#FF0000', | ||
| lineWidth: 2, | ||
| }} | ||
| /> | ||
|
|
||
| {/* Fill Layer for Polygon Fill */} | ||
| <MapboxGL.FillLayer | ||
| id="comapeo-alerts-polygon-fill" | ||
| filter={POLYGON_FILL_FILTER} | ||
| style={{ | ||
| fillColor: '#FF0000', | ||
| fillOpacity: 0.5, | ||
| }} | ||
| /> | ||
| </MapboxGL.ShapeSource> | ||
| ); | ||
| }; | ||
|
|
||
| function convertRemoteDetectionAlertsToFeatures( | ||
| alerts: RemoteDetectionAlert[], | ||
| ): FeatureCollection { | ||
| return { | ||
| type: 'FeatureCollection', | ||
| features: alerts.map(alert => { | ||
| const dateStart = new Date(alert.detectionDateStart); | ||
| return { | ||
| type: 'Feature', | ||
| geometry: alert.geometry, | ||
| properties: { | ||
| alertType: alert.metadata.alert_type, | ||
| detectionDateStart: alert.detectionDateStart, | ||
| detectionDateEnd: alert.detectionDateEnd, | ||
| sourceId: alert.sourceId, | ||
| monthDetec: dateStart.getMonth() + 1, | ||
| yearDetec: dateStart.getFullYear(), | ||
| }, | ||
| }; | ||
| }), | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters