qwc2 2025.12.17 → 2025.12.18

package/static/translations/uk-UA.json

@@ -67,7 +67,6 @@
       "addfeature": "",
       "commit": "",
       "csvexport": "",
-      "delete": "",
       "deletefailed": "",
       "deletefeatures": "",
       "deleting": "",
@@ -76,12 +75,10 @@
       "geomnoadd": "",
       "limittoextent": "",
       "loadfailed": "",
-      "loading": "",
       "nodelete": "",
       "nogeomnoform": "",
       "pleasereload": "",
       "reload": "",
-      "selectlayer": "",
       "title": "",
       "zoomtoselection": ""
     },
@@ -110,6 +107,37 @@
       "terms_label": "Правила користування",
       "viewertitle_label": "Домашня сторінка"
     },
+    "common": {
+      "all": "",
+      "cancel": "",
+      "circle": "",
+      "clear": "",
+      "clone": "",
+      "close": "",
+      "delete": "",
+      "download": "",
+      "ellipse": "",
+      "export": "",
+      "format": "Формат:",
+      "line": "Лінія",
+      "loading": "",
+      "lock2dview": "",
+      "noresults": "",
+      "pick": "",
+      "point": "Точка",
+      "polygon": "Полігон",
+      "rectangle": "",
+      "resolution": "Роздільна здатність:",
+      "save": "",
+      "select": "Виберіть...",
+      "selectlayer": "",
+      "square": "",
+      "sync2dview": "",
+      "text": "Текст",
+      "wait": "",
+      "zoomin": "Збільшити",
+      "zoomout": "Зменшити"
+    },
     "compare3d": {
       "clipplane": "",
       "compare_objects": "",
@@ -136,17 +164,14 @@
       "title": ""
     },
     "draw3d": {
-      "clone": "",
       "cone": "",
       "cuboid": "",
       "cylinder": "",
-      "delete": "",
       "drawings": "",
       "intersect": "",
       "label": "",
       "newgroupprompt": "",
       "numericinput": "",
-      "pick": "",
       "position": "",
       "pyramid": "",
       "rotate": "",
@@ -169,7 +194,6 @@
       "add": "",
       "attrtable": "",
       "canceldelete": "Не видаляти",
-      "clearpicture": "",
       "clone_all": "",
       "clone_copy": "",
       "clone_defaulted": "",
@@ -182,23 +206,17 @@
       "commitfailed": "",
       "contraintviolation": "",
       "create": "",
-      "delete": "Видалити",
       "discard": "Скасувати зміни",
       "draw": "Намалювати",
       "feature": "",
       "geomnonzeroz": "",
       "geomreadonly": "",
       "invalidform": "",
-      "maximize": "Розгорнути",
-      "minimize": "Згорнути",
       "noeditablelayers": "Немає шарів доступних для редагування.",
       "paint": "",
-      "pick": "Вибрати",
       "pickdrawfeature": "",
       "reallydelete": "Видалити",
       "relationcommitfailed": "",
-      "select": "Виберіть...",
-      "selectlayer": "",
       "takepicture": "",
       "unsavedchanged": ""
     },
@@ -210,14 +228,11 @@
     },
     "featureform": {
       "feature": "",
-      "noresults": "",
       "querying": "",
       "title": ""
     },
     "featuresearch": {
-      "noresults": "",
       "query": "",
-      "select": "",
       "title": ""
     },
     "fileselector": {
@@ -235,8 +250,7 @@
       "line_buffer": "",
       "point_buffer": "",
       "selfinter": "",
-      "send": "",
-      "wait": ""
+      "send": ""
     },
     "heightprofile": {
       "asl": "над р.м.",
@@ -262,8 +276,6 @@
       "clipboard": "",
       "compare": "",
       "comparing": "",
-      "download": "",
-      "export": "Експорт",
       "featureReport": "Звіт по об’єкту",
       "featurecount": "",
       "layerall": "",
@@ -292,7 +304,6 @@
       "asgroup": "",
       "connect": "Підключитись",
       "filter": "Фільтрувати...",
-      "loading": "",
       "localfile": "",
       "nofeatures": "Жоден об’єкт не доступний для імпорту",
       "noresults": "",
@@ -348,8 +359,6 @@
       "zoomtoobject": ""
     },
     "linkfeatureform": {
-      "cancel": "",
-      "close": "",
       "drawhint": "",
       "pickhint": ""
     },
