@opengeoweb/webmap-react 10.1.0 → 10.2.0

package/index.esm.js

@@ -1,4 +1,4 @@
-import { legendImageStore, WMImageEventType, webmapUtils, getLegendGraphicURLForLayer, getPixelCoordFromLatLong, WMJSMAP_LONLAT_EPSGCODE, getLatLongFromPixelCoord, LayerType, getWMJSMapById, debugLogger, DebugType, WMLayer, registerWMLayer, tilesettings, WMBBOX, getWMLayerById, WMJSMap, privateWebMapUtils, generateLayerId } from '@opengeoweb/webmap';
+import { legendImageStore, WMImageEventType, webmapUtils, getLegendGraphicURLForLayer, getPixelCoordFromLatLong, WMJSMAP_LONLAT_EPSGCODE, getLatLongFromPixelCoord, LayerType, getWMJSMapById, debugLogger, DebugType, WMLayer, registerWMLayer, tilesettings, WMBBOX, getWMLayerById, WMJSMap, privateWebMapUtils } from '@opengeoweb/webmap';
 export { WEBMAP_NAMESPACE, webmapTranslations } from '@opengeoweb/webmap';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -6798,17 +6798,32 @@ var addWMLayerPropsBasedOnChildProps = function addWMLayerPropsBasedOnChildProps
         child.onLayerError && child.onLayerError(newWMLayer, new Error(newWMLayer.lastError));
       }
       // This ensures that MultiMapViewConnect works properly.
-      setTimeout(function () {
-        var wmjsMap = getWMJSMapById(mapId);
-        if (!wmjsMap || wmjsMap.isDestroyed) {
-          return;
-        }
-        setWMLayerPropsBasedOnChildProps(child, newWMLayer, props);
-        var layerInfo = getLayerUpdateInfo(newWMLayer, mapId);
-        onUpdateLayerInformation && onUpdateLayerInformation(layerInfo);
-        child.onLayerReady && child.onLayerReady(newWMLayer, wmjsMap);
-        wmjsMap.draw();
-      }, 1);
+      setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var wmjsMap, layerInfo;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              wmjsMap = getWMJSMapById(mapId);
+              if (!(!wmjsMap || wmjsMap.isDestroyed)) {
+                _context.next = 3;
+                break;
+              }
+              return _context.abrupt("return");
+            case 3:
+              setWMLayerPropsBasedOnChildProps(child, newWMLayer, props);
+              _context.next = 6;
+              return newWMLayer.parseLayer();
+            case 6:
+              layerInfo = getLayerUpdateInfo(newWMLayer, mapId);
+              onUpdateLayerInformation && onUpdateLayerInformation(layerInfo);
+              child.onLayerReady && child.onLayerReady(newWMLayer, wmjsMap);
+              wmjsMap.draw();
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      })), 1);
     })["catch"](function (e) {
       child.onLayerError && child.onLayerError(e);
     });
