diff --git a/.github/workflows/create-milestone.yml b/.github/workflows/create-milestone.yml index 387aa5e272..9bf5ab64de 100644 --- a/.github/workflows/create-milestone.yml +++ b/.github/workflows/create-milestone.yml @@ -8,4 +8,4 @@ jobs: uses: geoadmin/.github/.github/workflows/create-milestone.yml@master secrets: inherit with: - ci_status_check_name: 'AWS CodeBuild eu-central-1 (mf-chsdi3)' + ci_status_check_name: 'AWS CodeBuild eu-central-1 (mf-chsdi3-pr)' diff --git a/chsdi/models/vector/uvek.py b/chsdi/models/vector/uvek.py index 2a91531cdd..9b1d7b263a 100644 --- a/chsdi/models/vector/uvek.py +++ b/chsdi/models/vector/uvek.py @@ -4296,6 +4296,7 @@ class LadebedarfsweltLadepunkte: allgemein_zugaenglich_anzahl_ladepunkte = Column('allgemein_zugaenglich_anzahl_ladepunkte', Float) quartier_ac_ladepunkte = Column('quartier_ac_ladepunkte', Float) zielort_ac_ladepunkte = Column('zielort_ac_ladepunkte', Float) + zielort_dc_50_ladepunkte = Column('zielort_dc_50_ladepunkte', Float) quartier_dc_150_ladepunkte = Column('quartier_dc_150_ladepunkte', Float) schnell_dc_150_ladepunkte = Column('schnell_dc_150_ladepunkte', Float) schnell_dc_350_ladepunkte = Column('schnell_dc_350_ladepunkte', Float) diff --git a/chsdi/models/vector/vbs.py b/chsdi/models/vector/vbs.py index 7b177a10af..3b08f82d90 100644 --- a/chsdi/models/vector/vbs.py +++ b/chsdi/models/vector/vbs.py @@ -198,6 +198,44 @@ class BundestankstellenBebecoZoom2(Base, BundestankstellenBebeco, Vector): register(BundestankstellenBebeco.__bodId__, BundestankstellenBebecoZoom2) +class Notfalltreffpunkte: + __tablename__ = 'v_notfalltreffpunkte' + __table_args__ = ({'schema': 'babs', 'autoload': False, 'extend_existing': True}) + __template__ = 'templates/htmlpopup/notfalltreffpunkte.mako' + __bodId__ = 'ch.babs.notfalltreffpunkte' + __label__ = 'id' + __returnedGeometry__ = 'the_geom_point' + id = Column('ntp_id', Unicode, primary_key=True) + gebbezeichnung = Column('gebbezeichnung', Unicode) + strasse = Column('strasse', Unicode) + haus_nummer = Column('haus_nummer', Unicode) + plz = Column('plz', Integer) + ort = Column('ort', Unicode) + gemeinde = Column('gemeinde', Unicode) + kanton = Column('kanton', Unicode) + xkoord = Column('xkoord', Integer) + ykoord = Column('ykoord', Integer) + linkkanton = Column('linkkanton', Unicode) + linkbabs = Column('linkbabs', Unicode) + bemerkungen = Column('bemerkungen', Unicode) + the_geom_point = Column('the_geom', Geometry2D) + + +class NotfalltreffpunkteZoom1(Base, Notfalltreffpunkte, Vector): + __minscale__ = 1 + __maxscale__ = 100000 + the_geom = Column('the_geom_tooltip_2', Geometry2D) + +register(NotfalltreffpunkteZoom1.__bodId__, NotfalltreffpunkteZoom1) + + +class NotfalltreffpunkteZoom2(Base, Notfalltreffpunkte, Vector): + __minscale__ = 100000 + the_geom = Column('the_geom_tooltip', Geometry2D) + +register(NotfalltreffpunkteZoom2.__bodId__, NotfalltreffpunkteZoom2) + + class LogistikraeumeArmeelogistikcenter(Base, Vector): __tablename__ = 'abschnittsregionen_armeelogistikzentren' __table_args__ = ({'schema': 'militaer', 'autoload': False}) diff --git a/chsdi/static/doc/source/releasenotes/index.rst b/chsdi/static/doc/source/releasenotes/index.rst index af9e92c89e..d2b0d69b64 100644 --- a/chsdi/static/doc/source/releasenotes/index.rst +++ b/chsdi/static/doc/source/releasenotes/index.rst @@ -14,6 +14,107 @@ Release Notes

