Merge pull request #4280 from geoadmin/develop-2023-11-01

New Release 2023-11-01-rc1
geoadmin · Oct 31, 2023 · 152c0e9 · 152c0e9
2 parents 1ce1d20 + 6d637b3
commit 152c0e9
Show file tree

Hide file tree

Showing 58 changed files with 1,783 additions and 44 deletions.
diff --git a/chsdi/models/vector/bafu.py b/chsdi/models/vector/bafu.py
@@ -2431,3 +2431,21 @@ class LandesforstinventarKantone(Base, Vector):
     the_geom = Column('the_geom', Geometry2D)
 
 register(LandesforstinventarKantone.__bodId__, LandesforstinventarKantone)
+
+
+class FaunaWildtierpassagen(Base, Vector):
+    __tablename__ = 'wildtierpassagen'
+    __table_args__ = ({'schema': 'fauna', 'autoload': False})
+    __bodId__ = 'ch.bafu.fauna-wildtierpassagen'
+    __template__ = 'templates/htmlpopup/bafu_fauna_wildtierpassagen.mako'
+    __label__ = 'id'
+    id = Column('bgdi_id', Integer, primary_key=True)
+    name  = Column('name', Unicode)
+    verkehrsinfrastrukturtyp  = Column('verkehrsinfrastrukturtyp', Unicode)
+    realisierungsjahr  = Column('realisierungsjahr', Unicode)
+    sanierungastra_de  = Column('sanierungastra_de', Unicode)
+    sanierungastra_fr  = Column('sanierungastra_fr', Unicode)
+    sanierungastra_it  = Column('sanierungastra_it', Unicode)
+    the_geom = Column('the_geom', Geometry2D)
+
+register(FaunaWildtierpassagen.__bodId__, FaunaWildtierpassagen)
diff --git a/chsdi/models/vector/evd.py b/chsdi/models/vector/evd.py
@@ -231,3 +231,69 @@ class Milchmarktregionen(Base, Vector):
     the_geom = Column(Geometry2D)
 
 register('ch.blw.milchmarktregionen', Milchmarktregionen)
+
+
+class SachplanCernAnhoerungFac:
+    __table_args__ = ({'schema': 'sbfi', 'autoload': False})
+    __bodId__ = 'ch.sbfi.sachplan-cern_anhoerung'
+    __label__ = 'objname_de'
+    id = Column('bgdi_id', Integer, primary_key=True)
+    objname_de = Column('objname_de', Unicode)
+    objname_fr = Column('objname_fr', Unicode)
+    objname_it = Column('objname_it', Unicode)
+    fackind_text_de = Column('fackind_text_de', Unicode)
+    fackind_text_fr = Column('fackind_text_fr', Unicode)
+    fackind_text_it = Column('fackind_text_it', Unicode)
+    facstatus_text_de = Column('facstatus_text_de', Unicode)
+    facstatus_text_fr = Column('facstatus_text_fr', Unicode)
+    facstatus_text_it = Column('facstatus_text_it', Unicode)
+    description_de = Column('description_de', Unicode)
+    description_fr = Column('description_fr', Unicode)
+    description_it = Column('description_it', Unicode)
+    validfrom = Column('validfrom', Unicode)
+    doc_web = Column('doc_web', Unicode)
+    the_geom = Column(Geometry2D)
+
+
+class SachplanCernAnhoerungFacPnt(Base, SachplanCernAnhoerungFac, Vector):
+    __tablename__ = 'sachplan_cern_anhoerung_fac_pnt'
+    __template__ = 'templates/htmlpopup/sbfi_sachplan_cern_anhoerung_pnt.mako'
+
+register('ch.sbfi.sachplan-cern_anhoerung', SachplanCernAnhoerungFacPnt)
+
+
+class SachplanCernAnhoerungFacLine(Base, SachplanCernAnhoerungFac, Vector):
+    __tablename__ = 'sachplan_cern_anhoerung_fac_line'
+    __template__ = 'templates/htmlpopup/sbfi_sachplan_cern_anhoerung_line.mako'
+
+register('ch.sbfi.sachplan-cern_anhoerung', SachplanCernAnhoerungFacLine)
+
+
+class SachplanCernAnhoerungPlmPoly(Base, Vector):
+    __tablename__ = 'sachplan_cern_anhoerung_plm_poly'
+    __table_args__ = ({'schema': 'sbfi', 'autoload': False})
+    __bodId__ = 'ch.sbfi.sachplan-cern_anhoerung'
+    __template__ = 'templates/htmlpopup/sbfi_sachplan_cern_anhoerung_poly.mako'
+    __label__ = 'plname_de'
+    id = Column('bgdi_id', Integer, primary_key=True)
+    plname_de = Column('plname_de', Unicode)
+    plname_fr = Column('plname_fr', Unicode)
+    plname_it = Column('plname_it', Unicode)
+    meastype_text_de = Column('meastype_text_de', Unicode)
+    meastype_text_fr = Column('meastype_text_fr', Unicode)
+    meastype_text_it = Column('meastype_text_it', Unicode)
+    coordlevel_text_de = Column('coordlevel_text_de', Unicode)
+    coordlevel_text_fr = Column('coordlevel_text_fr', Unicode)
+    coordlevel_text_it = Column('coordlevel_text_it', Unicode)
+    plstatus_text_de = Column('plstatus_text_de', Unicode)
+    plstatus_text_fr = Column('plstatus_text_fr', Unicode)
+    plstatus_text_it = Column('plstatus_text_it', Unicode)
+    validfrom = Column('validfrom', Unicode)
+    validuntil = Column('validuntil', Unicode)
+    description_de = Column('description_de', Unicode)
+    description_fr = Column('description_fr', Unicode)
+    description_it = Column('description_it', Unicode)
+    doc_web = Column('doc_web', Unicode)
+    the_geom = Column(Geometry2D)
+
+register('ch.sbfi.sachplan-cern_anhoerung', SachplanCernAnhoerungPlmPoly)
diff --git a/chsdi/models/vector/stopo.py b/chsdi/models/vector/stopo.py
@@ -3087,3 +3087,49 @@ class SwisstneBasePoly(Base, SwisstneBase, Vector):
 register(SwisstneBase.__bodId__, SwisstneBasePoint)
 register(SwisstneBase.__bodId__, SwisstneBaseLine)
 register(SwisstneBase.__bodId__, SwisstneBasePoly)
