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

Improve

Browse Source
This commit is contained in:
Alireza Adli 2023-11-16 13:41:32 -05:00
parent ea1e8a520d
commit e34ba23f18
1 changed files with 206 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,69 +5,69 @@ import React, {
useMemo, useMemo,
useState, useState,
useRef, useRef,
} from "react"; } from "react";
import { import {
AttributionControl, AttributionControl,
MapContainer, MapContainer,
ZoomControl, ZoomControl,
useMapEvent, useMapEvent,
Pane, Pane,
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";
import { import {
initialMapViewport, initialMapViewport,
mapBackgroundColor, mapBackgroundColor,
MapTheme, MapTheme,
LayerEnablementState, LayerEnablementState,
} from "../config/map-config"; } from "../config/map-config";
import mapboxgl from "mapbox-gl"; import mapboxgl from "mapbox-gl";
import { Building } from "../models/building"; import { Building } from "../models/building";
import { CityMap } from "./layers/city-base-map-layer"; import { CityMap } from "./layers/city-base-map-layer";
import { CityBoundaryLayer } from "./layers/city-boundary-layer"; import { CityBoundaryLayer } from "./layers/city-boundary-layer";
import { BoroughBoundaryLayer } from "./layers/borough-boundary-layer"; import { BoroughBoundaryLayer } from "./layers/borough-boundary-layer";
import { BoroughLabelLayer } from "./layers/borough-label-layer"; import { BoroughLabelLayer } from "./layers/borough-label-layer";
import { ParcelBoundaryLayer } from "./layers/parcel-boundary-layer"; import { ParcelBoundaryLayer } from "./layers/parcel-boundary-layer";
import { HistoricDataLayer } from "./layers/historic-data-layer"; import { HistoricDataLayer } from "./layers/historic-data-layer";
import { HistoricMapLayer } from "./layers/historic-map-layer"; import { HistoricMapLayer } from "./layers/historic-map-layer";
import { FloodBoundaryLayer } from "./layers/flood-boundary-layer"; import { FloodBoundaryLayer } from "./layers/flood-boundary-layer";
import { ConservationAreaBoundaryLayer } from "./layers/conservation-boundary-layer"; import { ConservationAreaBoundaryLayer } from "./layers/conservation-boundary-layer";
import { VistaBoundaryLayer } from "./layers/vista-boundary-layer"; import { VistaBoundaryLayer } from "./layers/vista-boundary-layer";
import { HousingBoundaryLayer } from "./layers/housing-boundary-layer"; import { HousingBoundaryLayer } from "./layers/housing-boundary-layer";
import { CreativeBoundaryLayer } from "./layers/creative-boundary-layer"; import { CreativeBoundaryLayer } from "./layers/creative-boundary-layer";
import { BuildingBaseLayer } from "./layers/building-base-layer"; import { BuildingBaseLayer } from "./layers/building-base-layer";
import { BuildingDataLayer } from "./layers/building-data-layer"; import { BuildingDataLayer } from "./layers/building-data-layer";
import { BuildingNumbersLayer } from "./layers/building-numbers-layer"; import { BuildingNumbersLayer } from "./layers/building-numbers-layer";
import { BuildingHighlightLayer } from "./layers/building-highlight-layer"; import { BuildingHighlightLayer } from "./layers/building-highlight-layer";
import { Legend } from "./legend"; import { Legend } from "./legend";
import SearchBox from "./search-box"; import SearchBox from "./search-box";
import ThemeSwitcher from "./theme-switcher"; import ThemeSwitcher from "./theme-switcher";
import DataLayerSwitcher from "./data-switcher"; import DataLayerSwitcher from "./data-switcher";
import { BoroughSwitcher } from "./borough-switcher"; import { BoroughSwitcher } from "./borough-switcher";
import { ParcelSwitcher } from "./parcel-switcher"; import { ParcelSwitcher } from "./parcel-switcher";
import { FloodSwitcher } from "./flood-switcher"; import { FloodSwitcher } from "./flood-switcher";
import { ConservationAreaSwitcher } from "./conservation-switcher"; import { ConservationAreaSwitcher } from "./conservation-switcher";
import { HistoricDataSwitcher } from "./historic-data-switcher"; import { HistoricDataSwitcher } from "./historic-data-switcher";
import { HistoricMapSwitcher } from "./historic-map-switcher"; import { HistoricMapSwitcher } from "./historic-map-switcher";
import { VistaSwitcher } from "./vista-switcher"; import { VistaSwitcher } from "./vista-switcher";
import { CreativeSwitcher } from "./creative-switcher"; import { CreativeSwitcher } from "./creative-switcher";
import { HousingSwitcher } from "./housing-switcher"; import { HousingSwitcher } from "./housing-switcher";
import { BuildingMapTileset } from "../config/tileserver-config"; import { BuildingMapTileset } from "../config/tileserver-config";
import { useDisplayPreferences } from "../displayPreferences-context"; import { useDisplayPreferences } from "../displayPreferences-context";
import { CategoryMapDefinition } from "../config/category-maps-config"; import { CategoryMapDefinition } from "../config/category-maps-config";
mapboxgl.accessToken = mapboxgl.accessToken =
"pk.eyJ1IjoiYWxpLWFkbGkiLCJhIjoiY2xuM2JtYjV1MGE5djJrb2d5OGp1ZWNyNiJ9.gENyP4xX6ElLAeZFlE0aDg"; "pk.eyJ1IjoiYWxpLWFkbGkiLCJhIjoiY2xuM2JtYjV1MGE5djJrb2d5OGp1ZWNyNiJ9.gENyP4xX6ElLAeZFlE0aDg";
interface ColouringMapProps { interface ColouringMapProps {
selectedBuildingId: number; selectedBuildingId: number;
mode: "basic" | "view" | "edit" | "multi-edit"; mode: "basic" | "view" | "edit" | "multi-edit";
revisionId: string; revisionId: string;
@ -75,9 +75,9 @@ import React, {
mapColourScale: BuildingMapTileset; mapColourScale: BuildingMapTileset;
onMapColourScale: (x: BuildingMapTileset) => void; onMapColourScale: (x: BuildingMapTileset) => void;
categoryMapDefinitions: CategoryMapDefinition[]; categoryMapDefinitions: CategoryMapDefinition[];
} }
export const ColouringMap: FC<ColouringMapProps> = ({ export const ColouringMap: FC<ColouringMapProps> = ({
mode, mode,
revisionId, revisionId,
onBuildingAction, onBuildingAction,
@ -86,7 +86,7 @@ import React, {
onMapColourScale, onMapColourScale,
categoryMapDefinitions, categoryMapDefinitions,
children, children,
}) => { }) => {
const { darkLightTheme, darkLightThemeSwitch, showLayerSelection } = const { darkLightTheme, darkLightThemeSwitch, showLayerSelection } =
useDisplayPreferences(); useDisplayPreferences();
const [position, setPosition] = useState(initialMapViewport.position); const [position, setPosition] = useState(initialMapViewport.position);
@ -128,7 +128,7 @@ import React, {
setLat(map.current.getCenter().lat.toFixed(4)); setLat(map.current.getCenter().lat.toFixed(4));
setZoom(map.current.getZoom().toFixed(2)); setZoom(map.current.getZoom().toFixed(2));
}); });
}); }, []);
return ( return (
<div <div
@ -175,30 +175,30 @@ import React, {
)} )}
</div> </div>
); );
}; };
function ClickHandler({ onClick }: { onClick: (e) => void }) { function ClickHandler({ onClick }: { onClick: (e) => void }) {
useMapEvent("click", (e) => onClick(e)); useMapEvent("click", (e) => onClick(e));
return null; return null;
} }
function MapBackgroundColor({ theme }: { theme: MapTheme }) { function MapBackgroundColor({ theme }: { theme: MapTheme }) {
const map = useMap(); const map = useMap();
useEffect(() => { useEffect(() => {
map.getContainer().style.backgroundColor = mapBackgroundColor[theme]; map.getContainer().style.backgroundColor = mapBackgroundColor[theme];
}); });
return null; return null;
} }
function MapViewport({ function MapViewport({
position, position,
zoom, zoom,
}: { }: {
position: [number, number]; position: [number, number];
zoom: number; zoom: number;
}) { }) {
const map = useMap(); const map = useMap();
useEffect(() => { useEffect(() => {
@ -206,5 +206,4 @@ import React, {
}, [position, zoom]); }, [position, zoom]);
return null; return null;
} }