Merge pull request #4307 from geoadmin/develop-2023-12-20

New Release 2023-12-20-rc1

chsdi/models/vector/bafu.py

@@ -1859,6 +1859,7 @@ class Trockenwiesenundweiden(Base, Vector):
     shape_area = Column('shape_area', Numeric)
     objnummer = Column('objnummer', Integer)
     teilobjnummer = Column('teilobjnummer', Unicode)
+    singularitaet = Column('singularitaet', Unicode)
     bewertung = Column('bewertungs', Integer)
     the_geom = Column(Geometry2D)
 
@@ -1877,6 +1878,7 @@ class TrockenwiesenundweidenAnhang2(Base, Vector):
     refobjblat = Column('refobjblat', Unicode)
     shape_area = Column('shape_area', Numeric)
     teilobjnummer = Column('teilobjnummer', Unicode)
+    singularit = Column('singularit', Unicode)
     bewertung = Column('bewertungs', Integer)
     the_geom = Column(Geometry2D)
 

chsdi/models/vector/dritte.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from sqlalchemy import Column, Unicode, Integer, Float
+from sqlalchemy import Column, Unicode, Integer
 from sqlalchemy.types import Numeric
 
 from chsdi.models import register, bases
@@ -24,27 +24,6 @@ class Notfallschutz(Base, Vector):
 register('ch.ensi.zonenplan-notfallschutz-kernanlagen', Notfallschutz)
 
 
-class PronaturaWaldreservate(Base, Vector):
-    __tablename__ = 'waldreservate'
-    __table_args__ = ({'schema': 'pronatura', 'autoload': False})
-    __template__ = 'templates/htmlpopup/pronatura.mako'
-    __bodId__ = 'ch.pronatura.waldreservate'
-    __label__ = 'name'
-    id = Column('bgdi_id', Integer, primary_key=True)
-    objnummer = Column('objnummer', Integer)
-    name = Column('name', Unicode)
-    gisflaeche = Column('obj_gisflaeche', Float)
-    gesflaeche = Column('obj_gesflaeche', Float)
-    gisteilobjekt = Column('obj_gisteilobjekt', Float)
-    mcpfe_class_de = Column('mcpfe_class_de', Unicode)
-    mcpfe_class_fr = Column('mcpfe_class_fr', Unicode)
-    mcpfe_class_it = Column('mcpfe_class_it', Unicode)
-    mcpfe_class_en = Column('mcpfe_class_en', Unicode)
-    the_geom = Column(Geometry2D)
-
-register(PronaturaWaldreservate.__bodId__, PronaturaWaldreservate)
-
-
 class PronaturaNaturschutzgebiete(Base, Vector):
     __tablename__ = 'naturschutzgebiete'
     __table_args__ = ({'schema': 'pronatura', 'autoload': False})

chsdi/models/vector/stopo.py

@@ -440,17 +440,26 @@ class SwissboundariesBezirk(Base, Vector):
 
 
 class SwissboundariesGemeinde(Base, Vector):
-    __tablename__ = 'swissboundaries_gemeinden'
+    __tablename__ = 'swissboundaries_gemeinden_hist_chsdi'
     __table_args__ = ({'schema': 'tlm', 'autoload': False})
     __template__ = 'templates/htmlpopup/swissboundaries_gemeinde.mako'
     __bodId__ = 'ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill'
+    __timeInstant__ = 'jahr'
     __label__ = 'gemname'
-    id = Column('id', Integer, primary_key=True)
-    gemname = Column('gemname', Unicode)
-    gemflaeche = Column('gemflaeche', Float)
+    id = Column('object_id', Unicode, primary_key=True)
+    gde_hist_id = Column('gde_hist_id', Integer)
+    gde_nr = Column('gde_nr', Integer)
+    gemname = Column('gde_name', Unicode)
+    jahr = Column('jahr', Integer)
+    gemflaeche = Column('flaeche_ha', Float)
     perimeter = Column('perimeter', Float)
     kanton = Column('kanton', Unicode)
     objektart = Column('objektart', Integer)
+    is_current_jahr = Column('is_current_jahr', Boolean)
+    objektart_lookup = Column('objektart_lookup', Unicode)
+    link_de = Column('link_de', Unicode)
+    link_fr = Column('link_fr', Unicode)
+    link_it = Column('link_it', Unicode)
     the_geom = Column(Geometry2D)
 
 register('ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill', SwissboundariesGemeinde)
