qwc2 2025.10.9 → 2025.10.14

package/components/map/layers/GoogleLayer.js

@@ -5,23 +5,226 @@
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
- */import React from"react";import ol from"openlayers";var layersMap;var rendererItem;// internal state for visibility of all Google Maps layers in layer tree
-var layerVisibilities={};var gmaps={};var isTouchSupported="ontouchstart"in window;var startEvent=isTouchSupported?"touchstart":"mousedown";var moveEvent=isTouchSupported?"touchmove":"mousemove";var endEvent=isTouchSupported?"touchend":"mouseup";// NOTE: For the GoogleLayer to work, you MUST use EPSG:3857 as map projection and the google mercator scales:
+ */
+
+import React from 'react';
+import ol from 'openlayers';
+var layersMap;
+var rendererItem;
+// internal state for visibility of all Google Maps layers in layer tree
+var layerVisibilities = {};
+var gmaps = {};
+var isTouchSupported = 'ontouchstart' in window;
+var startEvent = isTouchSupported ? 'touchstart' : 'mousedown';
+var moveEvent = isTouchSupported ? 'touchmove' : 'mousemove';
+var endEvent = isTouchSupported ? 'touchend' : 'mouseup';
+
+// NOTE: For the GoogleLayer to work, you MUST use EPSG:3857 as map projection and the google mercator scales:
 // [591658711,295829355,147914678,73957339,36978669,18489335,9244667,4622334,2311167,1155583,577792,288896,144448,72224,36112,18056,9028,4514,2257,1128,564,282,141,71,35,18,9,4,2]
