-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:links-ads/ermes-web-frontend
- Loading branch information
Showing
16 changed files
with
139 additions
and
101 deletions.
There are no files selected for viewing
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
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
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 |
|---|---|---|
| @@ -1,50 +1,54 @@ | ||
| import { polygon } from "@turf/helpers" | ||
| import { clearEventMap, drawPolyToMap, parseEvent } from "../../../../common/map/map-common" | ||
| import { CLUSTER_LAYER_ID, EVENTS_LAYER_ID, getColorForHazard, SOURCE_ID } from "./map-init" | ||
|
|
||
| import { polygon } from '@turf/helpers' | ||
| import { clearEventMap, drawPolyToMap, parseEvent } from '../../../../common/map/map-common' | ||
| import { CLUSTER_LAYER_ID, EVENTS_LAYER_ID, getColorForHazard, SOURCE_ID } from './map-init' | ||
|
|
||
| export const mapClickHandler = (evt, mapRef, leftClickState, setLeftClickState, spiderifierRef) => { | ||
| // handle only left click | ||
| evt.preventDefault() | ||
| evt.stopPropagation() | ||
| if (!evt['leftButton']) { | ||
| return | ||
| } | ||
| const features = evt.features | ||
| const map = mapRef.current?.getMap() | ||
| //check that a point with features has been clicked | ||
| if (map && Array.isArray(features) && features.length > 0) { | ||
| const layer = features[0]['layer']['id'] as string | ||
| if (layer === EVENTS_LAYER_ID || layer.startsWith(SOURCE_ID + '-spider-leaves')) { | ||
| // Cast is necessary | ||
| const feature = (features[0] as unknown) as GeoJSON.Feature<GeoJSON.Point> | ||
| const properties = feature.properties | ||
| const centroid = JSON.parse(properties?.center) | ||
| const coordinates = JSON.parse(properties?.polygon) | ||
| drawPolyToMap( | ||
| map, | ||
| { longitude: centroid[0], latitude: centroid[1] }, | ||
| polygon(coordinates, properties), | ||
| getColorForHazard as mapboxgl.Expression | ||
| ) | ||
| const newLeftClickState = { showPoint: true, clickedPoint: { long: centroid[0], lat: centroid[1] }, pointFeatures: parseEvent(properties) } | ||
| setLeftClickState(newLeftClickState) | ||
| } | ||
| else if (layer === CLUSTER_LAYER_ID) { | ||
| // Depending on settings, it will either expand the cluster or open the spider | ||
| if (spiderifierRef.current && mapRef.current) { | ||
| spiderifierRef.current.toggleSpiders(map, evt) | ||
| } | ||
| setLeftClickState({ showPoint: false, clickedPoint: null, pointFeatures: { ...leftClickState.pointFeatures } }) | ||
| } | ||
| else { | ||
| clearEventMap(map, setLeftClickState, leftClickState) | ||
| } | ||
| // handle only left click | ||
| evt.preventDefault() | ||
| evt.stopPropagation() | ||
| if (!evt['leftButton']) { | ||
| return | ||
| } | ||
| const features = evt.features | ||
| const map = mapRef.current?.getMap() | ||
| //check that a point with features has been clicked | ||
| if (map && Array.isArray(features) && features.length > 0) { | ||
| const layer = features[0]['layer']['id'] as string | ||
| if (layer === EVENTS_LAYER_ID || layer.startsWith(SOURCE_ID + '-spider-leaves')) { | ||
| // Cast is necessary | ||
| const feature = features[0] as unknown as GeoJSON.Feature<GeoJSON.Point> | ||
| const properties = feature.properties | ||
| const centroid = JSON.parse(properties?.center) | ||
| const coordinates = JSON.parse(properties?.polygon)[0] | ||
| drawPolyToMap( | ||
| map, | ||
| { longitude: centroid[0], latitude: centroid[1] }, | ||
| polygon(coordinates, properties), | ||
| getColorForHazard as mapboxgl.Expression | ||
| ) | ||
| const newLeftClickState = { | ||
| showPoint: true, | ||
| clickedPoint: { long: centroid[0], lat: centroid[1] }, | ||
| pointFeatures: parseEvent(properties) | ||
| } | ||
| setLeftClickState(newLeftClickState) | ||
| } else if (layer === CLUSTER_LAYER_ID) { | ||
| // Depending on settings, it will either expand the cluster or open the spider | ||
| if (spiderifierRef.current && mapRef.current) { | ||
| spiderifierRef.current.toggleSpiders(map, evt) | ||
| } | ||
| setLeftClickState({ | ||
| showPoint: false, | ||
| clickedPoint: null, | ||
| pointFeatures: { ...leftClickState.pointFeatures } | ||
| }) | ||
| } else { | ||
| clearEventMap(map, setLeftClickState, leftClickState) | ||
| } | ||
| else { | ||
| // Clear feature | ||
| if (map) { | ||
| clearEventMap(map, setLeftClickState, leftClickState) | ||
| } | ||
| } else { | ||
| // Clear feature | ||
| if (map) { | ||
| clearEventMap(map, setLeftClickState, leftClickState) | ||
| } | ||
| } | ||
| } |
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
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
Oops, something went wrong.