+
+
+class Reflexionsseismik:
+    __table_args__ = ({'schema': 'geol', 'autoload': False})
+    __bodId__ = 'ch.swisstopo.geologie-reflexionsseismik'
+    __extended_info__ = True
+    id = Column('bgdi_id', Unicode, primary_key=True)
+    alias = Column('alias', Unicode)
+    survey = Column('survey', Unicode)
+    access_de = Column('access_de', Unicode)
+    access_fr = Column('access_fr', Unicode)
+    access_it = Column('access_it', Unicode)
+    access_en = Column('access_en', Unicode)
+    reference = Column('reference', Unicode)
+    srd = Column('srd', Unicode)
+    domain_de = Column('domain_de', Unicode)
+    domain_fr = Column('domain_fr', Unicode)
+    domain_it = Column('domain_it', Unicode)
+    domain_en = Column('domain_en', Unicode)
+    vintage = Column('vintage', Unicode)
+    owner = Column('owner', Unicode)
+    region = Column('region', Unicode)
+    link = Column('link', Unicode)
+    download = Column('download', Unicode)
+    swissgeol = Column('swissgeol', Unicode)
+    the_geom = Column(Geometry2D)
+
+
+class ReflexionsseismikLine(Base, Reflexionsseismik, Vector):
+    __tablename__ = 'geologie_reflexionsseismik_line'
+    __template__ = 'templates/htmlpopup/geologie_reflexionsseismik_line.mako'
+    __label__ = 'linename'
+    linename = Column('linename', Unicode)
+    dim_km = Column('dim_km', Float)
+
+register(Reflexionsseismik.__bodId__, ReflexionsseismikLine)
+
+
+class ReflexionsseismikPoly(Base, Reflexionsseismik, Vector):
+    __tablename__ = 'geologie_reflexionsseismik_poly'
+    __template__ = 'templates/htmlpopup/geologie_reflexionsseismik_poly.mako'
+    __label__ = 'cubename'
+    cubename = Column('cubename', Unicode)
+    dim_km2 = Column('dim_km2', Float)
+
+register(Reflexionsseismik.__bodId__, ReflexionsseismikPoly)
diff --git a/chsdi/models/vector/uvek.py b/chsdi/models/vector/uvek.py
@@ -3904,6 +3904,7 @@ class ElektrischeAnlagenUeber36Point (Base, Vector):
     __template__ = 'templates/htmlpopup/bfe_elektrische_anlagen_ueber_36_point.mako'
     __bodId__ = 'ch.bfe.elektrische-anlagen_ueber_36'
     __label__ = 'fid'