@@ -6830,11 +6845,11 @@ var removeWMLayerFromMap = function removeWMLayerFromMap(wmLayer, mapId, onUpdat
     mapDimensions: {
       origin: origin,
       mapId: mapId,
-      dimensions: wmjsMap.mapdimensions.map(function (_ref) {
-        var name = _ref.name,
-          units = _ref.units,
-          currentValue = _ref.currentValue,
-          synced = _ref.synced;
+      dimensions: wmjsMap.mapdimensions.map(function (_ref2) {
+        var name = _ref2.name,
+          units = _ref2.units,
+          currentValue = _ref2.currentValue,
+          synced = _ref2.synced;
         return {
           name: name,
           units: units,
@@ -8836,14 +8851,14 @@ var obsPrecipitationIntensityPWS = {
 };
 var harmonieRelativeHumidityPl = {
   service: KNMIgeoservicesHarmonie.url,
-  name: 'relative_humidity__at_pl',
+  name: 'relative_humidity_pl',
   id: webmapUtils.generateLayerId(),
   layerType: LayerType.mapLayer,
   enabled: true
 };
 var harmonieWindPl = {
   service: KNMIgeoservicesHarmonie.url,
-  name: 'wind__at_pl',
+  name: 'wind_speed_pl',
   id: webmapUtils.generateLayerId(),
   layerType: LayerType.mapLayer,
   enabled: true
@@ -8871,7 +8886,7 @@ var harmoniePressure = {
 };
 var harmonieWindFlags = {
   service: KNMIgeoservicesHarmonie.url,
-  name: 'wind__at_10m',
+  name: 'wind_speed_components_hagl',
   enabled: true,
   id: webmapUtils.generateLayerId(),
   layerType: LayerType.mapLayer
@@ -9086,6 +9101,7 @@ var privateWmsGetCapabilities = privateWebMapUtils.privateWmsGetCapabilities,
   privateGetWMSServiceInfo = privateWebMapUtils.privateGetWMSServiceInfo,
   privateWmsGetLayerTree = privateWebMapUtils.privateWmsGetLayerTree,
   privateWmsFlattenLayerTree = privateWebMapUtils.privateWmsFlattenLayerTree,
+  privateWmtsGetCapabilities = privateWebMapUtils.privateWmtsGetCapabilities,
   QUERYWMS_GETCAPABILITIES = privateWebMapUtils.QUERYWMS_GETCAPABILITIES;
 /**
  * Queries the WMS GetCapabilities. This is the base TanStack hook for the other hooks in this file.
@@ -9188,6 +9204,17 @@ var useQueryGetWMSLayer = function useQueryGetWMSLayer(serviceUrl, name) {
   }, [layers, name]);
   return layer;
 };
+/**
+ * Returns a stylelist for given layer in a service
+ *
+ * @param {string} serviceUrl
+ * @param {string} name
+ * @returns {(Style[] | null)}
+ */
+var useGetWMSLayerStyleList = function useGetWMSLayerStyleList(serviceUrl, name) {
+  var _useQueryGetWMSLayer;
+  return ((_useQueryGetWMSLayer = useQueryGetWMSLayer(serviceUrl, name)) === null || _useQueryGetWMSLayer === void 0 ? void 0 : _useQueryGetWMSLayer.styles) || null;
+};
 /**
  * Returns WMLayer instance. The layer will contains parsed dimensions and styles and keeps a state for these properties.
  *
@@ -9195,29 +9222,52 @@ var useQueryGetWMSLayer = function useQueryGetWMSLayer(serviceUrl, name) {
  * @param {string} name
  * @returns {(WMLayer | null)}
  */
-var useGetWMLayerInstance = function useGetWMLayerInstance(serviceUrl, name) {
+var useGetWMLayerInstance = function useGetWMLayerInstance(serviceUrl, name, id) {
   var _React$useState9 = React__default.useState(null),
     _React$useState10 = _slicedToArray(_React$useState9, 2),
     layer = _React$useState10[0],
     setLayer = _React$useState10[1];
-  var layerId = useRef(generateLayerId()).current;
+  var refId = useRef(webmapUtils.generateLayerId()).current;
+  var layerId = id || refId;
   React__default.useEffect(function () {
-    var l = getWMLayerById(layerId);
-    if (l) {
-      return;
+    // Check if the layer is already registered
+    var l = webmapUtils.getWMLayerById(layerId);
+    if (!l || l.service !== serviceUrl) {
+      // Make a new layer if the serviceUrl changes. (But not when the name changes)
+      var _wmLayer = new WMLayer({
+        name: name,
+        service: serviceUrl,
+        layerType: LayerType.mapLayer,
+        id: layerId
+      });
+      webmapUtils.registerWMLayer(_wmLayer, layerId);
     }
-    var wmLayer = new WMLayer({
-      name: name,
-      service: serviceUrl,
-      layerType: LayerType.mapLayer,
-      id: layerId
-    });
-    void wmLayer.parseLayer().then(function () {
-      registerWMLayer(wmLayer, layerId);
+    // Set the name and parse the layer
+    var wmLayer = webmapUtils.getWMLayerById(layerId);
+    wmLayer.setName(name).then(function () {
+      webmapUtils.registerWMLayer(wmLayer, layerId);
+      setLayer(wmLayer);
+    })["catch"](function (e) {
+      console.error(e);
+      webmapUtils.registerWMLayer(wmLayer, layerId);
       setLayer(wmLayer);
     });
   }, [layerId, name, serviceUrl]);
   return layer;
 };
+/**
+ * Used for querying WMTS GetCapabilities documents
+ * @param serviceUrl
+ * @returns
+ */
+var useQueryWMTSGetCapabilities = function useQueryWMTSGetCapabilities(serviceUrl) {
+  var uriKey = new URLSearchParams(serviceUrl).toString();
+  return useQuery({
+    queryKey: [uriKey, 'queryGetCapabilities'],
+    queryFn: function queryFn() {
+      return privateWmtsGetCapabilities(serviceUrl, [], true);
+    }
+  });
+};
 
-export { DRAWMODE, DimensionSelectButton, DimensionSelectDialog, DimensionSelectSlider, EDITMODE, EditModeButton as EditModeButtonField, FeatureLayers, GeoJSONTextField, IntersectionSelect, LayerInfoButton, LayerInfoDialog, LayerInfoLegend, LayerInfoList, LayerInfoText, Legend, LegendButton, LegendDialog, LegendLayout, MINUTE_TO_MILLISECOND, MapControlButton, MapControls, MapDimensionSelect, MapDrawContainer, MapTime, MapView, MapViewLayer, MapWarningProperties, NEW_FEATURE_CREATED, NEW_LINESTRING_CREATED, NEW_POINT_CREATED, ORIGIN_REACTMAPVIEW_ONMAPCHANGEDIMENSION, ORIGIN_REACTMAPVIEW_ONUPDATELAYERINFO, Proj4js, radarGetCapabilities_spec as RadarGetCapabilities, ReactMapView, ReactMapViewLayer, SelectField, StoryLayoutGrid, WEBMAP_REACT_NAMESPACE, ZoomControls, addFeatureProperties, addGeoJSONProperties, addSelectionTypeToGeoJSON, addWMLayerPropsBasedOnChildProps, basicExampleDrawOptions, basicExampleMultipleShapeDrawOptions, basicExampleMultipleShapeWithValuesDrawOptions, checkHoverFeatures, convertGeoCoordsToScreenCoords, createInterSections, currentlySupportedDrawModes, defaultBox, defaultDelete, defaultGeoJSONStyleProperties, defaultIntersectionStyleProperties, defaultLayers, defaultModes, defaultPoint, defaultPolygon, defaultTimeFormat, dimensionConfig, distance, drawPolyStoryStyles, emptyGeoJSON, endToolExampleConfig, exampleIntersectionOptions, exampleIntersectionWithShapeOptions, exampleIntersections, exampleIntersectionsMultiDrawTool, featureBox, featureMultiPoint, featurePoint, featurePolygon, fillOptions, findClosestCoords, firSelectionType, formatTime, getCurrentDimensionValue, getDimensionIcon, getDimensionLabel, getDimensionValue, getDimensionsList, getDoubleControlToolIcon, getDrawFunctionFromStore, getFeatureCollection, getFeatureExtent, getFeatureLayers, getFirTitle, getGeoJSONPropertyValue, getGeoJson, getIcon, getIntersectionToolIcon, getIsInsideAcceptanceTime, getLastEmptyFeatureIndex, getLayerBbox, getLayerStyles, getLayerUpdateInfo, getPixelCoordFromGeoCoord, getProj4, getTimeDimension, getToolIcon, intersectPointGeoJSONS, intersectPolygonGeoJSONS, intersectionFeatureBE, intersectionFeatureNL, isAGeoJSONLayer, isAMapLayer, isBetween, isGeoJSONFeatureCreatedByTool, isPointFeatureCollection, lineString, lineStringCollection, makeLayerPropListFromChildren, marksByDimension, moveFeature, opacityOptions, orderLayers, parseWMJSLayer, projectorCache, publicLayers, publicServices, registerDrawFunction, removeWMLayerFromMap, rewindGeometry, setWMLayerPropsBasedOnChildProps, simpleBoxGeoJSON, simpleBoxGeoJSONWrongOrder, simpleFlightRouteLineStringGeoJSON, simpleFlightRoutePointsGeoJSON, simpleGeometryCollectionGeoJSON, simpleLineStringGeoJSON, simpleMultiPolygon, simplePointsGeojson, simplePolygonGeoJSON, simpleSmallLineStringGeoJSON, startToolExampleConfig, strokeWidthOptions, textStyle, textStyleWithMargin, updateEditModeButtonsWithFir, useGeoJSON, useGetWMLayerInstance, useMapDrawTool, useQueryGetWMSGetCapabilities, useQueryGetWMSLayer, useQueryGetWMSLayers, useQueryGetWMSLayersTree, useQueryGetWMSServiceInfo, webmapReactTranslations };
+export { DRAWMODE, DimensionSelectButton, DimensionSelectDialog, DimensionSelectSlider, EDITMODE, EditModeButton as EditModeButtonField, FeatureLayers, GeoJSONTextField, IntersectionSelect, LayerInfoButton, LayerInfoDialog, LayerInfoLegend, LayerInfoList, LayerInfoText, Legend, LegendButton, LegendDialog, LegendLayout, MINUTE_TO_MILLISECOND, MapControlButton, MapControls, MapDimensionSelect, MapDrawContainer, MapTime, MapView, MapViewLayer, MapWarningProperties, NEW_FEATURE_CREATED, NEW_LINESTRING_CREATED, NEW_POINT_CREATED, ORIGIN_REACTMAPVIEW_ONMAPCHANGEDIMENSION, ORIGIN_REACTMAPVIEW_ONUPDATELAYERINFO, Proj4js, radarGetCapabilities_spec as RadarGetCapabilities, ReactMapView, ReactMapViewLayer, SelectField, StoryLayoutGrid, WEBMAP_REACT_NAMESPACE, ZoomControls, addFeatureProperties, addGeoJSONProperties, addSelectionTypeToGeoJSON, addWMLayerPropsBasedOnChildProps, basicExampleDrawOptions, basicExampleMultipleShapeDrawOptions, basicExampleMultipleShapeWithValuesDrawOptions, checkHoverFeatures, convertGeoCoordsToScreenCoords, createInterSections, currentlySupportedDrawModes, defaultBox, defaultDelete, defaultGeoJSONStyleProperties, defaultIntersectionStyleProperties, defaultLayers, defaultModes, defaultPoint, defaultPolygon, defaultTimeFormat, dimensionConfig, distance, drawPolyStoryStyles, emptyGeoJSON, endToolExampleConfig, exampleIntersectionOptions, exampleIntersectionWithShapeOptions, exampleIntersections, exampleIntersectionsMultiDrawTool, featureBox, featureMultiPoint, featurePoint, featurePolygon, fillOptions, findClosestCoords, firSelectionType, formatTime, getCurrentDimensionValue, getDimensionIcon, getDimensionLabel, getDimensionValue, getDimensionsList, getDoubleControlToolIcon, getDrawFunctionFromStore, getFeatureCollection, getFeatureExtent, getFeatureLayers, getFirTitle, getGeoJSONPropertyValue, getGeoJson, getIcon, getIntersectionToolIcon, getIsInsideAcceptanceTime, getLastEmptyFeatureIndex, getLayerBbox, getLayerStyles, getLayerUpdateInfo, getPixelCoordFromGeoCoord, getProj4, getTimeDimension, getToolIcon, intersectPointGeoJSONS, intersectPolygonGeoJSONS, intersectionFeatureBE, intersectionFeatureNL, isAGeoJSONLayer, isAMapLayer, isBetween, isGeoJSONFeatureCreatedByTool, isPointFeatureCollection, lineString, lineStringCollection, makeLayerPropListFromChildren, marksByDimension, moveFeature, opacityOptions, orderLayers, parseWMJSLayer, projectorCache, publicLayers, publicServices, registerDrawFunction, removeWMLayerFromMap, rewindGeometry, setWMLayerPropsBasedOnChildProps, simpleBoxGeoJSON, simpleBoxGeoJSONWrongOrder, simpleFlightRouteLineStringGeoJSON, simpleFlightRoutePointsGeoJSON, simpleGeometryCollectionGeoJSON, simpleLineStringGeoJSON, simpleMultiPolygon, simplePointsGeojson, simplePolygonGeoJSON, simpleSmallLineStringGeoJSON, startToolExampleConfig, strokeWidthOptions, textStyle, textStyleWithMargin, updateEditModeButtonsWithFir, useGeoJSON, useGetWMLayerInstance, useGetWMSLayerStyleList, useMapDrawTool, useQueryGetWMSGetCapabilities, useQueryGetWMSLayer, useQueryGetWMSLayers, useQueryGetWMSLayersTree, useQueryGetWMSServiceInfo, useQueryWMTSGetCapabilities, webmapReactTranslations };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap-react",
-  "version": "10.1.0",
+  "version": "10.2.0",
   "description": "GeoWeb react wrapper for webmap",
   "license": "Apache-2.0",
   "repository": {

package/src/lib/hooks/useHooksGetCapabilities.d.ts

@@ -1,4 +1,4 @@
-import { GetCapabilitiesJson, WMSServiceInfo, LayerTree, LayerProps, WMLayer } from '@opengeoweb/webmap';
+import { GetCapabilitiesJson, WMSServiceInfo, LayerTree, LayerProps, WMLayer, Style } from '@opengeoweb/webmap';
 import { UseQueryResult } from '@tanstack/react-query';
 /**
  * Queries the WMS GetCapabilities. This is the base TanStack hook for the other hooks in this file.
@@ -36,6 +36,14 @@ export declare const useQueryGetWMSLayers: (serviceUrl: string) => LayerProps[];
  * @returns {(LayerProps | null)}
  */
 export declare const useQueryGetWMSLayer: (serviceUrl: string, name: string) => LayerProps | null;
+/**
+ * Returns a stylelist for given layer in a service
+ *
+ * @param {string} serviceUrl
+ * @param {string} name
+ * @returns {(Style[] | null)}
+ */
+export declare const useGetWMSLayerStyleList: (serviceUrl: string, name: string) => Style[] | null;
 /**
  * Returns WMLayer instance. The layer will contains parsed dimensions and styles and keeps a state for these properties.
  *
@@ -43,4 +51,10 @@ export declare const useQueryGetWMSLayer: (serviceUrl: string, name: string) =>
  * @param {string} name
  * @returns {(WMLayer | null)}
  */
-export declare const useGetWMLayerInstance: (serviceUrl: string, name: string) => WMLayer | null;
+export declare const useGetWMLayerInstance: (serviceUrl: string, name: string, id?: string) => WMLayer | null;
+/**
+ * Used for querying WMTS GetCapabilities documents
+ * @param serviceUrl
+ * @returns
+ */
+export declare const useQueryWMTSGetCapabilities: (serviceUrl: string) => UseQueryResult<GetCapabilitiesJson>;

package/src/lib/hooks/useHooksGetCapabilities.spec.d.ts

@@ -0,0 +1 @@
+export {};