@opengeoweb/webmap-react 12.4.2 → 12.5.0

package/index.esm.js

@@ -3062,7 +3062,9 @@ var OpenLayersLayer = function OpenLayersLayer(layerProps) {
     onLayerReady = layerProps.onLayerReady,
     onLayerError = layerProps.onLayerError,
     debugMode = layerProps.debugMode,
-    layerType = layerProps.layerType;
+    layerType = layerProps.layerType,
+    _layerProps$tileServe = layerProps.tileServerSettings,
+    tileServerSettings = _layerProps$tileServe === void 0 ? tilesettings : _layerProps$tileServe;
   var isBaseLayer = layerType === LayerType.baseLayer;
   var isOverlay = layerType === LayerType.overLayer;
   var layerOptions = useMemo(function () {
@@ -3097,46 +3099,42 @@ var OpenLayersLayer = function OpenLayersLayer(layerProps) {
       tileServer = layerProps.tileServer;
     if (type === 'twms' && _name) {
       var _map$getView;
-      var tileSettingByName = tilesettings[_name] || tileServer && tileServer[_name];
+      var tileSettingByName = tileServerSettings[_name] || tileServer && tileServer[_name];
       if (!tileSettingByName) {
-        console.warn("Tilesetting with name ".concat(_name, " not found in "), tilesettings, tileServer);
+        console.warn("Tilesetting with name ".concat(_name, " not found in "), tileServerSettings, tileServer);
       }
       var projectionName = map === null || map === void 0 || (_map$getView = map.getView()) === null || _map$getView === void 0 || (_map$getView = _map$getView.getProjection()) === null || _map$getView === void 0 ? void 0 : _map$getView.getCode();
       var projectionUsedFromTileServer = tileSettingByName[projectionName] ? projectionName : 'EPSG:3857';
       var tileSettingForCRS = tileSettingByName && projectionName && tileSettingByName[projectionUsedFromTileServer];
       if (tileSettingForCRS) {
         var home = tileSettingForCRS.home,
-          tileServerType = tileSettingForCRS.tileServerType;
-        if (tileServerType === 'osm') {
-          return jsx(XYZLayer, {
-            urlTemplate: "".concat(home, "{z}/{x}/{y}.png"),
-            layerOptions: layerOptions,
-            layerProps: _objectSpread2(_objectSpread2({}, layerProps), {}, {
-              enabled: true
-            }),
-            tileProjectionCode: projectionUsedFromTileServer
-          });
-        }
-        if (tileServerType === 'arcgisonline') {
-          return jsx(XYZLayer, {
-            urlTemplate: "".concat(home, "{z}/{y}/{x}.png"),
-            layerOptions: layerOptions,
-            layerProps: _objectSpread2(_objectSpread2({}, layerProps), {}, {
-              enabled: true
-            }),
-            tileProjectionCode: projectionUsedFromTileServer
-          });
+          tileServerType = tileSettingForCRS.tileServerType,
+          urlTemplateOverride = tileSettingForCRS.urlTemplate;
+        var urlTemplate = (urlTemplateOverride === null || urlTemplateOverride === void 0 ? void 0 : urlTemplateOverride(home)) || '';
+        if (!urlTemplateOverride) {
+          switch (tileServerType) {
+            case 'arcgisonline':
+              urlTemplate = "".concat(home, "{z}/{y}/{x}.png");
+              break;
+            case 'osm':
+              urlTemplate = "".concat(home, "{z}/{x}/{y}.png");
+              break;
+            case 'wmst':
+              urlTemplate = "".concat(home, "{z}/{y}/{x}");
+              break;
+          }
         }
-        if (tileServerType === 'wmst') {
-          return jsx(XYZLayer, {
-            urlTemplate: "".concat(home, "{z}/{y}/{x}"),
-            layerOptions: layerOptions,
-            layerProps: _objectSpread2(_objectSpread2({}, layerProps), {}, {
-              enabled: true
-            }),
-            tileProjectionCode: projectionUsedFromTileServer
-          });
+        if (!urlTemplate) {
+          console.warn("Tile server type ".concat(tileServerType, " not supported"), tileServerSettings, tileServer);
         }
+        return jsx(XYZLayer, {
+          urlTemplate: urlTemplate,
+          layerOptions: layerOptions,
+          layerProps: _objectSpread2(_objectSpread2({}, layerProps), {}, {
+            enabled: true
+          }),
+          tileProjectionCode: projectionUsedFromTileServer
+        });
       }
     } else if (_name && _service) {
       return jsx(WMSLayer, {
@@ -11687,7 +11685,8 @@ var FEATURE_EDR_HOVER = [new Style$1({
 })];
 var FEATURE_MY_LOCATION = new Style$1({
   renderer: function renderer(pixelCoordinates, state) {
-    var ctx = state.context;
+    var ctx = state.context,
+      pixelRatio = state.pixelRatio;
     var coord = pixelCoordinates;
     ctx.save();
     // Draw outer circle with shadow
@@ -11696,13 +11695,13 @@ var FEATURE_MY_LOCATION = new Style$1({
     ctx.shadowColor = '#00000080';
     ctx.shadowBlur = 10;
     ctx.beginPath();
-    ctx.arc(coord[0], coord[1], 24, 0, 2 * Math.PI);
+    ctx.arc(coord[0], coord[1], 12 * pixelRatio, 0, 2 * Math.PI);
     ctx.fill();
     ctx.shadowBlur = 0;
     // Draw inner circle
     ctx.fillStyle = '#186dff';
     ctx.beginPath();
-    ctx.arc(coord[0], coord[1], 18, 0, 2 * Math.PI);
+    ctx.arc(coord[0], coord[1], 9 * pixelRatio, 0, 2 * Math.PI);
     ctx.fill();
     // Reset transformations
     ctx.restore();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap-react",
-  "version": "12.4.2",
+  "version": "12.5.0",
   "description": "GeoWeb react wrapper for webmap",
   "license": "Apache-2.0",
   "repository": {
@@ -8,10 +8,10 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/webmap": "12.4.2",
+    "@opengeoweb/webmap": "12.5.0",
     "axios": "^1.7.7",
-    "@opengeoweb/theme": "12.4.2",
-    "@opengeoweb/shared": "12.4.2",
+    "@opengeoweb/theme": "12.5.0",
+    "@opengeoweb/shared": "12.5.0",
     "lodash": "^4.17.21",
     "ol": "^10.4.0",
     "proj4": "^2.9.2",

package/src/lib/components/OpenLayers/layers/OpenLayersLayer.d.ts

@@ -1,4 +1,4 @@
-import { LayerFoundation } from '@opengeoweb/webmap';
+import { LayerFoundation, TileServerSettings } from '@opengeoweb/webmap';
 import type { OnInitializeLayerProps } from '../utils/types';
 import { DrawModeExitCallback, FeatureEvent } from '../../MapDraw';
 export interface OpenLayersLayerProps extends LayerFoundation {
@@ -15,5 +15,6 @@ export interface OpenLayersLayerProps extends LayerFoundation {
     selectedFeatureIndex?: number;
     onClickFeature?: (event?: FeatureEvent) => void;
     onHoverFeature?: (event: FeatureEvent) => void;
+    tileServerSettings?: TileServerSettings;
 }
 export declare const OpenLayersLayer: (layerProps: OpenLayersLayerProps) => React.ReactElement;