@vidro/map-handler 1.2.179 → 1.2.191

package/examples/react-next/components/MapInfo.js

@@ -0,0 +1,36 @@
+import { useMaps } from "@/contexts/maps";
+import useMapEvents from "@/hooks/useMapEvents";
+const MapInfo = () => {
+  useMapEvents();
+  const {
+    zoomLevel,
+    mapScale,
+    clickedCoordinates,
+    map,
+    displayedLayers,
+    mapResolution,
+  } = useMaps();
+  if (!map) return null;
+  return (
+    <div className="absolute bg-white/60 right-0 p-5">
+      <div className="flex flex-col gap-1 text-xs">
+        <div>Zoom level: {zoomLevel}</div>
+        <div>Map scale: {mapScale}</div>
+        <div>Map resolution: {mapResolution}</div>
+        <div>Clicked coordinates: {clickedCoordinates}</div>
+      </div>
+      <div className="bg-black/20 p-5 text-left mt-2">
+        <span>Displayed Layers:</span>
+
+        {displayedLayers && displayedLayers.length > 0 && (
+          <div className="mt-1 flex flex-col gap-1 text-xs">
+            {displayedLayers.map((layer) => (
+              <div key={`lay_${layer}`}> - {layer}</div>
+            ))}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
+export default MapInfo;

package/examples/react-next/components/MapLayers.js

@@ -0,0 +1,60 @@
+import { useAuth } from "@/contexts/auth";
+import { useMaps } from "@/contexts/maps";
+import { useMessages } from "@/contexts/messages";
+import { useEffect, useState } from "react";
+
+const MapLayers = () => {
+  const { GetMapInfo, mapId, mapLayers, setActiveLayer } = useMaps();
+  const { ToggleLayer } = useMessages();
+  const { logged } = useAuth();
+  const [selectedLayer, setSelectedLayer] = useState("-1");
+
+  useEffect(() => {
+    if (!mapId) return;
+    GetMapInfo(mapId);
+  }, [mapId]);
+
+  if (!logged) return null;
+  if (!mapId) return null;
+  return (
+    <>
+      <div>
+        {mapLayers && mapLayers.length === 0 && <div>No layers available</div>}
+
+        <div className="m-2 flex gap-2">
+          <label className="block text-sm font-medium text-gray-700 pt-2">
+            Layers
+          </label>
+          {mapLayers && mapLayers.length > 0 && (
+            <select
+              className="border border-gray-300 rounded-md p-2 w-60"
+              onChange={(e) => setSelectedLayer(e.target.value)}
+              value={selectedLayer}
+            >
+              <option value="-1">Select layer...</option>
+              {mapLayers.map((ele) => (
+                <option key={ele.id} value={ele.qgis_name}>
+                  {ele.qgis_name} - {ele.alias}
+                </option>
+              ))}
+            </select>
+          )}
+
+          <button
+            onClick={(e) => {
+              console.log("Toggle layer", selectedLayer);
+              setActiveLayer(selectedLayer);
+              ToggleLayer(selectedLayer);
+            }}
+            disabled={selectedLayer === "-1"}
+            className="border border-gray-300 bg-black text-white rounded-md p-2 mt-1 text-xs"
+          >
+            Toggle layer
+          </button>
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default MapLayers;

package/examples/react-next/components/MapList.js

@@ -0,0 +1,43 @@
+import { useAuth } from "@/contexts/auth";
+import { useMaps } from "@/contexts/maps";
+import { useState } from "react";
+
+const MapList = () => {
+  const { GetMap } = useMaps();
+  const { projects, logged } = useAuth();
+  const [selectedMap, setSelectedMap] = useState("-1");
+  if (!logged) return null;
+  return (
+    <div>
+      <div className="m-2 flex gap-2">
+        <label className="block text-sm font-medium text-gray-700 pt-2">
+          Maps
+        </label>
+        <select
+          className="border border-gray-300 rounded-md p-2  w-32"
+          onChange={(e) => setSelectedMap(e.target.value)}
+          value={selectedMap}
+        >
+          <option value="-1">Select a map</option>
+          {projects.map((projectId) => (
+            <option key={projectId} value={projectId}>
+              {projectId}
+            </option>
+          ))}
+        </select>
+
+        <button
+          onClick={(e) => {
+            GetMap(selectedMap);
+          }}
+          disabled={selectedMap === "-1"}
+          className="border border-gray-300 bg-black text-white rounded-md p-2 mt-1 text-xs"
+        >
+          Load map
+        </button>
+      </div>
+    </div>
+  );
+};
+
+export default MapList;

package/examples/react-next/contexts/auth.js

@@ -5,7 +5,9 @@ import { useRouter } from "next/navigation";
 const AuthContext = createContext({});
 
 export const AuthProvider = ({ children }) => {
-  const [apiUrl, setApiUrl] = useState("");
+  const [apiUrl, setApiUrl] = useState(
+    process.env.NEXT_PUBLIC_APIURL ? process.env.NEXT_PUBLIC_APIURL : ""
+  );
   const [logged, setLogged] = useState(null);
   const [token, setToken] = useState(null);
   const [userId, setUserId] = useState(null);

package/examples/react-next/contexts/maps.js

@@ -1,28 +1,24 @@
 "use client";
 import { createContext, useContext, useState, useEffect } from "react";
-
-import MapService from "@/shared/maps-service";
 import { useAuth } from "./auth";
 
 const MapsContext = createContext({});
 
 export const MapsProvider = ({ children }) => {
   const { apiUrl, token } = useAuth();
-  const [loading, setLoading] = useState(true);
   const [map, setMap] = useState(null);
   const [mapId, setMapId] = useState(null);
-  const [mapToken, setMaptoken] = useState(null);
-  const [mapInfo, setMapInfo] = useState(null);
+
   const [mapError, setMapError] = useState(null);
   const [mapReady, setMapReady] = useState(false);
-  const [tiledReady, setTiledReady] = useState(false);
-  const [componentUrl, setComponentUrl] = useState(null);
+
   const [sessionToken, setSessionToken] = useState(null);
   const [currentMapAction, setCurrentMapAction] = useState(null);
   const [clickedCoordinates, setClickedCoordinates] = useState(null);
   const [bboxCoordinates, setBboxcoordinates] = useState(null);
   const [zoomLevel, setZoomLevel] = useState(null);
   const [mapScale, setMapScale] = useState(null);
+  const [mapResolution, setMapResolution] = useState(null);
   const [srid, setSrid] = useState(null);
 
   //geolocations
@@ -36,9 +32,7 @@ export const MapsProvider = ({ children }) => {
   //layers
   const [displayedLayers, setDisplayedLayers] = useState([]);
   const [activeLayer, setActiveLayer] = useState(null);
-  const [layerLabels, setLayerLabels] = useState([]); //layer list to be displayed on UI
-  //preselected layers - shortcut to displayed layers (the pills)
-  const [preselectedLayers, setPreselectedLayers] = useState([]);
+  const [mapLayers, setMapLayers] = useState(null);
 
   const [infoLayerSource, setInfoLayerSource] = useState([]); //layer from info is received
 
@@ -64,24 +58,46 @@ export const MapsProvider = ({ children }) => {
       });
       const data = await response.json();
       console.log("GetMap", data);
-
+      setMapId(id);
       setMapError(false);
-      setSessionToken(data.message.essionToken);
+      setSessionToken(data.message.sessionToken);
       setMap(
         `${data.message.iframe}?sessionToken=${data.message.sessionToken}`
       );
-      setComponentUrl(data.iframe);
       return;
     } catch (error) {
       console.error("Error fetching map:", error);
       setSessionToken(null);
       setMap(null);
-      setComponentUrl(null);
-      setMaptoken(null);
+      setMapId(null);
       throw error;
     }
   };
 
+  const GetMapInfo = async (id) => {
+    let url = `${apiUrl}map/detail/${id}`;
+
+    try {
+      const response = await fetch(url, {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${token}`,
+        },
+      });
+      const data = await response.json();
+      console.log("GetMapInfo", data);
+      console.log("Layers", data.message.layers);
+      setMapLayers(data.message.layers);
+      setConfiguredFilters(data.message.layerFilters);
+      return;
+    } catch (error) {
+      console.error("Error fetching map info:", error);
+
+      setMapLayers(null);
+      throw error;
+    }
+  };
   return (
     <MapsContext.Provider
       value={{
@@ -89,7 +105,6 @@ export const MapsProvider = ({ children }) => {
         setMapId,
         GetMap,
         map,
-        mapInfo,
         sessionToken,
         mapError,
         mapReady,
@@ -129,6 +144,10 @@ export const MapsProvider = ({ children }) => {
         mapScale,
         setMapScale,
         setSessionToken,
+        mapLayers,
+        GetMapInfo,
+        mapResolution,
+        setMapResolution,
       }}
     >
       {children}

package/examples/react-next/contexts/messages.js

@@ -59,6 +59,7 @@ export const MessageProvider = ({ children }) => {
 
   const Filters = (filters) => {
     if (!communicator) return;
+    console.log("messages - Filters", filters);
     communicator.setFilters(filters);
   };
 
@@ -119,12 +120,6 @@ export const MessageProvider = ({ children }) => {
     communicator.toggleLayer(layer, properties);
   };
 
-  const doSetActiveLayer = (name) => {
-    if (!communicator) return;
-    console.log("doSetActiveLayer", { name });
-    communicator.setActiveLayer(name);
-  };
-
   const removeLayer = (name) => {
     if (!communicator) return;
     console.log("removeLayer", { name });

package/examples/react-next/env.sample

@@ -0,0 +1,3 @@
+NEXT_PUBLIC_APIURL="https://your api url"
+NEXT_PUBLIC_USER="your user"
+NEXT_PUBLIC_PWD="your password"

package/examples/react-next/hooks/useMapEvents.js

@@ -1,199 +1,108 @@
 "use client";
-import { useEffect, useState } from "react";
-import Logger from "@/shared/logger";
-import { useIntl } from "react-intl";
-import { toast } from "react-toastify";
-import { ERRORS, MAP_EVENTS, PLUGINS } from "@/shared/constants";
+import { useEffect } from "react";
+import { MAP_EVENTS } from "@/shared/constants";
 import { useMessages } from "@/contexts/messages";
 import { useMaps } from "@/contexts/maps";
-import { storeMapCookie, readMapCookie } from "@/shared/cookies";
-
-const logger = new Logger("Hooks - useMapEvents");
-const useMapEvents = (setShowInfo) => {
+const useMapEvents = () => {
   const {
-    doInfo,
-    setTiledReady,
     setMapReady,
     setDisplayedLayers,
     setCurrentMapAction,
     displayedLayers,
     setZoomLevel,
-    mapInfo,
     mapReady,
-    AddLayerToPreselectedLayers,
-    mapScale,
     setMapScale,
+    setClickedCoordinates,
+    setSrid,
+    setBboxcoordinates,
+    setMapResolution,
   } = useMaps();
-  const { message, setMessage, zoomToCoordinates } = useMessages();
-  const [cookieCoordinates, setCookieCoordindates] = useState(null);
-  const [cookieZoom, setCookieZoom] = useState(null);
-  const [cookieToc, setCookieToc] = useState(null);
-
-  useEffect(() => {
-    if (!cookieCoordinates) return;
-    if (!cookieZoom) return;
-    try {
-      logger.log("Cookie zoom", { cookieZoom, cookieCoordinates });
-      zoomToCoordinates(JSON.parse(cookieCoordinates), cookieZoom);
-    } catch (e) {
-      logger.error("error parsing coordinates", e);
-    }
-  }, [cookieCoordinates, cookieZoom]);
-
-  useEffect(() => {
-    if (!mapInfo) return;
-    if (mapInfo?.layers.length === 0) return;
-    logger.log("Cookie layers", { mapInfo, cookieToc });
-    if (!cookieToc || cookieToc === "undefined") return;
-    try {
-      const tocLayers = JSON.parse(cookieToc);
-      logger.log("Cookie layers", tocLayers);
-      tocLayers.forEach((element) => {
-        logger.log("Cookie layers adding", element);
-        //find layer in project layers
-        const lay = mapInfo.layers.find((ly) => ly.qgis_name === element);
-        //render layer
-        AddLayerToPreselectedLayers(lay.id);
-      });
-    } catch (e) {
-      logger.error("error parsing cookieToc", e);
-    }
-  }, [cookieToc, mapInfo]);
+  const { message, setMessage, Highlight } = useMessages();
 
   useEffect(() => {
     if (!message) return;
     if (!mapReady) return;
-    if (!mapInfo) return;
 
     switch (message.type) {
       case MAP_EVENTS.ZOOM_CHANGE:
-        //store in cookie zoom level
-        if (mapInfo.zoomcookie) {
-          storeMapCookie(`${mapInfo.id}_zoom`, message.zoom);
-          setZoomLevel(message.zoom);
-        }
+        console.log("useMapEvents Zoom changed", message);
+        setZoomLevel(message.zoom);
         setMapScale(message?.meta?.scale);
+        setMapResolution(message?.meta?.resolution);
         setMessage(null);
         break;
       case MAP_EVENTS.CENTER_CHANGE:
-        if (mapInfo.zoomcookie) {
-          storeMapCookie(
-            `${mapInfo.id}_center`,
-            JSON.stringify(message.coordinates)
-          );
-        }
         setMessage(null);
         break;
       default:
         setMessage(null);
         break;
     }
-  }, [message, cookieCoordinates, cookieZoom, mapReady, mapInfo]);
+  }, [message, mapReady]);
 
   useEffect(() => {
     if (!message) return;
     switch (message.type) {
-      case MAP_EVENTS.VERSION:
-        //ToDo
-        break;
       case MAP_EVENTS.LOADED:
         if (message.what === "map") {
-          logger.log("Map loaded and ready");
-          //use cookie for zoom and position only if map is configured with zoomcookie
-          if (mapInfo.zoomcookie) {
-            setCookieCoordindates(readMapCookie(`${mapInfo.id}_center`));
-            setCookieZoom(readMapCookie(`${mapInfo.id}_zoom`));
-          }
-          //use cookie for toc layers configured with tocusecookie
-          if (mapInfo.tocusecookie) {
-            setCookieToc(readMapCookie(`${mapInfo.id}_toc`));
-          }
+          console.log("useMapEvents Map loaded and ready");
           setMapReady(true);
         } else if (message.what === "tiled") {
-          logger.log("Tiled loaded");
-          setTiledReady(true);
+          console.log("useMapEvents Tiled loaded");
         }
         if (message.what === "layer") {
-          if (mapInfo.tocusecookie) {
-            if (cookieToc && cookieToc !== "undefined") {
-              let currentCookie = JSON.parse(cookieToc);
-              if (!currentCookie.find((l) => l === message.layer)) {
-                logger.log("Store layer in TOC cookie", message.layer);
-                currentCookie.push(message.layer);
-                storeMapCookie(
-                  `${mapInfo.id}_toc`,
-                  JSON.stringify(currentCookie)
-                );
-              }
-            } else {
-              logger.log("Store layer in TOC cookie", message.layer);
-              storeMapCookie(
-                `${mapInfo.id}_toc`,
-                JSON.stringify([message.layer])
-              );
-            }
-          }
         }
         setMessage(null);
         break;
       case MAP_EVENTS.UNLOADED:
         if (message.what === "tiled") {
-          logger.log("Tiled unloaded");
-          setTiledReady(false);
+          console.log("useMapEvents Tiled unloaded");
         }
         setMessage(null);
         break;
       case MAP_EVENTS.LAYERS:
-        logger.log("MapComponent displayed layers", message.layers);
+        console.log("useMapEvents displayed layers", message.layers);
         if (!message.layers) returns;
         //check if is already displayed
         setDisplayedLayers(message.layers);
         setMessage(null);
         break;
       case MAP_EVENTS.GEOM_ADDED:
-        logger.log("GeomAdded", message);
+        console.log("GeomAdded", message);
         setCurrentMapAction(null);
+        //Highlight the added geom
+        Highlight(
+          {
+            feature_type: "HIGHLIGHT",
+            geom: message?.geom_astext,
+          },
+          2,
+          {
+            duration: 1500,
+            repeat: true,
+          },
+          0,
+          null
+        );
         if (message?.geom_astext === null) {
           setMessage(null);
           return;
         }
-        /************************************************************************************
-         *****************                      INFO                *************************
-         ***********************************************************************************/
-        (async () => {
-          /*
-          try {
-         const { data, error } = await doInfo(
-              message.geom_astext,
-              message.srid,
-              currentElementType.name
-            );
-
-            logger.log("GeomAdded info", { data, error });
-            if (error) {
-              return { error: error };
-            }
-          } catch (err) {
-            // Handle errors
-            logger.error("Error occurred:", err);
-          } finally {
-            // Clean up or perform additional actions
-            setMessage(null);
-            // setCurrentMapAction(null);
-          }*/
-        })();
-        break;
-
-      /************************************************************************************
-       *****************                    END INFO              *************************
-       ***********************************************************************************/
 
       /************************************************************************************
        *****************               CLICKED COORDINATES        *************************
        ***********************************************************************************/
 
-      /*** MAP_EVENTS.COORDINATES handled in contexts/info
-        
+      //*****************            MAP CLICKED COORDINATES       *************************
+      case MAP_EVENTS.COORDINATES:
+        console.log("clicked coordinates", message);
+
+        setClickedCoordinates(message.coordinates);
+        setSrid(message.srid);
+        setBboxcoordinates(message.bbox);
+        setMessage(null);
+        break;
+
       /************************************************************************************
        *****************             END CLICKED COORDINATES      *************************
        ***********************************************************************************/

package/examples/react-next/package.json

@@ -3,13 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev",
+    "dev": "next dev -p",
     "build": "next build",
     "start": "next start",
     "lint": "next lint"
   },
   "dependencies": {
-    "@vidro/map-handler": "^1.2.178",
+    "@vidro/map-handler": "^1.2.179",
     "next": "15.1.6",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"

package/examples/react-next/pages/index.js

@@ -1,10 +1,14 @@
 import MapButtons from "@/components/MapButtons";
 import MapIframe from "@/components/MapIframe";
-import SessionComponent from "@/components/SessionComponent";
+import MapInfo from "@/components/MapInfo";
+import AuthComponent from "@/components/AuthComponent";
 import { AuthProvider } from "@/contexts/auth";
 import { MapsProvider } from "@/contexts/maps";
 import { MessageProvider } from "@/contexts/messages";
 import Image from "next/image";
+import MapList from "@/components/MapList";
+import MapLayers from "@/components/MapLayers";
+import MapFilters from "@/components/MapFilters";
 
 export default function Home() {
   return (
@@ -13,12 +17,19 @@ export default function Home() {
         <MessageProvider>
           <MapsProvider>
             <main className="text-center">
-              <h1>Map component REACT integration</h1>
+              <h1 className="text-3xl">Map component REACT integration</h1>
               <div className="my-5">
-                <SessionComponent />
+                <AuthComponent />
               </div>
+              <div className="my-5">
+                <MapList />
+                <MapLayers />
+                <MapFilters />
+              </div>
+
               <div className="my-5 bg-gray-100 border border-gray-400  p-4">
                 <MapButtons />
+                <MapInfo />
                 <MapIframe />
               </div>
             </main>
@@ -28,48 +39,47 @@ export default function Home() {
       <footer className="row-start-3 flex gap-6 flex-wrap items-center justify-center">
         <a
           className="flex items-center gap-2 hover:underline hover:underline-offset-4"
-          href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
+          href="https://www.vidrosoftware.com"
           target="_blank"
           rel="noopener noreferrer"
         >
           <Image
             aria-hidden
-            src="/file.svg"
-            alt="File icon"
-            width={16}
-            height={16}
+            src="/logo.png"
+            alt="Vidrosoftware"
+            width={150}
+            height={120}
           />
-          Learn
         </a>
         <a
           className="flex items-center gap-2 hover:underline hover:underline-offset-4"
-          href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
+          href="https://github.com/Vidro-Software-SL/maphandler"
           target="_blank"
           rel="noopener noreferrer"
         >
           <Image
             aria-hidden
-            src="/window.svg"
+            src="/file.svg"
             alt="Window icon"
             width={16}
             height={16}
           />
-          Examples
+          Documentation
         </a>
         <a
           className="flex items-center gap-2 hover:underline hover:underline-offset-4"
-          href="https://nextjs.org?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
+          href="https://discord.com/channels/1305257097843179642/1305257098313072714"
           target="_blank"
           rel="noopener noreferrer"
         >
           <Image
             aria-hidden
-            src="/globe.svg"
-            alt="Globe icon"
+            src="/discord.svg"
+            alt="Discord icon"
             width={16}
             height={16}
           />
-          Go to nextjs.org →
+          Discord channel
         </a>
       </footer>
     </div>

package/examples/react-next/public/discord.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 -28.5 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <g>
+        <path d="M216.856339,16.5966031 C200.285002,8.84328665 182.566144,3.2084988 164.041564,0 C161.766523,4.11318106 159.108624,9.64549908 157.276099,14.0464379 C137.583995,11.0849896 118.072967,11.0849896 98.7430163,14.0464379 C96.9108417,9.64549908 94.1925838,4.11318106 91.8971895,0 C73.3526068,3.2084988 55.6133949,8.86399117 39.0420583,16.6376612 C5.61752293,67.146514 -3.4433191,116.400813 1.08711069,164.955721 C23.2560196,181.510915 44.7403634,191.567697 65.8621325,198.148576 C71.0772151,190.971126 75.7283628,183.341335 79.7352139,175.300261 C72.104019,172.400575 64.7949724,168.822202 57.8887866,164.667963 C59.7209612,163.310589 61.5131304,161.891452 63.2445898,160.431257 C105.36741,180.133187 151.134928,180.133187 192.754523,160.431257 C194.506336,161.891452 196.298154,163.310589 198.110326,164.667963 C191.183787,168.842556 183.854737,172.420929 176.223542,175.320965 C180.230393,183.341335 184.861538,190.991831 190.096624,198.16893 C211.238746,191.588051 232.743023,181.531619 254.911949,164.955721 C260.227747,108.668201 245.831087,59.8662432 216.856339,16.5966031 Z M85.4738752,135.09489 C72.8290281,135.09489 62.4592217,123.290155 62.4592217,108.914901 C62.4592217,94.5396472 72.607595,82.7145587 85.4738752,82.7145587 C98.3405064,82.7145587 108.709962,94.5189427 108.488529,108.914901 C108.508531,123.290155 98.3405064,135.09489 85.4738752,135.09489 Z M170.525237,135.09489 C157.88039,135.09489 147.510584,123.290155 147.510584,108.914901 C147.510584,94.5396472 157.658606,82.7145587 170.525237,82.7145587 C183.391518,82.7145587 193.761324,94.5189427 193.539891,108.914901 C193.539891,123.290155 183.391518,135.09489 170.525237,135.09489 Z" fill="#5865F2" fill-rule="nonzero">
+
+    </g>
+</svg>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vidro/map-handler",
-  "version": "1.2.179",
+  "version": "1.2.191",
   "description": "Tool to achieve the easiest way of communication with the map",
   "homepage": "https://github.com/Vidro-Software-SL/maphandler",
   "repository": {