@@ -1406,6 +1415,52 @@ class GeologieGeophysikTotalintensitaet(Base, Vector):
 register('ch.swisstopo.geologie-geophysik-totalintensitaet', GeologieGeophysikTotalintensitaet)
 
 
+class GeologieRohstoffe:
+    __table_args__ = ({'schema': 'geol', 'autoload': False})
+    id = Column('bgdi_id', Integer, primary_key=True)
+    type = Column('type', Unicode)
+    obname = Column('obname', Unicode)
+    cpkind = Column('cpkind', Unicode)
+    edkinds = Column('edkinds', Unicode)
+    purl = Column('purl', Unicode)
+    swissgeol_link = Column('swissgeol_link', Unicode)
+    stkind_de = Column('stkind_de', Unicode)
+    stkind_fr = Column('stkind_fr', Unicode)
+    stkind_it = Column('stkind_it', Unicode)
+    stkind_en = Column('stkind_en', Unicode)
+    ltkinds_de = Column('ltkinds_de', Unicode)
+    ltkinds_fr = Column('ltkinds_fr', Unicode)
+    ltkinds_it = Column('ltkinds_it', Unicode)
+    ltkinds_en = Column('ltkinds_en', Unicode)
+    infos_url_de = Column('infos_url_de', Unicode)
+    infos_url_fr = Column('infos_url_fr', Unicode)
+    infos_url_it = Column('infos_url_it', Unicode)
+    infos_url_en = Column('infos_url_en', Unicode)
+    the_geom = Column(Geometry2D)
+
+
+class GeologieRohstoffeZementAbbauVerarbeitung(Base, GeologieRohstoffe, Vector):
+    __tablename__ = 'rohstoffe_zementabbauverarbeitung'
+    __template__ = 'templates/htmlpopup/rohstoffe_zement_abbau_verarbeitung.mako'
+    __bodId__ = 'ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung'
+    __label__ = 'obname'
+    info_url_de = Column('info_url_de', Unicode)
+    info_url_fr = Column('info_url_fr', Unicode)
+    info_url_it = Column('info_url_it', Unicode)
+    info_url_en = Column('info_url_en', Unicode)
+
+register('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung', GeologieRohstoffeZementAbbauVerarbeitung)
+
+
+class GeologieRohstoffeZiegelAbbau(Base, GeologieRohstoffe, Vector):
+    __tablename__ = 'rohstoffe_ziegel_abbau'
+    __bodId__ = 'ch.swisstopo.geologie-rohstoffe-ziegel_abbau'
+    __template__ = 'templates/htmlpopup/rohstoffe_ziegel_abbau.mako'
+    __label__ = 'obname'
+
+register(GeologieRohstoffeZiegelAbbau.__bodId__, GeologieRohstoffeZiegelAbbau)
+
+
 class GeologieRohstoffeIndustrieminerale(Base, Vector):
     __tablename__ = 'rohstoffe_industriemin'
     __table_args__ = ({'schema': 'geol', 'autoload': False})
@@ -1545,47 +1600,6 @@ class GeologieRohstoffeGipsAbbauVerarbeitung(Base, Vector):
 register('ch.swisstopo.geologie-rohstoffe-gips_abbau_verarbeitung', GeologieRohstoffeGipsAbbauVerarbeitung)
 
 
