Skip to content

Center map #1570

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.

Sign up for GitHub

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

Merged
mariahosfeld merged 6 commits into from
Oct 4, 2022
Merged

Center map #1570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8df3f0f
center map
prachigarg19 Sep 19, 2022
a230235
replace dependency and condition
prachigarg19 Sep 19, 2022
6deb008
Revert "replace dependency and condition"
prachigarg19 Sep 19, 2022
cf37c04
change dependency and condition to center map
prachigarg19 Sep 19, 2022
42d2146
improve condition
prachigarg19 Sep 19, 2022
28e298a
preserve coordinates when we return from single project page
prachigarg19 Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/features/common/Layout/ProjectPropsContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { ReactElement } from 'react';
import { ParamsContext } from './QueryParamsContext';

interface Props {}

Expand Down Expand Up @@ -109,6 +110,7 @@ function ProjectPropsProvider({ children }: any): ReactElement {
const [filtersOpen, setFilterOpen] = React.useState(false);
const [purpose, setPurpose] = React.useState('trees');
const [plantLocationsLoaded, setPlantLocationsLoaded] = React.useState(false);
const { embed, showProjectList } = React.useContext(ParamsContext);

const mapRef = React.useRef(null);
const EMPTY_STYLE = {
Expand All @@ -123,7 +125,14 @@ function ProjectPropsProvider({ children }: any): ReactElement {
minZoom: 1,
maxZoom: 25,
});
const defaultMapCenter = isMobile ? [22.54, 9.59] : [36.96, -28.5];
const isEmbed = embed === 'true' && showProjectList === 'false';
const defaultMapCenter = isMobile
? isEmbed
? [22.54, 0]
: [22.54, 9.59]
: isEmbed
? [36.96, 0]
: [36.96, -28.5];
const defaultZoom = isMobile ? 1 : 1.4;
const [viewport, setViewPort] = React.useState({
width: Number('100%'),
Expand Down
13 changes: 12 additions & 1 deletion src/features/projects/components/ProjectsMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default function ProjectsMap(): ReactElement {
} = React.useContext(ProjectPropsContext);

const { t } = useTranslation(['maps']);
const { embed } = React.useContext(ParamsContext);
const { embed, showProjectList } = React.useContext(ParamsContext);
//Map
const _onStateChange = (state: any) => setMapState({ ...state });
const _onViewportChange = (view: any) => setViewPort({ ...view });
Expand Down Expand Up @@ -161,6 +161,17 @@ export default function ProjectsMap(): ReactElement {
}
}, [zoomLevel]);

React.useEffect(() => {
if (embed === 'true' && showProjectList === 'false') {
const newViewport = {
...viewport,
latitude: 36.96,
longitude: 0,
};
setViewPort(newViewport);
}
}, [showProjectList]);

return (
<div
className={
Expand Down