qwc2 2025.12.2 → 2025.12.15

package/plugins/style/Map.css

@@ -9,8 +9,10 @@ div.map-contents {
 /* Move and re-style rotation reset button */
 div.ol-rotate {
     padding: 0;
-    top: 4em!important;
-    right: 0.5em!important;
+    bottom: 2.75em!important;
+    left: 0.5em!important;
+    right: initial!important;
+    top: initial!important;
 }
 
 div.ol-rotate button {

package/plugins/style/ObliqueView.css

@@ -0,0 +1,112 @@
+div.obliqueview-body {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+}
+
+div.obliqueview-empty-overlay {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: rgba(200, 200, 200);
+    z-index: 4;
+}
+
+div.obliqueview-map {
+    height: 100%;
+}
+
+div.obliqueview-nav-rotate {
+    position: absolute;
+    right: 1em;
+    top: 1em;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-wrap: wrap;
+    width: 4em;
+    height: 4em;
+    border-radius: 3em;
+    color: var(--map-button-text-color);
+    background-color: var(--map-button-bg-color);
+    box-shadow: 0px 5px 10px rgba(136, 136, 136, 0.5);
+    margin-bottom: 0.5em;
+    transition: transform 0.5s;
+}
+
+div.obliqueview-nav-rotate > span {
+    flex: 0 0 1.25em;
+}
+
+span.obliqueview-nav-dir {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: bold;
+    cursor: pointer;
+    transition: transform 0.5s;
+}
+
+div.obliqueview-nav-zoom {
+    position: absolute;
+    right: 0.5em;
+    top: 6em;
+    width: 2em;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: var(--map-button-text-color);
+    background-color: var(--map-button-bg-color);
+    box-shadow: 0px 5px 10px rgba(136, 136, 136, 0.5);
+    border-radius: 4px;
+    cursor: pointer;
+    transition: background-color 0.5s, color 0.5s;
+    flex-direction: column;
+    margin: 0 1.5em 0.5em 1em;
+}
+
+div.obliqueview-nav-zoom > span {
+    height: 2em;
+    width: 1.5em;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+div.obliqueview-nav-zoom > span:first-child {
+    border-bottom: 1px solid var(--map-button-text-color);
+}
+
+div.obliqueview-bottombar {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    height: 3em;
+    z-index: 100;
+    color: var(--panel-text-color);
+    background-color: var(--panel-bg-color);
+    box-shadow: 0 -2px 4px rgba(136, 136, 136, 0.5);
+    backdrop-filter: blur(3px);
+    font-size: 75%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+div.obliqueview-scalechooser {
+    width: 10em;
+    display: flex;
+    align-items: center;
+}
+
+div.obliqueview-scalechooser > div.input-container {
+    flex: 1 1 auto;
+}

package/scripts/themesConfig.js

@@ -588,6 +588,7 @@ function getTheme(config, configItem, result, resultItem, proxy) {
       resultItem.mapTips = configItem.mapTips;
       resultItem.userMap = configItem.userMap;
       resultItem.map3d = configItem.map3d;
+      resultItem.obliqueDatasets = configItem.obliqueDatasets;
       resultItem.viewMode = configItem.viewMode;
       resultItem.editConfig = getEditConfig(configItem.editConfig);
 
@@ -640,6 +641,7 @@ function getGroupThemes(config, configGroup, result, resultGroup, proxy, groupCo
         var groupEntry = {
           id: 'g' + ++groupCounter,
           title: group.title,
+          titleMsgId: group.titleMsgId,
           items: [],
           subdirs: []
         };

package/scripts/themesConfig.py

@@ -540,6 +540,8 @@ def getTheme(config, configItem, result, resultItem):
 
         if "map3d" in configItem:
             resultItem["map3d"] = configItem["map3d"]
+        if "obliqueDatasets" in configItem:
+            resultItem["obliqueDatasets"] = configItem["obliqueDatasets"]
         if "viewMode" in configItem:
             resultItem["viewMode"] = configItem["viewMode"]
 
@@ -588,6 +590,7 @@ def getGroupThemes(config, configGroup, result, resultGroup, groupCounter):
             groupEntry = {
                 "id": "g%d" % groupCounter,
                 "title": group["title"],
+                "titleMsgId": group["titleMsgId"],
                 "items": [],
                 "subdirs": []
             }

package/static/translations/bg-BG.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Измерване на линия",
         "MeasurePolygon": "Измерване на полигон",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "Портал",
         "PrintScreen3D": "Експорт на мрежата",
@@ -461,6 +462,10 @@
       "width": "Ширина",
       "windowtitle": "Цифрово въвеждане"
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/ca-ES.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Mesurar una línia",
         "MeasurePolygon": "Mesurar un polígon",
         "NewsPopup": "Notícies",
+        "ObliqueView": "",
         "Panoramax": "Panoramax",
         "Portal": "Portal",
         "PrintScreen3D": "Exportar ràster",
@@ -461,6 +462,10 @@
       "width": "Amplada",
       "windowtitle": "Entrada numèrica"
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "No hi ha imatge disponible per a aquesta ubicació.",
       "title": "Visor Panoramax"

package/static/translations/cs-CZ.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Změřit úsek",
         "MeasurePolygon": "Měřit mnohoúhelník",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "",
       "windowtitle": ""
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/de-CH.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Messen Linie",
         "MeasurePolygon": "Messen Polygon",
         "NewsPopup": "Aktuelles",
+        "ObliqueView": "Schrägluftbildansicht",
         "Panoramax": "Panoramax",
         "Portal": "Portal",
         "PrintScreen3D": "Raster Export",
@@ -461,6 +462,10 @@
       "width": "Breite",
       "windowtitle": "Numerische Eingabe"
     },
+    "obliqueview": {
+      "nodataset": "Keine Schrägluftbilder verfügbar",
+      "title": "Schrägluftbildansicht"
+    },
     "panoramax": {
       "notfound": "An diesem Ort ist kein Bild verfügbar.",
       "title": "Panoramax Viewer"

package/static/translations/de-DE.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Messen Linie",
         "MeasurePolygon": "Messen Polygon",
         "NewsPopup": "Aktuelles",
+        "ObliqueView": "Schrägluftbildansicht",
         "Panoramax": "Panoramax",
         "Portal": "Portal",
         "PrintScreen3D": "Raster Export",
@@ -461,6 +462,10 @@
       "width": "Breite",
       "windowtitle": "Numerische Eingabe"
     },
+    "obliqueview": {
+      "nodataset": "Keine Schrägluftbilder verfügbar",
+      "title": "Schrägluftbildansicht"
+    },
     "panoramax": {
       "notfound": "An diesem Ort ist kein Bild verfügbar.",
       "title": "Panoramax Viewer"

package/static/translations/en-US.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Measure a line",
         "MeasurePolygon": "Measure a polygon",
         "NewsPopup": "News",
+        "ObliqueView": "Oblique Aerial View",
         "Panoramax": "Panoramax",
         "Portal": "Portal",
         "PrintScreen3D": "Raster Export",
@@ -461,6 +462,10 @@
       "width": "Width",
       "windowtitle": "Numeric input"
     },
+    "obliqueview": {
+      "nodataset": "No oblique imagery available",
+      "title": "Oblique Aerial View"
+    },
     "panoramax": {
       "notfound": "There is no image available for this location.",
       "title": "Panoramax Viewer"

package/static/translations/es-ES.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Medir una línea",
         "MeasurePolygon": "Medir un polígono",
         "NewsPopup": "Noticias",
+        "ObliqueView": "",
         "Panoramax": "Panoramax",
         "Portal": "Portal",
         "PrintScreen3D": "Exportar ráster",
@@ -461,6 +462,10 @@
       "width": "Ancho",
       "windowtitle": "Entrada numérica"
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "No hay imagen disponible para esta ubicación.",
       "title": "Visor Panoramax"

package/static/translations/fi-FI.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Mittaa viiva",
         "MeasurePolygon": "Mittaa monikulmion",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "",
       "windowtitle": ""
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/fr-FR.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Mesurer une ligne",
         "MeasurePolygon": "Mesurer un polygone",
         "NewsPopup": "Actualités",
+        "ObliqueView": "Vue aérienne oblique",
         "Panoramax": "Panoramax",
         "Portal": "Portail",
         "PrintScreen3D": "Export raster",
@@ -461,6 +462,10 @@
       "width": "Largeur",
       "windowtitle": "Entrée numérique"
     },
+    "obliqueview": {
+      "nodataset": "Aucune image aérienne oblique disponible",
+      "title": "Vue aérienne oblique"
+    },
     "panoramax": {
       "notfound": "Il n'y a pas d'image disponible pour cet emplacement.",
       "title": "Visionneuse Panoramax"

package/static/translations/hu-HU.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Mérési vonal",
         "MeasurePolygon": "Mérési sokszög",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "",
       "windowtitle": ""
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/it-IT.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Misura una linea",
         "MeasurePolygon": "Misura un poligono",
         "NewsPopup": "Attualità",
+        "ObliqueView": "Vista aerea obliqua",
         "Panoramax": "Panoramax",
         "Portal": "Portale",
         "PrintScreen3D": "Esporta raster",
@@ -461,6 +462,10 @@
       "width": "Larghezza",
       "windowtitle": "Formulario numerico"
     },
+    "obliqueview": {
+      "nodataset": "Nessuna immagine aerea obliqua disponibile",
+      "title": "Vista aerea obliqua"
+    },
     "panoramax": {
       "notfound": "Nessun immagine disponibile per questa posizione",
       "title": "Visualizzatore Panoramax"

package/static/translations/ja-JP.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "ラインを測る",
         "MeasurePolygon": "ポリゴンを測る",
         "NewsPopup": "ニュース",
+        "ObliqueView": "",
         "Panoramax": "Panoramax",
         "Portal": "ポータル",
         "PrintScreen3D": "ラスタ・エクスポート",
@@ -461,6 +462,10 @@
       "width": "幅",
       "windowtitle": "数値入力"
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "この場所には表示できる画像がありません。",
       "title": "Panoramax Viewer"

package/static/translations/nl-NL.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "lengte meten",
         "MeasurePolygon": "Oppervlakte meten",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "Portal",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "Breedte",
       "windowtitle": "Numerieke invoer"
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/no-NO.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Måle en linje",
         "MeasurePolygon": "Måle en polygon",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "",
       "windowtitle": ""
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/pl-PL.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Zmierzyć linię",
         "MeasurePolygon": "Zmierzyć wielokąt",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "",
       "windowtitle": ""
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/pt-BR.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Medir uma linha",
         "MeasurePolygon": "Medir um polígono",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "Largura",
       "windowtitle": "Título da janela"
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/pt-PT.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Medir Linha",
         "MeasurePolygon": "Medir Polígono",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "Largura",
       "windowtitle": "Entrada Numérica"
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/ro-RO.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Măsoară o linie",
         "MeasurePolygon": "Măsoară un poligon",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "Lățimea",
       "windowtitle": "Valori numerice"
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/ru-RU.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "измерить линию",
         "MeasurePolygon": "измерить многоугольник",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "",
       "windowtitle": ""
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/sv-SE.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Mäta en linje",
         "MeasurePolygon": "Mäta en polygon",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "",
       "windowtitle": ""
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/tr-TR.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Çizgi Ölç",
         "MeasurePolygon": "Alan Ölç",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "Portal",
         "PrintScreen3D": "Görüntüyü ver",
@@ -461,6 +462,10 @@
       "width": "Genişlik",
       "windowtitle": "Sayısal giriş"
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/static/translations/tsconfig.json

@@ -45,6 +45,7 @@
     "appmenu.items.MeasureLineString",
     "appmenu.items.MeasurePolygon",
     "appmenu.items.NewsPopup",
+    "appmenu.items.ObliqueView",
     "appmenu.items.ObjectList",
     "appmenu.items.Panoramax",
     "appmenu.items.Portal",
@@ -401,6 +402,8 @@
     "numericinput.side",
     "numericinput.width",
     "numericinput.windowtitle",
+    "obliqueview.nodataset",
+    "obliqueview.title",
     "panoramax.notfound",
     "panoramax.title",
     "pickfeature.querying",

package/static/translations/uk-UA.json

@@ -50,6 +50,7 @@
         "MeasureLineString": "Поміряти відрізок",
         "MeasurePolygon": "Виміряти полігон",
         "NewsPopup": "",
+        "ObliqueView": "",
         "Panoramax": "",
         "Portal": "",
         "PrintScreen3D": "",
@@ -461,6 +462,10 @@
       "width": "",
       "windowtitle": ""
     },
+    "obliqueview": {
+      "nodataset": "",
+      "title": ""
+    },
     "panoramax": {
       "notfound": "",
       "title": ""

package/utils/CoordinatesUtils.js

@@ -167,6 +167,8 @@ var CoordinatesUtils = {
     if (commonEsriWktLookup[epsgCode]) {
       return commonEsriWktLookup[epsgCode];
     }
+
+    /* eslint-disable-next-line */
     console.warn("No ESRI WKT definition found for ".concat(epsgCode, ". Shapefile export may not include projection information. Consider adding an 'esriWkt' property to the projection in config.json."));
     return null;
   },

package/utils/EditingInterface.js

@@ -25,6 +25,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import axios from 'axios';
 import isEmpty from 'lodash.isempty';
 import ConfigUtils from './ConfigUtils';
+import CoordinatesUtils from './CoordinatesUtils';
 import { computeExpressionFields } from './EditingUtils';
 import LocaleUtils from './LocaleUtils';
 var EditingInterface = {
@@ -86,8 +87,16 @@ var EditingInterface = {
     var requestUrl = editServiceUrl + '/' + editConfig.editDataset + '/';
 
     // 10px tolerance
-    var tol = 10.0 / dpi * 0.0254 * mapScale;
-    var bbox = mapPos[0] - tol + "," + (mapPos[1] - tol) + "," + (mapPos[0] + tol) + "," + (mapPos[1] + tol);
+    var bbox = null;
+    var metersPerPixel = 1 / dpi * 0.0254 * mapScale;
+    if (CoordinatesUtils.getUnits(mapCrs) === 'degrees') {
+      var tolLat = 10 * metersPerPixel / 111320.0; // meters per degree latitude
+      var tolLon = 10 * metersPerPixel / (111320.0 * Math.cos(mapPos[1] * Math.PI / 180));
+      bbox = [mapPos[0] - tolLon, mapPos[1] - tolLat, mapPos[0] + tolLon, mapPos[1] + tolLat].join(",");
+    } else {
+      var tol = 10 * metersPerPixel;
+      bbox = mapPos[0] - tol + "," + (mapPos[1] - tol) + "," + (mapPos[0] + tol) + "," + (mapPos[1] + tol);
+    }
     var params = {
       bbox: bbox,
       crs: mapCrs,