Skip to content
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

Fix critical error on /exploration #709

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Fix critical error on /exploration #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions app/scripts/components/common/map/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@ import React, { ReactNode } from 'react';
import { MapProvider } from 'react-map-gl';
import Maps, { MapsContextWrapperProps } from './maps';

export const COMPARE_CONTAINER_NAME = 'CompareContainer';
export function Compare({ children }: { children: ReactNode }) {
return <>{children}</>;
}

Compare.displayName = COMPARE_CONTAINER_NAME;

export const CONTROLS_CONTAINER_NAME = 'MapControlsContainer';
export function MapControls({ children }: { children: ReactNode }) {
return <>{children}</>;
}

MapControls.displayName = CONTROLS_CONTAINER_NAME;

export default function MapProviderWrapper(props: MapsContextWrapperProps) {
return (
<MapProvider>
Expand Down
16 changes: 11 additions & 5 deletions app/scripts/components/common/map/maps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import React, {
Children,
useMemo,
ReactElement,
JSXElementConstructor,
useState,
createContext
} from 'react';
Expand All @@ -23,6 +22,7 @@ import { Styles } from './styles';
import useMapCompare from './hooks/use-map-compare';
import MapComponent from './map-component';
import useMaps, { useMapsContext } from './hooks/use-maps';
import { COMPARE_CONTAINER_NAME, CONTROLS_CONTAINER_NAME } from '.';

const chevronRightURI = () =>
iconDataURI(CollecticonChevronRightSmall, {
Expand Down Expand Up @@ -92,13 +92,19 @@ function Maps({ children, projection }: MapsProps) {

const sortedChildren = childrenArr.reduce(
(acc, child) => {
const componentName = (child.type as JSXElementConstructor<any>).name;
if (componentName === 'Compare') {
// This is added so that we can use the component name in production
// where the function names are minified
// @ts-expect-error displayName is not in the type
const componentName = child.type.displayName ?? '';

if (componentName === COMPARE_CONTAINER_NAME) {
acc.compareGenerators = Children.toArray(
child.props.children
) as ReactElement[];
} else if (componentName.endsWith('Control')) {
acc.controls = [...acc.controls, child];
} else if (componentName == CONTROLS_CONTAINER_NAME) {
acc.controls = Children.toArray(
child.props.children
) as ReactElement[];
} else {
acc.generators = [...acc.generators, child];
}
Expand Down
58 changes: 32 additions & 26 deletions app/scripts/components/exploration/components/map/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@ import React, { useState } from 'react';
import { useAtomValue } from 'jotai';

import { useStacMetadataOnDatasets } from '../../hooks/use-stac-metadata-datasets';
import { selectedCompareDateAtom, selectedDateAtom, timelineDatasetsAtom } from '../../atoms/atoms';
import {
selectedCompareDateAtom,
selectedDateAtom,
timelineDatasetsAtom
} from '../../atoms/atoms';
import {
TimelineDatasetStatus,
TimelineDatasetSuccess
} from '../../types.d.ts';
import { Layer } from './layer';
import { AnalysisMessageControl } from './analysis-message-control';

import Map, { Compare } from '$components/common/map';
import Map, { Compare, MapControls } from '$components/common/map';
import { Basemap } from '$components/common/map/style-generators/basemap';
import GeocoderControl from '$components/common/map/controls/geocoder';
import { ScaleControl } from '$components/common/map/controls';
Expand Down Expand Up @@ -71,31 +75,33 @@ export function ExplorationMap() {
/>
))}
{/* Map controls */}
<DrawControl
displayControlsDefault={false}
controls={
{
polygon: true,
trash: true
} as any
}
/>
<CustomAoIControl />
<ResetAoIControl />
<AnalysisMessageControl />
<GeocoderControl />
<MapOptionsControl
projection={projection}
onProjectionChange={setProjection}
basemapStyleId={mapBasemapId}
onBasemapStyleIdChange={setBasemapId}
labelsOption={labelsOption}
boundariesOption={boundariesOption}
onOptionChange={onOptionChange}
/>
<MapControls>
<DrawControl
displayControlsDefault={false}
controls={
{
polygon: true,
trash: true
} as any
}
/>
<CustomAoIControl />
<ResetAoIControl />
<AnalysisMessageControl />
<GeocoderControl />
<MapOptionsControl
projection={projection}
onProjectionChange={setProjection}
basemapStyleId={mapBasemapId}
onBasemapStyleIdChange={setBasemapId}
labelsOption={labelsOption}
boundariesOption={boundariesOption}
onOptionChange={onOptionChange}
/>

<ScaleControl />
<MapCoordsControl />
<ScaleControl />
<MapCoordsControl />
</MapControls>
{comparing && (
// Compare map layers
<Compare>
Expand Down
Loading