From 70e5e956adee49b1510eef5b6f430f5b163623be Mon Sep 17 00:00:00 2001 From: "a.adell" Date: Mon, 9 Sep 2024 11:53:05 +0200 Subject: [PATCH] Fixed problem showing temporal slider bars with activated interface theme "Night Mapping" Removed unavailable download products --- i18n/openicgc_ca.ts | 551 +++++++++++++++-------------- i18n/openicgc_es.ts | 551 +++++++++++++++-------------- metadata.txt | 8 +- openicgc.py | 12 + qlib3/base/images/france_ortho.png | Bin 0 -> 7549 bytes qlib3/base/images/france_topo.png | Bin 0 -> 7065 bytes qlib3/base/pluginbase.py | 14 +- qlib3/base/qtextra.py | 27 +- qlib3/base/resources.qrc | 2 + resources3/fme.py | 7 - 10 files changed, 613 insertions(+), 559 deletions(-) create mode 100644 qlib3/base/images/france_ortho.png create mode 100644 qlib3/base/images/france_topo.png diff --git a/i18n/openicgc_ca.ts b/i18n/openicgc_ca.ts index 58d236b..a9e7fd7 100644 --- a/i18n/openicgc_ca.ts +++ b/i18n/openicgc_ca.ts @@ -1,6 +1,5 @@ - - + DownloadDialog @@ -27,42 +26,42 @@ OpenICGC - + Spatial search Cerca espacial - + Find Cercar - + Background maps Mapes de fons - + Delete background maps Esborrar mapes de fons - + Transparence Transparència - + Reload Open ICGC Recarregar Open ICGC - + Error, location without coordinates Error, localització sense coordenades - + Find: Address: municipality, street number or vice versa Barcelona, Aribau 86 @@ -133,137 +132,137 @@ 13077A018000390000FP - + Time series Sèries temporals - + About Open ICGC Sobre Open ICGC - + Help Ajuda - + Select download folder Seleccionar carpeta de descàrregues - + Name Nom - + Type Tipus - + Municipality Municipi - + Region Comarca - + Municipalities Municipis - + Counties Comarques - + Provinces Províncies - + Color orthophoto Ortofoto color - + [TS] Color orthophoto [ST] Ortofoto color - + Infrared orthophoto Ortofoto infraroja - + [TS] Infrared orthophoto [ST] Ortofoto infraroja - + Download Descàrregues - + Open download folder Obrir carpeta de descàrregues - + Paint styles for selected layers Estil de pintat de les capes seleccionades - + Desaturate raster layer Desaturació de capa ràster - + Reference %s Referència %s - + Download map area Descarregar àrea de mapa - + Minimum download rect side not reached (%d m) Mida mínima de descàrrega no aconseguida (%d m costat) - + Maximum download area reached (%s m%s) Àrea màxima de descàrrega sobrepassada (%s m%s) - + Change DB/geoPackage style Canviar estil de geoPackage / base de dades - + Error downloading file or selection is out of reference area Error descarregant el fitxer o la selecció està fora de l'àrea de referència - + You must write any text Cal escriure algun text - + Data type: %s (%s) Rectangle: @@ -286,7 +285,7 @@ Carpeta de descàrregues: Nom d'arxiu (%s): - + Data type: %s (%s) Point: @@ -309,7 +308,7 @@ Carpeta de descàrregues: Nom d'arxiu (%s): - + Data type: %s (%s) Point: @@ -332,42 +331,42 @@ Carpeta de descàrregues: Nom d'arxiu (%s): - + Find place names and adresses Cercar topònims i adreces - + Area Àrea - + County Comarca - + Catalonia Catalunya - + Available data Dades disponibles - + Download tool Eina de descàrrega - + Download point Descarregar punt - + Data type: %s (%s) Zone: @@ -386,42 +385,42 @@ Carpeta de descàrregues: Arxiu (%s): - + Selected: Seleccionat: - + Cartographic series Talls cartogràfics - + Select an area Selecciona una àrea - + Select municipality Selecciona un municipi - + Select county Selecciona una comarca - + Unknow, service unavailable Desconegut, servei no accessible - + Available products list Llista de productes disponibles - + Linkable products: - %s @@ -434,69 +433,69 @@ Productes descarregables: - %s - + Open ICGC Toolbar Barra d'eines d'Open ICGC - + Height highlighting Ressaltat d'alçades - + Warning: Atenció: - + QGIS version warnings Alertes de la versió de QGIS - + Download plugin Descarregar plugin - + Update available: v%s Actualització disponible: %s - + You can modify the brightness of the "Height hightlghting" layer to adjust the display to your background layer Pots modificar la brillantor de la capa "Ressaltat d'alçades" per ajustar la visualització a la teva capa de fons - + %s serie Tall %s - + QGIS plugin repository Repositori de connectors de QGIS - + Software Repository Repositori de codi - + Report an issue Reportar una incidència - + Send us an email Envia'ns un email - + Your QGIS version is %s. In versions of QGIS lower than 3.10.4 http files may not load correctly. Affected products will be disabled. @@ -511,7 +510,7 @@ En versions de QGIS inferiors a 3.4.0, els arxiu geopackage poden no carregar co Actualitza la versió de QGIS si és possible. - + ICGC products are generated in EPSG 25831, loading them into a project with EPSG %s could cause display problems, download problems, or increased load time. Do you want change the project coordinate system to EPSG 25831? @@ -520,541 +519,541 @@ Do you want change the project coordinate system to EPSG 25831? Vols canviar el sistema de coordenades del projecte a EPSG 25831? - + What's new Novetats - + Cartographic and Geological Institute of Catalonia web Web de l'Institut Cartogràfic i Geològic de Catalunya - + Current color orthophoto 25cm 1:2,500 Ortofoto color vigent 25cm 1:2.500 - + Current color orthophoto 50cm 1:5,000 Ortofoto color vigent 50cm 1:5.000 - + Current color orthophoto 2.5m 1:25,000 Ortofoto color vigent 2.5m 1:25.000 - + Current infrared orthophoto 25cm 1:2,500 Ortofoto infraroja vigent 25cm 1:2.500 - + Current infrared orthophoto 50cm 1:5,000 Ortofoto infraroja vigent 50cm 1:5.000 - + Current infrared orthophoto 2.5m 1:25,000 Ortofoto infraroja vigent 2.5m 1:25.000 - + Topographic map 1:25,000 Mapa topogràfic 1:25.000 - + Topographic map 1:50,000 Mapa topogràfic 1:50.000 - + Topographic map 1:100,000 Mapa topogràfic 1:100.000 - + Topographic map 1:250,000 Mapa topogràfic 1:250.000 - + Topographic map 1:500,000 Mapa topogràfic 1:500.000 - + Topographic map 1:1,000,000 Mapa topogràfic 1:1.000.000 - + Topographic map 1:2,000,000 Mapa topogràfic 1:2.000.000 - + Topographic cartography 1:1,000 Cartografia topogràfica 1:1.000 - + Territorial topographic referential Referencial topogràfic territorial - + Land cover map Mapa de cobertes del sòl - + Digital terrain model 2m 2008-2011 Model d'elevacions del terreny 2m 2008-2011 - + Digital terrain model 5m 2020 Model d'elevacions del terreny 5m 2020 - + Geological map 1:250,000 Mapa geològic 1:250.000 - + vectorial data dades vectorials - + raster data dades ràster - + Territorial topographic referential 3D Referencial topogràfic territorial 3D - + NDVI color (temporal serie) NDVI color (sèrie temporal) - + [TS] NDVI color [ST] NDVI color - + NDVI (temporal serie) NDVI (sèrie temporal) - + [TS] NDVI [ST] NDVI - + File type %s is unsupported by QGIS Do you want try open downloaded file in a external viewer? El tipus de fitxer %s no està suportat per QGIS Vols intentar obrir el fitxer descarregat amb un visor extern? - + Color orthophoto %s (provisional) Ortofoto color %s (provisional) - + Color orthophoto %s (rectification without corrections) Ortofoto color %s (rectificació sense correccions) - + Color orthophoto %s (temporal serie) Ortofoto color %s (sèrie temporal) - + Color orthophoto (annual serie) Ortofoto color (sèrie anual) - + Satellite color orthophoto (monthly serie) Ortofoto color satèl·lit (sèrie mensual) - + Infrared orthophoto %s (provisional) Ortofoto infraroja %s (provisional) - + Infrared orthophoto %s (rectification without corrections) Ortofoto infraroja %s (rectificació sense correccions) - + Infrared orthophoto %s (temporal serie) Ortofoto infraroja %s (sèrie temporal) - + Infrared orthophoto (annual serie) Ortofoto infraroja (sèrie anual) - + Satellite infrared orthophoto (monthly serie) Ortofoto infraroja satèl·lit (sèrie mensual) - + Shading DTM layer Ombrejat de capa MET - + The selected area is outside Catalonia L'àrea seleccionada és fora de Catalunya - + You must select a DTM layer S'ha de seleccionar una capa de MET - + You can modify the angle of the sun in the layer simbology Es pot modificar l'angle del sol en la simbologia de la capa - + [AS] Color orthophoto [SA] Ortofoto color - + [MS] Satellite color orthophoto [SM] Ortofoto color satèl·lit - + [AS] Infrared orthophoto [SA] Ortofoto infraroja - + [MS] Satellite infared orthophoto [SM] Ortofoto infraroja satèl·lit - + Geological map 1:50,000 Mapa geològic 1:50.000 - + Municipal capitals Caps de municipi - + Vegueries Vegueries - + Administrative divisions Divisions administratives - + Territorial topographic referential %s (temporal serie) Referencial topogràfic territorial %s (sèrie temporal) - + [TS] Territorial topographic referential [ST] Referencial topogràfic territorial - + Administrative divisions (raster pyramid) Divisions administratives (Piràmide ràster) - + The download file could not be opened No s'ha pogut obrir l'arxiu descarregat - + raster ràster - + vector vector - + Photo library Fototeca - + Photograms Fotogrames - + Photo: %s Foto: %s - + Photo query: %s Consulta fotos: %s - + Search photograms Cercar fotogrames - + Coord %s %s Coord %s %s - + It exists a previous photo search. Do you want close it? Existeix un cerca de fotogrames prèvia. Vols tancar-la? - + Search photograms interactively Cercar fotogrames interactivament - + Search photograms by coordinates Cercar fotogrames per coordenada - + Photograms search tool Eina de cerca de fotogrames - + Select a point Selecciona un punt - + Enter an x y value in the project coordinate system or add the corresponding EPSG code in the following format: "429393.19 4580194.65" or "429393.19 4580194.65 EPSG:25831" or "EPSG:25831 429393.19 4580194.65" Introdueix valors x y en el sistema de coordenades del projecte o afegeix el corresponent codi EPSG en el següent format: "429393.19 4580194.65" o "429393.19 4580194.65 EPSG:25831" o "EPSG:25831 429393.19 4580194.65" - + Flight code Codi de vol - + Flight date Data de vol - + Flight year Any de vol - + Image filename Arxiu d'imatge - + Image width Amplada d'imatge - + Image height Alçada d'imatge - + Image channels Canals d'imatge - + Image bits PPC Bits PPC d'imatge - + Color type Tipus de color - + Strip Passada - + Camera Càmera - + Focal Length Distància focal - + Ground sampling distance Mida de píxel - + Scale Escala - + Flying height Alçada de vol - + Mean ground height Alçada mitja del terra - + View type Tipus de vista - + Northing Nord - + Easting Est - + EPSG code Codi EPSG - + Omega Omega - + Phi Phi - + Kappa Kappa - + Photo in strip Fotograma dins la passada - + Spain Espanya - + IGN topographic Topogràfic IGN - + PNOA orthophoto Ortofoto PNOA - + Andorra Andorra - + Andorra topographic 1:25,000 1989 Andorra topogràfic 1:25.000 1989 - + Andorra topographic 1:50,000 1987 Andorra topogràfic 1:50.000 1987 - + Andorra orthophoto 1:5,000 2003 Andorra ortofoto 1:5.000 2003 - + Andorra orthophoto 1:500-1,000 20cm 2008 Andorra ortofoto 1:500-1.000 20cm 2008 - + World Mon - + NASA blue marble Nasa blue marble - + Minimum download rect side not reached (%d px) Mida mínima de descàrrega no aconseguida (%d px costat) - + Maximum download area reached (%s px%s) Àrea màxima de descàrrega sobrepassada (%s px%s) - + Area coordinates Coordenades de l'àrea - + Enter west, north, east, south values in the project coordinates system or add the corresponding EPSG code in the following format: "429393.19 4580194.65 429493.19 4580294.65" or "429393.19 4580194.65 429493.19 4580294.65 EPSG:25831" or @@ -1065,22 +1064,22 @@ Vols intentar obrir el fitxer descarregat amb un visor extern? "EPSG:25831 429393.19 4580194.65 429493.19 4580294.65" - + Territorial topographic referential volume Referencial topogràfic territorial volum - + Selected layer polygons Polígons selecionats en una capa - + You must activate a vector layer with one or more selected polygons Cal activar una capa vectorial amb un o més polígons seleccionats - + Data type: %s (%s) Polygon area: @@ -1099,62 +1098,62 @@ Carpeta de descàrregues: Nom d'arxiu (%s): - + Your polygons have too many points: %d maximum %d El polígons tenen massa punts: %d màxim %d - + Topographic map (topographical pyramid) Mapa topogràfic (piràmide topogràfica) - + Land cover map (temporal serie) Mapa de cobertes del sòl (sèrie temporal) - + [TS] Land cover map [ST] Mapa de cobertes del sòl - + Digital Terrain Model %s Model d'elevacions del terreny %s - + Incorrect coordinates format Format de coordenades incorrecte - + Instamaps pyramid Piràmide Instamaps - + Cadastral registry Cadastre - + Geological map 1:25,000 (GT I) Mapa geològic 1:25.000 (GT I) - + Geological map for the prevention of geological hazards 1:25,000 (GT VI) Mapa geològic per a la prevenció dels riscos geològics 1:25.000 (GT VI) - + Report photo bug Reportar error de fotograma - + Thanks for reporting an error in photogram: %s @@ -1165,7 +1164,7 @@ We try to fix it as soon as possible Intentarem corregir-ho el més aviat possible - + Before reporting an error, bear in mind that the position of photograms is an approximation i will never completely fit the underlying cartography, since no terrain model has been used to project the imatge against. Furthermore, changes in instrumenation over time (wheter GPS is used or not, scanning and photogrammetric workflow) account for a very limited precision in positioning. Only large displacements in position (for example, an element that should appear near the center does not appear) or if there is an error in rotation (eg. the sea appears in the northern part of a photo). @@ -1178,72 +1177,72 @@ Només cal considerar error d’ubicació si el fotograma està molt desplaçat Vols continuar? - + You must select one photogram Cal seleccionar un fotograma - + Keep scale Mantenir escala - + Anaglyph Anàglif - + Inverted stereo Estèreo invertit - + Analog Analògic - + Centered anaglyph photogram Fotograma anàglif central - + [AS] Centered anaglyph phootogram [SA] Fotograma anàglif central - + Centered rectified photogram (annual serie) Fotograma rectificat central (sèrie anual) - + [AS] Centered rectified photogram [SA] Fotograma rectificat central - + Centered photogram (annual serie) Fotograma central (sèrie anual) - + [AS] Centered photogram [SA] Fotograma central - + Centered anaglyph photogram %s (annual serie) Fotograma anàglif central %s (sèrie anual) - + This layer renders only the most centered photogram in the map view, you can zoom in for continuous navigation. Please note that current year may not have full photogram coverage Mostra només el fotograma més centrat en la vista mapa, pots apropar-te per obtenir una navegació contínua. L'any actual pot no tenir una cobertura completa - + Photo: %s Flight code: %s Date: %s @@ -1258,279 +1257,299 @@ Resolució: %.2fm Descripció del problema: - + Search photograms by name Cercar fotogrames per nom - + Photogram name: Nom de fotograma: - + Historic color orthophoto 10cm 1:1,000 Ortofoto color històrica 10cm 1:1.000 - + Historic color orthophoto 25cm 1:2,500 Ortofoto color històrica 25cm 1:2.500 - + Historic color orthophoto 1m 1:10,000 Ortofoto color històrica 1m 1:10.000 - + Historic infrared orthophoto 10cm 1:1,000 Ortofoto infraroja històrica 10cm 1:1.000 - + Historic infrared orthophoto 25cm 1:2,500 Ortofoto infraroja històrica 25cm 1:2.500 - + Historic infrared orthophoto 50cm 1:5,000 Ortofoto infraroja històrica 50cm 1:5.000 - + Historic infrared orthophoto 1m 1:10,000 Ortofoto infraroja històrica 1m 1:10.000 - + Historic infrared orthophoto 2.5m 1:25,000 Ortofoto infraroja històrica 2,5m 1:25.000 - + Historic color orthophoto 15cm 1:1,500 Ortofoto color històrica 15cm 1:1.500 - + Historic color orthophoto 50cm 1:5,000 Ortofoto color històrica 50cm 1:5.000 - + Historic color orthophoto 2.5m 1:25,000 Ortofoto color històrica 2,5m 1:25.000 - + Select a zone Selecciona una zona - + with available information amb informació disponible - + Selected layer polygons bounding box Rectangle contenidor de polígons selecionats en una capa - + Save map as PDF Guardar mapa com a PDF - + Save location map as PDF Guardar mapa de situació com a PDF - + PDF file (*.pdf) Arxiu PDF (*.pdf) - + Coord. Sys.: %s Generation date: %s Sist. Coord.: %s Data de generació: %s - + Error saving PDF file Error guardant l'arxiu PDF - + Topographic map: Mapa topogràfic: - + Map: Mapa: - + Location map: Mapa de situació: - + Unit tests Tests unitaris - + This PDF shows all the data visible in the QGIS project at the time of its generation Aquest PDF mostra totes les dades visibles del projecte QGIS en el moment de la seva generació - + Enable debug log info Activar registre d'informació de depuració - + ContextMaps ContextMaps - + ContextMaps standard map ContextMaps mapa estàndard - + ContextMaps gray map ContextMaps mapa gris - + ContextMaps simplified gray map ContextMaps mapa gris simplificat - + ContextMaps hybrid orthophoto ContextMaps ortofoto híbrida - + Andorra topographic 1:50,000 2020 Andorra topogràfic 1:25.000 2020 - + Andorra orthophoto 1:5,000 2012 Andorra ortofoto 1:5.000 2012 - + Debug Depuració - + Open debug log file Obrir arxiu de registre de depuració - + Open plugin installation folder Obrir carpeta d'instal·lació del connector - + Product metadatas Metadades de producte - + The maximum number of results (%d) has been reached. The query may have more results than are displayed. S'ha arribat al nombre màxim de resultats (%d). La consulta podria tenir més resultats dels mostrats. - + Anaglyph options Opcions anaglif - + yyyy/MM/dd HH:mm:ss dd/MM/yyyy HH:mm:ss - + Send us an email with debug information Envia'ns un email amb informació de depuració - + County capitals Capitals de comarca - + %s grid Quadrícula %s - + Territorial topographic referential BIM Referencial topogràfic territorial BIM - + Sheet Full - + Select sheet Selecciona un full - + Coast Costa - + Topobathymetric elevation model Model d’elevacions topobatimètric de la franja litoral - + Bathymetric chart Mapa d’isòbates - + Coastline Línia de costa - + Current color orthophoto Ortofoto color vigent - + Current infrared orthophoto Ortofoto infreroja vigent - + Current gray orthophoto Ortofoto gris vigent + + + France + França + + + + France topographic + França topogràfic + + + + France orthophoto 20cm + França ortofoto 20cm + + + + OpenStreetMap + OpenStreetMap + PhotoSearchSelectionDialog @@ -1651,22 +1670,22 @@ brillantor Ajustar brillantor - + Unavailable or lost No disponible o perdut - + No publishable No publicable - + Scan required Escaneig requerit - + Available Disponible @@ -1702,7 +1721,7 @@ tecla intro per visualitzar la foto Tipus de vista - + Parallax: %+d%% Paral·laxi: %+d%% diff --git a/i18n/openicgc_es.ts b/i18n/openicgc_es.ts index 278dff7..103a2f9 100644 --- a/i18n/openicgc_es.ts +++ b/i18n/openicgc_es.ts @@ -1,6 +1,5 @@ - - + DownloadDialog @@ -27,42 +26,42 @@ OpenICGC - + Spatial search Búsqueda espacial - + Find Buscar - + Background maps Mapas de fondo - + Delete background maps Borrar mapas de fondo - + Transparence Trasparencia - + Reload Open ICGC Recargar Open ICGC - + Error, location without coordinates Error, localización sin coordenadas - + Find: Address: municipality, street number or vice versa Barcelona, Aribau 86 @@ -133,137 +132,137 @@ 13077A018000390000FP - + Time series Series temporales - + About Open ICGC Acerca de Open ICGC - + Help Ayuda - + Select download folder Selección de carpeta de descargas - + Name Nombre - + Type Tipo - + Municipality Municipio - + Region Comarca - + Municipalities Municipios - + Counties Comarcas - + Provinces Provincias - + Color orthophoto Ortofoto color - + [TS] Color orthophoto [ST] Ortofoto color - + Infrared orthophoto Ortofoto infrarroja - + [TS] Infrared orthophoto [ST] Ortofoto infrarroja - + Download Descargas - + Open download folder Abrir carpeta de descargas - + Paint styles for selected layers Estilo de pintado de las capas seleccionadas - + Desaturate raster layer Desaturar capa raster - + Reference %s Referencia %s - + Download map area Descargar área de mapa - + Minimum download rect side not reached (%d m) Tamaño mínimo de descarga no alcanzado (%d m por lado) - + Maximum download area reached (%s m%s) Máxima área de descarga alcanzada (%s m%s) - + Change DB/geoPackage style Cambiar estilo de geoPackage / base de datos - + Error downloading file or selection is out of reference area Error descargando el fitchero o la selección está fuera del área de referencia - + You must write any text Debes escribir algun texto - + Data type: %s (%s) Rectangle: @@ -286,7 +285,7 @@ Carpeta de descargas: Nombre de archivo (%s): - + Data type: %s (%s) Point: @@ -309,7 +308,7 @@ Carpeta de descargas: Nombre de archivo (%s): - + Data type: %s (%s) Point: @@ -332,42 +331,42 @@ Carpeta de descargas: Nombre de archivo (%s): - + Find place names and adresses Buscar topónimos y direcciones - + Area Área - + County Comarca - + Catalonia Cataluña - + Available data Datos disponibles - + Download tool Herramienta de descarga - + Download point Descarga puntual - + Data type: %s (%s) Zone: @@ -386,42 +385,42 @@ Carpeta de descargas: Archivo (%s): - + Selected: Seleccionado: - + Cartographic series Cortes cartográficos - + Select an area Selecciona un área - + Select municipality Selecciona un municipio - + Select county Selecciona una comarca - + Unknow, service unavailable Desconocido, servicio no accesible - + Available products list Lista de productos disponibles - + Linkable products: - %s @@ -434,69 +433,69 @@ Productos descargables: - %s - + Open ICGC Toolbar Barra de herramientas de Open ICGC - + Height highlighting Resaltado de alturas - + Warning: Atención: - + QGIS version warnings Alertas de la versión de QGIS - + Download plugin Descargar plugin - + Update available: v%s Actualización disponible: v%s - + You can modify the brightness of the "Height hightlghting" layer to adjust the display to your background layer Puedes modificar el brillo de la capa "Resaltado de alturas" para ajustar la visualización a tu capa de fondo - + %s serie Corte %s - + QGIS plugin repository Repositorio de conectores de QGIS - + Software Repository Repositorio de código - + Report an issue Reportar una incidencia - + Send us an email Envíanos un email - + Your QGIS version is %s. In versions of QGIS lower than 3.10.4 http files may not load correctly. Affected products will be disabled. @@ -511,7 +510,7 @@ En versiones de QGIS inferiores a 3.4.0 los archivos geopackage pueden no cargar Actualiza tu versión de QGIS si es posible. - + ICGC products are generated in EPSG 25831, loading them into a project with EPSG %s could cause display problems, download problems, or increased load time. Do you want change the project coordinate system to EPSG 25831? @@ -520,546 +519,546 @@ Do you want change the project coordinate system to EPSG 25831? ¿Quieres cambiar el sistema de coordenadas del projecto a EPSG 25831? - + What's new Novedades - + Cartographic and Geological Institute of Catalonia web Web del Instituto Cartográfico y Geológico de Cataluña - + Current color orthophoto 25cm 1:2,500 Ortofoto color vigente 25cm 1:2.500 - + Current color orthophoto 50cm 1:5,000 Ortofoto color vigente 50cm 1:5.000 - + Current color orthophoto 2.5m 1:25,000 Ortofoto color vigente 2.5m 1:25.000 - + Current infrared orthophoto 25cm 1:2,500 Ortofoto infrarroja vigente 25cm 1:2.500 - + Current infrared orthophoto 50cm 1:5,000 Ortofoto infrarroja vigente 50cm 1:5.000 - + Current infrared orthophoto 2.5m 1:25,000 Ortofoto infrarroja vigente 2.5m 1:25.000 - + Topographic map 1:25,000 Mapa topográfico 1:25.000 - + Topographic map 1:50,000 Mapa topográfico 1:50.000 - + Topographic map 1:100,000 Mapa topográfico 1:100.000 - + Topographic map 1:250,000 Mapa topográfico 1:250.000 - + Topographic map 1:500,000 Mapa topográfico 1:500.000 - + Topographic map 1:1,000,000 Mapa topográfico 1:1.000.000 - + Topographic map 1:2,000,000 Mapa topográfico 1:2.000.000 - + Topographic cartography 1:1,000 Cartografía topográfica 1:1.000 - + Territorial topographic referential Referencial topográfico territorial - + Land cover map Mapa de cubiertas del suelo - + Digital terrain model 2m 2008-2011 Modelo de elevaciones del terreno 2m 2008-2011 - + Digital terrain model 5m 2020 Modelo de elevaciones del terreno 5m 2020 - + Geological map 1:250,000 Mapa geológico 1:250.000 - + vectorial data datos vectoriales - + raster data datos ráster - + Geological map for the prevention of geological hazards 1:25,000 (GT VI) Mapa geológico para la prevención de los riesgos geológicos 1:25.000 (GT VI) - + Territorial topographic referential 3D Referencial topográfico territorial 3D - + NDVI color (temporal serie) NDVI color (serie temporal) - + [TS] NDVI color [ST] NDVI color - + NDVI (temporal serie) NDVI (serie temporal) - + [TS] NDVI [ST] NDVI - + File type %s is unsupported by QGIS Do you want try open downloaded file in a external viewer? El tipo de fichero %s no está soportado por QGIS ¿Quieres intentar abrir el fichero descargado en un visor externo? - + Color orthophoto %s (provisional) Ortofoto color %s (provisional) - + Color orthophoto %s (rectification without corrections) Ortofoto color %s (rectificación sin correcciones) - + Color orthophoto %s (temporal serie) Ortofoto color %s (serie temporal) - + Color orthophoto (annual serie) Ortofoto color (serie anual) - + Satellite color orthophoto (monthly serie) Ortofoto color satélite (serie mensual) - + Infrared orthophoto %s (provisional) Ortofoto infrarroja %s (provisional) - + Infrared orthophoto %s (rectification without corrections) Ortofoto infrarroja %s (rectificación sin correcciones) - + Infrared orthophoto %s (temporal serie) Ortofoto infrarroja %s (serie temporal) - + Infrared orthophoto (annual serie) Ortofoto infrarroja %s (serie anual) - + Satellite infrared orthophoto (monthly serie) Ortofoto infrarroja satélite (serie mensual) - + Shading DTM layer Sombreado de capa MET - + The selected area is outside Catalonia El área seleccionada se encuentra fuera de Cataluña - + You must select a DTM layer Se ha de seleccionar una capa MET - + You can modify the angle of the sun in the layer simbology Se puede modificar el ángulo del sol desde la simbología de la capa - + [AS] Color orthophoto [SA] Ortofoto color - + [MS] Satellite color orthophoto [SM] Ortofoto color satélite - + [AS] Infrared orthophoto [SA] Ortofoto infrarroja - + [MS] Satellite infared orthophoto [SM] Ortofoto infrarroja satélite - + Geological map 1:50,000 Mapa geológico 1:50.000 - + Municipal capitals Capitales de municipio - + Vegueries Veguerías - + Administrative divisions Divisiones administrativas - + Territorial topographic referential %s (temporal serie) Referencial topográfico territorial %s (Serie temporal) - + [TS] Territorial topographic referential [ST] Referencial topográfico territorial - + Administrative divisions (raster pyramid) Divisiones administrativas (pirámide raster) - + The download file could not be opened No se ha podido abrir el archivo descargado - + raster raster - + vector vector - + Photo library Fototeca - + Photograms Fotogramas - + Photo: %s Foto: %s - + Photo query: %s Consulta fotogramas: %s - + Search photograms Buscar fotogramas - + Coord %s %s Coord %s %s - + It exists a previous photo search. Do you want close it? Existe una búsqueda de fotogramas previa. ¿Quieres cerrarla? - + Search photograms interactively Buscar fotogramas interactivamente - + Search photograms by coordinates Buscar fotogramas por coordenada - + Photograms search tool Herramienta de búsqueda de fotogramas - + Select a point Selecciona un punto - + Enter an x y value in the project coordinate system or add the corresponding EPSG code in the following format: "429393.19 4580194.65" or "429393.19 4580194.65 EPSG:25831" or "EPSG:25831 429393.19 4580194.65" Introduce valores x y en el sistema de coordenadas del proyecto o añade el correspondiente código EPSG en el siguiente formato: "429393.19 4580194.65" o "429393.19 4580194.65 EPSG:25831" o "EPSG:25831 429393.19 4580194.65" - + Flight code Código de vuelo - + Flight date Fecha de vuelo - + Flight year Año de vuelo - + Image filename Archivo de imagen - + Image width Anchura de imagen - + Image height Altura de imagen - + Image channels Canales de imagen - + Image bits PPC Bits PPC de imagen - + Color type Tipo de color - + Strip Pasada - + Camera Cámara - + Focal Length Distancia focal - + Ground sampling distance Tamaño de píxel - + Scale Escala - + Flying height Altura de vuelo - + Mean ground height Altura media en tierra - + View type Tipo de vista - + Northing Norte - + Easting Este - + EPSG code Código EPSG - + Omega Omega - + Phi Phi - + Kappa Kappa - + Photo in strip Fotograma dentro de pasada - + Spain España - + IGN topographic Topográfico IGN - + PNOA orthophoto Ortofoto PNOA - + Andorra Andorra - + Andorra topographic 1:25,000 1989 Andorra topográfico 1:25.000 1989 - + Andorra topographic 1:50,000 1987 Andorra topográfico 1:50.000 1987 - + Andorra orthophoto 1:5,000 2003 Andorra ortofoto 1:5.000 2003 - + Andorra orthophoto 1:500-1,000 20cm 2008 Andorra ortofoto 1:500-1.000 20cm 2008 - + World Mundo - + NASA blue marble NASA blue marble - + Minimum download rect side not reached (%d px) Tamaño mínimo de descarga no alcanzado (%d px por lado) - + Maximum download area reached (%s px%s) Máxima área de descarga alcanzada (%s px%s) - + Area coordinates Coordenadas de área - + Enter west, north, east, south values in the project coordinates system or add the corresponding EPSG code in the following format: "429393.19 4580194.65 429493.19 4580294.65" or "429393.19 4580194.65 429493.19 4580294.65 EPSG:25831" or @@ -1070,22 +1069,22 @@ Do you want try open downloaded file in a external viewer? "EPSG:25831 429393.19 4580194.65 429493.19 4580294.65" - + Territorial topographic referential volume Referencial topográfico territorial volumen - + Selected layer polygons Polígonos seleccionados en una capa - + You must activate a vector layer with one or more selected polygons Es necesario activar una capa vectorial com uno o más polígonos seleccionados - + Data type: %s (%s) Polygon area: @@ -1104,57 +1103,57 @@ Carpeta de descargas: Nombre de archivo (%s): - + Your polygons have too many points: %d maximum %d Los polígonos tienen demasiados puntos: %d máximo %d - + Topographic map (topographical pyramid) Mapa topográfico (pirámide topográfica) - + Land cover map (temporal serie) Mapa de cubiertas del suelo (serie temporal) - + [TS] Land cover map [ST] Mapa de cubiertas del suelo - + Digital Terrain Model %s Modelo de elevaciones del terreno %s - + Incorrect coordinates format Formato de coordenadas incorrecto - + Instamaps pyramid Pirámide Instamaps - + Cadastral registry Catastro - + Geological map 1:25,000 (GT I) Mapa geológico 1:25.000 (GT I) - + Report photo bug Reportar error de fotograma - + Thanks for reporting an error in photogram: %s @@ -1165,7 +1164,7 @@ We try to fix it as soon as possible Intentaremos corregirlo lo antes posible - + Before reporting an error, bear in mind that the position of photograms is an approximation i will never completely fit the underlying cartography, since no terrain model has been used to project the imatge against. Furthermore, changes in instrumenation over time (wheter GPS is used or not, scanning and photogrammetric workflow) account for a very limited precision in positioning. Only large displacements in position (for example, an element that should appear near the center does not appear) or if there is an error in rotation (eg. the sea appears in the northern part of a photo). @@ -1178,72 +1177,72 @@ Solamente deben considerarse errores de ubicación si el fotograma está muy des ¿Quieres continuar? - + You must select one photogram Se debe seleccionar un fotograma - + Keep scale Mantener escala - + Anaglyph Anaglifo - + Inverted stereo Estéreo invertido - + Analog Analógico - + Centered anaglyph photogram Fotograma anaglifo central - + [AS] Centered anaglyph phootogram [SA] Fotograma anaglifo central - + Centered rectified photogram (annual serie) Fotograma rectificado central (serie anual) - + [AS] Centered rectified photogram [SA] Fotograma rectificado central - + Centered photogram (annual serie) Fotograma central (serie anual) - + [AS] Centered photogram [SA] Fotograma central - + Centered anaglyph photogram %s (annual serie) Fotograma anaglifo central %s (serie anual) - + This layer renders only the most centered photogram in the map view, you can zoom in for continuous navigation. Please note that current year may not have full photogram coverage Muestra solo el fotograma más centrado en la vista mapa, puedes acercarte para obtener una navegació contínua. El año actual puede no tener una cobertura completa - + Photo: %s Flight code: %s Date: %s @@ -1258,279 +1257,299 @@ Resolución: %.2fm Descripción del problema: - + Search photograms by name Buscar fotogramas por nombre - + Photogram name: Nombre de fotograma: - + Historic color orthophoto 10cm 1:1,000 Ortofoto color histórica 10cm 1:1.000 - + Historic color orthophoto 25cm 1:2,500 Ortofoto color histórica 25cm 1:2.500 - + Historic color orthophoto 1m 1:10,000 Ortofoto color histórica 1m 1:10.000 - + Historic infrared orthophoto 10cm 1:1,000 Ortofoto infrarroja histórica 10cm 1:1.000 - + Historic infrared orthophoto 25cm 1:2,500 Ortofoto infrarroja histórica 25cm 1:2.500 - + Historic infrared orthophoto 50cm 1:5,000 Ortofoto infrarroja histórica 50cm 1:5.000 - + Historic infrared orthophoto 1m 1:10,000 Ortofoto infrarroja histórica 1m 1:10.000 - + Historic infrared orthophoto 2.5m 1:25,000 Ortofoto infrarroja histórica 2,5m 1:25.000 - + Historic color orthophoto 15cm 1:1,500 Ortofoto color histórica 15cm 1:1.500 - + Historic color orthophoto 50cm 1:5,000 Ortofoto color histórica 50cm 1:5.000 - + Historic color orthophoto 2.5m 1:25,000 Ortofoto color histórica 2,5m 1:25.000 - + Select a zone Selecciona una zona - + with available information con información disponible - + Selected layer polygons bounding box Rectángulo contenedor de polígonos seleccionados en una capa - + Save map as PDF Guardar mapa como PDF - + Save location map as PDF Guardar mapa de situación como PDF - + PDF file (*.pdf) Archivo PDF (*.pdf) - + Coord. Sys.: %s Generation date: %s Sist. Coord.: %s Fecha de generación: %s - + Error saving PDF file Error guardando el archivo PDF - + Topographic map: Mapa topográfico: - + Map: Mapa: - + Location map: Mapa de situación: - + Unit tests Tests unitarios - + This PDF shows all the data visible in the QGIS project at the time of its generation Este PDF muestra todos los datos visibles del proyecto QGIS en el momento de su generación - + Enable debug log info Activar registro de informació de depuración - + ContextMaps ContextMaps - + ContextMaps standard map ContextMaps mapa estándar - + ContextMaps gray map ContextMaps mapa gris - + ContextMaps simplified gray map ContextMaps mapa gris simplificado - + ContextMaps hybrid orthophoto ContextMaps ortofoto híbrida - + Andorra topographic 1:50,000 2020 Andorra topográfico 1:50.000 2020 - + Andorra orthophoto 1:5,000 2012 Andorra ortofoto 1:5.000 2012 - + Debug Depuración - + Open debug log file Abrir archivo de registro de depuración - + Open plugin installation folder Abrir capeta de instalación del conector - + Product metadatas Metadatos de producto - + The maximum number of results (%d) has been reached. The query may have more results than are displayed. Se ha alcanzado el número máximo de resultados (%d). La consulta podría tener más resultados de los mostrados. - + Anaglyph options Opciones anaglifo - + yyyy/MM/dd HH:mm:ss dd/MM/yyyy HH:mm:ss - + Send us an email with debug information Envíanos un email con informació de depuración - + County capitals Capitales de comarca - + %s grid Cuadrículas %s - + Territorial topographic referential BIM Referencial topográfico territorial BIM - + Sheet Hoja - + Select sheet Selecciona una hoja - + Coast Costa - + Topobathymetric elevation model Modelo de elevaciones topobatimétrico de la franja litoral - + Bathymetric chart Mapa de isóbatas - + Coastline Línea de costa - + Current color orthophoto Ortofoto color vigente - + Current infrared orthophoto Ortofoto infrarroja vigente - + Current gray orthophoto Ortofoto gris vigente + + + France + Francia + + + + France topographic + Francia topográfico + + + + France orthophoto 20cm + Francia ortofoto 20cm + + + + OpenStreetMap + OpenStreetMap + PhotoSearchSelectionDialog @@ -1651,22 +1670,22 @@ brillo Ajustar brillo - + Unavailable or lost No disponible o perdido - + No publishable No publicable - + Scan required Escaneo requerido - + Available Disponible @@ -1702,7 +1721,7 @@ la tecla intro para visualizar la foto Tipo de vista - + Parallax: %+d%% diff --git a/metadata.txt b/metadata.txt index d2d4902..f077137 100644 --- a/metadata.txt +++ b/metadata.txt @@ -28,8 +28,12 @@ email=qgis.openicgc@icgc.cat qgisMinimumVersion=2.99 qgisMaximumVersion=3.99 -version=1.1.20 -changelog=v1.1.20 (2024-09-02) +version=1.1.21 +changelog=V1.1.21 (2024-09-09) + - Fixed problem showing temporal slider bars with activated interface theme "Night Mapping" + - Removed unavailable download products + + v1.1.20 (2024-09-02) - Added current orthophoto (color, irc and gray) layers - Updated geological map 250.000 and added new download formats - Fixed problem showing photograms with undefined GSD value diff --git a/openicgc.py b/openicgc.py index b2d5b03..0478774 100644 --- a/openicgc.py +++ b/openicgc.py @@ -957,7 +957,19 @@ def initGui(self, check_qgis_updates=True, check_icgc_updates=False): lambda:self.layers.add_wms_layer(self.tr("Andorra orthophoto 1:5,000 2003"), "http://www.ideandorra.ad/Serveis/wmsorto2003/wms", ["Orto5000_2003"], [], "image/png", 27573, '', self.backgroup_map_group_name, only_one_map_on_group=False, set_current=True), QIcon(":/lib/qlib3/base/images/andorra_orto2003.png")), ]), + (self.tr("France"), None, QIcon(":/lib/qlib3/base/images/france_topo.png"), [ + (self.tr("France topographic"), + lambda:self.layers.add_wms_layer(self.tr("France topographic"), "http://mapsref.brgm.fr/wxs/refcom-brgm/refign", ["FONDS_SCAN"], [], "image/png", 23031, '', self.backgroup_map_group_name, only_one_map_on_group=False, set_current=True), + QIcon(":/lib/qlib3/base/images/france_topo.png")), + "---", + (self.tr("France orthophoto 20cm"), + lambda:self.layers.add_wms_layer(self.tr("France orthophoto 20cm"), "https://data.geopf.fr/annexes/ressources/wms-r/ortho.xml", ["HR.ORTHOIMAGERY.ORTHOPHOTOS"], ["normal"], "image/png", 23031, '', self.backgroup_map_group_name, only_one_map_on_group=False, set_current=True, ignore_get_map_url=False), + QIcon(":/lib/qlib3/base/images/france_ortho.png")), + ]), (self.tr("World"), None, QIcon(":/lib/qlib3/base/images/world.png"), [ + (self.tr("OpenStreetMap"), + lambda:self.layers.add_wms_layer(self.tr("OpenStreetMap"), "http://ows.terrestris.de/osm/service", ["OSM-WMS"], [], "image/png", 4326, '', self.backgroup_map_group_name, only_one_map_on_group=False, set_current=True), + QIcon(":/lib/qlib3/base/images/world.png")), (self.tr("NASA blue marble"), lambda:self.layers.add_wms_layer(self.tr("NASA blue marble"), "http://geoserver.webservice-energy.org/geoserver/ows", ["gn:bluemarble-2048"], [], "image/png", 4326, '', self.backgroup_map_group_name, only_one_map_on_group=False, set_current=True), QIcon(":/lib/qlib3/base/images/world.png")), diff --git a/qlib3/base/images/france_ortho.png b/qlib3/base/images/france_ortho.png new file mode 100644 index 0000000000000000000000000000000000000000..4b7785f8e6adc4ba959a4aa0addb151c189d6edf GIT binary patch literal 7549 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 literal 0 HcmV?d00001 diff --git a/qlib3/base/images/france_topo.png b/qlib3/base/images/france_topo.png new file mode 100644 index 0000000000000000000000000000000000000000..d28e18e89c8ee81bd2476acae8a508bcfad51aef GIT binary patch literal 7065 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 DJ8q|X literal 0 HcmV?d00001 diff --git a/qlib3/base/pluginbase.py b/qlib3/base/pluginbase.py index 005d25c..10329ce 100644 --- a/qlib3/base/pluginbase.py +++ b/qlib3/base/pluginbase.py @@ -4036,7 +4036,7 @@ def get_wms_t_time_series(self, url, layer_id, ts_regex=None, version="1.1.1", t return time_series_list, default_time - def add_wms_layer(self, layer_name, url, layers_list, styles_list, image_format, epsg=None, extra_tags="", group_name="", group_pos=None, only_one_map_on_group=False, only_one_visible_map_on_group=True, collapsed=True, visible=True, transparency=None, saturation=None, set_current=False, resampling_bilinear=False, resampling_cubic=False): + def add_wms_layer(self, layer_name, url, layers_list, styles_list, image_format, epsg=None, extra_tags="", group_name="", group_pos=None, only_one_map_on_group=False, only_one_visible_map_on_group=True, collapsed=True, visible=True, transparency=None, saturation=None, set_current=False, resampling_bilinear=False, resampling_cubic=False, ignore_get_map_url=True): """ Afegeix una capa a partir de la URL base, una llista de capes WMS, una llista d'estils i un format d'imatge. Retorna la capa. Opcionalment es pot especificar: @@ -4061,10 +4061,10 @@ def add_wms_layer(self, layer_name, url, layers_list, styles_list, image_format, - collapsed: Indicates whether we want to load the layer with collapsed legend - visible: Indicates whether we want to load the layer by leaving it visible or not """ - uri = self.generate_wms_layer_uri(url, layers_list, styles_list, image_format, epsg, extra_tags) + uri = self.generate_wms_layer_uri(url, layers_list, styles_list, image_format, epsg, extra_tags, ignore_get_map_url) return self.add_raster_uri_layer(layer_name, uri, "wms", group_name, group_pos, only_one_map_on_group, only_one_visible_map_on_group, collapsed, visible, transparency, saturation, set_current, resampling_bilinear, resampling_cubic) - def generate_wms_layer_uri(self, url, layers_list, styles_list, image_format, epsg=None, extra_tags=""): + def generate_wms_layer_uri(self, url, layers_list, styles_list, image_format, epsg=None, extra_tags="", ignore_get_map_url=True): """ Retorna el string uri a partir dels paràmetres WMS --- Return WMS uri string from WMS paràmeters @@ -4084,10 +4084,11 @@ def generate_wms_layer_uri(self, url, layers_list, styles_list, image_format, ep uri = "url=%s&crs=EPSG:%s&format=%s&styles=%s&layers=%s" % (url, epsg, image_format, "&styles=".join(styles_list), "&layers=".join(layers_list)) if extra_tags: uri += "&%s" % extra_tags - uri += "&IgnoreGetMapUrl=1" + if ignore_get_map_url: + uri += "&IgnoreGetMapUrl=1" return uri - def add_wms_url_query_layer(self, layer_name, url_query, group_name="", group_pos=None, only_one_map_on_group=False, only_one_visible_map_on_group=True, collapsed=True, visible=True, transparency=None, saturation=None, set_current=False): + def add_wms_url_query_layer(self, layer_name, url_query, group_name="", group_pos=None, only_one_map_on_group=False, only_one_visible_map_on_group=True, collapsed=True, visible=True, transparency=None, saturation=None, set_current=False, ignore_get_map_url=True): """ Afegeix una capa WMS a partir d'una petició WMS (URL). Retorna la capa. Veure add_wms_layer per opcions --- @@ -4095,7 +4096,8 @@ def add_wms_url_query_layer(self, layer_name, url_query, group_name="", group_po See add_wms_layer for options """ uri = "url=%s" % url_query.lower().replace("epsg:", "epsg:").replace("srs=", "crs=").replace("?", "&") - uri += "&IgnoreGetMapUrl=1" + if ignore_get_map_url: + uri += "&IgnoreGetMapUrl=1" return self.add_raster_uri_layer(layer_name, uri, "wms", group_name, group_pos, only_one_map_on_group, only_one_visible_map_on_group, collapsed, visible, transparency, saturation, set_current) def update_wms_layer(self, layer, wms_layer=None, wms_time=None, wms_style=None): diff --git a/qlib3/base/qtextra.py b/qlib3/base/qtextra.py index 2f2587a..e36da94 100644 --- a/qlib3/base/qtextra.py +++ b/qlib3/base/qtextra.py @@ -8,24 +8,27 @@ class QtExtra: @staticmethod - def changeStyle(widget, style_or_style_list, overwrite_style=None): + def changeStyle(widget, style_or_style_list): #, overwrite_style=None): """ Change style widget from style name o style name list. overwrite_style filter current style to do change """ # Gets desired style desired_style_list = style_or_style_list if type(style_or_style_list) is list else [style_or_style_list] + + # ATENCIÓ SI INTENTO OBTENIR L'ESTIL ACTIU SI ALGÚ ACTIVA EL "MODE FOSC" DE QGIS LA CRIDa app.style().baseStyle().objectName() PETA!! # Gets current style (Gets widget style or default app style) - app = QApplication.instance() - app_default_style = app.style().objectName() if app.style() is QCommonStyle else app.style().baseStyle().objectName() - widget_style = widget.style().objectName() - current_style = widget_style or app_default_style + #app = QApplication.instance() + #app_default_style = app.style().objectName() if type(app.style()) is QCommonStyle else app.style().baseStyle().objectName() + #widget_style = widget.style().objectName() + #current_style = widget_style or app_default_style + # if not overwrite_style or current_style == overwrite_style.lower(): + # Apply new style if it is available - if not overwrite_style or current_style == overwrite_style.lower(): - available_styles_list = QStyleFactory.keys() - for desired_style in desired_style_list: - if desired_style in available_styles_list: - widget.setStyle(QStyleFactory.create(desired_style)) - return True + available_styles_list = QStyleFactory.keys() + for desired_style in desired_style_list: + if desired_style in available_styles_list: + widget.setStyle(QStyleFactory.create(desired_style)) + return True return False @staticmethod def forceQSliderArrowStyle(slider): - return QtExtra.changeStyle(slider, ["windowsvista", "Windows"], "Fusion") + return QtExtra.changeStyle(slider, ["windowsvista", "Windows"]) #, "Fusion") diff --git a/qlib3/base/resources.qrc b/qlib3/base/resources.qrc index ec0b952..8583663 100644 --- a/qlib3/base/resources.qrc +++ b/qlib3/base/resources.qrc @@ -25,6 +25,8 @@ images/andorra_shadows.png images/andorra_topo25k.png images/andorra_topo50k.png + images/france_ortho.png + images/france_topo.png images/spain_cadastral.png images/spain_orto.png images/spain_topo.png diff --git a/resources3/fme.py b/resources3/fme.py index 8afb1f3..43fa5f0 100644 --- a/resources3/fme.py +++ b/resources3/fme.py @@ -129,13 +129,6 @@ ("met2", "MET 2m", 200, 800000000, None, None, None, None, ["", "pol", "mu", "co"], "met2.tif", "5k_limits", "%s/fmedatastreaming/Descarrega_basica/geotiff2format_clip_coor.fmw?SW_X=%s&SW_Y=%s&NE_X=%s&NE_Y=%s&poligon=%s&DEF_NAME=met2&Format=GEOTIFF&Projecte=met2&Codi=%s&piramide=True", None), ("met5", "MET 5m", 500, 5000000000, None, None, None, None, ["", "pol", "mu", "co"], "met5.tif", "5k_limits", "%s/fmedatastreaming/Descarrega_basica/geotiff2format_clip_coor.fmw?SW_X=%s&SW_Y=%s&NE_X=%s&NE_Y=%s&poligon=%s&DEF_NAME=met5m&Format=GEOTIFF&Projecte=met5&Codi=%s&piramide=True", None), - ("elevacions-franja-litoral", "Model d’elevacions topobatimètric de la franja litoral", 200, 200000000, None, None, None, None, ["", "pol"], "elevacions-franja-litoral.tif", "cat_limits", "%s/fmedatastreaming/Descarrega_basica/geotiff2format_clip_coor.fmw?SW_X=%s&SW_Y=%s&NE_X=%s&NE_Y=%s&poligon=%s&DEF_NAME=met2&Format=GEOTIFF&Projecte=elevacions-franja-litoral&Codi=%s&piramide=True", None), - ("batimetria", "Mapa d’isòbates", None, 200000000 , None, None, None, None, ["", "pol", "tot"], "batimetria.gpkg", "cat_limits", "%s/fmedatastreaming/batimetries/ICGC_batimetria_gpkg_clip.fmw?xMin=%s&yMin=%s&xMax=%s&yMax=%s&poligon=%s&Codi=%s", None), - #("linia-costa", "Línia de costa", None, 200000000 , None, None, None, get_coastline_years(), ["", "pol", "tot"], "linia-costa.gpkg", "cat_limits", "%s/fmedatastreaming/batimetries/ICGC_linia-costa_gpkg_clip.fmw?xMin=%s&yMin=%s&xMax=%s&yMax=%s&poligon=%s&Codi=%s", None), - ] + [ - ("linia-costa %s" % "-".join(coastline_filename.split('-')[3:]), "Línia de costa", - None, 200000000 , None, None, None, None, ["", "pol", "tot"], coastline_filename + ".gpkg", "cat_limits", "%s/fmedatastreaming/batimetries/ICGC_linia-costa_gpkg_clip.fmw?xMin=%s&yMin=%s&xMax=%s&yMax=%s&poligon=%s&Codi=%s&geopackage_out=linia_costa&geopackage_in=" + coastline_filename, None) \ - for coastline_filename in get_coastline_filenames() ] + [ ("mggt1", "GT I. Mapa geològic 1:25.000", None, None, None, None, None, None, ["tot"], "gt1.shp-zip", None, "%s/fmedatastreaming/Descarrega_basica/descarrega_shape_coor.fmw?SW_X=%s&SW_Y=%s&NE_X=%s&NE_Y=%s&poligon=%s&Projecte=gt125m&Codi=%s", None), ("mg50m", "Mapa Geològic 1:50.000", None, None, None, None, None, None, ["tot"], "mg50m.shp-zip", None, "%s/fmedatastreaming/Descarrega_basica/descarrega_shape_coor.fmw?SW_X=%s&SW_Y=%s&NE_X=%s&NE_Y=%s&poligon=%s&Projecte=mg50m&Codi=%s", None),