-
Notifications
You must be signed in to change notification settings - Fork 9
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 extra maps #304
Closed
Closed
feat: add extra maps #304
Changes from all commits
Commits
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 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,3 @@ | ||
| REACT_APP_MAPBOX_TOKEN=pk.eyJ1IjoiZHNhdmlub3YiLCJhIjoiY2xsd2VocjRsMjVpbzNwcDhsc3E1ZzAzNiJ9.3xSNq_gwuOMHPUTDkO4OzQ | ||
| REACT_APP_GOOGLE_MAPS_API_KEY= | ||
| REACT_APP_GOOGLE_MAP_VECTOR_ID= |
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,31 @@ | ||
| import { useEffect, useRef } from "react"; | ||
| import { useArcgis } from "../../hooks/use-arcgis-hook/use-arcgis-hook"; | ||
| import { StyledMapContainer } from "../common-styled"; | ||
|
|
||
| /* eslint-disable-next-line */ | ||
| export interface ArcgisWrapperProps {} | ||
|
|
||
| export function ArcgisWrapper({}: ArcgisWrapperProps) { | ||
| const mapContainer = useRef<HTMLDivElement | null>(null); | ||
| const map: unknown | null = useArcgis(mapContainer); | ||
|
|
||
| useEffect(() => { | ||
| if (!map) { | ||
| return; | ||
| } | ||
|
|
||
| const layers = []; | ||
| // @ts-expect-error @deck.gl/arcgis has no types | ||
| map.deck.set({ layers }); | ||
| }, [map]); | ||
|
|
||
| return ( | ||
| <StyledMapContainer | ||
| ref={mapContainer} | ||
| className="map-container" | ||
| data-testid="ArcgisContainer" | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| export default ArcgisWrapper; |
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,10 @@ | ||
| import styled from "styled-components"; | ||
|
|
||
| export const StyledMapContainer = styled.div` | ||
| overflow: hidden; | ||
| position: absolute; | ||
| width: 100%; | ||
| height: 100%; | ||
| left: 0; | ||
| top: 0; | ||
| `; |
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
77 changes: 77 additions & 0 deletions
77
src/components/google-maps-wrapper/google-maps-wrapper.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,77 @@ | ||
| import { useState, useEffect, useMemo } from "react"; | ||
| import { Wrapper, Status } from "@googlemaps/react-wrapper"; | ||
| import { GoogleMapsOverlay as DeckOverlay } from "@deck.gl/google-maps/typed"; | ||
| import { StyledMapContainer } from "../common-styled"; | ||
| import { useAppDispatch, useAppSelector } from "../../redux/hooks"; | ||
|
|
||
| const googleMapsApiToken = ""; //process.env.REACT_APP_GOOGLE_MAPS_API_KEY; | ||
| const googleMapsMapId = ""; //process.env.REACT_APP_GOOGLE_MAP_VECTOR_ID; | ||
|
|
||
| /* eslint-disable-next-line */ | ||
| interface GoogleMapsWrapperProps { | ||
| interleaved?: boolean; | ||
| } | ||
|
|
||
| const renderMap = (status: Status) => { | ||
| if (status === Status.LOADING) return <h3>{status} ..</h3>; | ||
| if (status === Status.FAILURE) return <h3>{status} ...</h3>; | ||
| return <h3>{status} .</h3>; | ||
| }; | ||
|
|
||
| export function GoogleMapsWrapper({ | ||
| interleaved = false, | ||
| }: GoogleMapsWrapperProps) { | ||
| const dispatch = useAppDispatch(); | ||
| const [map, setMap] = useState<google.maps.Map | null>(null); | ||
| const [mapContainer, setMapContainer] = useState<HTMLDivElement | null>(null); | ||
| const { longitude, latitude, zoom, pitch, bearing } = { | ||
| longitude: 10, | ||
| latitude: 20, | ||
| zoom: 10, | ||
| pitch: 1, | ||
| bearing: 1, | ||
| }; | ||
| /// const { longitude, latitude, zoom, pitch, bearing } = | ||
| /// useAppSelector(selectMapState); | ||
|
|
||
| const overlay = useMemo( | ||
| () => | ||
| new DeckOverlay({ | ||
| interleaved, | ||
| layers: [], | ||
| }), | ||
| [interleaved] | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| if (map) { | ||
| map.setCenter({ lat: latitude, lng: longitude }); | ||
| map.setZoom(zoom); | ||
| map.setHeading(bearing); | ||
| map.setTilt(pitch); | ||
| overlay.setMap(map); | ||
| } | ||
| }, [map, latitude, longitude, bearing, pitch, zoom, overlay]); | ||
|
|
||
| useEffect(() => { | ||
| if (!mapContainer) { | ||
| return; | ||
| } | ||
| const mapInstance = new google.maps.Map(mapContainer, { | ||
| mapId: googleMapsMapId, | ||
| }); | ||
| setMap(mapInstance); | ||
| }, [mapContainer]); | ||
|
|
||
| const setRef = (element: HTMLDivElement) => { | ||
| setMapContainer(element); | ||
| }; | ||
|
|
||
| return ( | ||
| <Wrapper apiKey={googleMapsApiToken} render={renderMap}> | ||
| <StyledMapContainer ref={setRef} id="map" /> | ||
| </Wrapper> | ||
| ); | ||
| } | ||
|
|
||
| export default GoogleMapsWrapper; |
Oops, something went wrong.
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.
I guess all these pros are in
mapProviderPropsThere 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.
replaced to {mapProviderProps[BaseMapProviderId.mapbox2].terrainProps.XXX} and {mapProviderProps[BaseMapProviderId.maplibre].terrainProps.XXX} accordingly.