-
Notifications
You must be signed in to change notification settings - Fork 3
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
Ajoute un bouton boussole pour réorienter la carte #807
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import {useState} from 'react' | ||
| import PropTypes from 'prop-types' | ||
| import {Tooltip, Position, IconButton, Pane} from 'evergreen-ui' | ||
|
|
||
| function MapButton({tooltipContent, marginBottom, ...buttonProps}) { | ||
| const [hovered, setHovered] = useState(false) | ||
| return ( | ||
| <Pane onMouseEnter={() => setHovered(true)} onMouseLeave={() => setHovered(false)} marginBottom={marginBottom}> | ||
| <Tooltip isShown={!buttonProps.disabled && hovered} position={Position.LEFT} content={tooltipContent}> | ||
| <IconButton | ||
| width={29} | ||
| height={29} | ||
| {...buttonProps} | ||
| /> | ||
| </Tooltip> | ||
| </Pane> | ||
| ) | ||
| } | ||
|
|
||
| MapButton.propTypes = { | ||
| tooltipContent: PropTypes.string.isRequired, | ||
| onClick: PropTypes.func.isRequired, | ||
| marginBottom: PropTypes.number, | ||
| // eslint-disable-next-line react/boolean-prop-naming | ||
| disabled: PropTypes.bool, | ||
| icon: PropTypes.object.isRequired, | ||
| intent: PropTypes.string, | ||
| appearance: PropTypes.string | ||
| } | ||
|
|
||
| export default MapButton |
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,142 @@ | ||
| import {useContext, useState, useEffect} from 'react' | ||
| import PropTypes from 'prop-types' | ||
| import {Pane, Alert, EyeOffIcon, EyeOpenIcon, AddIcon, CrossIcon, CompassIcon} from 'evergreen-ui' | ||
| import StyleControl from '@/components/map/controls/style-control' | ||
| import MapContext from '@/contexts/map' | ||
| import DrawContext from '@/contexts/draw' | ||
| import BalDataContext from '@/contexts/bal-data' | ||
| import TokenContext from '@/contexts/token' | ||
| import MapButton from './map-button' | ||
|
|
||
| // It looks better if the black arrow is pointing to the north | ||
| const DEFAULT_COMPASS_BEARING = 180 | ||
| const DEFAULT_COMPASS_PITCH = 0 | ||
|
|
||
| function MapControls({commune, isLabelsDisplayed, setIsLabelsDisplayed, isAddressFormOpen, handleAddressForm}) { | ||
| const [compassTransform, setCompassTransform] = useState({ | ||
| bearing: DEFAULT_COMPASS_BEARING, | ||
| pitch: DEFAULT_COMPASS_PITCH | ||
| }) | ||
| const {style, setStyle, isCadastreDisplayed, setIsCadastreDisplayed, map, setViewport} = useContext(MapContext) | ||
| const {hint} = useContext(DrawContext) | ||
| const { | ||
| voie, | ||
| numeros, | ||
| toponymes, | ||
| isEditing | ||
| } = useContext(BalDataContext) | ||
| const {token} = useContext(TokenContext) | ||
|
|
||
| useEffect(() => { | ||
| if (!map) { | ||
| return | ||
| } | ||
|
|
||
| const pitch = map.getPitch() | ||
| const bearing = map.getBearing() | ||
|
|
||
| setCompassTransform({ | ||
| bearing: DEFAULT_COMPASS_BEARING - bearing, | ||
| pitch: DEFAULT_COMPASS_PITCH - pitch | ||
| }) | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, [map?.transform.pitch, map?.transform.bearing]) | ||
|
|
||
| const getShowHintsContent = () => { | ||
| if (numeros) { | ||
| return isLabelsDisplayed ? 'Masquer les détails' : 'Afficher les détails' | ||
| } | ||
|
|
||
| return isLabelsDisplayed ? 'Masquer les toponymes' : 'Afficher les toponymes' | ||
| } | ||
|
|
||
| const onCenterMap = () => { | ||
| setViewport(currentViewport => ({ | ||
| ...currentViewport, | ||
| pitch: 0, | ||
| bearing: 0 | ||
| })) | ||
| setCompassTransform({ | ||
| bearing: DEFAULT_COMPASS_BEARING, | ||
| pitch: DEFAULT_COMPASS_PITCH | ||
| }) | ||
| } | ||
|
|
||
| const isRecenterButtonDisabled = | ||
| Math.abs(Math.round(compassTransform.bearing)) === DEFAULT_COMPASS_BEARING && | ||
| Math.abs(Math.round(compassTransform.pitch)) === DEFAULT_COMPASS_PITCH | ||
|
|
||
| return ( | ||
| <> | ||
| <StyleControl | ||
| style={style} | ||
| handleStyle={setStyle} | ||
| commune={commune} | ||
| isCadastreDisplayed={isCadastreDisplayed} | ||
| handleCadastre={setIsCadastreDisplayed} | ||
| /> | ||
|
|
||
| <Pane | ||
| position='absolute' | ||
| top={90} | ||
| right={16} | ||
| zIndex={1} | ||
| className='map-controls-buttons' | ||
| display='flex' | ||
| flexDirection='column' | ||
| > | ||
| <MapButton | ||
| tooltipContent='Réorienter la carte' | ||
| icon={() => <CompassIcon style={{transform: `rotate(${compassTransform.bearing}deg)`}} />} | ||
| onClick={onCenterMap} | ||
| disabled={isRecenterButtonDisabled} | ||
| marginBottom={15} | ||
| /> | ||
|
|
||
| {(voie || (toponymes && toponymes.length > 0)) && ( | ||
| <MapButton | ||
| icon={isLabelsDisplayed ? EyeOffIcon : EyeOpenIcon} | ||
| tooltipContent={getShowHintsContent()} | ||
| onClick={() => setIsLabelsDisplayed(!isLabelsDisplayed)} | ||
| marginBottom={5} | ||
| /> | ||
| )} | ||
|
|
||
| {token && ( | ||
| <MapButton | ||
| tooltipContent={isAddressFormOpen ? 'Annuler' : 'Créer une adresse'} | ||
| icon={isAddressFormOpen ? CrossIcon : AddIcon} | ||
| disabled={isEditing && !isAddressFormOpen} | ||
| onClick={() => handleAddressForm(!isAddressFormOpen)} | ||
| intent={isAddressFormOpen ? '' : 'success'} | ||
| appearance={isAddressFormOpen ? '' : 'primary'} | ||
| /> | ||
| )} | ||
| </Pane> | ||
|
|
||
| {hint && ( | ||
| <Pane | ||
| zIndex={1} | ||
| position='fixed' | ||
| alignSelf='center' | ||
| top={130} | ||
| > | ||
| <Alert title={hint} /> | ||
| </Pane> | ||
| )} | ||
| </> | ||
| ) | ||
| } | ||
|
|
||
| MapControls.propTypes = { | ||
| commune: PropTypes.shape({ | ||
| hasOrtho: PropTypes.bool.isRequired | ||
| }).isRequired, | ||
| isLabelsDisplayed: PropTypes.bool.isRequired, | ||
| setIsLabelsDisplayed: PropTypes.func.isRequired, | ||
| isAddressFormOpen: PropTypes.bool.isRequired, | ||
| handleAddressForm: PropTypes.func.isRequired | ||
| } | ||
|
|
||
| export default MapControls | ||
|
|
||
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Le hint sont des information a afficher sur la map (pour le tracer d'une voie par exemple), je ne mettrais pas ca dans les controls