qwc2 2026.3.30 → 2026.4.3

package/LICENSE

@@ -1,6 +1,5 @@
 Copyright (c) 2015-2016 GeoSolutions Sas
-Copyright (c) 2016-2024 Sourcepole AG
-Copyright (c) 2021 Oslandia SAS <infos+qwc2@oslandia.com>
+Copyright (c) QWC Contributors <https://github.com/qgis/qwc2/graphs/contributors>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are
@@ -22,7 +21,3 @@ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRU
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation are those
-of the authors and should not be interpreted as representing official policies,
-either expressed or implied, of the MapStore2 Project.

package/README.md

@@ -8,18 +8,22 @@ The `qwc2` NPM package can be used as a dependency to build a custom QWC applica
 
 ![Screenshot](https://github.com/qgis/qwc2/blob/gh-pages/Screenshot.jpg?raw=true)
 
-### Main Features
+## Homepage
+
+See [qwc.app](https://qwc.app).
+
+## Main Features
 
 See [qwc.app/features](https://qwc.app/features).
 
 ## Quick start
 
-See [qwc-services.github.io/master/QuickStart/](https://qwc-services.github.io/master/QuickStart/)
+See [docs.qwc.app/master/QuickStart/](https://docs.qwc.app/master/QuickStart/).
 
 ## Documentation
 
-* [qwc-services.github.io](https://qwc-services.github.io/)
-* [ChangeLog](https://qwc-services.github.io/master/release_notes/ChangeLog/)
+* [docs.qwc.app](https://docs.qwc.app)
+* [ChangeLog](https://docs.qwc.app/master/release_notes/ChangeLog/)
 
 ## Help
 

package/components/map/layers/MVTLayer.js

@@ -15,45 +15,83 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import axios from 'axios';
 import { applyStyle } from 'ol-mapbox-style';
 import ol from 'openlayers';
+function createLayer(url, options) {
+  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: url,
+      tileGrid: options.tileGridConfig ? new ol.tilegrid.TileGrid(_objectSpread({}, options.tileGridConfig)) : undefined
+    }, options.sourceConfig || {}))
+  }, options.layerConfig || {}));
+}
+export function createFromStyle(style, options, callback) {
+  axios.get(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);
+    // Collect used sources
+    var usedSources = new Set(glStyle.layers.map(function (l) {
+      return l.source;
+    }).filter(Boolean));
+    // Create layer for each source
+    usedSources.forEach(function (sourceName) {
+      var _source$url, _source$tiles;
+      var source = glStyle.sources[sourceName];
+      if (source.type !== 'vector' && source.type !== 'geojson') {
+        return;
+      }
+      ((_source$url = source.url) === null || _source$url === void 0 ? void 0 : _source$url.startsWith(".")) && (source.url = new URL(source.url, options.style).href);
+      if ((_source$tiles = source.tiles) !== null && _source$tiles !== void 0 && _source$tiles.length) {
+        var layer = createLayer(source.tiles[0], options);
+        applyStyle(layer, style, sourceName, options.styleOptions).then(function () {
+          callback(layer);
+        })["catch"](function (e) {
+          /* eslint-disable-next-line */
+          console.warn("Unable to apply style " + sourceName + ": " + String(e));
+        });
+      } else if (source.url) {
+        axios.get(source.url).then(function (response2) {
+          var _response2$data;
+          if ((_response2$data = response2.data) !== null && _response2$data !== void 0 && (_response2$data = _response2$data.tiles) !== null && _response2$data !== void 0 && _response2$data.length) {
+            var _layer = createLayer(response2.data.tiles[0], options, callback);
+            applyStyle(_layer, style, sourceName, options.styleOptions).then(function () {
+              callback(_layer);
+            })["catch"](function (e) {
+              /* eslint-disable-next-line */
+              console.warn("Unable to apply style " + sourceName + ": " + String(e));
+            });
+          } else {
+            /* eslint-disable-next-line */
+            console.warn("Could not find source tile URL for style " + sourceName);
+          }
+        })["catch"](function () {
+          /* eslint-disable-next-line */
+          console.warn("Could not find source tile URL for style " + sourceName);
+        });
+      } else {
+        /* eslint-disable-next-line */
+        console.warn("Could not find source tile URL for style " + sourceName);
+      }
+    });
+  })["catch"](function (e) {
+    /* eslint-disable-next-line */
+    console.warn("Unable to load style " + options.style + ": " + String(e));
+  });
+}
 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 apply style " + options.style + ": " + String(e));
-          });
-        });
-      })["catch"](function (e) {
-        /* eslint-disable-next-line */
-        console.warn("Unable to load style " + options.style + ": " + String(e));
+      createFromStyle(options.style, options, function (layer) {
+        group.getLayers().push(layer);
       });
     } else {
-      group.getLayers().push(createLayer());
+      group.getLayers().push(createLayer(options.url, options));
     }
     return group;
   }

package/components/map3d/ColorLayer3D.js