-export default{create:function create(options,map){var google=window.google;var mapId=map.get("id");if(mapId!=="map"){// ignore if not main map, e.g. overview
-return null}if(!layersMap){layersMap={HYBRID:google.maps.MapTypeId.HYBRID,SATELLITE:google.maps.MapTypeId.SATELLITE,ROADMAP:google.maps.MapTypeId.ROADMAP,TERRAIN:google.maps.MapTypeId.TERRAIN}}if(!gmaps[mapId]){gmaps[mapId]=new google.maps.Map(document.getElementById(mapId+"gmaps"),{disableDefaultUI:true,keyboardShortcuts:false,draggable:false,disableDoubleClickZoom:true,scrollwheel:false,streetViewControl:false,tilt:0})}gmaps[mapId].setMapTypeId(layersMap[options.name]);var mapContainer=document.getElementById(mapId+"gmaps");var setCenter=function setCenter(){if(mapContainer.style.visibility!=="hidden"){var center=ol.proj.transform(map.getView().getCenter(),"EPSG:3857","EPSG:4326");gmaps[mapId].setCenter(new google.maps.LatLng(center[1],center[0]))}};var setZoom=function setZoom(){if(mapContainer.style.visibility!=="hidden"){gmaps[mapId].setZoom(Math.round(map.getView().getZoom()))}};/**
-         * @param point {array}: [x, y]
-         * @param alpha {number}: rotation in degrees
-         */var rotatePoint=function rotatePoint(point,alpha){var radAlpha=alpha*Math.PI/180;var x=point[0];var y=point[1];var rx=x*Math.cos(radAlpha)-y*Math.sin(radAlpha);var ry=x*Math.sin(radAlpha)+y*Math.cos(radAlpha);return[rx,ry]};/**
-         * @param rotation {number}: rotation in degrees
-         * @param size {array}: map size [w, h]
-         */var calculateRotatedSize=function calculateRotatedSize(rotation,size){var w=size[0];var h=size[1];var vertices=[//  [   x  ,   y  ]
-[w/2,h/2],[-w/2,h/2],[-w/2,-h/2],[w/2,-h/2]];var rVertices=vertices.map(function(p){return rotatePoint(p,rotation)});var Xs=rVertices.map(function(p){return p[0]});var Ys=rVertices.map(function(p){return p[1]});var maxX=Math.max.apply(null,Xs);var minX=Math.min.apply(null,Xs);var maxY=Math.max.apply(null,Ys);var minY=Math.min.apply(null,Ys);var H=Math.abs(maxY)+Math.abs(minY);var W=Math.abs(maxX)+Math.abs(minX);return{width:W,height:H}};var setRotation=function setRotation(){if(mapContainer.style.visibility!=="hidden"){var rotation=map.getView().getRotation()*180/Math.PI;mapContainer.style.transform="rotate("+rotation+"deg)";google.maps.event.trigger(gmaps[mapId],"resize")}};var setViewEventListeners=function setViewEventListeners(){var view=map.getView();view.on("change:center",setCenter);view.on("change:resolution",setZoom);view.on("change:rotation",setRotation)};map.on("change:view",setViewEventListeners);setViewEventListeners();setCenter();setZoom();var viewport=map.getViewport();var oldTrans=document.getElementById(mapId+"gmaps").style.transform;var mousedown=false;var mousemove=false;var resizeGoogleLayerIfRotated=function resizeGoogleLayerIfRotated(){var degrees=/[+-]?\d+\.?\d*/i;var newTrans=document.getElementById(mapId+"gmaps").style.transform;if(newTrans!==oldTrans&&newTrans.indexOf("rotate")!==-1){var rotation=parseFloat(newTrans.match(degrees)[0]);var size=calculateRotatedSize(-rotation,map.getSize());mapContainer.style.width=size.width+"px";mapContainer.style.height=size.height+"px";mapContainer.style.left=Math.round((map.getSize()[0]-size.width)/2)+"px";mapContainer.style.top=Math.round((map.getSize()[1]-size.height)/2)+"px";google.maps.event.trigger(gmaps[mapId],"resize");setCenter()}};viewport.addEventListener(startEvent,function(){mousedown=true});viewport.addEventListener(endEvent,function(){if(mousemove&&mousedown){resizeGoogleLayerIfRotated()}oldTrans=document.getElementById(mapId+"gmaps").style.transform;mousedown=false});viewport.addEventListener(moveEvent,function(){mousemove=mousedown});return null},render:function render(options,map){var mapId=map.get("id");if(mapId!=="map"){// ignore if not main map, e.g. overview
-return null}// the first item that call render will take control
-if(!rendererItem){rendererItem=options.name}var wrapperStyle={zIndex:-1,position:"fixed",left:0,right:0,top:0,bottom:0};var gmapsStyle={height:"100%"};var visibilityChanged=layerVisibilities[options.id]!==options.visibility;layerVisibilities[options.id]=options.visibility;if(options.visibility===true){var div=document.getElementById(mapId+"gmaps");if(div){// override div visibility
-div.style.visibility="visible"}if(gmaps[mapId]&&layersMap){gmaps[mapId].setMapTypeId(layersMap[options.name]);gmaps[mapId].setTilt(0);if(visibilityChanged){// update map extent when turning visibility on
-var center=ol.proj.transform(map.getView().getCenter(),"EPSG:3857","EPSG:4326");gmaps[mapId].setCenter(new window.google.maps.LatLng(center[1],center[0]));gmaps[mapId].setZoom(map.getView().getZoom())}}}else{gmapsStyle.visibility="hidden";// used only for the renered div
-}// To hide the map when visibility is set to false for every
-// instance of google layer
-if(rendererItem===options.name){// assume the first render the div for gmaps
-var _div=document.getElementById(mapId+"gmaps");if(_div){_div.style.visibility=options.visibility?"visible":"hidden"}return/*#__PURE__*/React.createElement("div",{style:wrapperStyle},/*#__PURE__*/React.createElement("div",{className:"fill",id:mapId+"gmaps",style:gmapsStyle}))}return null},update:function update(layer,newOptions,oldOptions,map){var mapId=map.get("id");var google=window.google;if(!oldOptions.visibility&&newOptions.visibility){var view=map.getView();var center=ol.proj.transform(view.getCenter(),"EPSG:3857","EPSG:4326");gmaps[mapId].setCenter(new google.maps.LatLng(center[1],center[0]));gmaps[mapId].setZoom(view.getZoom())}}};
+
+export default {
+  create: function create(options, map) {
+    var google = window.google;
+    var mapId = map.get('id');
+    if (mapId !== 'map') {
+      // ignore if not main map, e.g. overview
+      return null;
+    }
+    if (!layersMap) {
+      layersMap = {
+        HYBRID: google.maps.MapTypeId.HYBRID,
+        SATELLITE: google.maps.MapTypeId.SATELLITE,
+        ROADMAP: google.maps.MapTypeId.ROADMAP,
+        TERRAIN: google.maps.MapTypeId.TERRAIN
+      };
+    }
+    if (!gmaps[mapId]) {
+      gmaps[mapId] = new google.maps.Map(document.getElementById(mapId + 'gmaps'), {
+        disableDefaultUI: true,
+        keyboardShortcuts: false,
+        draggable: false,
+        disableDoubleClickZoom: true,
+        scrollwheel: false,
+        streetViewControl: false,
+        tilt: 0
+      });
+    }
+    gmaps[mapId].setMapTypeId(layersMap[options.name]);
+    var mapContainer = document.getElementById(mapId + 'gmaps');
+    var setCenter = function setCenter() {
+      if (mapContainer.style.visibility !== 'hidden') {
+        var center = ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326');
+        gmaps[mapId].setCenter(new google.maps.LatLng(center[1], center[0]));
+      }
+    };
+    var setZoom = function setZoom() {
+      if (mapContainer.style.visibility !== 'hidden') {
+        gmaps[mapId].setZoom(Math.round(map.getView().getZoom()));
+      }
+    };
+
+    /**
+     * @param point {array}: [x, y]
+     * @param alpha {number}: rotation in degrees
+     */
+    var rotatePoint = function rotatePoint(point, alpha) {
+      var radAlpha = alpha * Math.PI / 180;
+      var x = point[0];
+      var y = point[1];
+      var rx = x * Math.cos(radAlpha) - y * Math.sin(radAlpha);
+      var ry = x * Math.sin(radAlpha) + y * Math.cos(radAlpha);
+      return [rx, ry];
+    };
+
+    /**
+     * @param rotation {number}: rotation in degrees
+     * @param size {array}: map size [w, h]
+     */
+    var calculateRotatedSize = function calculateRotatedSize(rotation, size) {
+      var w = size[0];
+      var h = size[1];
+      var vertices = [
+      //  [   x  ,   y  ]
+      [w / 2, h / 2], [-w / 2, h / 2], [-w / 2, -h / 2], [w / 2, -h / 2]];
+      var rVertices = vertices.map(function (p) {
+        return rotatePoint(p, rotation);
+      });
+      var Xs = rVertices.map(function (p) {
+        return p[0];
+      });
+      var Ys = rVertices.map(function (p) {
+        return p[1];
+      });
+      var maxX = Math.max.apply(null, Xs);
+      var minX = Math.min.apply(null, Xs);
+      var maxY = Math.max.apply(null, Ys);
+      var minY = Math.min.apply(null, Ys);
+      var H = Math.abs(maxY) + Math.abs(minY);
+      var W = Math.abs(maxX) + Math.abs(minX);
+      return {
+        width: W,
+        height: H
+      };
+    };
+    var setRotation = function setRotation() {
+      if (mapContainer.style.visibility !== 'hidden') {
+        var rotation = map.getView().getRotation() * 180 / Math.PI;
+        mapContainer.style.transform = "rotate(" + rotation + "deg)";
+        google.maps.event.trigger(gmaps[mapId], "resize");
+      }
+    };
+    var setViewEventListeners = function setViewEventListeners() {
+      var view = map.getView();
+      view.on('change:center', setCenter);
+      view.on('change:resolution', setZoom);
+      view.on('change:rotation', setRotation);
+    };
+    map.on('change:view', setViewEventListeners);
+    setViewEventListeners();
+    setCenter();
+    setZoom();
+    var viewport = map.getViewport();
+    var oldTrans = document.getElementById(mapId + 'gmaps').style.transform;
+    var mousedown = false;
+    var mousemove = false;
+    var resizeGoogleLayerIfRotated = function resizeGoogleLayerIfRotated() {
+      var degrees = /[+-]?\d+\.?\d*/i;
+      var newTrans = document.getElementById(mapId + 'gmaps').style.transform;
+      if (newTrans !== oldTrans && newTrans.indexOf('rotate') !== -1) {
+        var rotation = parseFloat(newTrans.match(degrees)[0]);
+        var size = calculateRotatedSize(-rotation, map.getSize());
+        mapContainer.style.width = size.width + 'px';
+        mapContainer.style.height = size.height + 'px';
+        mapContainer.style.left = Math.round((map.getSize()[0] - size.width) / 2.0) + 'px';
+        mapContainer.style.top = Math.round((map.getSize()[1] - size.height) / 2.0) + 'px';
+        google.maps.event.trigger(gmaps[mapId], "resize");
+        setCenter();
+      }
+    };
+    viewport.addEventListener(startEvent, function () {
+      mousedown = true;
+    });
+    viewport.addEventListener(endEvent, function () {
+      if (mousemove && mousedown) {
+        resizeGoogleLayerIfRotated();
+      }
+      oldTrans = document.getElementById(mapId + 'gmaps').style.transform;
+      mousedown = false;
+    });
+    viewport.addEventListener(moveEvent, function () {
+      mousemove = mousedown;
+    });
+    return null;
+  },
+  render: function render(options, map) {
+    var mapId = map.get('id');
+    if (mapId !== 'map') {
+      // ignore if not main map, e.g. overview
+      return null;
+    }
+
+    // the first item that call render will take control
+    if (!rendererItem) {
+      rendererItem = options.name;
+    }
+    var wrapperStyle = {
+      zIndex: -1,
+      position: 'fixed',
+      left: 0,
+      right: 0,
+      top: 0,
+      bottom: 0
+    };
+    var gmapsStyle = {
+      height: '100%'
+    };
+    var visibilityChanged = layerVisibilities[options.id] !== options.visibility;
+    layerVisibilities[options.id] = options.visibility;
+    if (options.visibility === true) {
+      var div = document.getElementById(mapId + "gmaps");
+      if (div) {
+        // override div visibility
+        div.style.visibility = 'visible';
+      }
+      if (gmaps[mapId] && layersMap) {
+        gmaps[mapId].setMapTypeId(layersMap[options.name]);
+        gmaps[mapId].setTilt(0);
+        if (visibilityChanged) {
+          // update map extent when turning visibility on
+          var center = ol.proj.transform(map.getView().getCenter(), 'EPSG:3857', 'EPSG:4326');
+          gmaps[mapId].setCenter(new window.google.maps.LatLng(center[1], center[0]));
+          gmaps[mapId].setZoom(map.getView().getZoom());
+        }
+      }
+    } else {
+      gmapsStyle.visibility = 'hidden'; // used only for the renered div
+    }
+    // To hide the map when visibility is set to false for every
+    // instance of google layer
+    if (rendererItem === options.name) {
+      // assume the first render the div for gmaps
+      var _div = document.getElementById(mapId + "gmaps");
+      if (_div) {
+        _div.style.visibility = options.visibility ? 'visible' : 'hidden';
+      }
+      return /*#__PURE__*/React.createElement("div", {
+        style: wrapperStyle
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "fill",
+        id: mapId + "gmaps",
+        style: gmapsStyle
+      }));
+    }
+    return null;
+  },
+  update: function update(layer, newOptions, oldOptions, map) {
+    var mapId = map.get('id');
+    var google = window.google;
+    if (!oldOptions.visibility && newOptions.visibility) {
+      var view = map.getView();
+      var center = ol.proj.transform(view.getCenter(), 'EPSG:3857', 'EPSG:4326');
+      gmaps[mapId].setCenter(new google.maps.LatLng(center[1], center[0]));
+      gmaps[mapId].setZoom(view.getZoom());
+    }
+  }
+};

