revert changes in non-geoportal apps

Author: mxfh

apps/belis/desktop/src/config/gazData.tsx

@@ -1,13 +1,13 @@
-import { createConfig, ENDPOINTS } from "@carma/resources";
+import { createConfig, ENDPOINT } from "@carma-commons/resources";
 
 const prefix = "GazDataForBelIS-OnlineByCismet";
 
 const endpoints = [
-  ENDPOINTS.ADRESSEN,
-  ENDPOINTS.BEZIRKE,
-  ENDPOINTS.QUARTIERE,
-  ENDPOINTS.POIS,
-  ENDPOINTS.KITAS,
+  ENDPOINT.ADRESSEN,
+  ENDPOINT.BEZIRKE,
+  ENDPOINT.QUARTIERE,
+  ENDPOINT.POIS,
+  ENDPOINT.KITAS,
 ];
 
 const host = import.meta.env.VITE_WUPP_ASSET_BASEURL;

apps/belis/online/src/config/gazData.js

@@ -1,13 +1,13 @@
-import { createConfig, ENDPOINTS } from "@carma/resources";
+import { createConfig, ENDPOINT } from "@carma-commons/resources";
 
 const prefix = "GazDataForBelIS-OnlineByCismet";
 
 const endpoints = [
-  ENDPOINTS.ADRESSEN,
-  ENDPOINTS.BEZIRKE,
-  ENDPOINTS.QUARTIERE,
-  ENDPOINTS.POIS,
-  ENDPOINTS.KITAS,
+  ENDPOINT.ADRESSEN,
+  ENDPOINT.BEZIRKE,
+  ENDPOINT.QUARTIERE,
+  ENDPOINT.POIS,
+  ENDPOINT.KITAS,
 ];
 
 const host = import.meta.env.VITE_WUPP_ASSET_BASEURL;

apps/belis/online/src/containers/TopNavbar.jsx

@@ -71,7 +71,7 @@ import {
   EmptySearchComponent,
   LibFuzzySearch,
 } from "@carma-mapping/fuzzy-search";
-import { isAreaType } from "@carma/resources";
+import { isAreaType } from "@carma-commons/resources";
 import { builtInGazetteerHitTrigger } from "react-cismap/tools/gazetteerHelper";
 
 //---------

apps/belis/online/src/index.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import ReactDOM from "react-dom";
-import { cjsGlobalShim } from "@carma-commons/dom/window";
+import { cjsGlobalShim } from "@carma-commons/utils/window";
 import App from "./App";
 import * as serviceWorkerRegistration from "./serviceWorkerRegistration";
 

apps/lagis/desktop/src/components/commons/Map.jsx

@@ -58,7 +58,7 @@ import {
   useSelection,
 } from "@carma-appframeworks/portals";
 import { LibFuzzySearch } from "@carma-mapping/fuzzy-search";
-import { isAreaType } from "@carma/resources";
+import { isAreaType } from "@carma-commons/resources";
 import { Control, ControlLayout } from "@carma-mapping/map-controls-layout";
 import { ZoomControl } from "@carma-mapping/components";
 import { TopicMapDispatchContext } from "react-cismap/contexts/TopicMapContextProvider";

apps/lagis/desktop/src/config/gazData.js

@@ -1,8 +1,8 @@
-import { createConfig, ENDPOINTS } from "@carma/resources";
+import { createConfig, ENDPOINT } from "@carma-commons/resources";
 
 const prefix = "GazDataForHitzeinderstadtByCismet";
 
-const endpoints = [ENDPOINTS.ADRESSEN, ENDPOINTS.POIS, ENDPOINTS.KITAS];
+const endpoints = [ENDPOINT.ADRESSEN, ENDPOINT.POIS, ENDPOINT.KITAS];
 
 const host = import.meta.env.VITE_WUPP_ASSET_BASEURL;
 const crs = "3857";

apps/topicmaps/baederkarte/src/config/gazData.js

@@ -1,13 +1,13 @@
-import { createConfig, ENDPOINTS } from "@carma/resources";
+import { createConfig, ENDPOINT } from "@carma-commons/resources";
 
 const prefix = "GazDataForHochwasserkarteByCismet";
 
 const endpoints = [
-  ENDPOINTS.ADRESSEN,
-  ENDPOINTS.BEZIRKE,
-  ENDPOINTS.QUARTIERE,
-  ENDPOINTS.POIS,
-  ENDPOINTS.KITAS,
+  ENDPOINT.ADRESSEN,
+  ENDPOINT.BEZIRKE,
+  ENDPOINT.QUARTIERE,
+  ENDPOINT.POIS,
+  ENDPOINT.KITAS,
 ];
 
 const host = import.meta.env.VITE_WUPP_ASSET_BASEURL;

