diff --git a/src/Map/Basemap.jsx b/src/Map/Basemap.jsx deleted file mode 100644 index c87e77f..0000000 --- a/src/Map/Basemap.jsx +++ /dev/null @@ -1,22 +0,0 @@ -import { Layer, Source } from "react-map-gl"; - -const greyMap = - "https://api.mapbox.com/styles/v1/ghermant/cla2nwk5f00el14nxvtjlsi6z/tiles/256/{z}/{x}/{y}@2x?access_token=pk.eyJ1IjoiZ2hlcm1hbnQiLCJhIjoiY2xhMm5zZ3ZrMDF4MDN2bzc5Yjd0ZjZ1dCJ9.fqnvrEqKKBoguR7R6DR7Yw"; -// const colorMap = -// "https://api.mapbox.com/styles/v1/ghermant/cl9vd1nji002n15s2xxj25f4m/tiles/256/{z}/{x}/{y}@2x?access_token=pk.eyJ1IjoiZ2hlcm1hbnQiLCJhIjoiY2pncDUwcnRmNDQ4ZjJ4czdjZXMzaHZpNyJ9.3rFyYRRtvLUngHm027HZ7A"; -// -// const positron = -// "https://a.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}@2x.png"; - -export const Basemap = () => { - return ( - - - - ); -}; diff --git a/src/Map/MapComponent.jsx b/src/Map/MapComponent.jsx index 7fcb803..4f3f8f4 100644 --- a/src/Map/MapComponent.jsx +++ b/src/Map/MapComponent.jsx @@ -1,24 +1,23 @@ -import maplibregl from "maplibre-gl"; -import Map, {MapProvider} from "react-map-gl"; -import {useEffect, useRef, useState} from "react"; -import {Sidebar} from "../modules/Sidebar/Sidebar"; -import {Layers} from "../dzkh-features/Layers/Layers.jsx"; -import {MapPopup} from "./Popup/Popup"; -import {Basemap} from "./Basemap"; import debounce from "lodash.debounce"; -import {usePopup} from "../stores/usePopup"; -import {useClickedPointConfig} from "../stores/useClickedPointConfig"; -import {Legend} from "../dzkh-features/Legend.jsx"; -import {TableWrapper} from "../modules/Table/TableWrapper"; -import {SidebarControl} from "./SidebarControl"; -import {useTable} from "../stores/useTable"; -import {twMerge} from "tailwind-merge"; -import {ImportDataModal} from "../dzkh-features/ImportDataModal.jsx"; -import {ImportDataButton} from "../dzkh-features/ImportDataButton.jsx"; -import {WeatherSlider} from "../dzkh-features/WeatherSlider/WeatherSlider.jsx"; -import {LAYER_IDS} from "../dzkh-features/constants.js"; -import {AccidentSimulationResults} from "../dzkh-features/AccidentSimulationResults.jsx"; +import maplibregl from "maplibre-gl"; +import { useEffect, useRef, useState } from "react"; +import Map, { MapProvider } from "react-map-gl"; +import { twMerge } from "tailwind-merge"; +import { AccidentSimulationResults } from "../dzkh-features/AccidentSimulationResults.jsx"; +import { ImportDataButton } from "../dzkh-features/ImportDataButton.jsx"; +import { ImportDataModal } from "../dzkh-features/ImportDataModal.jsx"; +import { Layers } from "../dzkh-features/Layers/Layers.jsx"; +import { Legend } from "../dzkh-features/Legend.jsx"; +import { WeatherSlider } from "../dzkh-features/WeatherSlider/WeatherSlider.jsx"; +import { LAYER_IDS } from "../dzkh-features/constants.js"; import { icons } from "../icons/icons-config.js"; +import { Sidebar } from "../modules/Sidebar/Sidebar"; +import { TableWrapper } from "../modules/Table/TableWrapper"; +import { useClickedPointConfig } from "../stores/useClickedPointConfig"; +import { usePopup } from "../stores/usePopup"; +import { useTable } from "../stores/useTable"; +import { MapPopup } from "./Popup/Popup"; +import { SidebarControl } from "./SidebarControl"; export const MapComponent = () => { const mapRef = useRef(null); @@ -138,6 +137,7 @@ export const MapComponent = () => { onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave} id="map" + mapStyle="https://raw.githubusercontent.com/gtitov/basemaps/refs/heads/master/positron-nolabels.json" > {popup && ( { -