@@ -0,0 +1,159 @@
+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 _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, 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 2026 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 React from 'react';
+import DrapedFeatureCollection from '@giro3d/giro3d/entities/DrapedFeatureCollection';
+import PropTypes from 'prop-types';
+import LayerRegistry3D from './layers/index';
+var ColorLayer3D = /*#__PURE__*/function (_React$Component) {
+  function ColorLayer3D(props) {
+    var _this;
+    _classCallCheck(this, ColorLayer3D);
+    _this = _callSuper(this, ColorLayer3D, [props]);
+    _defineProperty(_this, "applyLayerOptions", function (layerCreator, prevOptions) {
+      var _this$props$map$getLa;
+      var options = _this.props.options;
+      // Reorder layer
+      var layerBelow = (_this$props$map$getLa = _this.props.map.getLayers(function (l) {
+        return l.userData.layerId === _this.props.prevLayerId;
+      })[0]) !== null && _this$props$map$getLa !== void 0 ? _this$props$map$getLa : null;
+      _this.mapLayer.moveAfter(layerBelow);
+      // WMS layer handles visibility and opacity internally
+      if (_this.props.options.type !== "wms") {
+        _this.mapLayer.setVisible(options.visibility);
+        _this.mapLayer.setOpacity(options.opacity / 255);
+      }
+      if (_this.props.options.extrusionHeight !== undefined && _this.props.options.extrusionHeight !== 0) {
+        _this.createUpdateExtrudedLayer(layerCreator, options, options.features !== (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.features));
+      } else if ((prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.extrusionHeight) !== undefined && (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.extrusionHeight) !== 0) {
+        _this.props.sceneContext.removeSceneObject(_this.props.options.id + ":extruded");
+      }
+    });
+    _defineProperty(_this, "createUpdateExtrudedLayer", function (layerCreator, options) {
+      var _options$features, _options$features$red;
+      var forceCreate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var objId = options.id + ":extruded";
+      var makeColor = function makeColor(c) {
+        if (Array.isArray(c)) {
+          return c[0] << 16 | c[1] << 8 | c[2];
+        } else if (typeof c === "string") {
+          return parseInt(c.replace("#", ""), 16);
+        } else {
+          return c;
+        }
+      };
+      var obj = _this.props.sceneContext.getSceneObject(objId);
+      if (!obj || forceCreate) {
+        var _options$color;
+        if (obj) {
+          _this.props.sceneContext.removeSceneObject(objId);
+        }
+        var layercolor = makeColor((_options$color = options.color) !== null && _options$color !== void 0 ? _options$color : "#FF0000");
+        obj = new DrapedFeatureCollection({
+          source: layerCreator.createFeatureSource(_this.mapLayer, options, _this.props.sceneContext.mapCrs),
+          drapingMode: 'per-feature',
+          extrusionOffset: function extrusionOffset(feature) {
+            if (typeof obj.userData.extrusionHeight === "string") {
+              return parseFloat(feature.getProperties()[obj.userData.extrusionHeight]) || 0;
+            } else {
+              return obj.userData.extrusionHeight;
+            }
+          },
+          style: function style(feature) {
+            var _obj$userData$feature, _obj$userData$feature2;
+            return (_obj$userData$feature = (_obj$userData$feature2 = obj.userData.featureStyles) === null || _obj$userData$feature2 === void 0 ? void 0 : _obj$userData$feature2[feature.getId()]) !== null && _obj$userData$feature !== void 0 ? _obj$userData$feature : {
+              fill: {
+                color: layercolor,
+                shading: true
+              }
+            };
+          }
+        });
+        obj.castShadow = true;
+        obj.receiveShadow = true;
+        _this.props.sceneContext.addSceneObject(objId, obj, false, {}, false, function () {
+          obj.attach(_this.props.map);
+        });
+      }
+      obj.userData.extrusionHeight = options.extrusionHeight;
+      obj.userData.featureStyles = (_options$features = options.features) === null || _options$features === void 0 || (_options$features$red = _options$features.reduce) === null || _options$features$red === void 0 ? void 0 : _options$features$red.call(_options$features, function (res, feature) {
+        return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, feature.id, {
+          fill: {
+            color: makeColor(feature.styleOptions.fillColor),
+            shading: true
+          }
+        }));
+      }, {});
+      obj.opacity = _this.mapLayer.opacity();
+      obj.visible = _this.mapLayer.visible();
+      if (obj.visible) {
+        obj.updateStyles();
+      }
+    });
+    _this.mapLayer = null;
+    return _this;
+  }
+  _inherits(ColorLayer3D, _React$Component);
+  return _createClass(ColorLayer3D, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      var layerCreator = LayerRegistry3D[this.props.options.type];
+      if (layerCreator) {
+        this.mapLayer = layerCreator.create3d(this.props.options, this.props.sceneContext.mapCrs);
+        this.mapLayer.attach(this.props.map);
+        this.applyLayerOptions(layerCreator, {});
+      }
+    }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      var layerCreator = LayerRegistry3D[this.props.options.type];
+      if (this.mapLayer && layerCreator) {
+        var _layerCreator$update;
+        (_layerCreator$update = layerCreator.update3d) === null || _layerCreator$update === void 0 || _layerCreator$update.call(layerCreator, this.mapLayer, this.props.options, prevProps.options, this.props.sceneContext.mapCrs);
+        this.applyLayerOptions(layerCreator, prevProps.options);
+      }
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if (this.mapLayer) {
+        this.props.sceneContext.removeSceneObject(this.props.options.id + ":extruded");
+        this.mapLayer.dispose();
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      return null;
+    }
+  }]);
+}(React.Component);
+_defineProperty(ColorLayer3D, "propTypes", {
+  map: PropTypes.object,
+  options: PropTypes.object,
+  prevLayerId: PropTypes.string,
+  sceneContext: PropTypes.object
+});
+export { ColorLayer3D as default };