RSS Feeds

+.. _releasenotes_20241009: + +Release 20241009 - Wednesday, October 9th 2024 +---------------------------------------------- + +API & applications +****************** + +`API `__ +''''''''''''''''''''''''''''' + +- Bug fixes +- Announcements: + - the layers *ch.swisstopo.geologie-geotechnik-steinbrueche_1915*, *ch.swisstopo.geologie-geotechnik-steinbrueche_1965*, *ch.swisstopo.geologie-geotechnik-steinbrueche_1995* and *ch.swisstopo.geologie-geotechnik-steinbrueche_1980* have been removed from chsdi services as previously announced + - by the release of November 13th or December 18th the layers *ch.swisstopo-karto.skitouren* and *ch.swisstopo-karto.schneeschuhrouten* will no longer be raster maps but vector data sets + - important information about SSL certificates and http protocol for integrated symbols, KML’s or GPX files in map.geo.admin.ch. Details `read here ` + - the layers *ch.swisstopo.lubis-luftbilder_schwarzweiss*, *ch.swisstopo.lubis-luftbilder_farbe*, *ch.swisstopo.lubis-luftbilder_infrarot* will get the following changes by the release of November 13th: no extended tooltip anymore and the attributes inventarnummer, bildnummer, orientierung, rotation, filesize_mb, ort, image_height and image_width will be removed from chsdi services, because they are no longer filled and used. + - the layer *ch.swisstopo.lubis-luftbilder_schraegaufnahmen* will get the following changes by the release of November 13th: no extended tooltip anymore and the attributes inventory_number, medium_format, filesize_mb, contact and contact_email will be removed from chsdi services, because they are no longer filled and used. + - the layer *ch.swisstopo.lubis-terrestrische_aufnahmen* will get the following changes by the release of November 13th: no extended tooltip anymore and the attributes image_number, filesize_mb, medium_format, image_height and image_width will be removed from chsdi services, because they are no longer filled and used. + - the object ID values of the layer *ch.vbs.schiessanzeigen* will change for all objects due to geometrical changes in the source data with the release of November 13th or December 18th. Existing permalinks to objects may not work anymore and will have to be replaced by the new object id’s (chsdi fields featureId and id). In addition there will be a new attribute bezeichnung_ort on the dataset. The other existing attributes will stay. + - decommission of various vectortile styles and datasets by January 2025. Details `read here ` + - the layer *ch.bakom.notruf-112_satellit* will be decommissioned with one of the first releases in 2025 + + +- `Full changelog `__ + +Geodata +******* + ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| New | `Emergency meeting points `__ (ch.babs.notfalltreffpunkte) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Amphibian migration conflicts `__ (ch.bafu.amphibienwanderung-verkehrskonflikte) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Vegetation height model NFI `__ (ch.bafu.landesforstinventar-vegetationshoehenmodell) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Surface model NFI `__ (ch.bafu.landesforstinventar-vegetationshoehenmodell_relief) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `CLN Exceedance `__ (ch.bafu.luftreinhaltung-stickstoff_kritischer_eintrag) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Charging requirements: Plug-in vehicles `__ (ch.bfe.ladebedarfswelt-fahrzeuge) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Charging requirements: Home charging availability - Convenient `__ (ch.bfe.ladebedarfswelt-heimladeverfuegbarkeit_bequem) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Charging requirements: Home charging availability - Flexible `__ (ch.bfe.ladebedarfswelt-heimladeverfuegbarkeit_flexibel) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Charging requirements: Home charging availability - Planned `__ (ch.bfe.ladebedarfswelt-heimladeverfuegbarkeit_geplant) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Charging requirements: Charging points - Convenient `__ (ch.bfe.ladebedarfswelt-ladepunkte_bequem) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Charging requirements: Charging points - Flexible `__ (ch.bfe.ladebedarfswelt-ladepunkte_felxibel) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Charging requirements: Charging points - Planned `__ (ch.bfe.ladebedarfswelt-ladepunkte_geplant) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Charging requirements: Power requirements `__ (ch.bfe.ladebedarfswelt-strombedarf) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Land use statistics standard `__ (ch.bfs.arealstatistik) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Land use statistics cover `__ (ch.bfs.arealstatistik-bodenbedeckung) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Employment (FTE) `__ (ch.bfs.betriebszaehlungen-beschaeftigte_vollzeitaequivalente) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Enterprises `__ (ch.bfs.betriebszaehlungen-arbeitsstaetten) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Dwellings `__ (ch.bfs.volkszaehlung-gebaeudestatistik_wohnungen) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Buildings `__ (ch.bfs.volkszaehlung-gebaeudestatistik_gebaeude) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Population (residents) `__ (ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Landwirtschaftliche Nutzungsflächen Schweiz `__ (ch.blw.landwirtschaftliche-nutzungsflaechen) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Hiking trails `__ (ch.swisstopo.swisstlm3d-wanderwege) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Protected Areas swissTLMregio `__ (ch.swisstopo.vec200-adminboundaries-protectedarea) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Building generalized swissTLMregio `__ (ch.swisstopo.vec200-building) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Hydrology swissTLMregio `__ (ch.swisstopo.vec200-hydrography) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Land cover swissTLMregio `__ (ch.swisstopo.vec200-landcover) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Single objects swissTLMregio `__ (ch.swisstopo.vec200-miscellaneous) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Elevations swissTLMregio `__ (ch.swisstopo.vec200-miscellaneous-geodpoint) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Names swissTLMregio `__ (ch.swisstopo.vec200-names-namedlocation) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Public transportation swissTLMregio `__ (ch.swisstopo.vec200-transportation-oeffentliche-verkehr) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Road system swissTLMregio `__ (ch.swisstopo.vec200-transportation-strassennetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Aerial images cantons `__ (ch.swisstopo.lubis-luftbilder-dritte-kantone) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `SWISSIMAGE Journey through time `__ (ch.swisstopo.swissimage-product) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Division SWISSIMAGE 10 cm Raster `__ (ch.swisstopo.images-swissimage-dop10.metadata) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Tiling SWISSIMAGE Journey thru time `__ (ch.swisstopo.swissimage-product.metadata) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + .. _releasenotes_20240828: Release 20240828 - Wednesday, August 28th 2024 @@ -62,6 +163,8 @@ Geodata +--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Update | `SPM consultation `__ (ch.vbs.sachplan-infrastruktur-militaer_anhoerung) | +--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Aerial images cantons `__ (ch.swisstopo.lubis-luftbilder-dritte-kantone) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ .. _releasenotes_20240703: diff --git a/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_de.png b/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_de.png new file mode 100644 index 0000000000..35c172ce02 Binary files /dev/null and b/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_de.png differ diff --git a/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_en.png b/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_en.png new file mode 100644 index 0000000000..7f92b4dd61 Binary files /dev/null and b/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_en.png differ diff --git a/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_fr.png b/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_fr.png new file mode 100644 index 0000000000..d32d3fd4e5 Binary files /dev/null and b/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_fr.png differ diff --git a/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_it.png b/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_it.png new file mode 100644 index 0000000000..a967928d55 Binary files /dev/null and b/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_it.png differ diff --git a/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_rm.png b/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_rm.png new file mode 100644 index 0000000000..35c172ce02 Binary files /dev/null and b/chsdi/static/images/legends/ch.babs.notfalltreffpunkte_rm.png differ diff --git a/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_de.png b/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_de.png index fad9b45a40..bdef8fbbb6 100644 Binary files a/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_de.png and b/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_de.png differ diff --git a/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_en.png b/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_en.png index e4eb1941f7..6b5d08ad24 100644 Binary files a/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_en.png and b/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_en.png differ diff --git a/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_fr.png b/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_fr.png index 066bb5e0e6..76c9290b54 100644 Binary files a/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_fr.png and b/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_fr.png differ diff --git a/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_it.png b/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_it.png index 066bb5e0e6..76c9290b54 100644 Binary files a/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_it.png and b/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_it.png differ diff --git a/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_rm.png b/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_rm.png index fad9b45a40..bdef8fbbb6 100644 Binary files a/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_rm.png and b/chsdi/static/images/legends/ch.bfs.volkszaehlung-bevoelkerungsstatistik_einwohner_rm.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_de.png b/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_de.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_de.png and b/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_de.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_en.png b/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_en.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_en.png and b/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_en.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_fr.png b/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_fr.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_fr.png and b/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_fr.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_it.png b/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_it.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_it.png and b/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_it.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_rm.png b/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_rm.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_rm.png and b/chsdi/static/images/legends/ch.swisstopo.images-swissimage-dop10.metadata_rm.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_de.png b/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_de.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_de.png and b/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_de.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_en.png b/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_en.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_en.png and b/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_en.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_fr.png b/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_fr.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_fr.png and b/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_fr.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_it.png b/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_it.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_it.png and b/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_it.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_rm.png b/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_rm.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_rm.png and b/chsdi/static/images/legends/ch.swisstopo.images-swissimage.metadata_rm.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_de.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_de.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_de.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_de.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_en.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_en.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_en.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_en.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_fr.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_fr.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_fr.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_fr.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_it.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_it.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_it.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_it.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_rm.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_rm.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_rm.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk100.metadata_rm.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_de.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_de.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_de.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_de.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_en.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_en.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_en.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_en.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_fr.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_fr.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_fr.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_fr.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_it.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_it.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_it.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_it.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_rm.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_rm.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_rm.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk200.metadata_rm.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_de.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_de.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_de.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_de.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_en.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_en.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_en.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_en.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_fr.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_fr.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_fr.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_fr.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_it.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_it.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_it.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_it.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_rm.png b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_rm.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_rm.png and b/chsdi/static/images/legends/ch.swisstopo.pixelkarte-pk50.metadata_rm.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_de.png b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_de.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_de.png and b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_de.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_en.png b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_en.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_en.png and b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_en.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_fr.png b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_fr.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_fr.png and b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_fr.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_it.png b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_it.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_it.png and b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_it.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_rm.png b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_rm.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_rm.png and b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d-raster.metadata_rm.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_de.png b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_de.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_de.png and b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_de.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_en.png b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_en.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_en.png and b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_en.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_fr.png b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_fr.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_fr.png and b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_fr.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_it.png b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_it.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_it.png and b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_it.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_rm.png b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_rm.png index cd0b90ca4f..7e7cb4a987 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_rm.png and b/chsdi/static/images/legends/ch.swisstopo.swisssurface3d.metadata_rm.png differ diff --git a/chsdi/templates/htmlpopup/bfe_ladebedarfswelt_ladepunkte.mako b/chsdi/templates/htmlpopup/bfe_ladebedarfswelt_ladepunkte.mako index 3f1ee38ceb..a73cde5c25 100644 --- a/chsdi/templates/htmlpopup/bfe_ladebedarfswelt_ladepunkte.mako +++ b/chsdi/templates/htmlpopup/bfe_ladebedarfswelt_ladepunkte.mako @@ -21,6 +21,10 @@ ${_('ch.bfe.ladebedarfswelt-ladepunkte_bequem.Zielort_AC_Ladepunkte')} ${c['attributes']['zielort_ac_ladepunkte'] or '-'} + + ${_('ch.bfe.ladebedarfswelt-ladepunkte_bequem.Zielort_DC_50_Ladepunkte')} + ${c['attributes']['zielort_dc_50_ladepunkte'] or '-'} + ${_('ch.bfe.ladebedarfswelt-ladepunkte_bequem.Quartier_DC_150_Ladepunkte')} ${c['attributes']['quartier_dc_150_ladepunkte'] or '-'} diff --git a/chsdi/templates/htmlpopup/lubis_schraegaufnahmen.mako b/chsdi/templates/htmlpopup/lubis_schraegaufnahmen.mako index 3ca7ee5146..c6868af9e7 100644 --- a/chsdi/templates/htmlpopup/lubis_schraegaufnahmen.mako +++ b/chsdi/templates/htmlpopup/lubis_schraegaufnahmen.mako @@ -71,7 +71,7 @@ isStac = c['featureId'].startswith('lubis-luftbilder_schraegaufnahmen') # there is no way to open to activate the orthophoto with the link parameters if isStac: dataGeoAdminHost = request.registry.settings['datageoadminhost'] - asset_url=f"{dataGeoAdminHost}/{c['layerBodId']}/{c['featureId']}/{c['featureId']}.tif" + asset_url=f"{dataGeoAdminHost}/{c['layerBodId']}/{c['featureId']}/{c['featureId']}_2056.tif" preview_url=f"{dataGeoAdminHost}/{c['layerBodId']}/{c['featureId']}/{c['featureId']}.jpg" meta_csv_url=f"{dataGeoAdminHost}/{c['layerBodId']}/{c['featureId']}/{c['featureId']}.csv" viewer_url=asset_url @@ -166,7 +166,6 @@ if not isStac: lang, image_rotation) viewer_url = get_viewer_url(request, params) - %> % if isStac: # STAC Tooltips diff --git a/chsdi/templates/htmlpopup/lubis_terra.mako b/chsdi/templates/htmlpopup/lubis_terra.mako index 453f1b66c3..da1b8da7a7 100644 --- a/chsdi/templates/htmlpopup/lubis_terra.mako +++ b/chsdi/templates/htmlpopup/lubis_terra.mako @@ -103,9 +103,8 @@ else: %> % if isStac: # STAC Tooltips -${_(tt_lubis_ebkey)} ${c['attributes']['image_number'] or '-'} +${_(tt_lubis_ebkey)} ${c['featureId'] or '-'} ${_('ch.swisstopo.lubis-terrestrische_aufnahmen.tt_lubis_aufnahmedatum')}${datum or '-'} -${_('tt_lubis_bildpfad')} ${c['attributes']['filename'] or '-'} ${_('ch.swisstopo.lubis-terrestrische_aufnahmen.operate_name')} ${c['attributes']['ort'] or '-'} ${_('ch.swisstopo.lubis-terrestrische_aufnahmen.station')} ${c['attributes']['station'] or '-'} ${_('tt_lubis_schraegaufnahmen_x')} ${c['attributes']['x'] or '-'} diff --git a/chsdi/templates/htmlpopup/notfalltreffpunkte.mako b/chsdi/templates/htmlpopup/notfalltreffpunkte.mako new file mode 100644 index 0000000000..a2512a9531 --- /dev/null +++ b/chsdi/templates/htmlpopup/notfalltreffpunkte.mako @@ -0,0 +1,24 @@ +<%inherit file="base.mako"/> + +<%def name="table_body(c, lang)"> + <% c['stable_id'] = True %> + ${_('ch.babs.notfalltreffpunkte.ntp_id')} ${c['featureId']} + ${_('ch.babs.notfalltreffpunkte.gebbezeichnung')} ${c['attributes']['gebbezeichnung']} + ${_('ch.babs.notfalltreffpunkte.strasse')} ${c['attributes']['strasse']} + ${_('ch.babs.notfalltreffpunkte.haus_nummer')} ${c['attributes']['haus_nummer']} + ${_('ch.babs.notfalltreffpunkte.plz_ort')}${c['attributes']['plz']} ${c['attributes']['ort']} + ${_('ch.babs.notfalltreffpunkte.gemeinde')}${c['attributes']['gemeinde']} + ${_('ch.babs.notfalltreffpunkte.kanton')}${c['attributes']['kanton']} + ${_('ch.babs.notfalltreffpunkte.koord')}${c['attributes']['xkoord']}, ${c['attributes']['ykoord']} + % if c['attributes']['linkkanton'] is not None: + ${_('ch.babs.notfalltreffpunkte.linkkanton')}${_('link')} + % else: + ${_('ch.babs.notfalltreffpunkte.linkkanton')}- + % endif + % if c['attributes']['linkbabs'] is not None: + ${_('ch.babs.notfalltreffpunkte.linkbabs')}${_('link')} + % else: + ${_('ch.babs.notfalltreffpunkte.linkbabs')}- + % endif + ${_('ch.babs.notfalltreffpunkte.bemerkungen')}${c['attributes']['bemerkungen'] or "-"} +