-class GeologieRohstoffeZementAbbauVerarbeitung(Base, Vector):
-    __tablename__ = 'rohstoffe_zementabbauverarbeitung'
-    __table_args__ = ({'schema': 'geol', 'autoload': False})
-    __template__ = 'templates/htmlpopup/rohstoffe_zement_abbau_verarbeitung.mako'
-    __bodId__ = 'ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung'
-    __label__ = 'obname'
-    id = Column('obid', Integer, primary_key=True)
-    obname = Column('obname', Unicode)
-    tckinds = Column('tckinds', Unicode)
-    ltkinds = Column('ltkinds', Unicode)
-    emkinds = Column('emkinds', Unicode)
-    pckind = Column('pckind', Unicode)
-    cpkind = Column('cpkind', Unicode)
-    stkind = Column('stkind', Unicode)
-    tlyearsformatted = Column('tlyearsformatted', Unicode)
-    clkind = Column('clkind', Unicode)
-    purl = Column('purl', Unicode)
-    the_geom = Column(Geometry2D)
-
-register('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung', GeologieRohstoffeZementAbbauVerarbeitung)
-
-
-class GeologieRohstoffeZiegelAbbau(Base, Vector):
-    __tablename__ = 'rohstoffe_ziegel_abbau'
-    __table_args__ = ({'schema': 'geol', 'autoload': False})
-    __bodId__ = 'ch.swisstopo.geologie-rohstoffe-ziegel_abbau'
-    __template__ = 'templates/htmlpopup/rohstoffe_ziegel_abbau.mako'
-    __label__ = 'obname'
-    id = Column('bgdi_id', Integer, primary_key=True)
-    obname = Column('obname', Unicode)
-    tckinds = Column('tckinds', Unicode)
-    ltkinds = Column('ltkinds', Unicode)
-    stkind = Column('stkind', Unicode)
-    tlyearsformatted = Column('tlyearsformatted', Unicode)
-    purl = Column('purl', Unicode)
-    clkind = Column('clkind', Unicode)
-    the_geom = Column(Geometry2D)
-
-register(GeologieRohstoffeZiegelAbbau.__bodId__, GeologieRohstoffeZiegelAbbau)
-
-
 class GeologieRohstoffeZiegelVerarbeitung(Base, Vector):
     __tablename__ = 'rohstoffe_ziegel_verarbeitung'
     __table_args__ = ({'schema': 'geol', 'autoload': False})
@@ -2981,6 +2995,8 @@ class FixpunkteLfp1(Base, Vector):
     l_zuv_lv95 = Column('l_zuv_lv95', Unicode)
     h_zuv_lv95 = Column('h_zuv_lv95', Unicode)
     bgdi_created = Column('bgdi_created', Unicode)
+    kennzeichnung = Column('kennzeichnung', Unicode)
+    begehbar = Column('begehbar', Unicode)
     the_geom = Column(Geometry2D)
 
 register('ch.swisstopo.fixpunkte-lfp1', FixpunkteLfp1)
@@ -3008,6 +3024,8 @@ class FixpunkteHfp1(Base, Vector):
     zust_haupt = Column('zust_haupt', Unicode)
     zustaendig = Column('zustaendig', Unicode)
     bgdi_created = Column('bgdi_created', Unicode)
+    kennzeichnung = Column('kennzeichnung', Unicode)
+    begehbar = Column('begehbar', Unicode)
     the_geom = Column(Geometry2D)
 
 register('ch.swisstopo.fixpunkte-hfp1', FixpunkteHfp1)

chsdi/models/vector/uvek.py

@@ -2701,6 +2701,90 @@ class SisPlanningRasterK(Base, Vector):
 register('ch.bav.sachplan-infrastruktur-schiene_kraft', SisPlanningRasterK)
 
 
