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

WIP: Hide (redundant) action buttons on the entrance popup #163

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: Hide (redundant) action buttons on the entrance popup #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96d21a3
Add new properties into Overpass Tags interface
haphut May 28, 2020
d879a7f
Show a popup also for entrances
tuukka May 28, 2020
db55db9
Hide (redundant) action buttons on the entrance popup
tuukka May 28, 2020
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
160 changes: 94 additions & 66 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ interface State {
route: FeatureCollection;
isGeolocating: boolean;
geolocationPosition: LatLng | null;
popupCoordinates: LatLng | null;
popupCoordinates: ElementWithCoordinates | null;
snackbar?: ReactText;
}

Expand Down Expand Up @@ -379,21 +379,33 @@ const App: React.FC = () => {
setState(
(prevState): State => {
if (feature?.properties.entrance) {
const element = {
id: feature.properties["@id"],
type: feature.properties["@type"],
lat: feature.geometry.coordinates[1],
lon: feature.geometry.coordinates[0],
tags: feature.properties,
};
// If an entrance was clicked, set it as the destination
return {
...prevState,
destination: {
id: feature.properties["@id"],
type: feature.properties["@type"],
lat: feature.geometry.coordinates[1],
lon: feature.geometry.coordinates[0],
},
destination: element,
popupCoordinates: element,
};
}
// As a fallback, toggle popup.
if (prevState.popupCoordinates) {
return {
...prevState,
popupCoordinates: null,
};
}
// As a fallback, open a popup.
return {
...prevState,
popupCoordinates: [event.lngLat.lat, event.lngLat.lng],
popupCoordinates: latLngToDestination([
event.lngLat.lat,
event.lngLat.lng,
]),
};
}
);
Expand Down Expand Up @@ -638,74 +650,90 @@ const App: React.FC = () => {
/>
</Marker>
)}
{state.popupCoordinates != null && (
<Popup
latitude={state.popupCoordinates[0]}
longitude={state.popupCoordinates[1]}
closeButton={false}
closeOnClick
onClose={(): void =>
setState(
(prevState): State => ({ ...prevState, popupCoordinates: null })
)
}
>
<button
data-testid="origin-button"
type="button"
aria-label="Set origin"
onClick={(): void =>
setState(
(prevState): State => {
// Check this to appease the compiler.
if (prevState.popupCoordinates != null) {
<Popup
open={state.popupCoordinates != null}
latitude={state.popupCoordinates?.lat || null}
longitude={state.popupCoordinates?.lon || null}
closeButton={false}
closeOnClick={false}
>
{state.popupCoordinates && state.popupCoordinates.tags && (
<div>
<p>
{state.popupCoordinates.tags?.["addr:street"]}{" "}
{state.popupCoordinates.tags?.["addr:housenumber"]}{" "}
{state.popupCoordinates.tags?.["ref"] ||
state.popupCoordinates.tags?.["addr:unit"]}
</p>
<p>
{state.popupCoordinates.tags &&
JSON.stringify(
Object.entries(state.popupCoordinates.tags).filter(
([k]) => !k.startsWith("@")
)
)}
</p>
</div>
)}
{state.popupCoordinates && !state.popupCoordinates.tags && (
<>
<button
data-testid="origin-button"
type="button"
aria-label="Set origin"
onClick={(): void =>
setState(
(prevState): State => {
// Check this to appease the compiler.
if (prevState.popupCoordinates != null) {
return {
...prevState,
origin: destinationToLatLng(
prevState.popupCoordinates
),
isOriginExplicit: true,
popupCoordinates: null,
};
}
return {
...prevState,
origin: prevState.popupCoordinates,
isOriginExplicit: true,
popupCoordinates: null,
};
}
return {
...prevState,
isOriginExplicit: true,
popupCoordinates: null,
};
}
)
}
>
Origin
</button>
<button
data-testid="destination-button"
type="button"
aria-label="Set destination"
onClick={(): void =>
setState(
(prevState): State => {
// Check this to appease the compiler.
if (prevState.popupCoordinates != null) {
)
}
>
Origin
</button>
<button
data-testid="destination-button"
type="button"
aria-label="Set destination"
onClick={(): void =>
setState(
(prevState): State => {
// Check this to appease the compiler.
if (prevState.popupCoordinates != null) {
return {
...prevState,
destination: prevState.popupCoordinates,
popupCoordinates: null,
};
}
return {
...prevState,
destination: latLngToDestination(
prevState.popupCoordinates
),
popupCoordinates: null,
};
}
return {
...prevState,
popupCoordinates: null,
};
}
)
}
>
Destination
</button>
</Popup>
)}
)
}
>
Destination
</button>
</>
)}
</Popup>
</MapGL>
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions src/overpass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ export interface Tags {
operator?: string;
ref?: string;
"addr:unit"?: string;
"addr:housenumber"?: string;
"addr:street"?: string;
}

const buildEntranceQuery = (lat: number, lon: number): string => `
Expand Down