diff --git a/chsdi/models/vector/bafu.py b/chsdi/models/vector/bafu.py index 346b2ae1e3..6aa6048cd9 100644 --- a/chsdi/models/vector/bafu.py +++ b/chsdi/models/vector/bafu.py @@ -42,6 +42,7 @@ class AlpweidenHerdenschutzhunde(Base, Vector): code_refverhalten = Column('code_refverhalten', Integer) code_hundepraesenz = Column('code_hundepraesenz', Integer) code_hinweis = Column('code_hinweis', Integer) + refmeldungbeweidungszone = Column('refmeldungbeweidungszone', Unicode) the_geom = Column(Geometry2D) register(AlpweidenHerdenschutzhunde.__bodId__, AlpweidenHerdenschutzhunde) diff --git a/chsdi/models/vector/edi.py b/chsdi/models/vector/edi.py index 1ba1b9447e..5203db6e1c 100644 --- a/chsdi/models/vector/edi.py +++ b/chsdi/models/vector/edi.py @@ -108,7 +108,7 @@ class Gebaeuderegister(Base, Vector): class Arealstatistik(Base, Vector): - __tablename__ = 'arealstatistik_std' + __tablename__ = 'view_arealstatistik' __table_args__ = ({'schema': 'bfs', 'autoload': False}) __template__ = 'templates/htmlpopup/arealstatistik_std.mako' __bodId__ = 'ch.bfs.arealstatistik' @@ -116,10 +116,12 @@ class Arealstatistik(Base, Vector): __maxscale__ = 10000 # specially big layer __label__ = 'id' - id = Column('bgdi_id', Integer, primary_key=True) + __timeInstant__ = 'year' + id = Column('stable_id', Integer, primary_key=True) survey = Column('survey', Integer) + year = Column('year', Integer) fj = Column('fj', Integer) - as_72 = Column('as_72', Integer) + as_72 = Column('as09r_72', Integer) desc_as_72_de = Column('desc_as_72_de', Integer) desc_as_72_fr = Column('desc_as_72_fr', Integer) desc_as_72_it = Column('desc_as_72_it', Integer) @@ -131,7 +133,7 @@ class Arealstatistik(Base, Vector): class ArealstatistikBodenbedeckung(Base, Vector): - __tablename__ = 'arealstatistik_nolc' + __tablename__ = 'view_bodenbedeckung' __table_args__ = ({'schema': 'bfs', 'autoload': False}) __template__ = 'templates/htmlpopup/arealstatistik_nolc.mako' __bodId__ = 'ch.bfs.arealstatistik-bodenbedeckung' @@ -139,15 +141,17 @@ class ArealstatistikBodenbedeckung(Base, Vector): __maxscale__ = 10000 # specially big layer __label__ = 'id' - id = Column('bgdi_id', Integer, primary_key=True) + __timeInstant__ = 'year' + id = Column('stable_id', Integer, primary_key=True) survey = Column('survey', Integer) + year = Column('year', Integer) fj = Column('fj', Integer) - lc_27 = Column('lc_27', Integer) - desc_lc_27_de = Column('desc_lc_27_de', Integer) - desc_lc_27_fr = Column('desc_lc_27_fr', Integer) - desc_lc_27_it = Column('desc_lc_27_it', Integer) - desc_lc_27_rm = Column('desc_lc_27_rm', Integer) - desc_lc_27_en = Column('desc_lc_27_en', Integer) + lc09r_27 = Column('lc09r_27', Integer) + desc_lc09r_27_de = Column('desc_lc09r_27_de', Integer) + desc_lc09r_27_fr = Column('desc_lc09r_27_fr', Integer) + desc_lc09r_27_it = Column('desc_lc09r_27_it', Integer) + desc_lc09r_27_rm = Column('desc_lc09r_27_rm', Integer) + desc_lc09r_27_en = Column('desc_lc09r_27_en', Integer) the_geom = Column(Geometry2D) register('ch.bfs.arealstatistik-bodenbedeckung', ArealstatistikBodenbedeckung) diff --git a/chsdi/models/vector/stopo.py b/chsdi/models/vector/stopo.py index ac34a6f4f3..2611708caf 100644 --- a/chsdi/models/vector/stopo.py +++ b/chsdi/models/vector/stopo.py @@ -1568,12 +1568,20 @@ class GeologieTektonischeKarteLine(Base, Vector): __table_args__ = ({'schema': 'geol', 'autoload': False}) __template__ = 'templates/htmlpopup/tektonische_karte_line.mako' __bodId__ = 'ch.swisstopo.geologie-tektonische_karte' - # Translatable labels in fr - __label__ = 'type_de' + __label__ = 'kind_de' id = Column('fid', Integer, primary_key=True) - line_id = Column('line_id', Integer) - type_de = Column('type_de', Unicode) - type_fr = Column('type_fr', Unicode) + kind_de = Column('kind_de', Unicode) + kind_fr = Column('kind_fr', Unicode) + kind_it = Column('kind_it', Unicode) + kind_en = Column('kind_en', Unicode) + name_de = Column('name_de', Unicode) + name_fr = Column('name_fr', Unicode) + name_it = Column('name_it', Unicode) + name_en = Column('name_en', Unicode) + status_de = Column('status_de', Unicode) + status_fr = Column('status_fr', Unicode) + status_it = Column('status_it', Unicode) + status_en = Column('status_en', Unicode) the_geom = Column(Geometry2D) @@ -1582,16 +1590,56 @@ class GeologieTektonischeKartePoly(Base, Vector): __table_args__ = ({'schema': 'geol', 'autoload': False}) __template__ = 'templates/htmlpopup/tektonische_karte_poly.mako' __bodId__ = 'ch.swisstopo.geologie-tektonische_karte' - # Translatable labels in fr - __label__ = 'type_de' + __label__ = 'litho_de' id = Column('fid', Integer, primary_key=True) - t2_id = Column('t2_id', Integer) - type_de = Column('type_de', Unicode) - type_fr = Column('type_fr', Unicode) + litho_de = Column('litho_de', Unicode) + litho_fr = Column('litho_fr', Unicode) + litho_it = Column('litho_it', Unicode) + litho_en = Column('litho_en', Unicode) + the_geom = Column(Geometry2D) + + +class GeologieTektonischeKarteUnit(Base, Vector): + __tablename__ = 'tektonische_karte_units' + __table_args__ = ({'schema': 'geol', 'autoload': False}) + __template__ = 'templates/htmlpopup/tektonische_karte_unit.mako' + __bodId__ = 'ch.swisstopo.geologie-tektonische_karte' + __label__ = 'litho_de' + id = Column('fid', Integer, primary_key=True) + tecto_1_de = Column('tecto_1_de', Unicode) + tecto_1_fr = Column('tecto_1_fr', Unicode) + tecto_1_it = Column('tecto_1_it', Unicode) + tecto_1_en = Column('tecto_1_en', Unicode) + tecto_2_de = Column('tecto_2_de', Unicode) + tecto_2_fr = Column('tecto_2_fr', Unicode) + tecto_2_it = Column('tecto_2_it', Unicode) + tecto_2_en = Column('tecto_2_en', Unicode) + tecto_3_de = Column('tecto_3_de', Unicode) + tecto_3_fr = Column('tecto_3_fr', Unicode) + tecto_3_it = Column('tecto_3_it', Unicode) + tecto_3_en = Column('tecto_3_en', Unicode) + tecto_4_de = Column('tecto_4_de', Unicode) + tecto_4_fr = Column('tecto_4_fr', Unicode) + tecto_4_it = Column('tecto_4_it', Unicode) + tecto_4_en = Column('tecto_4_en', Unicode) + litho_de = Column('litho_de', Unicode) + litho_fr = Column('litho_fr', Unicode) + litho_it = Column('litho_it', Unicode) + litho_en = Column('litho_en', Unicode) + origin_de = Column('origin_de', Unicode) + origin_fr = Column('origin_fr', Unicode) + origin_it = Column('origin_it', Unicode) + origin_en = Column('origin_en', Unicode) + notice = Column('notice', Unicode) + legende_de = Column('legende_de', Unicode) + legende_fr = Column('legende_fr', Unicode) + legende_it = Column('legende_it', Unicode) + legende_en = Column('legende_en', Unicode) the_geom = Column(Geometry2D) register('ch.swisstopo.geologie-tektonische_karte', GeologieTektonischeKarteLine) register('ch.swisstopo.geologie-tektonische_karte', GeologieTektonischeKartePoly) +register('ch.swisstopo.geologie-tektonische_karte', GeologieTektonischeKarteUnit) class GeologieEiszeitLgm(Base, Vector): @@ -2680,28 +2728,6 @@ class HiksSiegfriedTa50Metadata(Base, Vector): register('ch.swisstopo.hiks-siegfried-ta50.metadata', HiksSiegfriedTa50Metadata) -class Treasurehunt(Base, Vector): - __tablename__ = 'treasurehunt' - __table_args__ = ({'schema': 'public', 'autoload': False}) - __template__ = 'templates/htmlpopup/treasurehunt.mako' - __bodId__ = 'ch.swisstopo.treasurehunt' - id = Column('bgdi_id', Integer, primary_key=True) - title_de = Column('title_de', Unicode) - title_fr = Column('title_fr', Unicode) - title_it = Column('title_it', Unicode) - info_de = Column('info_de', Unicode) - info_fr = Column('info_fr', Unicode) - info_it = Column('info_it', Unicode) - link_de = Column('link_de', Unicode) - link_fr = Column('link_fr', Unicode) - link_it = Column('link_it', Unicode) - type_coord = Column('type_coord', Unicode) - the_geom = Column(Geometry2D) - __maxscale__ = 1500 - -register('ch.swisstopo.treasurehunt', Treasurehunt) - - class SwissimageHistMetadata(Base, Vector): __tablename__ = 'swissimage_hist_chsdi' __table_args__ = ({'schema': 'datenstand', 'autoload': False}) @@ -3097,3 +3123,114 @@ class ReflexionsseismikPoly(Base, Reflexionsseismik, Vector): dim_km2 = Column('dim_km2', Float) register(Reflexionsseismik.__bodId__, ReflexionsseismikPoly) + + +class Hartsteinabbau: + __table_args__ = ({'schema': 'geol', 'autoload': False}) + __bodId__ = 'ch.swisstopo.geologie-hartsteinabbau' + id = Column('bgdi_hartstein_id', Integer, primary_key=True) + the_geom = Column(Geometry2D) + + +class HartsteinabbauMining(Base, Hartsteinabbau, Vector): + __tablename__ = 'hartstein_mining' + __template__ = 'templates/htmlpopup/hartsteinabbau_mining.mako' + __label__ = 'obname' + obname = Column('obname', Unicode) + cpkind = Column('cpkind', 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) + emkinds_de = Column('emkinds_de', Unicode) + emkinds_fr = Column('emkinds_fr', Unicode) + emkinds_it = Column('emkinds_it', Unicode) + emkinds_en = Column('emkinds_en', Unicode) + infos_url_de = Column('infos_url_de', Unicode) + infos_url_fr = Column('infos_url_fr', Unicode) + purl = Column('purl', Unicode) + swissgeol_link = Column('swissgeol_link', Unicode) + + +class HartsteinabbauProduction(Base, Hartsteinabbau, Vector): + __tablename__ = 'hartstein_production' + __template__ = 'templates/htmlpopup/hartsteinabbau_production.mako' + __label__ = 'obname' + obname = Column('obname', Unicode) + cpkind = Column('cpkind', 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) + infos_url_de = Column('infos_url_de', Unicode) + infos_url_fr = Column('infos_url_fr', Unicode) + purl = Column('purl', Unicode) + swissgeol_link = Column('swissgeol_link', Unicode) + + +register(Hartsteinabbau.__bodId__, HartsteinabbauMining) +register(Hartsteinabbau.__bodId__, HartsteinabbauProduction) + + +class HartsteinVorkommen(Base, Vector): + __table_args__ = ({'schema': 'geol', 'autoload': False}) + __tablename__ = 'hartstein_vorkommen' + __bodId__ = 'ch.swisstopo.geologie-hartsteinvorkommen' + __template__ = 'templates/htmlpopup/hartsteinvorkommen.mako' + __extended_info__ = True + id = Column('bgdi_id', Integer, primary_key=True) + please_note_de = Column('please_note_de', Unicode) + please_note_fr = Column('please_note_fr', Unicode) + please_note_it = Column('please_note_it', Unicode) + please_note_en = Column('please_note_en', Unicode) + unit_de = Column('unit_de', Unicode) + unit_fr = Column('unit_fr', Unicode) + unit_it = Column('unit_it', Unicode) + unit_en = Column('unit_en', Unicode) + thickness_concat = Column('thickness_concat', Unicode) + usable_thickness_concat_de = Column('usable_thickness_concat_de', Unicode) + usable_thickness_concat_fr = Column('usable_thickness_concat_fr', Unicode) + usable_thickness_concat_it = Column('usable_thickness_concat_it', Unicode) + usable_thickness_concat_en = Column('usable_thickness_concat_en', Unicode) + usability_ratio_concat = Column('usability_ratio_concat', Unicode) + legend_simple_tooltip_de = Column('legend_simple_tooltip_de', Unicode) + legend_simple_tooltip_fr = Column('legend_simple_tooltip_fr', Unicode) + legend_simple_tooltip_it = Column('legend_simple_tooltip_it', Unicode) + legend_simple_tooltip_en = Column('legend_simple_tooltip_en', Unicode) + usable_lithologies_de = Column('usable_lithologies_de', Unicode) + usable_lithologies_fr = Column('usable_lithologies_fr', Unicode) + usable_lithologies_it = Column('usable_lithologies_it', Unicode) + usable_lithologies_en = Column('usable_lithologies_en', Unicode) + not_usable_lithologies_de = Column('not_usable_lithologies_de', Unicode) + not_usable_lithologies_fr = Column('not_usable_lithologies_fr', Unicode) + not_usable_lithologies_it = Column('not_usable_lithologies_it', Unicode) + not_usable_lithologies_en = Column('not_usable_lithologies_en', Unicode) + elevation = Column('elevation', Integer) + legend_de = Column('legend_de', Unicode) + legend_fr = Column('legend_fr', Unicode) + legend_it = Column('legend_it', Unicode) + legend_en = Column('legend_en', Unicode) + data_density_thickness = Column('data_density_thickness', Integer) + data_density_usability = Column('data_density_usability', Integer) + level_of_confidence_de = Column('level_of_confidence_de', Unicode) + level_of_confidence_fr = Column('level_of_confidence_fr', Unicode) + level_of_confidence_it = Column('level_of_confidence_it', Unicode) + level_of_confidence_en = Column('level_of_confidence_en', Unicode) + thickness_boxplot_descr_de = Column('thickness_boxplot_descr_de', Unicode) + thickness_boxplot_descr_fr = Column('thickness_boxplot_descr_fr', Unicode) + thickness_boxplot_descr_it = Column('thickness_boxplot_descr_it', Unicode) + thickness_boxplot_descr_en = Column('thickness_boxplot_descr_en', Unicode) + thickness_boxplot_filename = Column('thickness_boxplot_filename', Unicode) + hst_catalog_link = Column('hst_catalog_link', Unicode) + tech_doc_link = Column('tech_doc_link', Unicode) + auto_thickness_paper_link = Column('auto_thickness_paper_link', Unicode) + mat_min_link_de = Column('mat_min_link_en_de', Unicode) + mat_min_link_fr = Column('mat_min_link_fr_it', Unicode) + swissgeol_link = Column('swissgeol_link', Unicode) + the_geom = Column(Geometry2D) + +register(HartsteinVorkommen.__bodId__, HartsteinVorkommen) diff --git a/chsdi/models/vector/uvek.py b/chsdi/models/vector/uvek.py index 015f7871a5..2a91531cdd 100644 --- a/chsdi/models/vector/uvek.py +++ b/chsdi/models/vector/uvek.py @@ -1128,215 +1128,230 @@ class BakomNotruf(Base, BakomNotrufBase, Vector): class BakomNotruf112Fest(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'fn_112_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_fn_112.mako' __bodId__ = 'ch.bakom.notruf-112_festnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - festnetz_112 = Column('festnetz_112', Unicode) - fn_gemeinde_112 = Column('fn_gemeinde_112', Unicode) - fn_addresse_112 = Column('fn_addresse_112', Unicode) + festnetz_112 = Column('phone_number', Unicode) + fn_gemeinde_112 = Column('name', Unicode) + fn_addresse_112 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-112_festnetz', BakomNotruf112Fest) class BakomNotruf117Fest(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'fn_117_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_fn_117.mako' __bodId__ = 'ch.bakom.notruf-117_festnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - festnetz_117 = Column('festnetz_117', Unicode) - fn_gemeinde_117 = Column('fn_gemeinde_117', Unicode) - fn_addresse_117 = Column('fn_addresse_117', Unicode) + festnetz_117 = Column('phone_number', Unicode) + fn_gemeinde_117 = Column('name', Unicode) + fn_addresse_117 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-117_festnetz', BakomNotruf117Fest) class BakomNotruf118Fest(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'fn_118_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_fn_118.mako' __bodId__ = 'ch.bakom.notruf-118_festnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - festnetz_118 = Column('festnetz_118', Unicode) - fn_gemeinde_118 = Column('fn_gemeinde_118', Unicode) - fn_addresse_118 = Column('fn_addresse_118', Unicode) + festnetz_118 = Column('phone_number', Unicode) + fn_gemeinde_118 = Column('name', Unicode) + fn_addresse_118 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-118_festnetz', BakomNotruf118Fest) class BakomNotruf143Fest(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'fn_143_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_fn_143.mako' __bodId__ = 'ch.bakom.notruf-143_festnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - festnetz_143 = Column('festnetz_143', Unicode) - fn_gemeinde_143 = Column('fn_gemeinde_143', Unicode) - fn_addresse_143 = Column('fn_addresse_143', Unicode) + festnetz_143 = Column('phone_number', Unicode) + fn_gemeinde_143 = Column('name', Unicode) + fn_addresse_143 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-143_festnetz', BakomNotruf143Fest) class BakomNotruf144Fest(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'fn_144_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_fn_144.mako' __bodId__ = 'ch.bakom.notruf-144_festnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - festnetz_144 = Column('festnetz_144', Unicode) - fn_gemeinde_144 = Column('fn_gemeinde_144', Unicode) - fn_addresse_144 = Column('fn_addresse_144', Unicode) + festnetz_144 = Column('phone_number', Unicode) + fn_gemeinde_144 = Column('name', Unicode) + fn_addresse_144 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-144_festnetz', BakomNotruf144Fest) class BakomNotruf145Fest(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'fn_145_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_fn_145.mako' __bodId__ = 'ch.bakom.notruf-145_festnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - festnetz_145 = Column('festnetz_145', Unicode) - fn_gemeinde_145 = Column('fn_gemeinde_145', Unicode) - fn_addresse_145 = Column('fn_addresse_145', Unicode) + festnetz_145 = Column('phone_number', Unicode) + fn_gemeinde_145 = Column('name', Unicode) + fn_addresse_145 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-145_festnetz', BakomNotruf145Fest) class BakomNotruf147Fest(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'fn_147_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_fn_147.mako' __bodId__ = 'ch.bakom.notruf-147_festnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - festnetz_147 = Column('festnetz_147', Unicode) - fn_gemeinde_147 = Column('fn_gemeinde_147', Unicode) - fn_addresse_147 = Column('fn_addresse_147', Unicode) + festnetz_147 = Column('phone_number', Unicode) + fn_gemeinde_147 = Column('name', Unicode) + fn_addresse_147 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-147_festnetz', BakomNotruf147Fest) class BakomNotruf112Mobil(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'mo_112_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_mo_112.mako' __bodId__ = 'ch.bakom.notruf-112_mobilnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - mobile_112 = Column('mobile_112', Unicode) - mo_gemeinde_112 = Column('mo_gemeinde_112', Unicode) - mo_addresse_112 = Column('mo_addresse_112', Unicode) + mobile_112 = Column('phone_number', Unicode) + mo_gemeinde_112 = Column('name', Unicode) + mo_addresse_112 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-112_mobilnetz', BakomNotruf112Mobil) class BakomNotruf117Mobil(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'mo_117_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_mo_117.mako' __bodId__ = 'ch.bakom.notruf-117_mobilnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - mobile_117 = Column('mobile_117', Unicode) - mo_gemeinde_117 = Column('mo_gemeinde_117', Unicode) - mo_addresse_117 = Column('mo_addresse_117', Unicode) + mobile_117 = Column('phone_number', Unicode) + mo_gemeinde_117 = Column('name', Unicode) + mo_addresse_117 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-117_mobilnetz', BakomNotruf117Mobil) class BakomNotruf118Mobil(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'mo_118_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_mo_118.mako' __bodId__ = 'ch.bakom.notruf-118_mobilnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - mobile_118 = Column('mobile_118', Unicode) - mo_gemeinde_118 = Column('mo_gemeinde_118', Unicode) - mo_addresse_118 = Column('mo_addresse_118', Unicode) + mobile_118 = Column('phone_number', Unicode) + mo_gemeinde_118 = Column('name', Unicode) + mo_addresse_118 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-118_mobilnetz', BakomNotruf118Mobil) class BakomNotruf143Mobil(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'mo_143_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_mo_143.mako' __bodId__ = 'ch.bakom.notruf-143_mobilnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - mobile_143 = Column('mobile_143', Unicode) - mo_gemeinde_143 = Column('mo_gemeinde_143', Unicode) - mo_addresse_143 = Column('mo_addresse_143', Unicode) + mobile_143 = Column('phone_number', Unicode) + mo_gemeinde_143 = Column('name', Unicode) + mo_addresse_143 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-143_mobilnetz', BakomNotruf143Mobil) class BakomNotruf144Mobil(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'mo_144_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_mo_144.mako' __bodId__ = 'ch.bakom.notruf-144_mobilnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - mobile_144 = Column('mobile_144', Unicode) - mo_gemeinde_144 = Column('mo_gemeinde_144', Unicode) - mo_addresse_144 = Column('mo_addresse_144', Unicode) + mobile_144 = Column('phone_number', Unicode) + mo_gemeinde_144 = Column('name', Unicode) + mo_addresse_144 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-144_mobilnetz', BakomNotruf144Mobil) class BakomNotruf145Mobil(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'mo_145_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_mo_145.mako' __bodId__ = 'ch.bakom.notruf-145_mobilnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - mobile_145 = Column('mobile_145', Unicode) - mo_gemeinde_145 = Column('mo_gemeinde_145', Unicode) - mo_addresse_145 = Column('mo_addresse_145', Unicode) + mobile_145 = Column('phone_number', Unicode) + mo_gemeinde_145 = Column('name', Unicode) + mo_addresse_145 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-145_mobilnetz', BakomNotruf145Mobil) class BakomNotruf147Mobil(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) + __tablename__ = 'mo_147_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) __template__ = 'templates/htmlpopup/notruf_mo_147.mako' __bodId__ = 'ch.bakom.notruf-147_mobilnetz' __label__ = 'id' id = Column('bfs_nummer', Integer, primary_key=True) - mobile_147 = Column('mobile_147', Unicode) - mo_gemeinde_147 = Column('mo_gemeinde_147', Unicode) - mo_addresse_147 = Column('mo_addresse_147', Unicode) + mobile_147 = Column('phone_number', Unicode) + mo_gemeinde_147 = Column('name', Unicode) + mo_addresse_147 = Column('address', Unicode) the_geom = Column(Geometry2D) register('ch.bakom.notruf-147_mobilnetz', BakomNotruf147Mobil) +class BakomNotruf112Sat(Base, Vector): + __tablename__ = 'sa_112_tooltip' + __table_args__ = ({'schema': 'bakom', 'autoload': False}) + __template__ = 'templates/htmlpopup/notruf_sa_112.mako' + __bodId__ = 'ch.bakom.notruf-112_satellit' + __label__ = 'id' + id = Column('bfs_nummer', Integer, primary_key=True) + satellit_112 = Column('phone_number', Unicode) + sa_gemeinde_112 = Column('name', Unicode) + sa_addresse_112 = Column('address', Unicode) + the_geom = Column(Geometry2D) + +register('ch.bakom.notruf-112_satellit', BakomNotruf112Sat) + + class BakomNotruf112Zentral(Base, Vector): __tablename__ = 'notruf' __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) @@ -1438,21 +1453,6 @@ class BakomNotruf147Zentral(Base, BakomNotrufBase, Vector): register('ch.bakom.notruf-147_zentral', BakomNotruf147Zentral) -class BakomNotruf112Sat(Base, Vector): - __tablename__ = 'notruf' - __table_args__ = ({'schema': 'bakom', 'autoload': False, 'extend_existing': True}) - __template__ = 'templates/htmlpopup/notruf_sa_112.mako' - __bodId__ = 'ch.bakom.notruf-112_satellit' - __label__ = 'id' - id = Column('bfs_nummer', Integer, primary_key=True) - satellit_112 = Column('satellit_112', Unicode) - sa_gemeinde_112 = Column('sa_gemeinde_112', Unicode) - sa_addresse_112 = Column('sa_addresse_112', Unicode) - the_geom = Column(Geometry2D) - -register('ch.bakom.notruf-112_satellit', BakomNotruf112Sat) - - class Bakomfernsehsender(Base, Vector): __tablename__ = 'nisdb_bro' __table_args__ = ({'schema': 'bakom', 'autoload': False}) @@ -4343,3 +4343,23 @@ class LadebedarfsweltStrombedarf (Base, Vector): the_geom = Column(Geometry2D) register('ch.bfe.ladebedarfswelt-strombedarf', LadebedarfsweltStrombedarf) + + +class Landschaftsruhezonen (Base, Vector): + __table_args__ = ({'schema': 'bazl', 'autoload': False}) + __tablename__ = 'landschaftsruhezonen' + __template__ = 'templates/htmlpopup/bazl_landschaftsruhezonen.mako' + __bodId__ = 'ch.bazl.landschaftsruhezonen' + __label__ = 'name_de' + id = Column('bgdi_id', Integer, primary_key=True) + name_de = Column('name_de', Unicode) + name_fr = Column('name_fr', Unicode) + name_it = Column('name_it', Unicode) + name_en = Column('name_en', Unicode) + description_de = Column('description_de', Unicode) + description_fr = Column('description_fr', Unicode) + description_it = Column('description_it', Unicode) + description_en = Column('description_en', Unicode) + the_geom = Column(Geometry2D) + +register('ch.bazl.landschaftsruhezonen', Landschaftsruhezonen) diff --git a/chsdi/models/vector/vbs.py b/chsdi/models/vector/vbs.py index 8fe4ebddf8..7b177a10af 100644 --- a/chsdi/models/vector/vbs.py +++ b/chsdi/models/vector/vbs.py @@ -153,7 +153,6 @@ class Armeelogistikcenter(Base, Vector): name = Column('name', Unicode) abkuerzung = Column('abkuerzung', Unicode) mail = Column('email', Unicode) - url = Column('url', Unicode) the_geom = Column(Geometry2D) register('ch.vbs.armeelogistikcenter', Armeelogistikcenter) @@ -396,3 +395,28 @@ class ArmeeKriegsdenkmaeler(Base, Vector): the_geom = Column(Geometry2D) register('ch.vbs.armee-kriegsdenkmaeler', ArmeeKriegsdenkmaeler) + + +class Ladestationen(Base, Vector): + __tablename__ = 'elektrotankstellen' + __table_args__ = ({'schema': 'militaer', 'autoload': False}) + __template__ = 'templates/htmlpopup/vbs_ladestationen.mako' + __bodId__ = 'ch.vbs.ladestationen' + __label__ = 'standort' + id = Column('bgdi_id', Integer, primary_key=True) + standort = Column('standort', Unicode) + strasse = Column('strasse', Unicode) + plz = Column('plz', Integer) + ort = Column('ort', Unicode) + oeffnungszeiten = Column('oeffnungszeiten', Unicode) + anzahl_ladepunkte = Column('anzahl_ladepunkte', Unicode) + leistung = Column('leistung', Unicode) + typ_stecker = Column('typ_stecker', Unicode) + hinweis = Column('hinweis', Unicode) + kontakt = Column('kontakt', Unicode) + x_koordinate = Column('x_koordinate', Integer) + y_koordinate = Column('y_koordinate', Integer) + bemerkungen = Column('bemerkungen', Unicode) + the_geom = Column(Geometry2D) + +register('ch.vbs.ladestationen', Ladestationen) diff --git a/chsdi/static/doc/source/index.rst b/chsdi/static/doc/source/index.rst index fa758c5225..db60ec61b1 100644 --- a/chsdi/static/doc/source/index.rst +++ b/chsdi/static/doc/source/index.rst @@ -138,7 +138,7 @@ Use the GeoAdmin API Forum to ask questions: http://groups.google.com/group/geoa To receive technical updates, we recommend to actively use the forum or mailing list at http://groups.google.com/group/geoadmin-api and RSS Feed https://groups.google.com/group/geoadmin-api/feed/rss_v2_0_msgs.xml. - **Note on web scraping**: Automatic parsing of the geoservices via bots with `high query intensities `_ is to be refrained from. For obtaining the datasets outside the context of the web services (use in offline systems, databases, etc.), the `download service `_ or `file based download `_ has to be used. + **Note on web scraping**: Automatic parsing of the geoservices via bots with `high query intensities `_ is to be refrained from. For obtaining the datasets outside the context of the web services (use in offline systems, databases, etc.), the `download service `_ or `file based download `_ has to be used. API diff --git a/chsdi/static/doc/source/releasenotes/index.rst b/chsdi/static/doc/source/releasenotes/index.rst index 8593fa8ea8..13583ff8a9 100644 --- a/chsdi/static/doc/source/releasenotes/index.rst +++ b/chsdi/static/doc/source/releasenotes/index.rst @@ -14,6 +14,124 @@ Release Notes

