Skip to content

Commit

Permalink
Merge pull request #4528 from geoadmin/develop-2025-02-05
Browse files Browse the repository at this point in the history 
New Release 2025-02-05-rc1
  • Loading branch information
@ltclm
ltclm authored Feb 4, 2025
2 parents 757813f + 321d56e commit 98d0bce
Show file tree
Hide file tree
Showing 21 changed files with 64 additions and 181 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Branch | Status |
|---|---|
| master | ![Build Status](https://codebuild.eu-central-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiUytMYkh3RStzRFBjQ0JVaDRubUFRU2UvUEEyeWVaZTNtaDNncWNKbmt3RFhTaTV1UmM0WGUza204dGszRnpFTFhWK1VNY1Vtd0hSb3l4N0g5azZYcHJZPSIsIml2UGFyYW1ldGVyU3BlYyI6IktVWkNjdUZRUWl5SVg3OWMiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master) |
| master | ![Build Status](https://codebuild.eu-central-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiNVluN1lOc05FUUZVa093RXJ6aERCVnpCZTIvM09mZlhMWkR0ekF6WkVDTDBVSWxBOGg0TE43b2ZwWSs1MldBOExqaUl4RlBpZWtXWlhxOURValRlUXdjPSIsIml2UGFyYW1ldGVyU3BlYyI6IjMxQ0dRZlNXVTVIeTA2TE4iLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master) |

## Table of contents

Expand Down
157 changes: 0 additions & 157 deletions chsdi/models/vector/uvek.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2157,49 +2157,11 @@ class SilPlanningA(Base, Vector):
document_web = Column('document_web', Unicode)
document_title = Column('document_title', Unicode)
bgdi_created = Column('bgdi_created', Unicode)
__minscale__ = 20005
__maxscale__ = 500005
the_geom = Column(Geometry2D)


class SilPlanningRasterA(Base, Vector):
__tablename__ = 'sachplan_inf_luft_plmeasures_r_anhorung'
__table_args__ = ({'schema': 'bazl', 'autoload': False})
__template__ = 'templates/htmlpopup/sil_planning.mako'
__bodId__ = 'ch.bazl.sachplan-infrastruktur-luftfahrt_anhorung'
# Translatable labels in fr, it
__label__ = 'facname_de'
id = Column('stabil_id', Unicode, primary_key=True)
facname_de = Column('facname_de', Unicode)
facname_fr = Column('facname_fr', Unicode)
facname_it = Column('facname_it', Unicode)
plname_de = Column('plname_de', Unicode)
plname_fr = Column('plname_fr', Unicode)
plname_it = Column('plname_it', Unicode)
measuretype_text_de = Column('measuretype_text_de', Unicode)
measuretype_text_fr = Column('measuretype_text_fr', Unicode)
measuretype_text_it = Column('measuretype_text_it', Unicode)
coordinationlevel_text_de = Column('coordinationlevel_text_de', Unicode)
coordinationlevel_text_fr = Column('coordinationlevel_text_fr', Unicode)
coordinationlevel_text_it = Column('coordinationlevel_text_it', Unicode)
planningstatus_text_de = Column('planningstatus_text_de', Unicode)
planningstatus_text_fr = Column('planningstatus_text_fr', Unicode)
planningstatus_text_it = Column('planningstatus_text_it', Unicode)
validfrom = Column('validfrom', Unicode)
validuntil = Column('validuntil', Unicode)
description_text_de = Column('description_text_de', Unicode)
description_text_fr = Column('description_text_fr', Unicode)
description_text_it = Column('description_text_it', Unicode)
document_web = Column('document_web', Unicode)
document_title = Column('document_title', Unicode)
bgdi_created = Column('bgdi_created', Unicode)
__maxscale__ = 20005
__minscale__ = 1
the_geom = Column(Geometry2D)

register('ch.bazl.sachplan-infrastruktur-luftfahrt_anhorung', SilFacilitiesA)
register('ch.bazl.sachplan-infrastruktur-luftfahrt_anhorung', SilPlanningA)
register('ch.bazl.sachplan-infrastruktur-luftfahrt_anhorung', SilPlanningRasterA)


class SilFacilitiesK(Base, Vector):
Expand Down Expand Up @@ -2263,50 +2225,11 @@ class SilPlanningK(Base, Vector):
document_web = Column('document_web', Unicode)
document_title = Column('document_title', Unicode)
bgdi_created = Column('bgdi_created', Unicode)
__minscale__ = 20005
__maxscale__ = 500005
the_geom = Column(Geometry2D)


class SilPlanningRasterK(Base, Vector):
__tablename__ = 'sachplan_inf_luft_plmeasures_r_kraft'
__table_args__ = ({'schema': 'bazl', 'autoload': False})
__template__ = 'templates/htmlpopup/sil_planning.mako'
__bodId__ = 'ch.bazl.sachplan-infrastruktur-luftfahrt_kraft'
# Translatable labels in fr, it
__label__ = 'facname_de'
id = Column('stabil_id', Unicode, primary_key=True)
facname_de = Column('facname_de', Unicode)
facname_fr = Column('facname_fr', Unicode)
facname_it = Column('facname_it', Unicode)
plname_de = Column('plname_de', Unicode)
plname_fr = Column('plname_fr', Unicode)
plname_it = Column('plname_it', Unicode)
measuretype_text_de = Column('measuretype_text_de', Unicode)
measuretype_text_fr = Column('measuretype_text_fr', Unicode)
measuretype_text_it = Column('measuretype_text_it', Unicode)
coordinationlevel_text_de = Column('coordinationlevel_text_de', Unicode)
coordinationlevel_text_fr = Column('coordinationlevel_text_fr', Unicode)
coordinationlevel_text_it = Column('coordinationlevel_text_it', Unicode)
planningstatus_text_de = Column('planningstatus_text_de', Unicode)
planningstatus_text_fr = Column('planningstatus_text_fr', Unicode)
planningstatus_text_it = Column('planningstatus_text_it', Unicode)
validfrom = Column('validfrom', Unicode)
validuntil = Column('validuntil', Unicode)
description_text_de = Column('description_text_de', Unicode)
description_text_fr = Column('description_text_fr', Unicode)
description_text_it = Column('description_text_it', Unicode)
document_web = Column('document_web', Unicode)
document_title = Column('document_title', Unicode)
bgdi_created = Column('bgdi_created', Unicode)
__maxscale__ = 20005
__minscale__ = 1
the_geom = Column(Geometry2D)


register('ch.bazl.sachplan-infrastruktur-luftfahrt_kraft', SilFacilitiesK)
register('ch.bazl.sachplan-infrastruktur-luftfahrt_kraft', SilPlanningK)
register('ch.bazl.sachplan-infrastruktur-luftfahrt_kraft', SilPlanningRasterK)


class NgaAnbieter(Base, Vector):
Expand Down Expand Up @@ -3039,8 +2962,6 @@ class SifPlanningA(Base, Vector):
doc_web = Column('doc_web', Unicode)
doc_title = Column('doc_title', Unicode)
bgdi_created = Column('bgdi_created', Unicode)
__minscale__ = 20005
__maxscale__ = 500005
the_geom = Column(Geometry2D)

register('ch.bav.sachplan-infrastruktur-schifffahrt_anhoerung', SifPlanningA)
Expand Down Expand Up @@ -3077,89 +2998,11 @@ class SifPlanningK(Base, Vector):
doc_web = Column('doc_web', Unicode)
doc_title = Column('doc_title', Unicode)
bgdi_created = Column('bgdi_created', Unicode)
__minscale__ = 20005
__maxscale__ = 500005
the_geom = Column(Geometry2D)

register('ch.bav.sachplan-infrastruktur-schifffahrt_kraft', SifPlanningK)


class SifPlanningRasterA(Base, Vector):
__tablename__ = 'sif_pl_r_anhorung'
__table_args__ = ({'schema': 'bav', 'autoload': False})
__template__ = 'templates/htmlpopup/sif_planning.mako'
__bodId__ = 'ch.bav.sachplan-infrastruktur-schifffahrt_anhoerung'
# Translatable labels in fr, it
__label__ = 'facname_de'
id = Column('stabil_id', Unicode, primary_key=True)
facname_de = Column('facname_de', Unicode)
facname_fr = Column('facname_fr', Unicode)
facname_it = Column('facname_it', Unicode)
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)
doc_title = Column('doc_title', Unicode)
bgdi_created = Column('bgdi_created', Unicode)
__maxscale__ = 20005
__minscale__ = 1
the_geom = Column(Geometry2D)

register('ch.bav.sachplan-infrastruktur-schifffahrt_anhoerung', SifPlanningRasterA)


class SifPlanningRasterK(Base, Vector):
__tablename__ = 'sif_pl_r_kraft'
__table_args__ = ({'schema': 'bav', 'autoload': False})
__template__ = 'templates/htmlpopup/sif_planning.mako'
__bodId__ = 'ch.bav.sachplan-infrastruktur-schifffahrt_kraft'
# Translatable labels in fr, it
__label__ = 'facname_de'
id = Column('stabil_id', Unicode, primary_key=True)
facname_de = Column('facname_de', Unicode)
facname_fr = Column('facname_fr', Unicode)
facname_it = Column('facname_it', Unicode)
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)
doc_title = Column('doc_title', Unicode)
bgdi_created = Column('bgdi_created', Unicode)
__maxscale__ = 20005
__minscale__ = 1
the_geom = Column(Geometry2D)

