Import the mapbox css and solve the controls problem
This commit is contained in:
parent
aa19dd40ff
commit
c451e572c8
@ -1,188 +1,252 @@
|
|||||||
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
import React, { useCallback, useEffect, useMemo, useState } from "react";
|
||||||
import { Redirect, Route, Switch } from 'react-router-dom';
|
import { Redirect, Route, Switch } from "react-router-dom";
|
||||||
import loadable from '@loadable/component';
|
import loadable from "@loadable/component";
|
||||||
|
|
||||||
import { useRevisionId } from './api-data/use-revision';
|
import { useRevisionId } from "./api-data/use-revision";
|
||||||
import { useBuildingData } from './api-data/use-building-data';
|
import { useBuildingData } from "./api-data/use-building-data";
|
||||||
import { useUserVerifiedData } from './api-data/use-user-verified-data';
|
import { useUserVerifiedData } from "./api-data/use-user-verified-data";
|
||||||
import { useUrlBuildingParam } from './nav/use-url-building-param';
|
import { useUrlBuildingParam } from "./nav/use-url-building-param";
|
||||||
import { useUrlCategoryParam } from './nav/use-url-category-param';
|
import { useUrlCategoryParam } from "./nav/use-url-category-param";
|
||||||
import { useUrlModeParam } from './nav/use-url-mode-param';
|
import { useUrlModeParam } from "./nav/use-url-mode-param";
|
||||||
import BuildingView from './building/building-view';
|
import BuildingView from "./building/building-view";
|
||||||
import Categories from './building/categories';
|
import Categories from "./building/categories";
|
||||||
import { EditHistory } from './building/edit-history/edit-history';
|
import { EditHistory } from "./building/edit-history/edit-history";
|
||||||
import MultiEdit from './building/multi-edit';
|
import MultiEdit from "./building/multi-edit";
|
||||||
import Sidebar from './building/sidebar';
|
import Sidebar from "./building/sidebar";
|
||||||
import { Building, UserVerified } from './models/building';
|
import { Building, UserVerified } from "./models/building";
|
||||||
import Welcome from './pages/welcome';
|
import Welcome from "./pages/welcome";
|
||||||
import { PrivateRoute } from './route';
|
import { PrivateRoute } from "./route";
|
||||||
import { useLastNotEmpty } from './hooks/use-last-not-empty';
|
import { useLastNotEmpty } from "./hooks/use-last-not-empty";
|
||||||
import { Category } from './config/categories-config';
|
import { Category } from "./config/categories-config";
|
||||||
import { BuildingMapTileset } from './config/tileserver-config';
|
import { BuildingMapTileset } from "./config/tileserver-config";
|
||||||
import { defaultMapCategory, categoryMapsConfig } from './config/category-maps-config';
|
import {
|
||||||
import { useMultiEditData } from './hooks/use-multi-edit-data';
|
defaultMapCategory,
|
||||||
import { useAuth } from './auth-context';
|
categoryMapsConfig,
|
||||||
import { sendBuildingUpdate } from './api-data/building-update';
|
} 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.
|
* Load and render ColouringMap component on client-side only.
|
||||||
* This is because leaflet and react-leaflet currently don't work on the server
|
* This is because leaflet and react-leaflet currently don't work on the server
|
||||||
* (leaflet assumes the presence of browser-specific global `window` variable).
|
* (leaflet assumes the presence of browser-specific global `window` variable).
|
||||||
*
|
*
|
||||||
* The previous solution involved installing react-leaflet-universal,
|
* The previous solution involved installing react-leaflet-universal,
|
||||||
* but that doesn't work with latest react-leaflet.
|
* but that doesn't work with latest react-leaflet.
|
||||||
*
|
*
|
||||||
* The limitation is that ColouringMap needs to be the single entry point in the whole app
|
* The limitation is that ColouringMap needs to be the single entry point in the whole app
|
||||||
* to all modules that import leaflet or react-leaflet.
|
* to all modules that import leaflet or react-leaflet.
|
||||||
*/
|
*/
|
||||||
const ColouringMap = loadable(
|
const ColouringMap = loadable(
|
||||||
async () => (await import('./map/map')).ColouringMap,
|
async () => (await import("./map/map")).ColouringMap,
|
||||||
{ ssr: false }
|
{ ssr: false }
|
||||||
);
|
);
|
||||||
|
|
||||||
interface MapAppProps {
|
interface MapAppProps {
|
||||||
building?: Building;
|
building?: Building;
|
||||||
revisionId?: string;
|
revisionId?: string;
|
||||||
user_verified?: object;
|
user_verified?: object;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Returns first argument, unless it's equal to the second argument - then returns undefined */
|
/** 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> {
|
function unless<V extends string, U extends V>(
|
||||||
return value === unlessValue ? undefined : value as Exclude<V, U>;
|
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 */
|
/** Returns the new value, unless it is equal to the current value - then returns undefined */
|
||||||
function setOrToggle<T>(currentValue: T, newValue: T): T {
|
function setOrToggle<T>(currentValue: T, newValue: T): T {
|
||||||
if(newValue == undefined || newValue === currentValue){
|
if (newValue == undefined || newValue === currentValue) {
|
||||||
return undefined;
|
return undefined;
|
||||||
} else {
|
} else {
|
||||||
return newValue;
|
return newValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function useStateWithOptions<T>(defaultValue: T, options: T[]): [T, (x: T) => void] {
|
function useStateWithOptions<T>(
|
||||||
const [value, setValue] = useState(defaultValue);
|
defaultValue: T,
|
||||||
|
options: T[]
|
||||||
|
): [T, (x: T) => void] {
|
||||||
|
const [value, setValue] = useState(defaultValue);
|
||||||
|
|
||||||
const effectiveValue = options.includes(value) ? value : options[0];
|
const effectiveValue = options.includes(value) ? value : options[0];
|
||||||
const handleChange = useCallback((x) => setValue(x), []);
|
const handleChange = useCallback((x) => setValue(x), []);
|
||||||
|
|
||||||
return [effectiveValue, handleChange];
|
return [effectiveValue, handleChange];
|
||||||
}
|
}
|
||||||
|
|
||||||
export const MapApp: React.FC<MapAppProps> = props => {
|
export const MapApp: React.FC<MapAppProps> = (props) => {
|
||||||
const { user } = useAuth();
|
const { user } = useAuth();
|
||||||
const [categoryUrlParam] = useUrlCategoryParam();
|
const [categoryUrlParam] = useUrlCategoryParam();
|
||||||
|
|
||||||
const [currentCategory, setCategory] = useState<Category>();
|
const [currentCategory, setCategory] = useState<Category>();
|
||||||
useEffect(() => setCategory(unless(categoryUrlParam, 'categories')), [categoryUrlParam]);
|
useEffect(
|
||||||
|
() => setCategory(unless(categoryUrlParam, "categories")),
|
||||||
const displayCategory = useLastNotEmpty(currentCategory) ?? defaultMapCategory;
|
[categoryUrlParam]
|
||||||
|
);
|
||||||
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 [revisionId, updateRevisionId] = useRevisionId(props.revisionId);
|
|
||||||
useEffect(() => {
|
|
||||||
updateRevisionId(building?.revision_id)
|
|
||||||
}, [building]);
|
|
||||||
|
|
||||||
const [mode] = useUrlModeParam();
|
|
||||||
const viewEditMode = unless(mode, 'multi-edit');
|
|
||||||
|
|
||||||
const [multiEditData, multiEditError] = useMultiEditData();
|
|
||||||
|
|
||||||
const selectBuilding = useCallback((selectedBuilding: Building) => {
|
const displayCategory =
|
||||||
const currentId = selectedBuildingId;
|
useLastNotEmpty(currentCategory) ?? defaultMapCategory;
|
||||||
updateBuilding(selectedBuilding);
|
|
||||||
setSelectedBuildingId(setOrToggle(currentId, selectedBuilding?.building_id));
|
|
||||||
}, [selectedBuildingId, setSelectedBuildingId, updateBuilding, building]);
|
|
||||||
|
|
||||||
const colourBuilding = useCallback(async (building: Building) => {
|
const [selectedBuildingId, setSelectedBuildingId] = useUrlBuildingParam(
|
||||||
const buildingId = building?.building_id;
|
"view",
|
||||||
|
displayCategory
|
||||||
|
);
|
||||||
|
|
||||||
if(buildingId != undefined && multiEditError == undefined) {
|
const [building, updateBuilding, reloadBuilding] = useBuildingData(
|
||||||
try {
|
selectedBuildingId,
|
||||||
const updatedBuilding = await sendBuildingUpdate(buildingId, multiEditData);
|
props.building,
|
||||||
updateRevisionId(updatedBuilding.revision_id);
|
user != undefined
|
||||||
} catch(error) {
|
);
|
||||||
console.error({ error });
|
const [userVerified, updateUserVerified, reloadUserVerified] =
|
||||||
}
|
useUserVerifiedData(selectedBuildingId, props.user_verified);
|
||||||
|
|
||||||
|
const [revisionId, updateRevisionId] = useRevisionId(props.revisionId);
|
||||||
|
useEffect(() => {
|
||||||
|
updateRevisionId(building?.revision_id);
|
||||||
|
}, [building]);
|
||||||
|
|
||||||
|
const [mode] = useUrlModeParam();
|
||||||
|
const viewEditMode = unless(mode, "multi-edit");
|
||||||
|
|
||||||
|
const [multiEditData, multiEditError] = useMultiEditData();
|
||||||
|
|
||||||
|
const selectBuilding = useCallback(
|
||||||
|
(selectedBuilding: Building) => {
|
||||||
|
const currentId = selectedBuildingId;
|
||||||
|
updateBuilding(selectedBuilding);
|
||||||
|
setSelectedBuildingId(
|
||||||
|
setOrToggle(currentId, selectedBuilding?.building_id)
|
||||||
|
);
|
||||||
|
},
|
||||||
|
[selectedBuildingId, setSelectedBuildingId, updateBuilding, building]
|
||||||
|
);
|
||||||
|
|
||||||
|
const colourBuilding = useCallback(
|
||||||
|
async (building: Building) => {
|
||||||
|
const buildingId = building?.building_id;
|
||||||
|
|
||||||
|
if (buildingId != undefined && multiEditError == undefined) {
|
||||||
|
try {
|
||||||
|
const updatedBuilding = await sendBuildingUpdate(
|
||||||
|
buildingId,
|
||||||
|
multiEditData
|
||||||
|
);
|
||||||
|
updateRevisionId(updatedBuilding.revision_id);
|
||||||
|
} catch (error) {
|
||||||
|
console.error({ error });
|
||||||
}
|
}
|
||||||
}, [multiEditError, multiEditData, currentCategory]);
|
}
|
||||||
|
},
|
||||||
|
[multiEditError, multiEditData, currentCategory]
|
||||||
|
);
|
||||||
|
|
||||||
const handleBuildingUpdate = useCallback((buildingId: number, updatedData: Building) => {
|
const handleBuildingUpdate = useCallback(
|
||||||
// only update current building data if the IDs match
|
(buildingId: number, updatedData: Building) => {
|
||||||
if(buildingId === selectedBuildingId) {
|
// only update current building data if the IDs match
|
||||||
updateBuilding(Object.assign({}, building, updatedData));
|
if (buildingId === selectedBuildingId) {
|
||||||
} else {
|
updateBuilding(Object.assign({}, building, updatedData));
|
||||||
// otherwise, still update the latest revision ID
|
} else {
|
||||||
updateRevisionId(updatedData.revision_id);
|
// 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(
|
||||||
// only update current building data if the IDs match
|
(buildingId: number, updatedData: UserVerified) => {
|
||||||
if(buildingId === selectedBuildingId) {
|
// only update current building data if the IDs match
|
||||||
updateUserVerified(Object.assign({}, userVerified, updatedData)); // quickly show added verifications
|
if (buildingId === selectedBuildingId) {
|
||||||
reloadBuilding();
|
updateUserVerified(Object.assign({}, userVerified, updatedData)); // quickly show added verifications
|
||||||
reloadUserVerified(); // but still reload from server to reflect removed 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]);
|
return (
|
||||||
const availableMapStyles = useMemo(() => categoryMapDefinitions.map(x => x.mapStyle), [categoryMapDefinitions]);
|
<>
|
||||||
const [mapColourScale, setMapColourScale] = useStateWithOptions<BuildingMapTileset>(undefined, availableMapStyles);
|
<PrivateRoute path="/:mode(edit|multi-edit)" />{" "}
|
||||||
|
{/* empty private route to ensure auth for editing */}
|
||||||
return (
|
<Sidebar>
|
||||||
<>
|
<Switch>
|
||||||
<PrivateRoute path="/:mode(edit|multi-edit)" /> {/* empty private route to ensure auth for editing */}
|
<Route exact path="/">
|
||||||
<Sidebar>
|
<Welcome />
|
||||||
<Switch>
|
</Route>
|
||||||
<Route exact path="/">
|
<Route exact path="/multi-edit/:cat">
|
||||||
<Welcome />
|
<MultiEdit category={displayCategory} />
|
||||||
</Route>
|
</Route>
|
||||||
<Route exact path="/multi-edit/:cat">
|
<Route path="/:mode/:cat">
|
||||||
<MultiEdit category={displayCategory} />
|
<Categories
|
||||||
</Route>
|
mode={mode || "view"}
|
||||||
<Route path="/:mode/:cat">
|
building_id={selectedBuildingId}
|
||||||
<Categories mode={mode || 'view'} building_id={selectedBuildingId} />
|
/>
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route exact path="/:mode/:cat/:building/history">
|
<Route exact path="/:mode/:cat/:building/history">
|
||||||
<EditHistory building={building} />
|
<EditHistory building={building} />
|
||||||
</Route>
|
</Route>
|
||||||
<Route exact path="/:mode/:cat/:building?">
|
<Route exact path="/:mode/:cat/:building?">
|
||||||
<BuildingView
|
<BuildingView
|
||||||
mode={viewEditMode}
|
mode={viewEditMode}
|
||||||
cat={displayCategory}
|
cat={displayCategory}
|
||||||
building={building}
|
building={building}
|
||||||
user_verified={userVerified ?? {}}
|
user_verified={userVerified ?? {}}
|
||||||
onBuildingUpdate={handleBuildingUpdate}
|
onBuildingUpdate={handleBuildingUpdate}
|
||||||
onUserVerifiedUpdate={handleUserVerifiedUpdate}
|
onUserVerifiedUpdate={handleUserVerifiedUpdate}
|
||||||
mapColourScale={mapColourScale}
|
mapColourScale={mapColourScale}
|
||||||
onMapColourScale={setMapColourScale}
|
onMapColourScale={setMapColourScale}
|
||||||
/>
|
|
||||||
</Route>
|
|
||||||
</Switch>
|
|
||||||
</Route>
|
|
||||||
<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" }}>
|
|
||||||
<ColouringMap
|
|
||||||
selectedBuildingId={selectedBuildingId}
|
|
||||||
mode={mode || 'basic'}
|
|
||||||
revisionId={revisionId}
|
|
||||||
onBuildingAction={mode === 'multi-edit' ? colourBuilding : selectBuilding}
|
|
||||||
mapColourScale={mapColourScale}
|
|
||||||
onMapColourScale={setMapColourScale}
|
|
||||||
categoryMapDefinitions={categoryMapDefinitions}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</Route>
|
||||||
</>
|
</Switch>
|
||||||
);
|
</Route>
|
||||||
|
<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",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ColouringMap
|
||||||
|
selectedBuildingId={selectedBuildingId}
|
||||||
|
mode={mode || "basic"}
|
||||||
|
revisionId={revisionId}
|
||||||
|
onBuildingAction={
|
||||||
|
mode === "multi-edit" ? colourBuilding : selectBuilding
|
||||||
|
}
|
||||||
|
mapColourScale={mapColourScale}
|
||||||
|
onMapColourScale={setMapColourScale}
|
||||||
|
categoryMapDefinitions={categoryMapDefinitions}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user