package/components/map/layers/GraticuleLayer.js

@@ -5,4 +5,24 @@
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
- */import ol from"openlayers";export default{create:function create(options,map){var graticule=new ol.Graticule({strokeStyle:options.style||new ol.style.Stroke({color:"rgba(255,120,0,0.9)",width:2,lineDash:[0.5,4]})});graticule.setMap(map);return{detached:true,remove:function remove(){graticule.setMap(null)}}}};
+ */
+
+import ol from 'openlayers';
+export default {
+  create: function create(options, map) {
+    var graticule = new ol.Graticule({
+      strokeStyle: options.style || new ol.style.Stroke({
+        color: 'rgba(255,120,0,0.9)',
+        width: 2,
+        lineDash: [0.5, 4]
+      })
+    });
+    graticule.setMap(map);
+    return {
+      detached: true,
+      remove: function remove() {
+        graticule.setMap(null);
+      }
+    };
+  }
+};

package/components/map/layers/ImageLayer.js

@@ -5,4 +5,18 @@
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
- */import ol from"openlayers";export default{create:function create(options){return new ol.layer.Image({source:new ol.source.ImageStatic({url:options.url,projection:options.projection,imageExtent:options.imageExtent})})},update:function update(){}};
+ */
+
+import ol from 'openlayers';
+export default {
+  create: function create(options) {
+    return new ol.layer.Image({
+      source: new ol.source.ImageStatic({
+        url: options.url,
+        projection: options.projection,
+        imageExtent: options.imageExtent
+      })
+    });
+  },
+  update: function update() {}
+};

