a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Solve the scroll bar issue

Browse Source
This commit is contained in:
Alireza Adli 2023-11-10 16:44:21 -05:00
parent c451e572c8
commit b746aabeba
7 changed files with 375 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/frontend/building/sidebar.tsx
View File

@ -8,7 +8,7 @@ const Sidebar: React.FC<{}> = (props) => {
return ( return (
<Fragment> <Fragment>
<div style={{ position: "static" }} id="sidebar" className={"info-container " + (collapsed? "offscreen": "")}> <div id="sidebar" className={"info-container " + (collapsed? "offscreen": "")}>
<button className="info-container-collapse btn btn-light" <button className="info-container-collapse btn btn-light"
onClick={() => setCollapsed(!collapsed)} onClick={() => setCollapsed(!collapsed)}
> >

178
app/src/frontend/map-app.tsx
View File

@ -1,33 +1,28 @@
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 { import { defaultMapCategory, categoryMapsConfig } from './config/category-maps-config';
defaultMapCategory, import { useMultiEditData } from './hooks/use-multi-edit-data';
categoryMapsConfig, import { useAuth } from './auth-context';
} from "./config/category-maps-config"; import { sendBuildingUpdate } from './api-data/building-update';
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.
@ -41,7 +36,7 @@ import "mapbox-gl/dist/mapbox-gl.css";
* 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 }
); );
@ -52,11 +47,8 @@ interface MapAppProps {
} }
/** 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>( function unless<V extends string, U extends V>(value: V, unlessValue: U): Exclude<V, U> {
value: V, return value === unlessValue ? undefined : value as Exclude<V, U>;
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 */
@ -68,10 +60,7 @@ function setOrToggle<T>(currentValue: T, newValue: T): T {
} }
} }
function useStateWithOptions<T>( function useStateWithOptions<T>(defaultValue: T, options: T[]): [T, (x: T) => void] {
defaultValue: T,
options: T[]
): [T, (x: T) => void] {
const [value, setValue] = useState(defaultValue); const [value, setValue] = useState(defaultValue);
const effectiveValue = options.includes(value) ? value : options[0]; const effectiveValue = options.includes(value) ? value : options[0];
@ -80,74 +69,50 @@ function useStateWithOptions<T>(
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( useEffect(() => setCategory(unless(categoryUrlParam, 'categories')), [categoryUrlParam]);
() => setCategory(unless(categoryUrlParam, "categories")),
[categoryUrlParam]
);
const displayCategory = const displayCategory = useLastNotEmpty(currentCategory) ?? defaultMapCategory;
useLastNotEmpty(currentCategory) ?? defaultMapCategory;
const [selectedBuildingId, setSelectedBuildingId] = useUrlBuildingParam( const [selectedBuildingId, setSelectedBuildingId] = useUrlBuildingParam('view', displayCategory);
"view",
displayCategory
);
const [building, updateBuilding, reloadBuilding] = useBuildingData( const [building, updateBuilding, reloadBuilding] = useBuildingData(selectedBuildingId, props.building, user != undefined);
selectedBuildingId, const [userVerified, updateUserVerified, reloadUserVerified] = useUserVerifiedData(selectedBuildingId, props.user_verified);
props.building,
user != undefined
);
const [userVerified, updateUserVerified, reloadUserVerified] =
useUserVerifiedData(selectedBuildingId, props.user_verified);
const [revisionId, updateRevisionId] = useRevisionId(props.revisionId); const [revisionId, updateRevisionId] = useRevisionId(props.revisionId);
useEffect(() => { useEffect(() => {
updateRevisionId(building?.revision_id); updateRevisionId(building?.revision_id)
}, [building]); }, [building]);
const [mode] = useUrlModeParam(); const [mode] = useUrlModeParam();
const viewEditMode = unless(mode, "multi-edit"); const viewEditMode = unless(mode, 'multi-edit');
const [multiEditData, multiEditError] = useMultiEditData(); const [multiEditData, multiEditError] = useMultiEditData();
const selectBuilding = useCallback( const selectBuilding = useCallback((selectedBuilding: Building) => {
(selectedBuilding: Building) => {
const currentId = selectedBuildingId; const currentId = selectedBuildingId;
updateBuilding(selectedBuilding); updateBuilding(selectedBuilding);
setSelectedBuildingId( setSelectedBuildingId(setOrToggle(currentId, selectedBuilding?.building_id));
setOrToggle(currentId, selectedBuilding?.building_id) }, [selectedBuildingId, setSelectedBuildingId, updateBuilding, building]);
);
},
[selectedBuildingId, setSelectedBuildingId, updateBuilding, building]
);
const colourBuilding = useCallback( const colourBuilding = useCallback(async (building: Building) => {
async (building: Building) => {
const buildingId = building?.building_id; const buildingId = building?.building_id;
if(buildingId != undefined && multiEditError == undefined) { if(buildingId != undefined && multiEditError == undefined) {
try { try {
const updatedBuilding = await sendBuildingUpdate( const updatedBuilding = await sendBuildingUpdate(buildingId, multiEditData);
buildingId,
multiEditData
);
updateRevisionId(updatedBuilding.revision_id); updateRevisionId(updatedBuilding.revision_id);
} catch(error) { } catch(error) {
console.error({ error }); console.error({ error });
} }
} }
}, }, [multiEditError, multiEditData, currentCategory]);
[multiEditError, multiEditData, currentCategory]
);
const handleBuildingUpdate = useCallback( const handleBuildingUpdate = useCallback((buildingId: number, updatedData: Building) => {
(buildingId: number, updatedData: Building) => {
// only update current building data if the IDs match // only update current building data if the IDs match
if(buildingId === selectedBuildingId) { if(buildingId === selectedBuildingId) {
updateBuilding(Object.assign({}, building, updatedData)); updateBuilding(Object.assign({}, building, updatedData));
@ -155,37 +120,25 @@ export const MapApp: React.FC<MapAppProps> = (props) => {
// otherwise, still update the latest revision ID // otherwise, still update the latest revision ID
updateRevisionId(updatedData.revision_id); updateRevisionId(updatedData.revision_id);
} }
}, }, [selectedBuildingId, building, updateBuilding, updateRevisionId]);
[selectedBuildingId, building, updateBuilding, updateRevisionId]
);
const handleUserVerifiedUpdate = useCallback( const handleUserVerifiedUpdate = useCallback((buildingId: number, updatedData: UserVerified) => {
(buildingId: number, updatedData: UserVerified) => {
// only update current building data if the IDs match // only update current building data if the IDs match
if(buildingId === selectedBuildingId) { if(buildingId === selectedBuildingId) {
updateUserVerified(Object.assign({}, userVerified, updatedData)); // quickly show added verifications updateUserVerified(Object.assign({}, userVerified, updatedData)); // quickly show added verifications
reloadBuilding(); reloadBuilding();
reloadUserVerified(); // but still reload from server to reflect removed verifications reloadUserVerified(); // but still reload from server to reflect removed verifications
} }
}, }, [selectedBuildingId, updateUserVerified, reloadBuilding, userVerified]);
[selectedBuildingId, updateUserVerified, reloadBuilding, userVerified]
);
const categoryMapDefinitions = useMemo(
() => categoryMapsConfig[displayCategory], const categoryMapDefinitions = useMemo(() => categoryMapsConfig[displayCategory], [displayCategory]);
[displayCategory] const availableMapStyles = useMemo(() => categoryMapDefinitions.map(x => x.mapStyle), [categoryMapDefinitions]);
); const [mapColourScale, setMapColourScale] = useStateWithOptions<BuildingMapTileset>(undefined, availableMapStyles);
const availableMapStyles = useMemo(
() => categoryMapDefinitions.map((x) => x.mapStyle),
[categoryMapDefinitions]
);
const [mapColourScale, setMapColourScale] =
useStateWithOptions<BuildingMapTileset>(undefined, availableMapStyles);
return ( return (
<> <>
<PrivateRoute path="/:mode(edit|multi-edit)" />{" "} <PrivateRoute path="/:mode(edit|multi-edit)" /> {/* empty private route to ensure auth for editing */}
{/* empty private route to ensure auth for editing */}
<Sidebar> <Sidebar>
<Switch> <Switch>
<Route exact path="/"> <Route exact path="/">
@ -195,10 +148,7 @@ export const MapApp: React.FC<MapAppProps> = (props) => {
<MultiEdit category={displayCategory} /> <MultiEdit category={displayCategory} />
</Route> </Route>
<Route path="/:mode/:cat"> <Route path="/:mode/:cat">
<Categories <Categories mode={mode || 'view'} building_id={selectedBuildingId} />
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} />
@ -217,36 +167,20 @@ export const MapApp: React.FC<MapAppProps> = (props) => {
</Route> </Route>
</Switch> </Switch>
</Route> </Route>
<Route <Route exact path="/:mode(view|edit|multi-edit)"
exact render={props => (<Redirect to={`/${props.match.params.mode}/categories`} />)}
path="/:mode(view|edit|multi-edit)"
render={(props) => (
<Redirect to={`/${props.match.params.mode}/categories`} />
)}
/> />
</Switch> </Switch>
</Sidebar> </Sidebar>
<div
style={{
width: "100%",
height: "100%",
position: "relative",
float: "right",
overflow: "hidden",
}}
>
<ColouringMap <ColouringMap
selectedBuildingId={selectedBuildingId} selectedBuildingId={selectedBuildingId}
mode={mode || "basic"} mode={mode || 'basic'}
revisionId={revisionId} revisionId={revisionId}
onBuildingAction={ onBuildingAction={mode === 'multi-edit' ? colourBuilding : selectBuilding}
mode === "multi-edit" ? colourBuilding : selectBuilding
}
mapColourScale={mapColourScale} mapColourScale={mapColourScale}
onMapColourScale={setMapColourScale} onMapColourScale={setMapColourScale}
categoryMapDefinitions={categoryMapDefinitions} categoryMapDefinitions={categoryMapDefinitions}
/> />
</div>
</> </>
); );
}; };

25
app/src/frontend/map/layers/city-base-map-layer.tsx
View File

@ -1,23 +1,17 @@
import React, { useEffect } from "react"; import React, { useEffect } from 'react';
import mapboxgl from "mapbox-gl"; import mapboxgl from 'mapbox-gl';
// Set your Mapbox access token // Set your Mapbox access token
mapboxgl.accessToken = mapboxgl.accessToken = 'pk.eyJ1IjoiYWxpLWFkbGkiLCJhIjoiY2xuM2JtYjV1MGE5djJrb2d5OGp1ZWNyNiJ9.gENyP4xX6ElLAeZFlE0aDg';
"pk.eyJ1IjoiYWxpLWFkbGkiLCJhIjoiY2xuM2JtYjV1MGE5djJrb2d5OGp1ZWNyNiJ9.gENyP4xX6ElLAeZFlE0aDg";
/* /**
Component to display a Mapbox map. * Component to display a Mapbox map.
*/ */
export function CityMap() { export function CityMap() {
const remote_css = fetch(
"https://api.tiles.mapbox.com/mapbox-gl-js/v0.53.0/mapbox-gl.css"
);
useEffect(() => { useEffect(() => {
const map = new mapboxgl.Map({ const map = new mapboxgl.Map({
container: "map", // container ID container: 'map', // container ID
style: "mapbox://styles/mapbox/streets-v12", // style URL style: 'mapbox://styles/mapbox/streets-v12', // style URL
center: [-73.5801403, 45.4962261], // starting position [lng, lat] center: [-73.5801403, 45.4962261], // starting position [lng, lat]
zoom: 15, // starting zoom zoom: 15, // starting zoom
}); });
@ -28,7 +22,10 @@ export function CityMap() {
return () => map.remove(); return () => map.remove();
}, []); }, []);
return <div id="map"></div>; return (
<div id="map" style={{ width: '100%', height: '100vh' }}></div>
);
} }
export default CityMap; export default CityMap;

4
app/src/frontend/map/map-button.css
View File

@ -73,14 +73,14 @@
} }
.theme-switcher { .theme-switcher {
top: 117px; top: 77px;
} }
.theme-switcher .btn { .theme-switcher .btn {
min-width: 340px; min-width: 340px;
} }
.data-switcher { .data-switcher {
top: 157px; top: 117px;
} }
.data-switcher .btn { .data-switcher .btn {
min-width: 340px; min-width: 340px;

7
app/src/frontend/map/map.css
View File

@ -1,5 +1,5 @@
.map-container { .map-container {
position: fixed; position: absolute;
top: 76px; /* sync with header positioning*/ top: 76px; /* sync with header positioning*/
bottom: 0; bottom: 0;
left: 0; left: 0;
@ -11,9 +11,7 @@
left: 470px; left: 470px;
} }
} }
.leaflet-container { .leaflet-container {height: 100%;
position: absolute;
height: 100%;
width: 100%; width: 100%;
} }
.leaflet-container .leaflet-control-zoom { .leaflet-container .leaflet-control-zoom {
@ -34,3 +32,4 @@
display: block; display: block;
} }
} }