RSS Feeds

+ +.. _releasenotes_20240703: + +Release 20240703 - Wednesday, July 3rd 2024 +------------------------------------------- + +API & applications +****************** + +`API `__ +''''''''''''''''''''''''''''' + +- Bug fixes +- Announcements: + - the layer *ch.swisstopo.geologie-geologischer_atlas_vector.metadata* will be removed from chsdi services with the release of August 28th 2024 +- `Full changelog `__ + +Geodata +******* + ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| New | `Hard rock aggregates: Production and mining sites of the hard rock industry `__ (ch.swisstopo.geologie-hartsteinabbau) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| New | `Hard rock aggregates: Thickness and quality of geological occurrences `__ (ch.swisstopo.geologie-hartsteinvorkommen) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| New | `Charging stations of the Federal Administration `__ (ch.vbs.ladestationen) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Traffic counting locations - principal `__ (ch.astra.strassenverkehrszaehlung-uebergeordnet) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Alps with livestock guardian dogs `__ (ch.bafu.alpweiden-herdenschutzhunde) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Flussgebiete (Einzugsgebiete) HADES `__ (ch.bafu.hydrologischer-atlas_flussgebiete) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Hydrological gauging stations `__ (ch.bafu.hydrologie-hydromessstationen) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Area outlets `__ (ch.bafu.wasser-gebietsauslaesse) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `2km2 sub catchment areas `__ (ch.bafu.wasser-teileinzugsgebiete_2) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `40km2 sub catchment areas `__ (ch.bafu.wasser-teileinzugsgebiete_40) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Type of flow regime `__ (ch.bafu.wasser-vorfluter) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Emergency calls by comune `__ (ch.bakom.notruf) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `112 Fixed network `__ (ch.bakom.notruf-112_festnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `117 Fixed network `__ (ch.bakom.notruf-117_festnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `118 Fixed network `__ (ch.bakom.notruf-118_festnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `143 Fixed network `__ (ch.bakom.notruf-143_festnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `144 Fixed network `__ (ch.bakom.notruf-144_festnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `145 Fixed network `__ (ch.bakom.notruf-145_festnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `147 Fixed network `__ (ch.bakom.notruf-147_festnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `112 Mobile network `__ (ch.bakom.notruf-112_mobilnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `117 Mobile network `__ (ch.bakom.notruf-117_mobilnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `118 Mobile network `__ (ch.bakom.notruf-118_mobilnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `143 Mobile network `__ (ch.bakom.notruf-143_mobilnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `144 Mobile network `__ (ch.bakom.notruf-144_mobilnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `145 Mobile network `__ (ch.bakom.notruf-145_mobilnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `147 Mobile network `__ (ch.bakom.notruf-147_mobilnetz) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `112 Satellite network `__ (ch.bakom.notruf-112_satellit) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `112 Satellite network `__ (ch.bakom.notruf-112_satellit) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Sanctuaries for silence and nature for aviation `__ (ch.bazl.landschaftsruhezonen) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| 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 | `Land use statistics standard `__ (ch.bfs.arealstatistik) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Land use statistics cover `__ (ch.bfs.arealstatistik-bodenbedeckung) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Accessibility of pharmacies `__ (ch.bfs.erreichbarkeit-apotheken) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Accessibility of restaurants `__ (ch.bfs.erreichbarkeit-restaurants) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `GeoCover - Vector Datasets `__ (ch.swisstopo.geologie-geocover) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Division GeoCover `__ (ch.swisstopo.geologie-geocover.metadata) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Geological Atlas GA25 `__ (ch.swisstopo.geologie-geologischer_atlas) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Division Geological Atlas GA25 `__ (ch.swisstopo.geologie-geologischer_atlas.metadata) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Geothermal potential studies `__ (ch.swisstopo.geologie-geothermische_potenzialstudien_regional) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Crushed-rock aggregates `__ (ch.swisstopo.geologie-rohstoffe-gebrochene_gesteine_abbau) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `The Tectonic Map of Switzerland (GK500-Tekto) `__ (ch.swisstopo.geologie-tektonische_karte) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Deep geothermal projects `__ (ch.swisstopo.geologie-tiefengeothermie_projekte) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Geographical Names swissNAMES3D `__ (ch.swisstopo.swissnames3d) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Army logistics centre logistics areas `__ (ch.vbs.logistikraeume-armeelogistikcenter) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Update | `Arsenals `__ (ch.vbs.retablierungsstellen) | ++--------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ + + + .. _releasenotes_20240515: Release 20240515 - Wednesday, May 15th 2024 diff --git a/chsdi/static/doc/source/services/sdiservices.rst b/chsdi/static/doc/source/services/sdiservices.rst index d7986360e0..679276a119 100644 --- a/chsdi/static/doc/source/services/sdiservices.rst +++ b/chsdi/static/doc/source/services/sdiservices.rst @@ -627,6 +627,12 @@ No css styling is provided per default so that you can use your own. +-----------------------------------+-------------------------------------------------------------------------------------------+ | **time (optional)** | Time (YYYY) to filter out time enabled layers, e.g. LUBIS. Defaults to "none". | +-----------------------------------+-------------------------------------------------------------------------------------------+ +| **mapExtent (optional)** | The extent of the map. (minx, miny, maxx, maxy). | ++-----------------------------------+-------------------------------------------------------------------------------------------+ +| **imageDisplay (optional)** | The screen image display parameters (width, height, and dpi) of the map. | +| | The combination of *mapExtent* and *imageDisplay* are used to compute a *resolution* or | +| | *scale*. Some layer have *scale* dependant htmlpopup responses | ++-----------------------------------+-------------------------------------------------------------------------------------------+ | **callback (optional)** | The name of the callback function. | +-----------------------------------+-------------------------------------------------------------------------------------------+ diff --git a/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_de.png b/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_de.png index f4a8f0396d..b3cbb4d09e 100644 Binary files a/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_de.png and b/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_de.png differ diff --git a/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_en.png b/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_en.png index f4a8f0396d..7ac207407d 100644 Binary files a/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_en.png and b/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_en.png differ diff --git a/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_fr.png b/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_fr.png index 58856ce344..0648ae1115 100644 Binary files a/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_fr.png and b/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_fr.png differ diff --git a/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_it.png b/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_it.png index 8a99e8c7a9..1b0c39d2e4 100644 Binary files a/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_it.png and b/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_it.png differ diff --git a/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_rm.png b/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_rm.png index f4a8f0396d..90816a87e4 100644 Binary files a/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_rm.png and b/chsdi/static/images/legends/ch.bazl.landschaftsruhezonen_rm.png differ diff --git a/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_de.png b/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_de.png old mode 100755 new mode 100644 index 78871424eb..1a93476905 Binary files a/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_de.png and b/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_de.png differ diff --git a/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_en.png b/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_en.png old mode 100755 new mode 100644 index 78871424eb..2246d4b0b4 Binary files a/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_en.png and b/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_en.png differ diff --git a/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_fr.png b/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_fr.png old mode 100755 new mode 100644 index 3f0b3302b0..9ce0492358 Binary files a/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_fr.png and b/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_fr.png differ diff --git a/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_it.png b/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_it.png old mode 100755 new mode 100644 index 3f0b3302b0..f7950f6020 Binary files a/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_it.png and b/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_it.png differ diff --git a/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_rm.png b/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_rm.png old mode 100755 new mode 100644 index 78871424eb..af0e62d1fd Binary files a/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_rm.png and b/chsdi/static/images/legends/ch.bfs.arealstatistik-bodenbedeckung_rm.png differ diff --git a/chsdi/static/images/legends/ch.bfs.arealstatistik_de.png b/chsdi/static/images/legends/ch.bfs.arealstatistik_de.png index 6d84a19c79..be15754566 100644 Binary files a/chsdi/static/images/legends/ch.bfs.arealstatistik_de.png and b/chsdi/static/images/legends/ch.bfs.arealstatistik_de.png differ diff --git a/chsdi/static/images/legends/ch.bfs.arealstatistik_en.png b/chsdi/static/images/legends/ch.bfs.arealstatistik_en.png index 298031c35d..3ea22008c5 100644 Binary files a/chsdi/static/images/legends/ch.bfs.arealstatistik_en.png and b/chsdi/static/images/legends/ch.bfs.arealstatistik_en.png differ diff --git a/chsdi/static/images/legends/ch.bfs.arealstatistik_fr.png b/chsdi/static/images/legends/ch.bfs.arealstatistik_fr.png index 87340c7539..f140841432 100644 Binary files a/chsdi/static/images/legends/ch.bfs.arealstatistik_fr.png and b/chsdi/static/images/legends/ch.bfs.arealstatistik_fr.png differ diff --git a/chsdi/static/images/legends/ch.bfs.arealstatistik_it.png b/chsdi/static/images/legends/ch.bfs.arealstatistik_it.png index d3cbaf49a2..3121683839 100644 Binary files a/chsdi/static/images/legends/ch.bfs.arealstatistik_it.png and b/chsdi/static/images/legends/ch.bfs.arealstatistik_it.png differ diff --git a/chsdi/static/images/legends/ch.bfs.arealstatistik_rm.png b/chsdi/static/images/legends/ch.bfs.arealstatistik_rm.png index a626f6e425..69a2ad731e 100644 Binary files a/chsdi/static/images/legends/ch.bfs.arealstatistik_rm.png and b/chsdi/static/images/legends/ch.bfs.arealstatistik_rm.png differ diff --git a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_de.png b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_de.png index f4d48fcd90..af63e81ed9 100644 Binary files a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_de.png and b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_de.png differ diff --git a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_en.png b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_en.png index ee2bf17451..af63e81ed9 100644 Binary files a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_en.png and b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_en.png differ diff --git a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_fr.png b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_fr.png index 50e7ffc676..af63e81ed9 100644 Binary files a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_fr.png and b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_fr.png differ diff --git a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_it.png b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_it.png index 50e7ffc676..af63e81ed9 100644 Binary files a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_it.png and b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_it.png differ diff --git a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_rm.png b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_rm.png index f4d48fcd90..af63e81ed9 100644 Binary files a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_rm.png and b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-apotheken_rm.png differ diff --git a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_de.png b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_de.png index f4d48fcd90..5bf98ed524 100644 Binary files a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_de.png and b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_de.png differ diff --git a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_en.png b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_en.png index ee2bf17451..5bf98ed524 100644 Binary files a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_en.png and b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_en.png differ diff --git a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_fr.png b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_fr.png index 50e7ffc676..5bf98ed524 100644 Binary files a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_fr.png and b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_fr.png differ diff --git a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_it.png b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_it.png index 50e7ffc676..5bf98ed524 100644 Binary files a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_it.png and b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_it.png differ diff --git a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_rm.png b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_rm.png index f4d48fcd90..5bf98ed524 100644 Binary files a/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_rm.png and b/chsdi/static/images/legends/ch.bfs.erreichbarkeit-restaurants_rm.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_de.png b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_de.png new file mode 100755 index 0000000000..d9e38bd729 Binary files /dev/null and b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_de.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_en.png b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_en.png new file mode 100755 index 0000000000..cb93b00896 Binary files /dev/null and b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_en.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_fr.png b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_fr.png new file mode 100755 index 0000000000..dddac9204e Binary files /dev/null and b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_fr.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_it.png b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_it.png new file mode 100755 index 0000000000..5442ac65b8 Binary files /dev/null and b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_it.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_rm.png b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_rm.png new file mode 100755 index 0000000000..d9e38bd729 Binary files /dev/null and b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinabbau_rm.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_de.png b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_de.png new file mode 100755 index 0000000000..977e382f6b Binary files /dev/null and b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_de.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_en.png b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_en.png new file mode 100755 index 0000000000..2ed2ebaf51 Binary files /dev/null and b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_en.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_fr.png b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_fr.png new file mode 100755 index 0000000000..085802eb5d Binary files /dev/null and b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_fr.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_it.png b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_it.png new file mode 100755 index 0000000000..deb7e67136 Binary files /dev/null and b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_it.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_rm.png b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_rm.png new file mode 100755 index 0000000000..977e382f6b Binary files /dev/null and b/chsdi/static/images/legends/ch.swisstopo.geologie-hartsteinvorkommen_rm.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_de.png b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_de.png index 5c1a285d14..a8fc18a1b5 100755 Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_de.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_de.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_de_big.pdf b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_de_big.pdf index 393b87b7b8..5a6f7cf206 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_de_big.pdf and b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_de_big.pdf differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_en.png b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_en.png index 5c1a285d14..01ad4a3b81 100755 Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_en.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_en.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_en_big.pdf b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_en_big.pdf index 393b87b7b8..2c236987f1 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_en_big.pdf and b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_en_big.pdf differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_fr.png b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_fr.png index 5c1a285d14..209d8208fe 100755 Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_fr.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_fr.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_fr_big.pdf b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_fr_big.pdf index 393b87b7b8..fea85903a3 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_fr_big.pdf and b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_fr_big.pdf differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_it.png b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_it.png index 5c1a285d14..845ac27cce 100755 Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_it.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_it.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_it_big.pdf b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_it_big.pdf index 393b87b7b8..01dae24259 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_it_big.pdf and b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_it_big.pdf differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_rm.png b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_rm.png index 5c1a285d14..3b6eee69ea 100755 Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_rm.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_rm.png differ diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_rm_big.pdf b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_rm_big.pdf index 393b87b7b8..5a6f7cf206 100644 Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_rm_big.pdf and b/chsdi/static/images/legends/ch.swisstopo.geologie-tektonische_karte_rm_big.pdf differ diff --git a/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_de.png b/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_de.png index 54927bf848..6a83ccbad4 100644 Binary files a/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_de.png and b/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_de.png differ diff --git a/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_en.png b/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_en.png index eb03326bbd..9568e29678 100644 Binary files a/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_en.png and b/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_en.png differ diff --git a/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_fr.png b/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_fr.png index 4946708dda..aa176e70d4 100644 Binary files a/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_fr.png and b/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_fr.png differ diff --git a/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_it.png b/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_it.png index 4c894bb2e4..d673cadbb5 100644 Binary files a/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_it.png and b/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_it.png differ diff --git a/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_rm.png b/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_rm.png index 54927bf848..6a83ccbad4 100644 Binary files a/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_rm.png and b/chsdi/static/images/legends/ch.vbs.armeelogistikcenter_rm.png differ diff --git a/chsdi/static/images/legends/ch.vbs.ladestationen_de.png b/chsdi/static/images/legends/ch.vbs.ladestationen_de.png new file mode 100644 index 0000000000..6b6fa6ecdb Binary files /dev/null and b/chsdi/static/images/legends/ch.vbs.ladestationen_de.png differ diff --git a/chsdi/static/images/legends/ch.vbs.ladestationen_en.png b/chsdi/static/images/legends/ch.vbs.ladestationen_en.png new file mode 100644 index 0000000000..eded3117c4 Binary files /dev/null and b/chsdi/static/images/legends/ch.vbs.ladestationen_en.png differ diff --git a/chsdi/static/images/legends/ch.vbs.ladestationen_fr.png b/chsdi/static/images/legends/ch.vbs.ladestationen_fr.png new file mode 100644 index 0000000000..b5846d0153 Binary files /dev/null and b/chsdi/static/images/legends/ch.vbs.ladestationen_fr.png differ diff --git a/chsdi/static/images/legends/ch.vbs.ladestationen_it.png b/chsdi/static/images/legends/ch.vbs.ladestationen_it.png new file mode 100644 index 0000000000..0aec2d2daf Binary files /dev/null and b/chsdi/static/images/legends/ch.vbs.ladestationen_it.png differ diff --git a/chsdi/static/images/legends/ch.vbs.ladestationen_rm.png b/chsdi/static/images/legends/ch.vbs.ladestationen_rm.png new file mode 100644 index 0000000000..6b6fa6ecdb Binary files /dev/null and b/chsdi/static/images/legends/ch.vbs.ladestationen_rm.png differ diff --git a/chsdi/static/images/legends/ch.vbs.retablierungsstellen_de.png b/chsdi/static/images/legends/ch.vbs.retablierungsstellen_de.png index daf460004a..3d24895a48 100644 Binary files a/chsdi/static/images/legends/ch.vbs.retablierungsstellen_de.png and b/chsdi/static/images/legends/ch.vbs.retablierungsstellen_de.png differ diff --git a/chsdi/static/images/legends/ch.vbs.retablierungsstellen_en.png b/chsdi/static/images/legends/ch.vbs.retablierungsstellen_en.png index 4b6ce9474a..3159175a7f 100644 Binary files a/chsdi/static/images/legends/ch.vbs.retablierungsstellen_en.png and b/chsdi/static/images/legends/ch.vbs.retablierungsstellen_en.png differ diff --git a/chsdi/static/images/legends/ch.vbs.retablierungsstellen_fr.png b/chsdi/static/images/legends/ch.vbs.retablierungsstellen_fr.png index 40ebd75b80..619f5f24bc 100644 Binary files a/chsdi/static/images/legends/ch.vbs.retablierungsstellen_fr.png and b/chsdi/static/images/legends/ch.vbs.retablierungsstellen_fr.png differ diff --git a/chsdi/static/images/legends/ch.vbs.retablierungsstellen_it.png b/chsdi/static/images/legends/ch.vbs.retablierungsstellen_it.png index efa01fa091..953fd60c41 100644 Binary files a/chsdi/static/images/legends/ch.vbs.retablierungsstellen_it.png and b/chsdi/static/images/legends/ch.vbs.retablierungsstellen_it.png differ diff --git a/chsdi/static/images/legends/ch.vbs.retablierungsstellen_rm.png b/chsdi/static/images/legends/ch.vbs.retablierungsstellen_rm.png index daf460004a..3d24895a48 100644 Binary files a/chsdi/static/images/legends/ch.vbs.retablierungsstellen_rm.png and b/chsdi/static/images/legends/ch.vbs.retablierungsstellen_rm.png differ diff --git a/chsdi/static/vectorStyles/ch.swisstopo.treasurehunt.json b/chsdi/static/vectorStyles/ch.swisstopo.treasurehunt.json index 982c31db08..c1a69a35b2 100644 --- a/chsdi/static/vectorStyles/ch.swisstopo.treasurehunt.json +++ b/chsdi/static/vectorStyles/ch.swisstopo.treasurehunt.json @@ -5,7 +5,8 @@ { "geomType": "point", "value": "", - "maxResolution": 1, + "minResolution": 0, + "maxResolution": 0.8, "vectorOptions": { "type": "icon", "src": "https://data.geo.admin.ch/ch.swisstopo.treasurehunt/2020_icon.png" diff --git a/chsdi/templates/htmlpopup/alpweiden_herdenschutzhunde.mako b/chsdi/templates/htmlpopup/alpweiden_herdenschutzhunde.mako index 9c1e04640f..b161696333 100644 --- a/chsdi/templates/htmlpopup/alpweiden_herdenschutzhunde.mako +++ b/chsdi/templates/htmlpopup/alpweiden_herdenschutzhunde.mako @@ -25,4 +25,12 @@ ${_('ch.bafu.alpweiden-herdenschutzhunde.kontname')}${c['attributes']['kontname'] or '-'.strip()} ${_('ch.bafu.alpweiden-herdenschutzhunde.konttel')}${c['attributes']['konttel'] or '-'.strip()} ${_('ch.bafu.alpweiden-herdenschutzhunde.kontemail')}${c['attributes']['kontemail'] or '-'.strip()} + + + ${_('ch.bafu.alpweiden-herdenschutzhunde.refmeldungbeweidungszone')} + + + Link + + diff --git a/chsdi/templates/htmlpopup/arealstatistik_nolc.mako b/chsdi/templates/htmlpopup/arealstatistik_nolc.mako index fb53c8f610..bbf601e861 100644 --- a/chsdi/templates/htmlpopup/arealstatistik_nolc.mako +++ b/chsdi/templates/htmlpopup/arealstatistik_nolc.mako @@ -4,14 +4,13 @@ <%def name="table_body(c,lang)"> <% - lang = lang if lang in ('fr','it','en') else 'de' - desc_text = 'desc_lc_27_%s' % lang + desc_text = 'desc_lc09r_27_%s' % lang %> ${_('ch.bfs.arealstatistik.survey')}${c['attributes']['survey'] or '-'} - ${_('ch.bfs.arealstatistik.lc_27')}${c['attributes'][desc_text] or '-'} + ${_('ch.bfs.arealstatistik-bodenbedeckung.desc_lc09r_27')}${c['attributes'][desc_text] or '-'} ${_('ch.bfs.arealstatistik.fj')}${c['attributes']['fj'] or '-'} diff --git a/chsdi/templates/htmlpopup/arealstatistik_std.mako b/chsdi/templates/htmlpopup/arealstatistik_std.mako index 0fe0182090..70a873bbf2 100644 --- a/chsdi/templates/htmlpopup/arealstatistik_std.mako +++ b/chsdi/templates/htmlpopup/arealstatistik_std.mako @@ -4,7 +4,6 @@ <%def name="table_body(c,lang)"> <% - lang = lang if lang in ('fr','it','en') else 'de' desc_text = 'desc_as_72_%s' % lang %> diff --git a/chsdi/templates/htmlpopup/armeelogistikcenter.mako b/chsdi/templates/htmlpopup/armeelogistikcenter.mako index 68b49b9a80..bedf1596cf 100644 --- a/chsdi/templates/htmlpopup/armeelogistikcenter.mako +++ b/chsdi/templates/htmlpopup/armeelogistikcenter.mako @@ -8,7 +8,5 @@ ${c['attributes']['abkuerzung'] or '-'} ${_('ch.vbs.armeelogistikcenter.mail')} ${_('ch.vbs.armeelogistikcenter.mail')} - ${_('ch.vbs.armeelogistikcenter.url')} - ${_('ch.vbs.armeelogistikcenter.url')} diff --git a/chsdi/templates/htmlpopup/bazl_landschaftsruhezonen.mako b/chsdi/templates/htmlpopup/bazl_landschaftsruhezonen.mako new file mode 100644 index 0000000000..4e528c6433 --- /dev/null +++ b/chsdi/templates/htmlpopup/bazl_landschaftsruhezonen.mako @@ -0,0 +1,17 @@ +<%inherit file="base.mako"/> + +<%def name="table_body(c, lang)"> + <% + lang = lang if lang in ('de', 'fr', 'it', 'en') else 'de' + name = 'name_%s' % lang + description = 'description_%s' % lang + %> + + ${_('ch.bazl.landschaftsruhezonen.name')} + ${c['attributes'][name] or '-'} + + + ${_('ch.bazl.landschaftsruhezonen.description')} + ${c['attributes'][description] or '-'} + + diff --git a/chsdi/templates/htmlpopup/ga25_line_aux.mako b/chsdi/templates/htmlpopup/ga25_line_aux.mako index c7221342ab..8c8d9c2d59 100644 --- a/chsdi/templates/htmlpopup/ga25_line_aux.mako +++ b/chsdi/templates/htmlpopup/ga25_line_aux.mako @@ -6,7 +6,7 @@ ${_('geocover_erl_num')} % if c['attributes']['erl_num']: - ${_('link')} + ${_('link')} % else: - % endif @@ -14,7 +14,7 @@ ${_('linkzurlegende')} % if c['attributes']['leg_num']: - ${_('link')} + ${_('link')} % else: - % endif diff --git a/chsdi/templates/htmlpopup/ga25_point_drill.mako b/chsdi/templates/htmlpopup/ga25_point_drill.mako index 7c39cf60d4..7613c974e9 100644 --- a/chsdi/templates/htmlpopup/ga25_point_drill.mako +++ b/chsdi/templates/htmlpopup/ga25_point_drill.mako @@ -11,7 +11,7 @@ ${_('geocover_erl_num')} % if c['attributes']['erl_num']: - ${_('link')} + ${_('link')} % else: - % endif @@ -19,7 +19,7 @@ ${_('linkzurlegende')} % if c['attributes']['leg_num']: - ${_('link')} + ${_('link')} % else: - % endif diff --git a/chsdi/templates/htmlpopup/ga25_point_hydro.mako b/chsdi/templates/htmlpopup/ga25_point_hydro.mako index 9e7c1211c7..29fbd73615 100644 --- a/chsdi/templates/htmlpopup/ga25_point_hydro.mako +++ b/chsdi/templates/htmlpopup/ga25_point_hydro.mako @@ -8,7 +8,7 @@ ${_('geocover_erl_num')} % if c['attributes']['erl_num']: - ${_('link')} + ${_('link')} % else: - % endif @@ -16,7 +16,7 @@ ${_('linkzurlegende')} % if c['attributes']['leg_num']: - ${_('link')} + ${_('link')} % else: - % endif diff --git a/chsdi/templates/htmlpopup/ga25_point_info.mako b/chsdi/templates/htmlpopup/ga25_point_info.mako index 457ddd657d..a20d69958c 100644 --- a/chsdi/templates/htmlpopup/ga25_point_info.mako +++ b/chsdi/templates/htmlpopup/ga25_point_info.mako @@ -5,7 +5,7 @@ ${_('geocover_erl_num')} % if c['attributes']['erl_num']: - ${_('link')} + ${_('link')} % else: - % endif @@ -13,7 +13,7 @@ ${_('linkzurlegende')} % if c['attributes']['leg_num']: - ${_('link')} + ${_('link')} % else: - % endif diff --git a/chsdi/templates/htmlpopup/ga25_point_struct.mako b/chsdi/templates/htmlpopup/ga25_point_struct.mako index 5b2db68e4a..06ce22298a 100644 --- a/chsdi/templates/htmlpopup/ga25_point_struct.mako +++ b/chsdi/templates/htmlpopup/ga25_point_struct.mako @@ -8,7 +8,7 @@ ${_('geocover_erl_num')} % if c['attributes']['erl_num']: - ${_('link')} + ${_('link')} % else: - % endif @@ -16,7 +16,7 @@ ${_('linkzurlegende')} % if c['attributes']['leg_num']: - ${_('link')} + ${_('link')} % else: - % endif diff --git a/chsdi/templates/htmlpopup/ga25_polygon.mako b/chsdi/templates/htmlpopup/ga25_polygon.mako index 4e8b651757..c023ae41eb 100644 --- a/chsdi/templates/htmlpopup/ga25_polygon.mako +++ b/chsdi/templates/htmlpopup/ga25_polygon.mako @@ -6,7 +6,7 @@ ${_('geocover_erl_num')} % if c['attributes']['erl_num']: - ${_('link')} + ${_('link')} % else: - % endif @@ -14,7 +14,7 @@ ${_('linkzurlegende')} % if c['attributes']['leg_num']: - ${_('link')} + ${_('link')} % else: - % endif diff --git a/chsdi/templates/htmlpopup/gebietsauslaesse.mako b/chsdi/templates/htmlpopup/gebietsauslaesse.mako index 63525a0328..ddb282776d 100644 --- a/chsdi/templates/htmlpopup/gebietsauslaesse.mako +++ b/chsdi/templates/htmlpopup/gebietsauslaesse.mako @@ -8,7 +8,10 @@ ${_('ch.bafu.wasser-gebietsauslaesse.ezgnr')}${c['attributes']['ezgnr'] or '-'} ${_('ch.bafu.wasser-gebietsauslaesse.gewaessername')}${c['attributes']['gewaessername'] or '-'} ${_('ch.bafu.wasser-gebietsauslaesse.gwlnr')}${c['attributes']['gwlnr'] or '-'} - ${_('ch.bafu.wasser-gebietsauslaesse.adresse')}${c['attributes']['adresse'] or '-'} + + ${_('ch.bafu.wasser-gebietsauslaesse.adresse')} + ${c['attributes']['adresse'] if c['attributes']['adresse'] is not None else '-'} + ${_('ch.bafu.wasser-gebietsauslaesse.de_nebenarm')}${c['attributes'][de_nebenarm] or '-'} diff --git a/chsdi/templates/htmlpopup/hartsteinabbau_mining.mako b/chsdi/templates/htmlpopup/hartsteinabbau_mining.mako new file mode 100644 index 0000000000..8c5a1cbbc9 --- /dev/null +++ b/chsdi/templates/htmlpopup/hartsteinabbau_mining.mako @@ -0,0 +1,65 @@ +<%inherit file="base.mako"/> + +<%def name="table_body(c, lang)"> + <% + lang_select = lang if lang in ('fr','it','en') else 'de' + stkind_text = 'stkind_%s' % lang_select + ltkinds_text = 'ltkinds_%s' % lang_select + emkinds_text = 'emkinds_%s' % lang_select + + lang_url_select ={ + "de": "de", + "en": "de", + "rm": "de", + "fr": "fr", + "it": "fr", + } + infos_url_text = 'infos_url_%s' % lang_url_select[lang] + + layerid = c['layerBodId'] + %> + + ${_(f'{layerid}.obname_mining')} + ${c['attributes']['obname'] or '-'} + + + ${_(f'{layerid}.cpkind_mining')} + ${c['attributes']['cpkind'] or '-'} + + + ${_(f'{layerid}.stkind_mining')} + ${c['attributes'][stkind_text] or '-'} + + + ${_(f'{layerid}.ltkinds')} + ${c['attributes'][ltkinds_text] or '-'} + + + ${_(f'{layerid}.emkinds')} + ${c['attributes'][emkinds_text] or '-'} + + + ${_(f'{layerid}.infos_url')} + % if c['attributes'].get(infos_url_text, '-').startswith('http'): + ${_('link')} + % else: + ${c['attributes'][infos_url_text] or '-'} + %endif + + + ${_(f'{layerid}.purl')} + % if c['attributes'].get('purl', '-').startswith('http'): + ${_('link')} + % else: + ${c['attributes']['purl'] or '-'} + %endif + + + ${_(f'{layerid}.swissgeol_link')} + % if c['attributes'].get('swissgeol_link', '-').startswith('http'): + ${_('link')} + % else: + ${c['attributes']['swissgeol_link'] or '-'} + %endif + + diff --git a/chsdi/templates/htmlpopup/hartsteinabbau_production.mako b/chsdi/templates/htmlpopup/hartsteinabbau_production.mako new file mode 100644 index 0000000000..414176f6b8 --- /dev/null +++ b/chsdi/templates/htmlpopup/hartsteinabbau_production.mako @@ -0,0 +1,57 @@ +<%inherit file="base.mako"/> + +<%def name="table_body(c, lang)"> + <% + lang_select = lang if lang in ('fr','it','en') else 'de' + stkind_text = 'stkind_%s' % lang_select + ltkinds_text = 'ltkinds_%s' % lang_select + emkinds_text = 'emkinds_%s' % lang_select + + lang_url_select ={ + "de": "de", + "en": "de", + "rm": "de", + "fr": "fr", + "it": "fr", + } + infos_url_text = 'infos_url_%s' % lang_url_select[lang] + + layerid = c['layerBodId'] + %> + + ${_(f'{layerid}.obname_production')} + ${c['attributes']['obname'] or '-'} + + + ${_(f'{layerid}.cpkind_production')} + ${c['attributes']['cpkind'] or '-'} + + + ${_(f'{layerid}.stkind_production')} + ${c['attributes'][stkind_text] or '-'} + + + ${_(f'{layerid}.infos_url')} + % if c['attributes'].get(infos_url_text, '-').startswith('http'): + ${_('link')} + % else: + ${c['attributes'][infos_url_text] or '-'} + %endif + + + ${_(f'{layerid}.purl')} + % if c['attributes'].get('purl', '-').startswith('http'): + ${_('link')} + % else: + ${c['attributes']['purl'] or '-'} + %endif + + + ${_(f'{layerid}.swissgeol_link')} + % if c['attributes'].get('swissgeol_link', '-').startswith('http'): + ${_('link')} + % else: + ${c['attributes']['swissgeol_link'] or '-'} + %endif + + diff --git a/chsdi/templates/htmlpopup/hartsteinvorkommen.mako b/chsdi/templates/htmlpopup/hartsteinvorkommen.mako new file mode 100644 index 0000000000..8e38989d89 --- /dev/null +++ b/chsdi/templates/htmlpopup/hartsteinvorkommen.mako @@ -0,0 +1,175 @@ +<%inherit file="base.mako"/> + +<%def name="table_body(c, lang)"> + <% + lang_select = lang if lang in ('fr','it','en') else 'de' + please_note = 'please_note_%s' % lang_select + unit = 'unit_%s' % lang_select + usable_thickness_concat = 'usable_thickness_concat_%s' % lang_select + legend_simple_tooltip = 'legend_simple_tooltip_%s' % lang_select + + layerid = c['layerBodId'] + %> + + ${_(f'{layerid}.please_note')} + ${c['attributes'][please_note] or '-'} + + + ${_(f'{layerid}.unit')} + ${c['attributes'][unit] or '-'} + + + ${_(f'{layerid}.thickness_concat')} + ${c['attributes']['thickness_concat'] or '-'} + + + ${_(f'{layerid}.usable_thickness_concat')} + ${c['attributes'][usable_thickness_concat] or '-'} + + + ${_(f'{layerid}.usability_ratio_concat')} + ${c['attributes']['usability_ratio_concat'] or '-'} + + + ${_(f'{layerid}.legend_simple_tooltip')} + % if c['attributes'].get(legend_simple_tooltip, '-').startswith('http'): + ${_('link')} + % else: + ${c['attributes'][infos_url_text] or '-'} + %endif + + + +<%def name="extended_info(c, lang)"> + <% + lang_select = lang if lang in ('fr','it','en') else 'de' + please_note = 'please_note_%s' % lang_select + unit = 'unit_%s' % lang_select + usable_thickness_concat = 'usable_thickness_concat_%s' % lang_select + usable_lithologies = 'usable_lithologies_%s' % lang_select + not_usable_lithologies = 'not_usable_lithologies_%s' % lang_select + legend = 'legend_%s' % lang_select + level_of_confidence = 'level_of_confidence_%s' % lang_select + thickness_boxplot_descr = 'thickness_boxplot_descr_%s' %lang_select + + lang_mat_mapping ={ + "de": "de", + "en": "de", + "rm": "de", + "fr": "fr", + "it": "fr", + } + mat_min_link = 'mat_min_link_%s' % lang_mat_mapping[lang] + layerid = c['layerBodId'] + %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + % if c['attributes'].get(legend, '-').startswith('http'): + + % else: + + %endif + + + + + + + + + + + + + + + + + + + + + + + % if c['attributes'].get('hst_catalog_link', '-').startswith('http'): + + % else: + + %endif + + + + % if c['attributes'].get('tech_doc_link', '-').startswith('http'): + + % else: + + %endif + + + + % if c['attributes'].get('auto_thickness_paper_link', '-').startswith('http'): + + % else: + + %endif + + + + % if c['attributes'].get(mat_min_link, '-').startswith('http'): + + % else: + + %endif + + + + % if c['attributes'].get('swissgeol_link', '-').startswith('http'): + + % else: + + %endif + +
${_(f'{layerid}.please_note')}${c['attributes'][please_note] or '-'}
${_(f'{layerid}.unit')}${c['attributes'][unit] or '-'}
${_(f'{layerid}.thickness_concat')}${c['attributes']['thickness_concat'] or '-'}
${_(f'{layerid}.usable_thickness_concat')}${c['attributes'][usable_thickness_concat] or '-'}
${_(f'{layerid}.usability_ratio_concat')}${c['attributes']['usability_ratio_concat'] or '-'}
${_(f'{layerid}.usable_lithologies')}${c['attributes'][usable_lithologies] or '-'}
${_(f'{layerid}.not_usable_lithologies')}${c['attributes'][not_usable_lithologies] or '-'}
${_(f'{layerid}.elevation')}${int(round(c['attributes']['elevation'])) if c['attributes']['elevation'] is not None else '-'}
${_(f'{layerid}.legend')} + + ${c['attributes'][legend] or '-'}
${_(f'{layerid}.data_density_thickness')}${int(round(c['attributes']['data_density_thickness'])) if c['attributes']['data_density_thickness'] is not None else '-'}
${_(f'{layerid}.data_density_usability')}${int(round(c['attributes']['data_density_usability'])) if c['attributes']['data_density_usability'] is not None else '-'}
${_(f'{layerid}.level_of_confidence')}${c['attributes'][level_of_confidence] or '-'}
${_(f'{layerid}.thickness_boxplot_descr')}${c['attributes'][thickness_boxplot_descr] or '-'}
+ % if c['attributes'].get('thickness_boxplot_filename', '-').startswith('http'): + + % else: + ${c['attributes']['thickness_boxplot_filename'] or '-'} + %endif +
${_(f'{layerid}.hst_catalog_link')}${_('link')}
${c['attributes']['hst_catalog_link'] or '-'}
${_(f'{layerid}.tech_doc_link')}${_('link')}
${c['attributes']['tech_doc_link'] or '-'}
${_(f'{layerid}.auto_thickness_paper_link')}${_('link')}
${c['attributes']['auto_thickness_paper_link'] or '-'}
${_(f'{layerid}.mat_min_link')}${_('link')}
${c['attributes'][mat_min_link] or '-'}
${_(f'{layerid}.swissgeol_link')}${c['attributes']['swissgeol_link'] or '-'}
${c['attributes']['swissgeol_link'] or '-'}
+ diff --git a/chsdi/templates/htmlpopup/tektonische_karte_line.mako b/chsdi/templates/htmlpopup/tektonische_karte_line.mako index 5a5c8e55d7..c0a48d771c 100644 --- a/chsdi/templates/htmlpopup/tektonische_karte_line.mako +++ b/chsdi/templates/htmlpopup/tektonische_karte_line.mako @@ -1,10 +1,22 @@ <%inherit file="base.mako"/> <%def name="table_body(c,lang)"> - ${_('geol_f')}${c['attributes']['line_id'] or '-'} - % if lang == 'de' or lang == 'rm' or lang == 'en': - ${_('id_objekt')}${c['attributes']['type_de'] or '-'} - % elif lang == 'fr' or lang == 'it': - ${_('id_objekt')}${c['attributes']['type_fr'] or '-'} - % endif + <% + lang = lang if lang in ('de', 'fr', 'it', 'en') else 'de' + kind = 'kind_%s' % lang + name = 'name_%s' % lang + status = 'status_%s' % lang + %> + + ${_('ch.swisstopo.geologie-tektonische_karte.Kind')} + ${c['attributes'][kind] or '-'} + + + ${_('ch.swisstopo.geologie-tektonische_karte.Name')} + ${c['attributes'][name] or '-'} + + + ${_('ch.swisstopo.geologie-tektonische_karte.Status')} + ${c['attributes'][status] or '-'} + diff --git a/chsdi/templates/htmlpopup/tektonische_karte_poly.mako b/chsdi/templates/htmlpopup/tektonische_karte_poly.mako index 37d3701faf..97f26f57ec 100644 --- a/chsdi/templates/htmlpopup/tektonische_karte_poly.mako +++ b/chsdi/templates/htmlpopup/tektonische_karte_poly.mako @@ -1,11 +1,13 @@ <%inherit file="base.mako"/> <%def name="table_body(c,lang)"> - ${_('geol_f')}${c['attributes']['t2_id'] or '-'} - % if lang == 'de' or lang == 'rm' or lang == 'en': - ${_('id_objekt')}${c['attributes']['type_de'] or '-'} - % elif lang == 'fr' or lang == 'it': - ${_('id_objekt')}${c['attributes']['type_fr'] or '-'} - % endif + <% + lang = lang if lang in ('de', 'fr', 'it', 'en') else 'de' + litho = 'litho_%s' % lang + %> + + ${_('ch.swisstopo.geologie-tektonische_karte.Litho')} + ${c['attributes'][litho] or '-'} + diff --git a/chsdi/templates/htmlpopup/tektonische_karte_unit.mako b/chsdi/templates/htmlpopup/tektonische_karte_unit.mako new file mode 100644 index 0000000000..d9ab0ae1e0 --- /dev/null +++ b/chsdi/templates/htmlpopup/tektonische_karte_unit.mako @@ -0,0 +1,57 @@ +<%inherit file="base.mako"/> + +<%def name="table_body(c,lang)"> + <% + lang = lang if lang in ('de', 'fr', 'it', 'en') else 'de' + tecto_1 = 'tecto_1_%s' % lang + tecto_2 = 'tecto_2_%s' % lang + tecto_3 = 'tecto_3_%s' % lang + tecto_4 = 'tecto_4_%s' % lang + origin = 'origin_%s' % lang + litho = 'litho_%s' % lang + chrono = 'chrono_%s' % lang + lith = 'lith_%s' % lang + legende = 'legende_%s' % lang + %> + + ${_('ch.swisstopo.geologie-tektonische_karte.Tecto_1')} + ${c['attributes'][tecto_1] or '-'} + + + ${_('ch.swisstopo.geologie-tektonische_karte.Tecto_2')} + ${c['attributes'][tecto_2] or '-'} + + + ${_('ch.swisstopo.geologie-tektonische_karte.Tecto_3')} + ${c['attributes'][tecto_3] or '-'} + + + ${_('ch.swisstopo.geologie-tektonische_karte.Tecto_4')} + ${c['attributes'][tecto_4] or '-'} + + + ${_('ch.swisstopo.geologie-tektonische_karte.Litho')} + ${c['attributes'][litho] or '-'} + + + ${_('ch.swisstopo.geologie-tektonische_karte.Origin')} + ${c['attributes'][origin] or '-'} + + + ${_('ch.swisstopo.geologie-tektonische_karte.Notice')} + % if 'http' not in c['attributes']['notice']: + ${c['attributes']['notice'] or '-'} + % else: + Link + % endif + + + ${_('ch.swisstopo.geologie-tektonische_karte.Legende')} + % if 'http' not in c['attributes'][legende]: + ${c['attributes'][legende] or '-'} + % else: + Link + % endif + + + diff --git a/chsdi/templates/htmlpopup/treasurehunt.mako b/chsdi/templates/htmlpopup/treasurehunt.mako deleted file mode 100644 index c6bc7c1c8a..0000000000 --- a/chsdi/templates/htmlpopup/treasurehunt.mako +++ /dev/null @@ -1,30 +0,0 @@ -<%inherit file="base.mako"/> - -<%def name="table_body(c, lang)"> -<% - lang = lang if lang in ('fr', 'it') else 'de' - title = 'title_%s' % lang - link = 'link_%s' % lang - information = 'info_%s' % lang - -%> - ${_('title')}${c['attributes'][title] or '-'|n} - -% if c['attributes']['type_coord'] =='info': - - ${_('information')}${c['attributes'][information] or '-'|n} - -% else: - - ${_('link')} - ${_('treasure_hunt')} - -% endif - - - - - - - - diff --git a/chsdi/templates/htmlpopup/vbs_ladestationen.mako b/chsdi/templates/htmlpopup/vbs_ladestationen.mako new file mode 100644 index 0000000000..b08c70a91e --- /dev/null +++ b/chsdi/templates/htmlpopup/vbs_ladestationen.mako @@ -0,0 +1,59 @@ +<%inherit file="base.mako"/> + +<%def name="table_body(c,lang)"> + <% + lang = lang if lang in ('fr','it','en') else 'de' + %> + + ${_('ch.vbs.ladestationen.Standort')} + ${c['attributes']['standort'] or '-'} + + + ${_('ch.vbs.ladestationen.Strasse')} + ${c['attributes']['strasse'] or '-'} + + + ${_('ch.vbs.ladestationen.PLZ')} + ${c['attributes']['plz'] or '-'} + + + ${_('ch.vbs.ladestationen.Ort')} + ${c['attributes']['ort'] or '-'} + + + ${_('ch.vbs.ladestationen.Oeffnungszeiten')} + ${c['attributes']['oeffnungszeiten'] or '-'} + + + ${_('ch.vbs.ladestationen.Anzahl_Ladepunkte')} + ${c['attributes']['anzahl_ladepunkte'] or '-'} + + + ${_('ch.vbs.ladestationen.Leistung')} + ${c['attributes']['leistung'] or '-'} + + + ${_('ch.vbs.ladestationen.Typ_Stecker')} + ${c['attributes']['typ_stecker'] or '-'} + + + ${_('ch.vbs.ladestationen.Hinweis')} + ${c['attributes']['hinweis'] or '-'} + + + ${_('ch.vbs.ladestationen.Kontakt')} + ${c['attributes']['kontakt'] or '-'} + + + ${_('ch.vbs.ladestationen.XKoordinate')} + ${c['attributes']['x_koordinate'] or '-'} + + + ${_('ch.vbs.ladestationen.YKoordinate')} + ${c['attributes']['y_koordinate'] or '-'} + + + ${_('ch.vbs.ladestationen.Bemerkungen')} + ${c['attributes']['bemerkungen'] or '-'} + + diff --git a/chsdi/templates/htmlpopup/vorfluter.mako b/chsdi/templates/htmlpopup/vorfluter.mako index 6d09e59e45..46880d35bf 100644 --- a/chsdi/templates/htmlpopup/vorfluter.mako +++ b/chsdi/templates/htmlpopup/vorfluter.mako @@ -9,8 +9,14 @@ ${_('ch.bafu.wasser-vorfluter.ezgnr')}${c['attributes']['ezgnr'] or '-'} ${_('ch.bafu.wasser-vorfluter.gewaessername')}${c['attributes']['gewaessername'] or '-'} ${_('ch.bafu.wasser-vorfluter.gwlnr')}${c['attributes']['gwlnr'] or '-'} - ${_('ch.bafu.wasser-vorfluter.unteresende')}${c['attributes']['unteresende'] or '-'} - ${_('ch.bafu.wasser-vorfluter.oberesende')}${c['attributes']['oberesende'] or '-'} + + ${_('ch.bafu.wasser-vorfluter.unteresende')} + ${c['attributes']['unteresende'] if c['attributes']['unteresende'] is not None else '-'} + + + ${_('ch.bafu.wasser-vorfluter.oberesende')} + ${c['attributes']['oberesende'] if c['attributes']['oberesende'] is not None else '-'} + ${_('ch.bafu.wasser-vorfluter.nebenarm')}${c['attributes'][nebenarm] or '-'} diff --git a/tests/integration/test_features_service.py b/tests/integration/test_features_service.py index 41a978cd88..cb39694150 100644 --- a/tests/integration/test_features_service.py +++ b/tests/integration/test_features_service.py @@ -309,13 +309,6 @@ def test_feature_wrong_idfeature(self): resp = self.testapp.get('/rest/services/api/MapServer/ch.bafu.bundesinventare-bln/htmlPopup', status=404) self.assertIn('No feature with id', resp.text) - def test_feature_htmlpopup_not_scale_dep(self): - params = {'imageDisplay': '960,700,96', - 'lang': 'it', - 'mapExtent': '642389,81044,882389,256044'} - resp = self.testapp.get('/rest/services/swisstopo/MapServer/ch.swisstopo.treasurehunt/1/htmlPopup', params=params, status=200) - self.assertEqual(resp.content_type, 'text/html') - # TODO; we should not hardcode stable IDs, because they are not so stable def test_feature_htmlpopup_opensurvey(self): params = {'coord': '2599337,1211687', diff --git a/tests/integration/test_identify_service.py b/tests/integration/test_identify_service.py index b16e4c7fb1..bb7790ab6d 100644 --- a/tests/integration/test_identify_service.py +++ b/tests/integration/test_identify_service.py @@ -1009,20 +1009,6 @@ def test_identify_outside_extent(self): self.assertEqual(resp.content_type, 'application/geo+json') self.assertEqual(len(resp.json['results']), 0) - def test_identify_treasurehunt_not_in_scale_range(self): - params = dict(geometryType='esriGeometryPoint', - geometry='611334,271015', - geometryFormat='geojson', - imageDisplay='1920,730,96', - layers='all:ch.swisstopo.treasurehunt', - mapExtent='601163,260868,621504,281135', - returnGeometry='true', - tolerance='10', - lang='fr') - resp = self.testapp.get('/rest/services/all/MapServer/identify', params=params, headers=accept_headers, status=200) - self.assertEqual(resp.content_type, 'application/geo+json') - self.assertEqual(len(resp.json['results']), 0) - def test_identify_no_geotable(self): params = dict(geometryType='esriGeometryPoint', geometry='612824.615589634,177050.95813678834',