@@ -374,32 +383,22 @@
       "resetrotation": ""
     },
     "map3d": {
-      "lockview": "",
-      "syncview": "",
       "terrain": "",
       "title": ""
     },
     "mapexport": {
       "configuration": "",
-      "format": "Формат:",
       "projection": "",
-      "resolution": "Роздільна здатність:",
       "scale": "",
       "size": "",
-      "submit": "",
-      "usersize": "",
-      "wait": ""
+      "usersize": ""
     },
     "mapfilter": {
       "addcustomfilter": "",
       "brokenrendering": "",
-      "cancel": "",
       "geomfilter": "",
       "hidefiltergeom": "",
       "invalidfilter": "",
-      "save": "",
-      "select": "",
-      "selectlayer": "",
       "timefilter": "",
       "timefrom": "",
       "timeto": ""
@@ -443,7 +442,8 @@
       "imperial": "",
       "lengthLabel": "Довжина",
       "metric": "",
-      "pointLabel": "Позиція"
+      "pointLabel": "Позиція",
+      "showmeasurements": ""
     },
     "misc": {
       "ctrlclickhint": ""
@@ -454,7 +454,6 @@
       "prev": ""
     },
     "newspopup": {
-      "dialogclose": "",
       "dontshowagain": "",
       "title": ""
     },
@@ -484,28 +483,21 @@
     },
     "print": {
       "atlasfeature": "",
-      "download": "",
       "download_as_onepdf": "",
       "download_as_onezip": "",
       "download_as_single": "",
-      "format": "Формат",
       "grid": "Сітка",
       "layout": "Макет",
       "legend": "",
-      "maximize": "Розгорнути",
-      "minimize": "Згорнути",
       "nolayouts": "Вибранна тема не підтримує друк",
       "notheme": "Тема не вибрана",
       "output": "",
       "overlap": "",
       "pickatlasfeature": "",
-      "resolution": "Роздільна здатність",
       "rotation": "Поворот",
-      "save": "",
       "scale": "Масштаб",
       "series": "",
-      "submit": "Друк",
-      "wait": ""
+      "submit": "Друк"
     },
     "qtdesignerform": {
       "loading": ""
@@ -518,35 +510,20 @@
       "bufferlayer": "",
       "bufferlayername": "",
       "bufferselectfeature": "",
-      "circle": "",
-      "clone": "",
       "ctrlhint": "",
-      "delete": "",
       "draw": "",
       "edit": "",
-      "ellipse": "",
-      "export": "",
       "freehand": "",
       "label": "Напис",
       "layer": "",
       "layertitle": "",
-      "line": "Лінія",
       "markers": "",
-      "measurements": "",
       "numericinput": "",
-      "pick": "Вибрати",
-      "point": "Точка",
-      "polygon": "Полігон",
-      "rectangle": "",
       "size": "Розмір",
-      "square": "",
-      "text": "Текст",
+      "text": "",
       "transform": ""
     },
     "reports": {
-      "all": "",
-      "download": "",
-      "pick": "",
       "region": "",
       "selectlayer": ""
     },
@@ -555,11 +532,9 @@
       "addlayer": "",
       "addviapoint": "",
       "arriveat": "",
-      "clear": "",
       "computefailed": "",
       "computing": "",
       "excludepolygons": "",
-      "export": "",
       "fastest": "",
       "fromhere": "",
       "importerror": "",