apps/topicmaps/bplan-auskunft/src/app/components/FuzzySearchWrapper.tsx

@@ -1,30 +1,26 @@
-import { useContext } from "react";
-import { useDispatch } from "react-redux";
-import type { UnknownAction } from "redux";
-import L from "leaflet";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faSearch } from "@fortawesome/free-solid-svg-icons";
-
-import { ResponsiveTopicMapContext } from "react-cismap/contexts/ResponsiveTopicMapContextProvider";
-import { TopicMapContext } from "react-cismap/contexts/TopicMapContextProvider";
-
-import { ManagedProjections } from "@carma/geo/proj";
-import { ENDPOINTS, isAreaType } from "@carma/resources";
-import type { SearchResultItem } from "@carma/types";
 import {
   SelectionMetaData,
   useSelection,
   useSelectionTopicMap,
 } from "@carma-appframeworks/portals";
-
-import { getBoundingBoxForLeafletMap } from "@carma-mapping/engines/leaflet";
 import { LibFuzzySearch } from "@carma-mapping/fuzzy-search";
+import { type SearchResultItem } from "@carma/types";
 
+import { ResponsiveTopicMapContext } from "react-cismap/contexts/ResponsiveTopicMapContextProvider";
+import { useContext } from "react";
+import { ENDPOINT, isAreaType } from "@carma-commons/resources";
+import { useDispatch } from "react-redux";
 import {
   getPlanFeatureByTitle,
   getPlanFeatures,
 } from "../../store/slices/bplaene";
-
+import { TopicMapContext } from "react-cismap/contexts/TopicMapContextProvider";
+import L from "leaflet";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faSearch } from "@fortawesome/free-solid-svg-icons";
+import type { UnknownAction } from "redux";
+import { getBoundingBoxForLeafletMap } from "@carma-mapping/utils";
+import proj4 from "proj4";
 interface FuzzySearchProps {
   setFeatures: (hit) => void;
   setSelectedIndex: (idx) => void;
@@ -55,7 +51,7 @@ const FuzzySearchWrapper = ({
     const selectionMetaData: SelectionMetaData = {
       selectedFrom: "gazetteer",
       selectionTimestamp: Date.now(),
-      isAreaSelection: isAreaType(selection.type),
+      isAreaSelection: isAreaType(selection.type as ENDPOINT),
     };
     setSelection(Object.assign({}, selection, selectionMetaData));
 
@@ -90,7 +86,7 @@ const FuzzySearchWrapper = ({
       ) {
         const boundingBox = getBoundingBoxForLeafletMap(
           routedMapRef?.leafletMap,
-          ManagedProjections.EPSG25832
+          proj4.defs("EPSG:25832")
         );
         dispatch(
           getPlanFeatures({

apps/topicmaps/bplan-auskunft/src/config/gazData.js

@@ -1,14 +1,14 @@
-import { createConfig, ENDPOINTS } from "@carma/resources";
+import { createConfig, ENDPOINT } from "@carma-commons/resources";
 
 const prefix = "GazDataForHochwasserkarteByCismet";
 
 const endpoints = [
-  ENDPOINTS.ADRESSEN,
-  ENDPOINTS.BEZIRKE,
-  ENDPOINTS.QUARTIERE,
-  ENDPOINTS.POIS,
-  ENDPOINTS.KITAS,
-  ENDPOINTS.BPLAENE,
+  ENDPOINT.ADRESSEN,
+  ENDPOINT.BEZIRKE,
+  ENDPOINT.QUARTIERE,
+  ENDPOINT.POIS,
+  ENDPOINT.KITAS,
+  ENDPOINT.BPLAENE,
 ];
 const host = import.meta.env.VITE_WUPP_ASSET_BASEURL;
 const crs = "25832";

apps/topicmaps/bplan-auskunft/src/utils/gazData.ts

@@ -3,6 +3,22 @@ import { getGazDataForTopicIds } from "react-cismap/tools/gazetteerHelper";
 
 import { host } from "../constants/bplaene";
 
+export type ENDPOINT =
+  | "adressen"
+  | "aenderungsv"
+  | "bezirke"
+  | "bpklimastandorte"
+  | "bplaene"
+  | "ebikes"
+  | "emob"
+  | "geps"
+  | "geps_reverse"
+  | "kitas"
+  | "prbr"
+  | "no2"
+  | "quartiere"
+  | "pois";
+
 export const getGazData = async (setGazData) => {
   const prefix = "GazData";
   const sources: Partial<Record<ENDPOINT, string | null>> = {};