+    __maxscale__ = 50000
     id = Column('bgdi_id', Integer, primary_key=True)
     fid = Column('id', Unicode)
     eigentuemer = Column('eigentuemer', Unicode)

diff --git a/chsdi/models/vector/uvek_solarkataster.py b/chsdi/models/vector/uvek_solarkataster.py
@@ -46,6 +46,7 @@ class SolarClass:
     monats_ertrag = Column('monats_ertrag', postgresql.ARRAY(Numeric))
     gs_serie_start = Column('gs_serie_start', Date)
     klasse_text = Column('klasse_text', Unicode)
+    gwr_egid = Column('gwr_egid', Integer)
     the_geom = Column(Geometry2D)
 
 
@@ -89,7 +90,6 @@ class EignungFassaden(Base, SolarClass, Vector):
     __queryable_attributes__ = ['ff_nummer', 'gwr_egid', 'building_id']
     id = Column('ff_uuid', BigInteger, primary_key=True)
     ff_nummer = Column('ff_nummer', Integer)
-    gwr_egid = Column('gwr_egid', Integer)
 
 register(EignungFassaden.__bodId__, EignungFassaden)
 

diff --git a/chsdi/response_callbacks.py b/chsdi/response_callbacks.py
@@ -23,7 +23,7 @@ def add_default_cache_control(request, response):
 def add_cors_header(request, response):
     response.headers['Access-Control-Allow-Origin'] = "*"
     response.headers['Access-Control-Allow-Methods'] = "POST, GET, OPTIONS"
-    response.headers['Access-Control-Allow-Headers'] = "x-requested-with, Content-Type, origin, authorization, accept, client-security-token"
+    response.headers['Access-Control-Allow-Headers'] = "*"
 
 
 def add_cross_domain_policy(request, response):

diff --git a/chsdi/static/doc/source/releasenotes/index.rst b/chsdi/static/doc/source/releasenotes/index.rst
@@ -14,6 +14,70 @@ Release Notes
 
     <p id="rss-feed"><a class="reference external" href="rss2.xml"> <i class="fa fa-rss"> RSS Feeds </i></a></p>
 