@@ -595,9 +570,7 @@
       "finish": ""
     },
     "search": {
-      "all": "Все",
       "circleradius": "",
-      "clearfilter": "",
       "coordinates": "",
       "existinglayer": "",
       "filter": "",
@@ -606,7 +579,6 @@
       "more": "",
       "nodescription": "",
       "none": "",
-      "noresults": "",
       "placeholder": "",
       "places": "",
       "providerselection": "",
@@ -694,7 +666,6 @@
       "group": "",
       "groupnone": "",
       "home": "",
-      "loading": "",
       "loop": "",
       "markers": "",
       "notemporaldata": "",
@@ -725,17 +696,13 @@
         "months": "",
         "seconds": "",
         "years": ""
-      },
-      "zoomin": "",
-      "zoomout": ""
+      }
     },
     "tooltip": {
       "background": "Змінити фон",
       "fullscreendisable": "",
       "fullscreenenable": "",
-      "home": "Показати всю карту",
-      "zoomin": "Збільшити",
-      "zoomout": "Зменшити"
+      "home": "Показати всю карту"
     },
     "tourguide": {
       "done": "",
@@ -743,7 +710,6 @@
       "previous": ""
     },
     "valuetool": {
-      "all": "",
       "allbands": "",
       "alllayers": "",
       "bands": "",
@@ -770,7 +736,6 @@
       "storingstate": ""
     },
     "window": {
-      "close": "",
       "detach": "",
       "dock": "",
       "embed": "",

package/utils/FeatureStyles.js

@@ -237,25 +237,20 @@ export default {
       })
     })];
   },
-  interaction: function interaction(options, isSnap) {
+  interaction: function interaction(feature, options, isSnap) {
     var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
-    var fillColor = opts.fillColor;
-    var strokeColor = opts.strokeColor;
-    var strokeWidth = opts.strokeWidth;
-    if (isSnap) {
-      fillColor = opts.snapFillColor;
-      strokeColor = opts.snapStrokeColor;
-      strokeWidth = opts.snapStrokeWidth;
-    }
-    return new ol.style.Style({
-      fill: new ol.style.Fill({
-        color: fillColor
-      }),
-      stroke: new ol.style.Stroke({
-        color: strokeColor,
-        width: strokeWidth
-      })
-    });
+    var styleOptions = isSnap ? {
+      strokeColor: opts.snapStrokeColor,
+      strokeWidth: opts.snapStrokeWidth,
+      fillColor: opts.snapFillColor
+    } : {
+      strokeColor: opts.strokeColor,
+      strokeWidth: opts.strokeWidth,
+      fillColor: opts.fillColor
+    };
+    styleOptions.strokeDash = [];
+    styleOptions.circleRadius = 0;
+    return defaultStyle(feature, styleOptions);
   },
   interactionVertex: function interactionVertex(options, isSnap) {
     var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);

package/utils/IdentifyUtils.js

@@ -27,6 +27,8 @@ import CoordinatesUtils from '../utils/CoordinatesUtils';
 import LayerUtils from '../utils/LayerUtils';
 import MapUtils from '../utils/MapUtils';
 import VectorLayerUtils from './VectorLayerUtils';
+export var EXCLUDE_PROPS = ['featurereport', 'displayfield', 'layername', 'layertitle', 'layerinfo', 'attribnames', 'clickPos', 'displayname', 'bbox'];
+export var EXCLUDE_ATTRS = ['htmlContent', 'htmlContentInline'];
 function identifyRequestParams(layer, queryLayers, projection, params) {
   var _layer$format;
   var format = 'text/plain';
@@ -184,14 +186,14 @@ var IdentifyUtils = {
       });
     }
   },
