Skip to content

Commit

Permalink
Update submodule for new MapExport plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
manisandro committed Oct 12, 2023
1 parent 9cdb706 commit 55da4e8
Show file tree
Hide file tree
Showing 18 changed files with 412 additions and 265 deletions.
2 changes: 2 additions & 0 deletions js/appConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import LocateButtonPlugin from 'qwc2/plugins/LocateButton';
import LoginUserPlugin from 'qwc2/plugins/LoginUser';
import MapComparePlugin from 'qwc2/plugins/MapCompare';
import MapCopyrightPlugin from 'qwc2/plugins/MapCopyright';
import MapExportPlugin from 'qwc2/plugins/MapExport';
import MapInfoTooltipPlugin from 'qwc2/plugins/MapInfoTooltip';
import MapLegendPlugin from 'qwc2/plugins/MapLegend';
import MapTipPlugin from 'qwc2/plugins/MapTip';
Expand Down Expand Up @@ -105,6 +106,7 @@ export default {
LoginUserPlugin: LoginUserPlugin,
MapComparePlugin: MapComparePlugin,
MapCopyrightPlugin: MapCopyrightPlugin,
MapExportPlugin: MapExportPlugin,
MapInfoTooltipPlugin: MapInfoTooltipPlugin(),
MapLegendPlugin: MapLegendPlugin,
MapTipPlugin: MapTipPlugin,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "QWC2App",
"version": "2023.10.07-master",
"version": "2023.10.12-master",
"description": "QGIS Web Client 2 application",
"author": "Sourcepole",
"license": "BSD-2-Clause",
Expand Down
21 changes: 6 additions & 15 deletions static/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,7 @@
{"key": "Editing", "icon": "editing"},
{"key": "FeatureForm", "icon": "featureform"},
{"key": "AttributeTable", "icon": "editing"},
{"key": "DxfExport", "icon": "dxfexport"},
{"key": "RasterExport", "icon": "rasterexport"},
{"key": "MapExport", "icon": "rasterexport"},
{"key": "Routing", "icon": "routing"}
]},
{"key": "Print", "icon": "print", "shortcut": "alt+shift+p"},
Expand Down Expand Up @@ -295,21 +294,13 @@
}
},
{
"name": "DxfExport",
"cfg": {
"serviceUrl": "http://127.0.0.1:8001/ows/dxf_geobau",
"layerOptions": [
{"label": "Geobau", "layers": "dxfgeobau"},
{"label": "Geobau + Höhenkurven", "layers": "dxfgeobau,hoehenkurven"}
],
"formatOptions": "MODE:SYMBOLLAYERSYMBOLOGY;SCALE:500;NO_MTEXT:TEXT"
}
},
{
"name": "RasterExport",
"name": "MapExport",
"cfg": {
"dpis": [96, 300],
"exportExternalLayers": true
"exportExternalLayers": true,
"defaultFormat": "image/png",
"formatConfiguration": {
}
}
},
{
Expand Down
11 changes: 11 additions & 0 deletions static/translations/cs-CZ.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"MeasurePolygon": "Měřit mnohoúhelník",
"Print": "Tisk",
"RasterExport": "Export rastru",
"MapExport": "Export mapu",
"Redlining": "Připomínkování",
"Routing": "Trasy",
"Share": "Sdílet odkaz",
Expand Down Expand Up @@ -242,6 +243,16 @@
"loading": "Načítání...",
"resetrotation": "Obnovit orientaci mapy"
},
"mapexport": {
"configuration": "",
"format": "Formát:",
"resolution": "Rozlišení:",
"scale": "Měřítko",
"size": "Velikost",
"submit": "Export",
"usersize": "Vybrat na mapě...",
"wait": "Čekejte..."
},
"mapinfotooltip": {
"elevation": "Nadmořská výška",
"title": "Poloha"
Expand Down
11 changes: 11 additions & 0 deletions static/translations/de-CH.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"MeasurePolygon": "Messen Polygon",
"Print": "Drucken",
"RasterExport": "Raster-Export",
"MapExport": "Karte exportieren",
"Redlining": "Zeichnen",
"Routing": "Routing",
"Share": "Teilen",
Expand Down Expand Up @@ -242,6 +243,16 @@
"loading": "Karte wird geladen...",
"resetrotation": "Drehung zurücksetzen"
},
"mapexport": {
"configuration": "Konfiguration",
"format": "Format",
"resolution": "Auflösung",
"scale": "Massstab",
"size": "Dimensionen",
"submit": "Exportieren",
"usersize": "Auf Karte auswählen...",
"wait": "Bitte warten..."
},
"mapinfotooltip": {
"elevation": "Höhe",
"title": "Position"
Expand Down
11 changes: 11 additions & 0 deletions static/translations/de-DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"MeasurePolygon": "Messen Polygon",
"Print": "Drucken",
"RasterExport": "Raster-Export",
"MapExport": "Karte exportieren",
"Redlining": "Zeichnen",
"Routing": "Routing",
"Share": "Teilen",
Expand Down Expand Up @@ -242,6 +243,16 @@
"loading": "Karte wird geladen...",
"resetrotation": "Drehung zurücksetzen"
},
"mapexport": {
"configuration": "Konfiguration",
"format": "Format",
"resolution": "Auflösung",
"scale": "Maßstab",
"size": "Dimensionen",
"submit": "Exportieren",
"usersize": "Auf Karte auswählen...",
"wait": "Bitte warten..."
},
"mapinfotooltip": {
"elevation": "Höhe",
"title": "Position"
Expand Down
11 changes: 11 additions & 0 deletions static/translations/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"MeasurePolygon": "Measure a polygon",
"Print": "Print",
"RasterExport": "Raster Export",
"MapExport": "Export map",
"Redlining": "Redlining",
"Routing": "Routing",
"Share": "Share Link",
Expand Down Expand Up @@ -242,6 +243,16 @@
"loading": "Loading...",
"resetrotation": "Reset rotation"
},
"mapexport": {
"configuration": "Configuration",
"format": "Format",
"resolution": "Resolution",
"scale": "Scale",
"size": "Size",
"submit": "Export",
"usersize": "Select on map...",
"wait": "Please wait..."
},
"mapinfotooltip": {
"elevation": "Elevation",
"title": "Position"
Expand Down
11 changes: 11 additions & 0 deletions static/translations/es-ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"MeasurePolygon": "Medir un polígono",
"Print": "Imprimir",
"RasterExport": "Exportar trama",
"MapExport": "Exportar mapa",
"Redlining": "Línea de demarcación",
"Routing": "",
"Share": "Compartir enlace",
Expand Down Expand Up @@ -242,6 +243,16 @@
"loading": "Cargando...",
"resetrotation": "Reiniciar rotación"
},
"mapexport": {
"configuration": "",
"format": "Formato:",
"resolution": "Resolución:",
"scale": "",
"size": "",
"submit": "",
"usersize": "",
"wait": ""
},
"mapinfotooltip": {
"elevation": "Elevación",
"title": "Posición"
Expand Down
11 changes: 11 additions & 0 deletions static/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"MeasurePolygon": "Mesurer un polygone",
"Print": "Imprimer",
"RasterExport": "Export image",
"MapExport": "Exporter carte",
"Redlining": "Dessiner",
"Routing": "Routage",
"Share": "Partager",
Expand Down Expand Up @@ -242,6 +243,16 @@
"loading": "Chargement de la carte...",
"resetrotation": "Réinitialiser la rotation"
},
"mapexport": {
"configuration": "Configuration",
"format": "Format",
"resolution": "Résolution",
"scale": "Echelle",
"size": "Dimension",
"submit": "Exporter",
"usersize": "Selectionner sur la carte...",
"wait": "Veuillez patienter..."
},
"mapinfotooltip": {
"elevation": "Altitude",
"title": "Position"
Expand Down
13 changes: 12 additions & 1 deletion static/translations/it-IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"MeasurePolygon": "Misura un poligono",
"Print": "Stampa",
"RasterExport": "Esporta su immagine",
"MapExport": "Esporta mappa",
"Redlining": "Strumenti di disegno",
"Routing": "Routing",
"Share": "Condividi",
Expand Down Expand Up @@ -242,6 +243,16 @@
"loading": "In caricamento...",
"resetrotation": "Resetta orientamento"
},
"mapexport": {
"configuration": "Configurazione",
"format": "Formato",
"resolution": "Risoluzione",
"scale": "Scala",
"size": "Dimensione",
"submit": "Esporta",
"usersize": "Seleziona sulla mappa...",
"wait": "Attendere..."
},
"mapinfotooltip": {
"elevation": "Altitudine",
"title": "Posizione"
Expand Down Expand Up @@ -356,7 +367,7 @@
"isocenter": "Centro",
"isoextracenter": "Ulteriore centro",
"leaveat": "Partenza il",
"leavenow": "",
"leavenow": "Parti ora",
"maxspeed": "Velocità massima",
"method": "Metodo",
"mode_auto": "Automobile",
Expand Down
11 changes: 11 additions & 0 deletions static/translations/pl-PL.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"MeasurePolygon": "Zmierzyć wielokąt",
"Print": "Drukuj",
"RasterExport": "Eksport Rastra",
"MapExport": "Eksportuj mapę",
"Redlining": "Redlining",
"Routing": "",
"Share": "Udostępnij Link",
Expand Down Expand Up @@ -242,6 +243,16 @@
"loading": "Ładowanie...",
"resetrotation": ""
},
"mapexport": {
"configuration": "",
"format": "Format:",
"resolution": "Rozdzielczość:",
"scale": "",
"size": "",
"submit": "",
"usersize": "",
"wait": ""
},
"mapinfotooltip": {
"elevation": "Wysokość",
"title": "Pozycja"
Expand Down
11 changes: 11 additions & 0 deletions static/translations/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"MeasurePolygon": "Medir um polígono",
"Print": "Imprimir",
"RasterExport": "Exportar trama",
"MapExport": "Exportar mapa",
"Redlining": "Línea de demarcación",
"Routing": "",
"Share": "Compartilhar enlace",
Expand Down Expand Up @@ -242,6 +243,16 @@
"loading": "Carregar...",
"resetrotation": ""
},
"mapexport": {
"configuration": "",
"format": "Formato:",
"resolution": "Resolução:",
"scale": "",
"size": "",
"submit": "",
"usersize": "",
"wait": ""
},
"mapinfotooltip": {
"elevation": "Elevação",
"title": "Posição"
Expand Down
11 changes: 11 additions & 0 deletions static/translations/pt-PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"MeasurePolygon": "Medir um polígono",
"Print": "Imprimir",
"RasterExport": "Exportar trama",
"MapExport": "Exportar mapa",
"Redlining": "Línea de demarcación",
"Routing": "",
"Share": "Compartilhar enlace",
Expand Down Expand Up @@ -242,6 +243,16 @@
"loading": "Carregar...",
"resetrotation": ""
},
"mapexport": {
"configuration": "",
"format": "Formato:",
"resolution": "Resolução:",
"scale": "",
"size": "",
"submit": "",
"usersize": "",
"wait": ""
},
"mapinfotooltip": {
"elevation": "Elevação",
"title": "Posição"
Expand Down
Loading

0 comments on commit 55da4e8

Please sign in to comment.