Import the mapbox css and solve the controls problem
This commit is contained in:
parent
aa19dd40ff
commit
c451e572c8
@ -1,28 +1,33 @@
|
||||
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { Redirect, Route, Switch } from 'react-router-dom';
|
||||
import loadable from '@loadable/component';
|
||||
import React, { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import { Redirect, Route, Switch } from "react-router-dom";
|
||||
import loadable from "@loadable/component";
|
||||
|
||||
import { useRevisionId } from './api-data/use-revision';
|
||||
import { useBuildingData } from './api-data/use-building-data';
|
||||
import { useUserVerifiedData } from './api-data/use-user-verified-data';
|
||||
import { useUrlBuildingParam } from './nav/use-url-building-param';
|
||||
import { useUrlCategoryParam } from './nav/use-url-category-param';
|
||||
import { useUrlModeParam } from './nav/use-url-mode-param';
|
||||
import BuildingView from './building/building-view';
|
||||
import Categories from './building/categories';
|
||||
import { EditHistory } from './building/edit-history/edit-history';
|
||||
import MultiEdit from './building/multi-edit';
|
||||
import Sidebar from './building/sidebar';
|
||||
import { Building, UserVerified } from './models/building';
|
||||
import Welcome from './pages/welcome';
|
||||
import { PrivateRoute } from './route';
|
||||
import { useLastNotEmpty } from './hooks/use-last-not-empty';
|
||||
import { Category } from './config/categories-config';
|
||||
import { BuildingMapTileset } from './config/tileserver-config';
|
||||
import { defaultMapCategory, categoryMapsConfig } from './config/category-maps-config';
|
||||
import { useMultiEditData } from './hooks/use-multi-edit-data';
|
||||
import { useAuth } from './auth-context';
|
||||
import { sendBuildingUpdate } from './api-data/building-update';
|
||||
import { useRevisionId } from "./api-data/use-revision";
|
||||
import { useBuildingData } from "./api-data/use-building-data";
|
||||
import { useUserVerifiedData } from "./api-data/use-user-verified-data";
|
||||
import { useUrlBuildingParam } from "./nav/use-url-building-param";
|
||||
import { useUrlCategoryParam } from "./nav/use-url-category-param";
|
||||
import { useUrlModeParam } from "./nav/use-url-mode-param";
|
||||
import BuildingView from "./building/building-view";
|
||||
import Categories from "./building/categories";
|
||||
import { EditHistory } from "./building/edit-history/edit-history";
|
||||
import MultiEdit from "./building/multi-edit";
|
||||
import Sidebar from "./building/sidebar";
|
||||
import { Building, UserVerified } from "./models/building";
|
||||
import Welcome from "./pages/welcome";
|
||||
import { PrivateRoute } from "./route";
|
||||
import { useLastNotEmpty } from "./hooks/use-last-not-empty";
|
||||
import { Category } from "./config/categories-config";
|
||||
import { BuildingMapTileset } from "./config/tileserver-config";
|
||||
import {
|
||||
defaultMapCategory,
|
||||
categoryMapsConfig,
|
||||
} from "./config/category-maps-config";
|
||||
import { useMultiEditData } from "./hooks/use-multi-edit-data";
|
||||
import { useAuth } from "./auth-context";
|
||||
import { sendBuildingUpdate } from "./api-data/building-update";
|
||||
|
||||
import "mapbox-gl/dist/mapbox-gl.css";
|
||||
|
||||
/**
|
||||
* Load and render ColouringMap component on client-side only.
|
||||
@ -36,7 +41,7 @@ import { sendBuildingUpdate } from './api-data/building-update';
|
||||
* to all modules that import leaflet or react-leaflet.
|
||||
*/
|
||||
const ColouringMap = loadable(
|
||||
async () => (await import('./map/map')).ColouringMap,
|
||||
async () => (await import("./map/map")).ColouringMap,
|
||||
{ ssr: false }
|
||||
);
|
||||
|
||||
@ -47,20 +52,26 @@ interface MapAppProps {
|
||||
}
|
||||
|
||||
/** Returns first argument, unless it's equal to the second argument - then returns undefined */
|
||||
function unless<V extends string, U extends V>(value: V, unlessValue: U): Exclude<V, U> {
|
||||
return value === unlessValue ? undefined : value as Exclude<V, U>;
|
||||
function unless<V extends string, U extends V>(
|
||||
value: V,
|
||||
unlessValue: U
|
||||
): Exclude<V, U> {
|
||||
return value === unlessValue ? undefined : (value as Exclude<V, U>);
|
||||
}
|
||||
|
||||
/** Returns the new value, unless it is equal to the current value - then returns undefined */
|
||||
function setOrToggle<T>(currentValue: T, newValue: T): T {
|
||||
if(newValue == undefined || newValue === currentValue){
|
||||
if (newValue == undefined || newValue === currentValue) {
|
||||
return undefined;
|
||||
} else {
|
||||
return newValue;
|
||||
}
|
||||
}
|
||||
|
||||
function useStateWithOptions<T>(defaultValue: T, options: T[]): [T, (x: T) => void] {
|
||||
function useStateWithOptions<T>(
|
||||
defaultValue: T,
|
||||
options: T[]
|
||||
): [T, (x: T) => void] {
|
||||
const [value, setValue] = useState(defaultValue);
|
||||
|
||||
const effectiveValue = options.includes(value) ? value : options[0];
|
||||
@ -69,76 +80,112 @@ function useStateWithOptions<T>(defaultValue: T, options: T[]): [T, (x: T) => vo
|
||||
return [effectiveValue, handleChange];
|
||||
}
|
||||
|
||||
export const MapApp: React.FC<MapAppProps> = props => {
|
||||
export const MapApp: React.FC<MapAppProps> = (props) => {
|
||||
const { user } = useAuth();
|
||||
const [categoryUrlParam] = useUrlCategoryParam();
|
||||
|
||||
const [currentCategory, setCategory] = useState<Category>();
|
||||
useEffect(() => setCategory(unless(categoryUrlParam, 'categories')), [categoryUrlParam]);
|
||||
useEffect(
|
||||
() => setCategory(unless(categoryUrlParam, "categories")),
|
||||
[categoryUrlParam]
|
||||
);
|
||||
|
||||
const displayCategory = useLastNotEmpty(currentCategory) ?? defaultMapCategory;
|
||||
const displayCategory =
|
||||
useLastNotEmpty(currentCategory) ?? defaultMapCategory;
|
||||
|
||||
const [selectedBuildingId, setSelectedBuildingId] = useUrlBuildingParam('view', displayCategory);
|
||||
const [selectedBuildingId, setSelectedBuildingId] = useUrlBuildingParam(
|
||||
"view",
|
||||
displayCategory
|
||||
);
|
||||
|
||||
const [building, updateBuilding, reloadBuilding] = useBuildingData(selectedBuildingId, props.building, user != undefined);
|
||||
const [userVerified, updateUserVerified, reloadUserVerified] = useUserVerifiedData(selectedBuildingId, props.user_verified);
|
||||
const [building, updateBuilding, reloadBuilding] = useBuildingData(
|
||||
selectedBuildingId,
|
||||
props.building,
|
||||
user != undefined
|
||||
);
|
||||
const [userVerified, updateUserVerified, reloadUserVerified] =
|
||||
useUserVerifiedData(selectedBuildingId, props.user_verified);
|
||||
|
||||
const [revisionId, updateRevisionId] = useRevisionId(props.revisionId);
|
||||
useEffect(() => {
|
||||
updateRevisionId(building?.revision_id)
|
||||
updateRevisionId(building?.revision_id);
|
||||
}, [building]);
|
||||
|
||||
const [mode] = useUrlModeParam();
|
||||
const viewEditMode = unless(mode, 'multi-edit');
|
||||
const viewEditMode = unless(mode, "multi-edit");
|
||||
|
||||
const [multiEditData, multiEditError] = useMultiEditData();
|
||||
|
||||
const selectBuilding = useCallback((selectedBuilding: Building) => {
|
||||
const selectBuilding = useCallback(
|
||||
(selectedBuilding: Building) => {
|
||||
const currentId = selectedBuildingId;
|
||||
updateBuilding(selectedBuilding);
|
||||
setSelectedBuildingId(setOrToggle(currentId, selectedBuilding?.building_id));
|
||||
}, [selectedBuildingId, setSelectedBuildingId, updateBuilding, building]);
|
||||
setSelectedBuildingId(
|
||||
setOrToggle(currentId, selectedBuilding?.building_id)
|
||||
);
|
||||
},
|
||||
[selectedBuildingId, setSelectedBuildingId, updateBuilding, building]
|
||||
);
|
||||
|
||||
const colourBuilding = useCallback(async (building: Building) => {
|
||||
const colourBuilding = useCallback(
|
||||
async (building: Building) => {
|
||||
const buildingId = building?.building_id;
|
||||
|
||||
if(buildingId != undefined && multiEditError == undefined) {
|
||||
if (buildingId != undefined && multiEditError == undefined) {
|
||||
try {
|
||||
const updatedBuilding = await sendBuildingUpdate(buildingId, multiEditData);
|
||||
const updatedBuilding = await sendBuildingUpdate(
|
||||
buildingId,
|
||||
multiEditData
|
||||
);
|
||||
updateRevisionId(updatedBuilding.revision_id);
|
||||
} catch(error) {
|
||||
} catch (error) {
|
||||
console.error({ error });
|
||||
}
|
||||
}
|
||||
}, [multiEditError, multiEditData, currentCategory]);
|
||||
},
|
||||
[multiEditError, multiEditData, currentCategory]
|
||||
);
|
||||
|
||||
const handleBuildingUpdate = useCallback((buildingId: number, updatedData: Building) => {
|
||||
const handleBuildingUpdate = useCallback(
|
||||
(buildingId: number, updatedData: Building) => {
|
||||
// only update current building data if the IDs match
|
||||
if(buildingId === selectedBuildingId) {
|
||||
if (buildingId === selectedBuildingId) {
|
||||
updateBuilding(Object.assign({}, building, updatedData));
|
||||
} else {
|
||||
// otherwise, still update the latest revision ID
|
||||
updateRevisionId(updatedData.revision_id);
|
||||
}
|
||||
}, [selectedBuildingId, building, updateBuilding, updateRevisionId]);
|
||||
},
|
||||
[selectedBuildingId, building, updateBuilding, updateRevisionId]
|
||||
);
|
||||
|
||||
const handleUserVerifiedUpdate = useCallback((buildingId: number, updatedData: UserVerified) => {
|
||||
const handleUserVerifiedUpdate = useCallback(
|
||||
(buildingId: number, updatedData: UserVerified) => {
|
||||
// only update current building data if the IDs match
|
||||
if(buildingId === selectedBuildingId) {
|
||||
if (buildingId === selectedBuildingId) {
|
||||
updateUserVerified(Object.assign({}, userVerified, updatedData)); // quickly show added verifications
|
||||
reloadBuilding();
|
||||
reloadUserVerified(); // but still reload from server to reflect removed verifications
|
||||
}
|
||||
}, [selectedBuildingId, updateUserVerified, reloadBuilding, userVerified]);
|
||||
},
|
||||
[selectedBuildingId, updateUserVerified, reloadBuilding, userVerified]
|
||||
);
|
||||
|
||||
|
||||
const categoryMapDefinitions = useMemo(() => categoryMapsConfig[displayCategory], [displayCategory]);
|
||||
const availableMapStyles = useMemo(() => categoryMapDefinitions.map(x => x.mapStyle), [categoryMapDefinitions]);
|
||||
const [mapColourScale, setMapColourScale] = useStateWithOptions<BuildingMapTileset>(undefined, availableMapStyles);
|
||||
const categoryMapDefinitions = useMemo(
|
||||
() => categoryMapsConfig[displayCategory],
|
||||
[displayCategory]
|
||||
);
|
||||
const availableMapStyles = useMemo(
|
||||
() => categoryMapDefinitions.map((x) => x.mapStyle),
|
||||
[categoryMapDefinitions]
|
||||
);
|
||||
const [mapColourScale, setMapColourScale] =
|
||||
useStateWithOptions<BuildingMapTileset>(undefined, availableMapStyles);
|
||||
|
||||
return (
|
||||
<>
|
||||
<PrivateRoute path="/:mode(edit|multi-edit)" /> {/* empty private route to ensure auth for editing */}
|
||||
<PrivateRoute path="/:mode(edit|multi-edit)" />{" "}
|
||||
{/* empty private route to ensure auth for editing */}
|
||||
<Sidebar>
|
||||
<Switch>
|
||||
<Route exact path="/">
|
||||
@ -148,7 +195,10 @@ export const MapApp: React.FC<MapAppProps> = props => {
|
||||
<MultiEdit category={displayCategory} />
|
||||
</Route>
|
||||
<Route path="/:mode/:cat">
|
||||
<Categories mode={mode || 'view'} building_id={selectedBuildingId} />
|
||||
<Categories
|
||||
mode={mode || "view"}
|
||||
building_id={selectedBuildingId}
|
||||
/>
|
||||
<Switch>
|
||||
<Route exact path="/:mode/:cat/:building/history">
|
||||
<EditHistory building={building} />
|
||||
@ -167,17 +217,31 @@ export const MapApp: React.FC<MapAppProps> = props => {
|
||||
</Route>
|
||||
</Switch>
|
||||
</Route>
|
||||
<Route exact path="/:mode(view|edit|multi-edit)"
|
||||
render={props => (<Redirect to={`/${props.match.params.mode}/categories`} />)}
|
||||
<Route
|
||||
exact
|
||||
path="/:mode(view|edit|multi-edit)"
|
||||
render={(props) => (
|
||||
<Redirect to={`/${props.match.params.mode}/categories`} />
|
||||
)}
|
||||
/>
|
||||
</Switch>
|
||||
</Sidebar>
|
||||
<div style={{ width: "100%", height: "100%", position: "relative", float: "right", overflow: "hidden" }}>
|
||||
<div
|
||||
style={{
|
||||
width: "100%",
|
||||
height: "100%",
|
||||
position: "relative",
|
||||
float: "right",
|
||||
overflow: "hidden",
|
||||
}}
|
||||
>
|
||||
<ColouringMap
|
||||
selectedBuildingId={selectedBuildingId}
|
||||
mode={mode || 'basic'}
|
||||
mode={mode || "basic"}
|
||||
revisionId={revisionId}
|
||||
onBuildingAction={mode === 'multi-edit' ? colourBuilding : selectBuilding}
|
||||
onBuildingAction={
|
||||
mode === "multi-edit" ? colourBuilding : selectBuilding
|
||||
}
|
||||
mapColourScale={mapColourScale}
|
||||
onMapColourScale={setMapColourScale}
|
||||
categoryMapDefinitions={categoryMapDefinitions}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user