-  parseResponse: function parseResponse(response, layer, format, clickPoint, projection, featureInfoReturnsLayerName) {
+  parseResponse: function parseResponse(response, layer, format, clickPoint, projection) {
     var decimals = CoordinatesUtils.getPrecision(projection);
     var posstr = clickPoint ? clickPoint[0].toFixed(decimals) + ", " + clickPoint[1].toFixed(decimals) : "";
     var results = {};
     if (["application/json", "application/geojson", "application/geo+json", "GeoJSON"].includes(format)) {
       results = IdentifyUtils.parseGeoJSONResponse(response, projection, layer);
     } else if (format === "text/xml") {
-      results = IdentifyUtils.parseXmlResponse(response, projection, layer, posstr, featureInfoReturnsLayerName);
+      results = IdentifyUtils.parseXmlResponse(response, projection, layer, posstr);
     } else if (format === "application/vnd.ogc.gml") {
       results = IdentifyUtils.parseGmlResponse(response, projection, layer, posstr);
     } else if (format.startsWith("text/xml;subtype=gml/3.1") || format.startsWith("text/xml;subtype=gml/3.0")) {
@@ -310,8 +312,6 @@ var IdentifyUtils = {
       _doc$firstChild$getEl,
       _this = this;
     var posstr = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-    var featureInfoReturnsLayerName = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-    var mapLayers = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
     var parser = new DOMParser();
     var doc = parser.parseFromString(response, "text/xml");
     var layersEl = [].slice.call(((_doc$firstChild = doc.firstChild) === null || _doc$firstChild === void 0 || (_doc$firstChild$getEl = _doc$firstChild.getElementsByTagName) === null || _doc$firstChild$getEl === void 0 ? void 0 : _doc$firstChild$getEl.call(_doc$firstChild, "Layer")) || []);
@@ -326,18 +326,21 @@ var IdentifyUtils = {
         var displayfield = layerEl.attributes.displayfield ? layerEl.attributes.displayfield.value : null;
         var layername = "";
         var layertitle = "";
-        if (layerEl.attributes.layername) {
+        if (layerEl.attributes.title) {
           var _layer$translations$l, _layer$translations;
+          // QGIS Server 3.36+ / qwc-feature-info-service 2025.12.18+
+          layername = layerEl.attributes.name.value;
+          layertitle = (_layer$translations$l = (_layer$translations = layer.translations) === null || _layer$translations === void 0 || (_layer$translations = _layer$translations.layertree) === null || _layer$translations === void 0 ? void 0 : _layer$translations[layername]) !== null && _layer$translations$l !== void 0 ? _layer$translations$l : layerEl.attributes.title.value;
+        } else if (layerEl.attributes.layername) {
+          var _layer$translations$l2, _layer$translations2;
+          // qwc-feature-info-service < 2025.12.18
           layername = layerEl.attributes.layername.value;
-          layertitle = (_layer$translations$l = (_layer$translations = layer.translations) === null || _layer$translations === void 0 || (_layer$translations = _layer$translations.layertree) === null || _layer$translations === void 0 ? void 0 : _layer$translations[layername]) !== null && _layer$translations$l !== void 0 ? _layer$translations$l : layerEl.attributes.name.value;
-        } else if (featureInfoReturnsLayerName) {
+          layertitle = (_layer$translations$l2 = (_layer$translations2 = layer.translations) === null || _layer$translations2 === void 0 || (_layer$translations2 = _layer$translations2.layertree) === null || _layer$translations2 === void 0 ? void 0 : _layer$translations2[layername]) !== null && _layer$translations$l2 !== void 0 ? _layer$translations$l2 : layerEl.attributes.name.value;
+        } else {
           var _LayerUtils$searchSub, _LayerUtils$searchSub2;
+          // QGIS Server < 3.36
           layername = layerEl.attributes.name.value;
           layertitle = (_LayerUtils$searchSub = (_LayerUtils$searchSub2 = LayerUtils.searchSubLayer(layer, 'name', layername)) === null || _LayerUtils$searchSub2 === void 0 ? void 0 : _LayerUtils$searchSub2.title) !== null && _LayerUtils$searchSub !== void 0 ? _LayerUtils$searchSub : layername;
-        } else {
-          var _LayerUtils$searchSub3, _LayerUtils$searchSub4;
-          layertitle = layerEl.attributes.name.value;
-          layername = (_LayerUtils$searchSub3 = (_LayerUtils$searchSub4 = LayerUtils.searchSubLayer(layer, 'title', layertitle)) === null || _LayerUtils$searchSub4 === void 0 ? void 0 : _LayerUtils$searchSub4.name) !== null && _LayerUtils$searchSub3 !== void 0 ? _LayerUtils$searchSub3 : layertitle;
         }
         var layerinfo = layerEl.attributes.layerinfo ? layerEl.attributes.layerinfo.value : null;
         var features = [].slice.call(layerEl.getElementsByTagName("Feature"));

package/utils/SearchProviders.js

@@ -419,7 +419,7 @@ export var FulltextSearch = /*#__PURE__*/function () {
           resultCount: placeResultCount,
           type: SearchResultType.PLACE,
           items: data.results.filter(function (entry) {
-            return entry.feature;
+            return entry.feature && entry.feature.bbox;
           }).map(function (entry) {
             return {
               id: entry.feature.feature_id,