register('ch.bav.sachplan-infrastruktur-schifffahrt_kraft', SifPlanningRasterK)


class SifAusgangslage(Base, Vector):
__tablename__ = 'sif_ausgangslage'
__table_args__ = ({'schema': 'bav', 'autoload': False})
Expand Down
22 changes: 0 additions & 22 deletions chsdi/models/vector/vbs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,39 +341,17 @@ class SimPlanning:
class SimPlanningK(Base, SimPlanning, Vector):
__tablename__ = 'sim_pl_kraft'
__bodId__ = 'ch.vbs.sachplan-infrastruktur-militaer_kraft'
__minscale__ = 20005
__maxscale__ = 500005

register('ch.vbs.sachplan-infrastruktur-militaer_kraft', SimPlanningK)


class SimPlanningA(Base, SimPlanning, Vector):
__tablename__ = 'sim_pl_anhoerung'
__bodId__ = 'ch.vbs.sachplan-infrastruktur-militaer_anhoerung'
__minscale__ = 20005
__maxscale__ = 500005

register('ch.vbs.sachplan-infrastruktur-militaer_anhoerung', SimPlanningA)


class SimPlanningRasterA(Base, SimPlanning, Vector):
__tablename__ = 'sim_pl_r_anhoerung'
__bodId__ = 'ch.vbs.sachplan-infrastruktur-militaer_anhoerung'
__maxscale__ = 20005
__minscale__ = 1

register('ch.vbs.sachplan-infrastruktur-militaer_anhoerung', SimPlanningRasterA)


class SimPlanningRasterK(Base, SimPlanning, Vector):
__tablename__ = 'sim_pl_r_kraft'
__bodId__ = 'ch.vbs.sachplan-infrastruktur-militaer_kraft'
__maxscale__ = 20005
__minscale__ = 1

register('ch.vbs.sachplan-infrastruktur-militaer_kraft', SimPlanningRasterK)


class KatasterBelasteterStandorteMilitaer(Base, Vector):
__tablename__ = 'kataster_belasteter_standorte_militaer'
__table_args__ = ({'schema': 'militaer', 'autoload': False})
Expand Down
Loading

0 comments on commit 98d0bce

Please sign in to comment.