package/components/map/layers/MVTLayer.js

@@ -1,7 +1,57 @@
-function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(o){return typeof o}:function(o){return o&&"function"==typeof Symbol&&o.constructor===Symbol&&o!==Symbol.prototype?"symbol":typeof o},_typeof(o)}function ownKeys(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);r&&(o=o.filter(function(r){return Object.getOwnPropertyDescriptor(e,r).enumerable})),t.push.apply(t,o)}return t}function _objectSpread(e){for(var r=1;r<arguments.length;r++){var t=null!=arguments[r]?arguments[r]:{};r%2?ownKeys(Object(t),!0).forEach(function(r){_defineProperty(e,r,t[r])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):ownKeys(Object(t)).forEach(function(r){Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(t,r))})}return e}function _defineProperty(e,r,t){return(r=_toPropertyKey(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==_typeof(i)?i:i+""}function _toPrimitive(t,r){if("object"!=_typeof(t)||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,r||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===r?String:Number)(t)}/**
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
  * Copyright 2022 Oslandia SAS <infos+qwc2@oslandia.com>
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
- */import axios from"axios";import{applyStyle}from"ol-mapbox-style";import ol from"openlayers";export default{create:function create(options){var createLayer=function createLayer(){return new ol.layer.VectorTile(_objectSpread({minResolution:options.minResolution,maxResolution:options.maxResolution,declutter:options.declutter,source:new ol.source.VectorTile(_objectSpread({projection:options.projection,format:new ol.format.MVT({}),url:options.url,tileGrid:options.tileGridConfig?new ol.tilegrid.TileGrid(_objectSpread({},options.tileGridConfig)):undefined},options.sourceConfig||{}))},options.layerConfig||{}))};var group=new ol.layer.Group;if(options.style){axios.get(options.style).then(function(response){var _glStyle$sprite,_glStyle$glyphs;var glStyle=response.data;((_glStyle$sprite=glStyle.sprite)===null||_glStyle$sprite===void 0?void 0:_glStyle$sprite.startsWith("."))&&(glStyle.sprite=new URL(glStyle.sprite,options.style).href);((_glStyle$glyphs=glStyle.glyphs)===null||_glStyle$glyphs===void 0?void 0:_glStyle$glyphs.startsWith("."))&&(glStyle.glyphs=new URL(glStyle.glyphs,options.style).href);Object.keys(glStyle.sources).forEach(function(styleSource){var _glStyle$sources$styl;((_glStyle$sources$styl=glStyle.sources[styleSource].url)===null||_glStyle$sources$styl===void 0?void 0:_glStyle$sources$styl.startsWith("."))&&(glStyle.sources[styleSource].url=new URL(glStyle.sources[styleSource].url,options.style).href);var layer=createLayer();applyStyle(layer,glStyle,styleSource,options.styleOptions).then(function(){group.getLayers().push(layer)})})})["catch"](function(e){/* eslint-disable-next-line */console.warn("Unable to load style "+options.style+": "+String(e))})}else{group.getLayers().push(createLayer())}return group}};
+ */
+
+import axios from 'axios';
+import { applyStyle } from 'ol-mapbox-style';
+import ol from 'openlayers';
+export default {
+  create: function create(options) {
+    var createLayer = function createLayer() {
+      return new ol.layer.VectorTile(_objectSpread({
+        minResolution: options.minResolution,
+        maxResolution: options.maxResolution,
+        declutter: options.declutter,
+        source: new ol.source.VectorTile(_objectSpread({
+          projection: options.projection,
+          format: new ol.format.MVT({}),
+          url: options.url,
+          tileGrid: options.tileGridConfig ? new ol.tilegrid.TileGrid(_objectSpread({}, options.tileGridConfig)) : undefined
+        }, options.sourceConfig || {}))
+      }, options.layerConfig || {}));
+    };
+    var group = new ol.layer.Group();
+    if (options.style) {
+      axios.get(options.style).then(function (response) {
+        var _glStyle$sprite, _glStyle$glyphs;
+        var glStyle = response.data;
+        ((_glStyle$sprite = glStyle.sprite) === null || _glStyle$sprite === void 0 ? void 0 : _glStyle$sprite.startsWith(".")) && (glStyle.sprite = new URL(glStyle.sprite, options.style).href);
+        ((_glStyle$glyphs = glStyle.glyphs) === null || _glStyle$glyphs === void 0 ? void 0 : _glStyle$glyphs.startsWith(".")) && (glStyle.glyphs = new URL(glStyle.glyphs, options.style).href);
+        Object.keys(glStyle.sources).forEach(function (styleSource) {
+          var _glStyle$sources$styl;
+          ((_glStyle$sources$styl = glStyle.sources[styleSource].url) === null || _glStyle$sources$styl === void 0 ? void 0 : _glStyle$sources$styl.startsWith(".")) && (glStyle.sources[styleSource].url = new URL(glStyle.sources[styleSource].url, options.style).href);
+          var layer = createLayer();
+          applyStyle(layer, glStyle, styleSource, options.styleOptions).then(function () {
+            group.getLayers().push(layer);
+          });
+        });
+      })["catch"](function (e) {
+        /* eslint-disable-next-line */
+        console.warn("Unable to load style " + options.style + ": " + String(e));
+      });
+    } else {
+      group.getLayers().push(createLayer());
+    }
+    return group;
+  }
+};

package/components/map/layers/OSMLayer.js

@@ -1,8 +1,30 @@
-function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(o){return typeof o}:function(o){return o&&"function"==typeof Symbol&&o.constructor===Symbol&&o!==Symbol.prototype?"symbol":typeof o},_typeof(o)}function ownKeys(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);r&&(o=o.filter(function(r){return Object.getOwnPropertyDescriptor(e,r).enumerable})),t.push.apply(t,o)}return t}function _objectSpread(e){for(var r=1;r<arguments.length;r++){var t=null!=arguments[r]?arguments[r]:{};r%2?ownKeys(Object(t),!0).forEach(function(r){_defineProperty(e,r,t[r])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):ownKeys(Object(t)).forEach(function(r){Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(t,r))})}return e}function _defineProperty(e,r,t){return(r=_toPropertyKey(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==_typeof(i)?i:i+""}function _toPrimitive(t,r){if("object"!=_typeof(t)||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,r||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===r?String:Number)(t)}/**
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
  * Copyright 2015 GeoSolutions Sas
  * Copyright 2016-2024 Sourcepole AG
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
- */import ol from"openlayers";import ConfigUtils from"../../../utils/ConfigUtils";export default{create:function create(options){return new ol.layer.Tile(_objectSpread({minResolution:options.minResolution,maxResolution:options.maxResolution,preload:ConfigUtils.getConfigProp("tilePreloadLevels",null,0),source:new ol.source.OSM(_objectSpread({url:options.url,projection:options.projection},options.sourceConfig||{}))},options.layerConfig||{}))}};
+ */
+
+import ol from 'openlayers';
+import ConfigUtils from '../../../utils/ConfigUtils';
+export default {
+  create: function create(options) {
+    return new ol.layer.Tile(_objectSpread({
+      minResolution: options.minResolution,
+      maxResolution: options.maxResolution,
+      preload: ConfigUtils.getConfigProp("tilePreloadLevels", null, 0),
+      source: new ol.source.OSM(_objectSpread({
+        url: options.url,
+        projection: options.projection
+      }, options.sourceConfig || {}))
+    }, options.layerConfig || {}));
+  }
+};

package/components/map/layers/OverlayLayer.js

@@ -5,6 +5,58 @@
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
- */import ol from"openlayers";var _removeIds=function removeIds(items){if(items.length!==0){for(var i=0;i<items.length;i++){var item=items.item(i);item.removeAttribute("data-reactid");_removeIds(item.children||[])}}};var cloneOriginalOverlay=function cloneOriginalOverlay(original,options){var cloned=original.cloneNode(true);cloned.id=options.id+"-overlay";cloned.className=(options.className||original.className)+"-overlay";cloned.removeAttribute("data-reactid");// remove reactjs generated ids from cloned object
-_removeIds(cloned.children||[]);// handle optional close button on overlay
-var closeClassName=options.closeClass||"close";if(options.onClose&&cloned.getElementsByClassName(closeClassName).length===1){var close=cloned.getElementsByClassName(closeClassName)[0];var onClose=function onClose(e){options.onClose(e.target.getAttribute("data-overlayid"))};close.addEventListener("click",onClose)}return cloned};export default{create:function create(options,map){var original=document.getElementById(options.id);var cloned=cloneOriginalOverlay(original,options);document.body.appendChild(cloned);var overlay=new ol.Overlay({id:options.id,element:cloned,autoPan:options.autoPan||false,positioning:options.positioning||"top-left",offset:options.offset||[0,0],autoPanAnimation:{duration:options.autoPanAnimation||250},position:[options.position.x,options.position.y]});map.addOverlay(overlay);return{detached:true,remove:function remove(){map.removeOverlay(overlay)}}}};
+ */
+
+import ol from 'openlayers';
+var _removeIds = function removeIds(items) {
+  if (items.length !== 0) {
+    for (var i = 0; i < items.length; i++) {
+      var item = items.item(i);
+      item.removeAttribute('data-reactid');
+      _removeIds(item.children || []);
+    }
+  }
+};
+var cloneOriginalOverlay = function cloneOriginalOverlay(original, options) {
+  var cloned = original.cloneNode(true);
+  cloned.id = options.id + '-overlay';
+  cloned.className = (options.className || original.className) + "-overlay";
+  cloned.removeAttribute('data-reactid');
+  // remove reactjs generated ids from cloned object
+  _removeIds(cloned.children || []);
+  // handle optional close button on overlay
+  var closeClassName = options.closeClass || 'close';
+  if (options.onClose && cloned.getElementsByClassName(closeClassName).length === 1) {
+    var close = cloned.getElementsByClassName(closeClassName)[0];
+    var onClose = function onClose(e) {
+      options.onClose(e.target.getAttribute('data-overlayid'));
+    };
+    close.addEventListener("click", onClose);
+  }
+  return cloned;
+};
+export default {
+  create: function create(options, map) {
+    var original = document.getElementById(options.id);
+    var cloned = cloneOriginalOverlay(original, options);
+    document.body.appendChild(cloned);
+    var overlay = new ol.Overlay({
+      id: options.id,
+      element: cloned,
+      autoPan: options.autoPan || false,
+      positioning: options.positioning || 'top-left',
+      offset: options.offset || [0, 0],
+      autoPanAnimation: {
+        duration: options.autoPanAnimation || 250
+      },
+      position: [options.position.x, options.position.y]
+    });
+    map.addOverlay(overlay);
+    return {
+      detached: true,
+      remove: function remove() {
+        map.removeOverlay(overlay);
+      }
+    };
+  }
+};