+.. _releasenotes_20231101:
+
+Release 20231101 - Wednesday, November 1st 2023
+------------------------------------------------
+
+API & applications
+******************
+
+`API <//api3.geo.admin.ch>`__
+'''''''''''''''''''''''''''''
+- Bug fixes
+- Announcements:
+    - the layer *ch.bafu.hydroweb-warnkarte_regional* has been removed from chsdi services as previously announced
+    - the layers *ch.swisstopo.geologie-geotechnik-zementindustrie_1965*, *ch.swisstopo.geologie-geotechnik-zementindustrie_1995*, *ch.swisstopo.geologie-rohstoffe-ziegel_verarbeitung* and *ch.swisstopo.geologie-geotechnik-ziegeleien_1907* will be removed from chsdi services with the release of December 20st 2023
+    - the removal of the layers *ch.bakom.mobil-antennenstandorte-5g, ch.bakom.mobil-antennenstandorte-gsm, ch.bakom.mobil-antennenstandorte-umts, ch.bakom.mobil-antennenstandorte-lte* has been postponed to 2024. A detailed planning will be communicated later.
+- `Full changelog <https://github.com/geoadmin/mf-chsdi3/compare/2023-09-06-rc1...2023-11-01-rc1>`__
+
+Geodata
+*******
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| New    | `Reflection seismic <//map.geo.admin.ch/?layers=ch.swisstopo.geologie-reflexionsseismik>`__ (ch.swisstopo.geologie-reflexionsseismik)                                                                             |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| New    | `Wetness potential in the agricultural land, vector ( <//map.geo.admin.ch/?layers=ch.agroscope.feuchtflaechenpotential-kulturlandschaft>`__ (ch.agroscope.feuchtflaechenpotential-kulturlandschaft)               |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| New    | `Wildlife Passages <//map.geo.admin.ch/?layers=ch.bafu.fauna-wildtierpassagen>`__ (ch.bafu.fauna-wildtierpassagen)                                                                                                |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| New    | `Milchmarktregionen <//map.geo.admin.ch/?layers=ch.blw.milchmarktregionen>`__ (ch.blw.milchmarktregionen)                                                                                                         |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Geological Profiles GA25 <//map.geo.admin.ch/?layers=ch.swisstopo.geologie-geologischer_atlas_profile>`__ (ch.swisstopo.geologie-geologischer_atlas_profile)                                                     |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Safety zone plan <//map.geo.admin.ch/?layers=ch.bazl.sicherheitszonenplan>`__ (ch.bazl.sicherheitszonenplan)                                                                                                     |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Wells > 500m <//map.geo.admin.ch/?layers=ch.swisstopo.geologie-bohrungen_tiefer_500>`__ (ch.swisstopo.geologie-bohrungen_tiefer_500)                                                                             |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Protected Areas VECTOR200 <//map.geo.admin.ch/?layers=ch.swisstopo.vec200-adminboundaries-protectedarea>`__ (ch.swisstopo.vec200-adminboundaries-protectedarea)                                                  |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Building generalized VECTOR200 <//map.geo.admin.ch/?layers=ch.swisstopo.vec200-building>`__ (ch.swisstopo.vec200-building)                                                                                       |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Hydrology VECTOR200 <//map.geo.admin.ch/?layers=ch.swisstopo.vec200-hydrography>`__ (ch.swisstopo.vec200-hydrography)                                                                                            |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Land cover VECTOR200 <//map.geo.admin.ch/?layers=ch.swisstopo.vec200-landcover>`__ (ch.swisstopo.vec200-landcover)                                                                                               |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Single objects  VECTOR200 <//map.geo.admin.ch/?layers=ch.swisstopo.vec200-miscellaneous>`__ (ch.swisstopo.vec200-miscellaneous)                                                                                  |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Elevations VECTOR200 <//map.geo.admin.ch/?layers=ch.swisstopo.vec200-miscellaneous-geodpoint>`__ (ch.swisstopo.vec200-miscellaneous-geodpoint)                                                                   |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Names VECTOR200 <//map.geo.admin.ch/?layers=ch.swisstopo.vec200-names-namedlocation>`__ (ch.swisstopo.vec200-names-namedlocation)                                                                                |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Public transportation VECTOR200 <//map.geo.admin.ch/?layers=ch.swisstopo.vec200-transportation-oeffentliche-verkehr>`__ (ch.swisstopo.vec200-transportation-oeffentliche-verkehr)                                |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Road system VECTOR200 <//map.geo.admin.ch/?layers=ch.swisstopo.vec200-transportation-strassennetz>`__ (ch.swisstopo.vec200-transportation-strassennetz)                                                          |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Viticulture on slopes <//map.geo.admin.ch/?layers=ch.blw.steil_terrassenlagen_rebbau>`__ (ch.blw.steil_terrassenlagen_rebbau)                                                                                    |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Hillsides and slopes <//map.geo.admin.ch/?layers=ch.blw.hang_steillagen>`__ (ch.blw.hang_steillagen)                                                                                                             |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Low distortion area <//map.geo.admin.ch/?layers=ch.swisstopo-vd.spannungsarme-gebiete>`__ (ch.swisstopo-vd.spannungsarme-gebiete)                                                                                |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Consultation <//map.geo.admin.ch/?layers=ch.bfe.sachplan-uebertragungsleitungen_anhoerung>`__ (ch.bfe.sachplan-uebertragungsleitungen_anhoerung)                                                                 |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Update | `Housing Inventory <//map.geo.admin.ch/?layers=ch.are.wohnungsinventar-zweitwohnungsanteil>`__ (ch.are.wohnungsinventar-zweitwohnungsanteil)                                                                      |
++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+
+
 .. _releasenotes_20230906:
 
 Release 20230906 - Wednesday, September 6th 2023
@@ -88,7 +152,7 @@ Geodata
 | Update | `Forest reserves <//map.geo.admin.ch/?layers=ch.bafu.waldreservate>`__ (ch.bafu.waldreservate)                                                                                                  |
 +--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
-
+- `Full changelog <https://github.com/geoadmin/mf-chsdi3/compare/2023-06-28-rc1...2023-09-06-rc1>`__
 
 .. _releasenotes_20230628:
 
@@ -156,7 +220,7 @@ Geodata
 | Update | `Hunting Ban Reserves <//map.geo.admin.ch/?layers=ch.bafu.bundesinventare-jagdbanngebiete>`__ (ch.bafu.bundesinventare-jagdbanngebiete)                                                         |
 +--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
-
+- `Full changelog <https://github.com/geoadmin/mf-chsdi3/compare/2023-05-10-rc1...2023-06-28-rc1>`__
 
 .. _releasenotes_20230510: