Merge branch 'master' into add_map_node_detail

This commit is contained in:
Hunter Thornsberry
2025-01-07 00:05:45 -05:00
committed by GitHub
5 changed files with 21 additions and 10 deletions
+5 -1
View File
@@ -17,7 +17,7 @@ import {
ZoomOutIcon,
} from "lucide-react";
import { useCallback, useEffect, useState } from "react";
import { Marker, useMap, Popup } from "react-map-gl";
import { AttributionControl, Marker, Popup, useMap } from "react-map-gl";
import MapGl from "react-map-gl/maplibre";
import { Protobuf } from "@meshtastic/js";
@@ -130,6 +130,7 @@ export const MapPage = (): JSX.Element => {
// }}
// @ts-ignore
attributionControl={false}
renderWorldCopies={false}
maxPitch={0}
@@ -146,6 +147,9 @@ export const MapPage = (): JSX.Element => {
longitude: 0,
}}
>
<AttributionControl
style={{ background: darkMode ? "#ffffff" : "", color: darkMode ? "black" : "" }}
/>
{waypoints.map((wp) => (
<Marker
key={wp.id}