Ismail/nodeMap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

markerUtils in poiUitls umbenannt

Browse Source
This commit is contained in:
ISA
2024-09-03 11:30:37 +02:00
parent bbd60cd5f4
commit f35c7c4d0b
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/imports.js
View File

@@ -28,7 +28,7 @@ import { mapIdState, userIdState } from "../store/atoms/urlParameterState.js";
import { poiLayerVisibleState } from "../store/atoms/poiLayerVisibleState.js"; import { poiLayerVisibleState } from "../store/atoms/poiLayerVisibleState.js";
import plusRoundIcon from "./PlusRoundIcon.js"; import plusRoundIcon from "./PlusRoundIcon.js";
import { parsePoint, findClosestPoints } from "../utils/geometryUtils.js"; import { parsePoint, findClosestPoints } from "../utils/geometryUtils.js";
import { insertNewMarker, removeMarker, handleEditPoi } from "../utils/markerUtils.js"; import { insertNewPOI, removePOI, handleEditPoi } from "../utils/poiUtils.js";
import { createAndSetDevices } from "../utils/createAndSetDevices.js"; import { createAndSetDevices } from "../utils/createAndSetDevices.js";
import { redrawPolyline, restoreMapSettings, checkOverlappingMarkers } from "../utils/mapUtils.js"; import { redrawPolyline, restoreMapSettings, checkOverlappingMarkers } from "../utils/mapUtils.js";
import circleIcon from "./gisPolylines/icons/CircleIcon.js"; import circleIcon from "./gisPolylines/icons/CircleIcon.js";
@@ -105,8 +105,8 @@ export {
plusRoundIcon, plusRoundIcon,
parsePoint, parsePoint,
findClosestPoints, findClosestPoints,
insertNewMarker, insertNewPOI,
removeMarker, removePOI,
createAndSetDevices, createAndSetDevices,
handleEditPoi, handleEditPoi,
redrawPolyline, redrawPolyline,

2
hooks/layers/useOtdrMarkersLayer.js
View File

@@ -2,7 +2,7 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import L from "leaflet"; import L from "leaflet";
import { addContextMenuToMarker } from "../../utils/contextMenuUtils"; import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
import { createAndSetDevices } from "../../utils/createAndSetDevices"; // Assuming this function is in markerUtils import { createAndSetDevices } from "../../utils/createAndSetDevices"; // Assuming this function is in poiUtils
const useOtdrMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => { const useOtdrMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
const [otdrMarkers, setOtdrMarkers] = useState([]); const [otdrMarkers, setOtdrMarkers] = useState([]);

10
utils/markerUtils.js → utils/poiUtils.js
View File

@@ -1,12 +1,12 @@
// /utils/markerUtils.js // /utils/poiUtils.js
import circleIcon from "../components/gisPolylines/icons/CircleIcon"; import circleIcon from "../components/gisPolylines/icons/CircleIcon.js";
import { saveLineData, redrawPolyline } from "./mapUtils"; import { saveLineData, redrawPolyline } from "./mapUtils.js";
import L from "leaflet"; import L from "leaflet";
import "leaflet.smooth_marker_bouncing"; import "leaflet.smooth_marker_bouncing";
import { toast } from "react-toastify"; import { toast } from "react-toastify";
import * as config from "../config/config.js"; import * as config from "../config/config.js";
export const insertNewMarker = (closestPoints, newPoint, lineData, map) => { export const insertNewPOI = (closestPoints, newPoint, lineData, map) => {
const newMarker = L.marker(newPoint, { const newMarker = L.marker(newPoint, {
icon: circleIcon, icon: circleIcon,
draggable: true, draggable: true,
@@ -32,7 +32,7 @@ export const insertNewMarker = (closestPoints, newPoint, lineData, map) => {
}); });
}; };
export const removeMarker = (marker, lineData, currentZoom, currentCenter) => { export const removePOI = (marker, lineData, currentZoom, currentCenter) => {
// Save zoom and center to localStorage // Save zoom and center to localStorage
//localStorage.setItem("mapZoom", currentZoom); //localStorage.setItem("mapZoom", currentZoom);
//localStorage.setItem("mapCenter", JSON.stringify(currentCenter)); //localStorage.setItem("mapCenter", JSON.stringify(currentCenter));

2
utils/setupPOIs.js
View File

@@ -2,7 +2,7 @@
import { findClosestPoints } from "./geometryUtils"; import { findClosestPoints } from "./geometryUtils";
import handlePoiSelect from "./handlePoiSelect"; import handlePoiSelect from "./handlePoiSelect";
import { updateLocationInDatabase } from "../services/apiService"; import { updateLocationInDatabase } from "../services/apiService";
import { handleEditPoi, insertNewMarker, removeMarker } from "./markerUtils"; import { handleEditPoi, insertNewPOI, removePOI } from "./poiUtils";
import { parsePoint } from "./geometryUtils"; import { parsePoint } from "./geometryUtils";
import circleIcon from "../components/gisPolylines/icons/CircleIcon"; import circleIcon from "../components/gisPolylines/icons/CircleIcon";
import startIcon from "../components/gisPolylines/icons/StartIcon"; import startIcon from "../components/gisPolylines/icons/StartIcon";

6
utils/setupPolylines.js
View File

@@ -2,7 +2,7 @@
import { findClosestPoints } from "./geometryUtils"; import { findClosestPoints } from "./geometryUtils";
import handlePoiSelect from "./handlePoiSelect"; import handlePoiSelect from "./handlePoiSelect";
import { updateLocationInDatabase } from "../services/apiService"; import { updateLocationInDatabase } from "../services/apiService";
import { handleEditPoi, insertNewMarker, removeMarker } from "./markerUtils"; import { handleEditPoi, insertNewPOI, removePOI } from "./poiUtils";
import { parsePoint } from "./geometryUtils"; import { parsePoint } from "./geometryUtils";
import circleIcon from "../components/gisPolylines/icons/CircleIcon"; import circleIcon from "../components/gisPolylines/icons/CircleIcon";
import startIcon from "../components/gisPolylines/icons/StartIcon"; import startIcon from "../components/gisPolylines/icons/StartIcon";
@@ -127,7 +127,7 @@ export const setupPolylines = (map, linePositions, lineColors, tooltipContents,
const newCoordinates = [...lineData.coordinates]; const newCoordinates = [...lineData.coordinates];
newCoordinates[index] = [newCoords.lat, newCoords.lng]; newCoordinates[index] = [newCoords.lat, newCoords.lng];
removeMarker(marker, lineData, currentZoom, currentCenter); removePOI(marker, lineData, currentZoom, currentCenter);
polylines[lineIndex].remove(); polylines[lineIndex].remove();
lineData.coordinates = newCoordinates; lineData.coordinates = newCoordinates;
}, },
@@ -157,7 +157,7 @@ export const setupPolylines = (map, linePositions, lineColors, tooltipContents,
} }
const newPoint = e.latlng; const newPoint = e.latlng;
const closestPoints = findClosestPoints(lineData.coordinates, newPoint, map); const closestPoints = findClosestPoints(lineData.coordinates, newPoint, map);
insertNewMarker(closestPoints, newPoint, lineData, map); insertNewPOI(closestPoints, newPoint, lineData, map);
redrawPolyline(lineData, lineColors, tooltipContents, map); redrawPolyline(lineData, lineColors, tooltipContents, map);
window.location.reload(); window.location.reload();
}, },