@opengeoweb/webmap-react 9.21.0 → 9.22.0

package/index.esm.js

@@ -1,7 +1,7 @@
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
 import React__default, { useRef, useState, useEffect } from 'react';
-import { legendImageStore, WMImageEventType, webmapUtils, getLegendGraphicURLForLayer, LayerType, getWMJSMapById, debugLogger, DebugType, WMLayer, registerWMLayer, WMBBOX, getWMLayerById, WMJSMap, tilesettings } from '@opengeoweb/webmap';
+import { legendImageStore, WMImageEventType, webmapUtils, getLegendGraphicURLForLayer, getPixelCoordFromLatLong, WMJSMAP_LONLAT_EPSGCODE, getLatLongFromPixelCoord, LayerType, getWMJSMapById, debugLogger, DebugType, WMLayer, registerWMLayer, WMBBOX, getWMLayerById, WMJSMap, tilesettings } from '@opengeoweb/webmap';
 import { CustomTooltip, CanvasComponent, ToolContainerDraggable, CustomIconButton, dateUtils } from '@opengeoweb/shared';
 import i18n from 'i18next';
 import { initReactI18next, useTranslation } from 'react-i18next';
@@ -175,24 +175,24 @@ var nl = {
 	"webmap-react-click-disconnect": "Klik om laag los te koppelen",
 	"webmap-react-click-connect": "Klik om laag te koppelen",
 	"webmap-react-layer-info": "Laag Informatie",
-	"webmap-react-vertical-level": "niet vertaald",
-	"webmap-react-hpa": "niet vertaald",
-	"webmap-react-ensemble-member": "niet vertaald",
-	"webmap-react-member": "niet vertaald",
-	"webmap-react-probability": "niet vertaald",
-	"webmap-react-percent": "niet vertaald",
-	"webmap-react-level": "niet vertaald",
-	"webmap-react-west": "niet vertaald",
-	"webmap-react-east": "niet vertaald",
-	"webmap-react-north": "niet vertaald",
-	"webmap-react-south": "niet vertaald",
-	"webmap-react-new-linestring-created": "niet vertaald",
-	"webmap-react-new-feature": "niet vertaald",
-	"webmap-react-new-point": "niet vertaald",
-	"webmap-react-point": "niet vertaald",
-	"webmap-react-polygon": "niet vertaald",
-	"webmap-react-box": "niet vertaald",
-	"webmap-react-linestring": "niet vertaald"
+	"webmap-react-vertical-level": "Verticaal niveau",
+	"webmap-react-hpa": "hPa",
+	"webmap-react-ensemble-member": "Ensemble lid",
+	"webmap-react-member": "lid",
+	"webmap-react-probability": "Waarschijnlijkheid",
+	"webmap-react-percent": "%",
+	"webmap-react-level": "Niveau",
+	"webmap-react-west": "west",
+	"webmap-react-east": "oost",
+	"webmap-react-north": "noord",
+	"webmap-react-south": "zuid",
+	"webmap-react-new-linestring-created": "nieuw punt in lijn gemaakt",
+	"webmap-react-new-feature": "nieuwe feature gemaakt",
+	"webmap-react-new-point": "nieuw punt gemaakt",
+	"webmap-react-point": "Punt",
+	"webmap-react-polygon": "Polygoon",
+	"webmap-react-box": "Rechthoek",
+	"webmap-react-linestring": "Lijn"
 };
 var webmapReactTranslations = {
 	en: en,
@@ -2748,13 +2748,16 @@ const isBetween = (a, c, b) => {
 };
 const convertGeoCoordsToScreenCoords = (featureCoords, mapId) => {
   const webmapjs = webmapUtils.getWMJSMapById(mapId);
+  if (!webmapjs) {
+    return [];
+  }
   const XYCoords = [];
   for (const featureCoord of featureCoords) {
     if (featureCoord.length < 2) {
       // eslint-disable-next-line no-continue
       continue;
     }
-    const coord = webmapjs.getPixelCoordFromLatLong({
+    const coord = getPixelCoordFromLatLong(webmapjs, {
       x: featureCoord[0],
       y: featureCoord[1]
     });
@@ -2764,14 +2767,17 @@ const convertGeoCoordsToScreenCoords = (featureCoords, mapId) => {
 };
 const getPixelCoordFromGeoCoord = (featureCoords, mapId) => {
   const webmapjs = webmapUtils.getWMJSMapById(mapId);
+  if (!webmapjs) {
+    return [];
+  }
   const {
     width,
     height
   } = webmapjs.getSize();
-  const bbox = webmapjs.getBBOX();
+  const bbox = webmapjs.getDrawBBOX();
   const proj = webmapjs.getProj4();
   const XYCoords = [];
-  const from = getProj4(proj.lonlat);
+  const from = getProj4(WMJSMAP_LONLAT_EPSGCODE);
   const to = getProj4(proj.crs);
   for (const featureCoord of featureCoords) {
     if (featureCoord.length < 2) {
@@ -3273,6 +3279,7 @@ class MapDraw extends React.PureComponent {
     }
   }
   componentDidUpdate(prevProps) {
+    var _a;
     const {
       geojson,
       isInEditMode,
@@ -3299,7 +3306,7 @@ class MapDraw extends React.PureComponent {
           return;
         }
       }
-      webmapUtils.getWMJSMapById(mapId).draw('MapDraw::componentDidUpdateIsInEditMode');
+      (_a = webmapUtils.getWMJSMapById(mapId)) === null || _a === void 0 ? void 0 : _a.draw('MapDraw::componentDidUpdateIsInEditMode');
     }
     /* Handle toggle delete */
     if (isInDeleteMode !== prevIsInDeleteMode) {
@@ -3510,7 +3517,10 @@ class MapDraw extends React.PureComponent {
       return undefined;
     }
     const webmapjs = webmapUtils.getWMJSMapById(mapId);
-    this.mouseGeoCoord = webmapjs.getLatLongFromPixelCoord({
+    if (!webmapjs) {
+      return undefined;
+    }
+    this.mouseGeoCoord = getLatLongFromPixelCoord(webmapjs, {
       x: mouseX,
       y: mouseY
     });
@@ -3606,9 +3616,12 @@ class MapDraw extends React.PureComponent {
       mapId
     } = this.props;
     const webmapjs = webmapUtils.getWMJSMapById(mapId);
+    if (!webmapjs) {
+      return false;
+    }
     if (this.myDrawMode === DRAWMODE.POLYGON) {
       if (this.selectedEdge !== EDGE.NONE && this.myEditMode !== EDITMODE.DELETE_FEATURES) {
-        this.mouseGeoCoord = webmapjs.getLatLongFromPixelCoord({
+        this.mouseGeoCoord = getLatLongFromPixelCoord(webmapjs, {
           x: mouseX,
           y: mouseY
         });
@@ -3628,7 +3641,7 @@ class MapDraw extends React.PureComponent {
     }
     if (this.myDrawMode === DRAWMODE.LINESTRING) {
       if (this.selectedEdge !== EDGE.NONE && this.myEditMode !== EDITMODE.DELETE_FEATURES) {
-        this.mouseGeoCoord = webmapjs.getLatLongFromPixelCoord({
+        this.mouseGeoCoord = getLatLongFromPixelCoord(webmapjs, {
           x: mouseX,
           y: mouseY
         });
@@ -3663,6 +3676,9 @@ class MapDraw extends React.PureComponent {
       selectedFeatureIndex
     } = this.props;
     const webmapjs = webmapUtils.getWMJSMapById(mapId);
+    if (!webmapjs) {
+      return;
+    }
     if (this.myEditMode === EDITMODE.EMPTY) {
       this.myEditMode = EDITMODE.ADD_FEATURE;
       if (!this.geojson.features[selectedFeatureIndex]) {
@@ -3670,7 +3686,7 @@ class MapDraw extends React.PureComponent {
       }
       const feature = this.getSelectedFeature();
       this.initializeFeatureCoordinates(feature, this.myDrawMode);
-      this.mouseGeoCoord = webmapjs.getLatLongFromPixelCoord({
+      this.mouseGeoCoord = getLatLongFromPixelCoord(webmapjs, {
         x: mouseX,
         y: mouseY
       });
@@ -3774,9 +3790,12 @@ class MapDraw extends React.PureComponent {
       mapId
     } = this.props;
     const webmapjs = webmapUtils.getWMJSMapById(mapId);
+    if (!webmapjs) {
+      return false;
+    }
     if (this.myDrawMode === DRAWMODE.MULTIPOINT) {
       if (this.myEditMode === EDITMODE.ADD_FEATURE && this.snappedPolygonIndex !== SNAPPEDFEATURE.NONE) {
-        this.mouseGeoCoord = webmapjs.getLatLongFromPixelCoord({
+        this.mouseGeoCoord = getLatLongFromPixelCoord(webmapjs, {
           x: mouseX,
           y: mouseY
         });
@@ -3802,9 +3821,12 @@ class MapDraw extends React.PureComponent {
       mapId
     } = this.props;
     const webmapjs = webmapUtils.getWMJSMapById(mapId);
+    if (!webmapjs) {
+      return false;
+    }
     if (this.myDrawMode === DRAWMODE.POLYGON) {
       if (this.myEditMode === EDITMODE.ADD_FEATURE && this.snappedPolygonIndex !== SNAPPEDFEATURE.NONE) {
-        this.mouseGeoCoord = webmapjs.getLatLongFromPixelCoord({
+        this.mouseGeoCoord = getLatLongFromPixelCoord(webmapjs, {
           x: mouseX,
           y: mouseY
         });
@@ -3842,9 +3864,12 @@ class MapDraw extends React.PureComponent {
       mapId
     } = this.props;
     const webmapjs = webmapUtils.getWMJSMapById(mapId);
+    if (!webmapjs) {
+      return false;
+    }
     if (this.myDrawMode === DRAWMODE.LINESTRING) {
       if (this.myEditMode === EDITMODE.ADD_FEATURE) {
-        this.mouseGeoCoord = webmapjs.getLatLongFromPixelCoord({
+        this.mouseGeoCoord = getLatLongFromPixelCoord(webmapjs, {
           x: mouseX,
           y: mouseY
         });
@@ -3959,7 +3984,7 @@ class MapDraw extends React.PureComponent {
       this.deletePolygon(polygonIndex);
     }
     this.featureHasChanged('deleteFeature');
-    webmapjs.draw('MapDraw::deletefeatures');
+    webmapjs === null || webmapjs === void 0 ? void 0 : webmapjs.draw('MapDraw::deletefeatures');
   }
   mouseUp(event) {
     const {
@@ -4060,7 +4085,7 @@ class MapDraw extends React.PureComponent {
         featureCoords.pop();
       }
       this.featureHasChanged('cancelEdit');
-      webmapjs.draw('MapDraw::cancelEdit');
+      webmapjs === null || webmapjs === void 0 ? void 0 : webmapjs.draw('MapDraw::cancelEdit');
     } else {
       /* When in deletefeatures mode, remove any vertex under the mousecursor */
       // eslint-disable-next-line no-lonely-if
@@ -4648,7 +4673,10 @@ class MapDraw extends React.PureComponent {
       mapId
     } = this.props;
     const webmapjs = webmapUtils.getWMJSMapById(mapId);
-    const image = webmapjs.getMapImageStore.getImage(featureProperties.imageURL);
+    if (!webmapjs) {
+      return undefined;
+    }
+    const image = webmapjs === null || webmapjs === void 0 ? void 0 : webmapjs.getMapImageStore.getImage(featureProperties.imageURL);
     if (image.isLoaded() === false && image.hasError() === false && image.isLoading() === false) {
       image.load();
       /* After the image is loaded the canvas will be redrawn and drawIcon will be triggered again
@@ -9567,8 +9595,7 @@ const getLayerUpdateInfo = (wmLayer, mapId) => {
   return updateObject;
 };
 
-/**
- * Returns filtered list of props with geoJson
+/** Returns filtered list of props with geoJson
  * @param children React.ReactNode, layers with geoJson
  */
 const getFeatureLayers = children => children && Array.isArray(children) ? children
@@ -9685,6 +9712,9 @@ const setWMLayerPropsBasedOnChildProps = (child, wmLayer, mapViewProps) => {
 };
 const addWMLayerPropsBasedOnChildProps = (child, mapId, props, onUpdateLayerInformation) => {
   const wmjsMap = getWMJSMapById(mapId);
+  if (!wmjsMap) {
+    return;
+  }
   const keepOnTop = child.layerType === LayerType.overLayer || false;
   const newWMLayer = new WMLayer(Object.assign(Object.assign({}, child), {
     keepOnTop
@@ -9723,6 +9753,9 @@ const removeWMLayerFromMap = (wmLayer, mapId, onUpdateLayerInformation) => {
   wmLayer.remove();
   /// Trigger update of all map dimensions
   const wmjsMap = getWMJSMapById(mapId);
+  if (!wmjsMap) {
+    return;
+  }
   onUpdateLayerInformation && onUpdateLayerInformation({
     origin: ORIGIN_REACTMAPVIEW_UTILS_ONUPDATELAYERINFO,
     layerStyle: null,
@@ -9785,8 +9818,7 @@ class ReactMapView extends React.Component {
       const {
         shouldAutoFetch
       } = this.props;
-      /*
-        TODO, Maarten Plieger, 2021-09-02, https://gitlab.com/opengeoweb/opengeoweb/-/issues/1159:
+      /* TODO, Maarten Plieger, 2021-09-02, https://gitlab.com/opengeoweb/opengeoweb/-/issues/1159:
         This causes many issues, we should improve the update strategy.
         Certain presets have >20 layers. This causes 20 times parsing the GetCapabilities for a minor update of the store.
       */
@@ -9797,6 +9829,9 @@ class ReactMapView extends React.Component {
           mapId
         } = this.props;
         const wmjsMap = webmapUtils.getWMJSMapById(mapId);
+        if (!wmjsMap) {
+          return;
+        }
         const layers = wmjsMap.getLayers();
         layers.forEach(layer => {
           if (layer.enabled !== false) {
@@ -10118,6 +10153,9 @@ class ReactMapView extends React.Component {
       mapId
     } = this.props;
     const wmjsMap = webmapUtils.getWMJSMapById(mapId);
+    if (!wmjsMap) {
+      return;
+    }
     wmjsMap.getListener().suspendEvents();
     wmjsMap.draw();
     wmjsMap.getListener().resumeEvents();
@@ -10130,7 +10168,7 @@ class ReactMapView extends React.Component {
       bbox,
       onMapPinChangeLocation
     } = this.props;
-    /* Check if we have something to mount WMJSMap on */
+    /* Check if we have something to mount IWMJSMap on */
     if (this.adagucWebMapJSRef.current === null) {
       console.warn('No this.adagucWebMapJSRef.current  yet ');
       return null;
@@ -10212,6 +10250,9 @@ class ReactMapView extends React.Component {
           mapId
         } = this.props;
         const wmjsMap = webmapUtils.getWMJSMapById(mapId);
+        if (!wmjsMap) {
+          return;
+        }
         wmjsMap.setSize(newWidth, newHeight);
       }
     }
@@ -10397,9 +10438,11 @@ const ProfileAxis = ({
   mapId
 }) => {
   const drawAxisOnMapDisplay = (ctx, webMap, axisStyle) => {
-    const bbox = webMap.getBBOX();
-    const width = webMap.getWidth();
-    const height = webMap.getHeight();
+    const bbox = webMap.getDrawBBOX();
+    const {
+      width,
+      height
+    } = webMap.getSize();
     const offY = height - 50;
     const offX = 20;
     try {
@@ -10427,7 +10470,8 @@ const ProfileAxis = ({
     };
     // Draw on map canvas callback function
     const beforeCanvasDisplay = ctx => {
-      drawAxisOnMapDisplay(ctx, getWMJSMapById(mapId), axisStyle);
+      const webmapjs = getWMJSMapById(mapId);
+      webmapjs && drawAxisOnMapDisplay(ctx, webmapjs, axisStyle);
     };
     // unMount logic
     const unMount = () => {
@@ -10439,7 +10483,7 @@ const ProfileAxis = ({
     // Mount logic
     const webMap = getWMJSMapById(mapId);
     if (webMap && webMap.getProjection().srs === 'GFI:TIME_ELEVATION') {
-      webMap.hideScaleBar();
+      webMap.displayScaleBarInMap(false);
       webMap.hideMouseCursorProperties();
       webMap.setTimeOffset('');
       webMap.addListener('beforecanvasdisplay', beforeCanvasDisplay, true);
@@ -10554,13 +10598,17 @@ const drawHeightAxis = (ctx, bbox, offsetX, offsetY, width, height, axisStyle) =
   ctx.stroke();
 };
 const drawCursor = (ctx, bbox, offsetX, offsetY, width, height, webMapJS, axisStyle) => {
+  const {
+    mouseX: mapMouseX,
+    mouseY: mapMouseY
+  } = webMapJS.getMapMouseCoordinates();
   // Do not draw if mouse is not in the map
-  if (webMapJS.mouseX < 5 && webMapJS.mouseY < 5) {
+  if (mapMouseX < 5 && mapMouseY < 5) {
     return;
   }
   /* Draw cursor line */
-  const mouseX = Math.round(webMapJS.mouseX) + 0.5;
-  const mouseY = Math.round(webMapJS.mouseY) + 0.5;
+  const mouseX = Math.round(mapMouseX) + 0.5;
+  const mouseY = Math.round(mapMouseY) + 0.5;
   ctx.strokeStyle = '#303030';
   ctx.setLineDash([15, 5]);
   ctx.beginPath();
@@ -10648,15 +10696,18 @@ const MapView = _a => {
         mapId: mapId
       }), jsx(ZoomControls, {
         onZoomIn: () => {
-          const wmjsMap = webmapUtils.getWMJSMapById(mapId);
-          wmjsMap.zoomIn(undefined);
+          var _a;
+          (_a = webmapUtils.getWMJSMapById(mapId)) === null || _a === void 0 ? void 0 : _a.zoomIn(undefined);
         },
         onZoomOut: () => {
-          const wmjsMap = webmapUtils.getWMJSMapById(mapId);
-          wmjsMap.zoomOut();
+          var _a;
+          (_a = webmapUtils.getWMJSMapById(mapId)) === null || _a === void 0 ? void 0 : _a.zoomOut();
         },
         onZoomReset: () => {
           const wmjsMap = webmapUtils.getWMJSMapById(mapId);
+          if (!wmjsMap) {
+            return;
+          }
           wmjsMap.zoomToLayer(wmjsMap.getActiveLayer());
         }
       })]
@@ -10670,7 +10721,11 @@ const MapView = _a => {
         showLegend: false,
         displayTimeInMap: false,
         onWMJSMount: id => {
-          wmjsMapRef.current = webmapUtils.getWMJSMapById(id);
+          const webMapJS = webmapUtils.getWMJSMapById(id);
+          if (!webMapJS) {
+            return;
+          }
+          wmjsMapRef.current = webMapJS;
           if (onWMJSMount) {
             onWMJSMount(id);
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap-react",
-  "version": "9.21.0",
+  "version": "9.22.0",
   "description": "GeoWeb react wrapper for webmap",
   "license": "Apache-2.0",
   "repository": {
@@ -11,7 +11,7 @@
     "@opengeoweb/webmap": "*",
     "axios": "1.5.0",
     "@opengeoweb/theme": "*",
-    "@mui/material": "~5.15.11",
+    "@mui/material": "^5.16.0",
     "@opengeoweb/shared": "*",
     "lodash": "^4.17.21",
     "proj4": "^2.9.2",

package/src/lib/components/MapView/MapViewLayer.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { LayerFoundation, WMJSMap, WMLayer } from '@opengeoweb/webmap';
+import { LayerFoundation, IWMJSMap, WMLayer } from '@opengeoweb/webmap';
 import { DrawModeExitCallback, FeatureEvent } from '../MapDraw';
 export interface MapViewLayerProps extends LayerFoundation {
     id: string;
-    onLayerReady?: (layer: WMLayer, webmap?: WMJSMap) => void;
+    onLayerReady?: (layer: WMLayer, webmap?: IWMJSMap) => void;
     onLayerError?: (layer: WMLayer, error?: Error) => void;
     isInEditMode?: boolean;
     drawMode?: string;

package/src/lib/components/ReactMapView/ReactMapView.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import * as React from 'react';
-import { WMJSMap, WMLayer, WMBBOX } from '@opengeoweb/webmap';
+import { IWMJSMap, WMLayer, WMBBOX } from '@opengeoweb/webmap';
 import { ReactMapViewProps } from './types';
 import type { MapViewLayerProps } from '../MapView';
 export declare const ORIGIN_REACTMAPVIEW_ONMAPCHANGEDIMENSION = "ORIGIN_REACTMAPVIEW_ONMAPCHANGEDIMENSION";
@@ -51,7 +51,7 @@ export declare class ReactMapView extends React.Component<ReactMapViewProps, Rea
     clearRefetchTimer: () => void;
     updateWMJSMapProps(prevProps: ReactMapViewProps, props: ReactMapViewProps): void;
     drawDebounced(): void;
-    mountWMJSMap(): WMJSMap | null;
+    mountWMJSMap(): IWMJSMap | null;
     resize(): void;
     render(): React.ReactElement;
 }

package/src/lib/components/ReactMapView/types.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="react" />
-import { Bbox, Dimension, WMJSMap } from '@opengeoweb/webmap';
+import { Bbox, Dimension, IWMJSMap } from '@opengeoweb/webmap';
 export interface ReactMapViewProps {
     listeners?: {
         name?: string;
         data: string;
         keep: boolean;
-        callbackfunction: (webMap: WMJSMap, value: string) => void;
+        callbackfunction: (webMap: IWMJSMap, value: string) => void;
     }[];
     srs?: string;
     bbox?: Bbox;

package/src/lib/components/ReactMapView/utils.d.ts

@@ -1,10 +1,9 @@
-import { Dimension, LayerFoundation, WMJSMap, WMLayer } from '@opengeoweb/webmap';
+import { Dimension, LayerFoundation, IWMJSMap, WMLayer } from '@opengeoweb/webmap';
 import React from 'react';
 import { FeatureLayer } from '../MapDraw';
 import type { MapViewLayerProps, MapViewProps } from '../MapView';
 import { ReactMapViewProps, UpdateLayerInfoPayload } from './types';
-/**
- * Returns filtered list of props with geoJson
+/** Returns filtered list of props with geoJson
  * @param children React.ReactNode, layers with geoJson
  */
 export declare const getFeatureLayers: (children: React.ReactNode) => FeatureLayer[];
@@ -24,4 +23,4 @@ export declare const parseWMJSLayer: (wmLayer: WMLayer, forceReload: boolean) =>
 export declare const setWMLayerPropsBasedOnChildProps: (child: MapViewLayerProps, wmLayer: WMLayer, mapViewProps: ReactMapViewProps) => boolean;
 export declare const addWMLayerPropsBasedOnChildProps: (child: MapViewLayerProps, mapId: string, props: MapViewProps, onUpdateLayerInformation?: ((payload: UpdateLayerInfoPayload) => void) | undefined) => void;
 export declare const removeWMLayerFromMap: (wmLayer: WMLayer, mapId: string, onUpdateLayerInformation?: ((payload: UpdateLayerInfoPayload) => void) | undefined) => void;
-export declare const orderLayers: (wmjsMap: WMJSMap, _reactMapViewLayers: MapViewLayerProps[]) => boolean;
+export declare const orderLayers: (wmjsMap: IWMJSMap, _reactMapViewLayers: MapViewLayerProps[]) => boolean;