+class SugBaseClass:
+    __table_args__ = ({'schema': 'bav', 'autoload': False})
+    __label__ = 'facname_de'
+    id = Column('xtf_id', Unicode, primary_key=True)
+    facname_de = Column('facname_de', Unicode)
+    facname_fr = Column('facname_fr', Unicode)
+    facname_it = Column('facname_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)
+    static_url_de = Column('static_url_de', Unicode)
+    static_url_it = Column('static_url_it', Unicode)
+    static_url_fr = Column('static_url_fr', Unicode)
+    the_geom = Column(Geometry2D)
+
+
+class SugPlanignAnhoerung(Base, SugBaseClass, Vector):
+    __tablename__ = 'sug_pl_anhorung'
+    __template__ = 'templates/htmlpopup/sug_planning.mako'
+    __bodId__ = 'ch.bav.sachplan-unterirdischer-guetertransport_anhoerung'
+    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)
+    validuntil = Column('validuntil', Unicode)
+
+
+register('ch.bav.sachplan-unterirdischer-guetertransport_anhoerung', SugPlanignAnhoerung)
+
+
+class SugFacilityAnhoerung(Base, SugBaseClass, Vector):
+    __tablename__ = 'sug_fac_anhorung'
+    __template__ = 'templates/htmlpopup/sug_facilities.mako'
+    __bodId__ = 'ch.bav.sachplan-unterirdischer-guetertransport_anhoerung'
+    facstatus_text_de = Column('facstatus_text_de', Unicode)
+    facstatus_text_fr = Column('facstatus_text_fr', Unicode)
+    facstatus_text_it = Column('facstatus_text_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)
+
+register('ch.bav.sachplan-unterirdischer-guetertransport_anhoerung', SugFacilityAnhoerung)
+
+
+class SugPlanignKraft(Base, SugBaseClass, Vector):
+    __tablename__ = 'sug_pl_kraft'
+    __template__ = 'templates/htmlpopup/sug_planning.mako'
+    __bodId__ = 'ch.bav.sachplan-unterirdischer-guetertransport_kraft'
+    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)
+    validuntil = Column('validuntil', Unicode)
+
+
+register('ch.bav.sachplan-unterirdischer-guetertransport_kraft', SugPlanignKraft)
+
+
+class SugFacilityKraft(Base, SugBaseClass, Vector):
+    __tablename__ = 'sug_fac_kraft'
+    __template__ = 'templates/htmlpopup/sug_facilities.mako'
+    __bodId__ = 'ch.bav.sachplan-unterirdischer-guetertransport_kraft'
+    facstatus_text_de = Column('facstatus_text_de', Unicode)
+    facstatus_text_fr = Column('facstatus_text_fr', Unicode)
+    facstatus_text_it = Column('facstatus_text_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)
+
+register('ch.bav.sachplan-unterirdischer-guetertransport_kraft', SugFacilityKraft)
+
+
 class KbsZivilflugpl(Base, Vector):
     __tablename__ = 'kataster_belasteter_standorte_zivflpl'
     __table_args__ = ({'schema': 'bazl', 'autoload': False})
@@ -3708,7 +3792,7 @@ class FlugplaetzeHeliports(Base, Vector):
     __table_args__ = ({'schema': 'bazl', 'autoload': False})
     __template__ = 'templates/htmlpopup/flugplaetze_heliports.mako'
     __bodId__ = 'ch.bazl.flugplaetze-heliports'
-    id = Column('bgdi_id', Integer, primary_key=True)
+    id = Column('ident', Unicode, primary_key=True)
     icao = Column('icao', Unicode)
     name = Column('name', Unicode)
     location = Column('location', Unicode)
@@ -3726,7 +3810,7 @@ class Gebirgslandeplaetze(Base, Vector):
     __table_args__ = ({'schema': 'bazl', 'autoload': False})
     __template__ = 'templates/htmlpopup/gebirgslandeplaetze.mako'
     __bodId__ = 'ch.bazl.gebirgslandeplaetze'
-    id = Column('bgdi_id', Integer, primary_key=True)
+    id = Column('ident', Unicode, primary_key=True)
     icao = Column('icao', Unicode)
     name = Column('name', Unicode)
     canton = Column('canton', Unicode)
@@ -3951,3 +4035,30 @@ class ElektrischeAnlagenUeber36StationPointNoPoly (Base, ElektrischeAnlagenUeber
 
 
 register(ElektrischeAnlagenUeber36StationPointNoPoly.__bodId__, ElektrischeAnlagenUeber36StationPointNoPoly)
+
+
+class BetriebeStoerfallverordnungEisenbahnanlagen (Base, Vector):
+    __table_args__ = ({'schema': 'bav', 'autoload': False})
+    __tablename__ = 'stoerfallverordnung_eisenbahnanlagen_betriebe'
+    __template__ = 'templates/htmlpopup/bav_betriebe_stoerfallverordnung_eisenbahnanlagen.mako'
+    __bodId__ = 'ch.bav.betriebe-stoerfallverordnung_eisenbahnanlagen'
+    __label__ = 'name'
+    id = Column('bgdi_id', Integer, primary_key=True)
+    name = Column('name', Unicode)
+    the_geom = Column(Geometry2D)
+
+register('ch.bav.betriebe-stoerfallverordnung_eisenbahnanlagen', BetriebeStoerfallverordnungEisenbahnanlagen)
+
+
+class LageStoerfallverordnungEisenbahnanlagen (Base, Vector):
+    __table_args__ = ({'schema': 'bav', 'autoload': False})
+    __tablename__ = 'stoerfallverordnung_eisenbahnanlagen_lage'
+    __template__ = 'templates/htmlpopup/bav_lage_stoerfallverordnung_eisenbahnanlagen.mako'
+    __bodId__ = 'ch.bav.lage-stoerfallverordnung_eisenbahnanlagen'
+    __label__ = 'name'
+    id = Column('bgdi_id', Integer, primary_key=True)
+    name = Column('name', Unicode)
+    geom_type = Column('geom_type', Unicode)
+    the_geom = Column(Geometry2D)
+
+register('ch.bav.lage-stoerfallverordnung_eisenbahnanlagen', LageStoerfallverordnungEisenbahnanlagen)