7
app/src/frontend/map/map.tsx
View File

@ -15,7 +15,7 @@ import {
useMap, useMap,
} from "react-leaflet"; } from "react-leaflet";
// import 'leaflet/dist/leaflet.css'; import 'leaflet/dist/leaflet.css';
import "./map.css"; import "./map.css";
import { apiGet } from "../apiHelpers"; import { apiGet } from "../apiHelpers";
@ -134,13 +134,13 @@ export const ColouringMap: FC<ColouringMapProps> = ({
<div <div
ref={mapContainer} ref={mapContainer}
className="map-container" className="map-container"
/*style={{ style={{
position: "absolute", position: "absolute",
top: "0", top: "0",
bottom: "0", bottom: "0",
left: "0", left: "0",
right: "0", right: "0",
}}*/ }}
> >
{mode !== "basic" && ( {mode !== "basic" && (
<> <>
@ -207,3 +207,4 @@ function MapViewport({
return null; return null;
} }

3
app/src/frontendRoute.tsx
View File

@ -93,6 +93,7 @@ function renderHTML(context, data, req, res) {
`<!doctype html> `<!doctype html>
<html lang=""> <html lang="">
<head> <head>
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta charset="utf-8" /> <meta charset="utf-8" />
@ -127,6 +128,8 @@ function renderHTML(context, data, req, res) {
font-style: normal; font-style: normal;
} }
</style> </style>
<link href="https://api.mapbox.com/mapbox-gl-js/v2.14.1/mapbox-gl.css" rel="stylesheet">
<script src="https://api.mapbox.com/mapbox-gl-js/v2.14.1/mapbox-gl.js"></script>
${ ${
assets.client.css assets.client.css
? `<link rel="stylesheet" href="${assets.client.css}">` ? `<link rel="stylesheet" href="${assets.client.css}">`