Skip to content
Draft
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
37 changes: 37 additions & 0 deletions client/src/components/MapView/FeatureSelectPopup.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { Table } from 'react-bootstrap';
import { Popup, LngLat, MapGeoJSONFeature } from 'react-map-gl/maplibre';

export function FeatureSelectPopup({
coordinates,
features,
onClose,
setShowPropsPopup,
}: {
coordinates: LngLat;
features: MapGeoJSONFeature[];
onClose: () => void;
setShowPropsPopup: ({ coordinates, feature }: { coordinates: LngLat; feature: MapGeoJSONFeature }) => void;
}) {
return (
<Popup latitude={coordinates.lat} longitude={coordinates.lng} onClose={onClose}>
<p style={{ fontWeight: 'bold' }}>Overlapping features</p>
<Table>
<tbody>
{features.map((feature, index) => (
<tr className="feature-select-item" key={index}>
<th scope="row">{index}</th>
<td
onClick={() => {
onClose();
setShowPropsPopup({ coordinates, feature });
}}
>
{feature.properties.name || feature.properties.class}
</td>
</tr>
))}
</tbody>
</Table>
</Popup>
);
}
19 changes: 17 additions & 2 deletions client/src/components/MapView/MapView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ import { ContextMenuPopup } from './ContextMenuPopup.tsx';
import { GeometryPropertyPopup } from './GeometryPropertyPopup.tsx';
import RightMenu from './RightMenu.tsx';
import { findSelectedDebugLayers } from '../../util/map.ts';
import { FeatureSelectPopup } from './FeatureSelectPopup.tsx';

const styleUrl = import.meta.env.VITE_DEBUG_STYLE_URL;

type PopupData = { coordinates: LngLat; feature: MapGeoJSONFeature };
type FeatureSelectData = { coordinates: LngLat; features: MapGeoJSONFeature[] };

export function MapView({
tripQueryVariables,
Expand All @@ -39,6 +41,7 @@ export function MapView({
const onMapDoubleClick = useMapDoubleClick({ tripQueryVariables, setTripQueryVariables });
const [showContextPopup, setShowContextPopup] = useState<LngLat | null>(null);
const [showPropsPopup, setShowPropsPopup] = useState<PopupData | null>(null);
const [showFeatureSelectPopup, setShowFeatureSelectPopup] = useState<FeatureSelectData | null>(null);
const [interactiveLayerIds, setInteractiveLayerIds] = useState<string[]>([]);
const [cursor, setCursor] = useState<string>('auto');
const onMouseEnter = useCallback(() => setCursor('pointer'), []);
Expand All @@ -52,8 +55,13 @@ export function MapView({
// if you click on a cluster of map features it's possible that there are multiple
// to select from. we are using the first one instead of presenting a selection UI.
// you can always zoom in closer if you want to make a more specific click.
const feature = e.features[0];
setShowPropsPopup({ coordinates: e.lngLat, feature: feature });
if (e.features.length == 1) {
const feature = e.features[0];
setShowPropsPopup({ coordinates: e.lngLat, feature: feature });
}
if (e.features.length > 1) {
setShowFeatureSelectPopup({ coordinates: e.lngLat, features: e.features });
}
}
};
const panToWorldEnvelopeIfRequired = (e: MapEvent) => {
Expand Down Expand Up @@ -141,6 +149,13 @@ export function MapView({
onClose={() => setShowPropsPopup(null)}
/>
)}
{showFeatureSelectPopup && (
<FeatureSelectPopup
{...showFeatureSelectPopup}
setShowPropsPopup={setShowPropsPopup}
onClose={() => setShowFeatureSelectPopup(null)}
/>
)}
</Map>
</div>
);
Expand Down
7 changes: 7 additions & 0 deletions client/src/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,13 @@
padding: 0 5px;
}

/* feature select popup */

.feature-select-item td:hover {
background-color: #d5d5d5;
cursor: pointer;
}

/* debug layer selector */

.maplibregl-ctrl-group.layer-select {
Expand Down
Loading