diff --git a/chsdi/models/vector/stopo.py b/chsdi/models/vector/stopo.py
index 022cd10348..18f0f58a78 100644
--- a/chsdi/models/vector/stopo.py
+++ b/chsdi/models/vector/stopo.py
@@ -1406,6 +1406,52 @@ class GeologieGeophysikTotalintensitaet(Base, Vector):
register('ch.swisstopo.geologie-geophysik-totalintensitaet', GeologieGeophysikTotalintensitaet)
+class GeologieRohstoffe:
+ __table_args__ = ({'schema': 'geol', 'autoload': False})
+ id = Column('bgdi_id', Integer, primary_key=True)
+ type = Column('type', Unicode)
+ obname = Column('obname', Unicode)
+ cpkind = Column('cpkind', Unicode)
+ edkinds = Column('edkinds', Unicode)
+ purl = Column('purl', Unicode)
+ swissgeol_link = Column('swissgeol_link', Unicode)
+ stkind_de = Column('stkind_de', Unicode)
+ stkind_fr = Column('stkind_fr', Unicode)
+ stkind_it = Column('stkind_it', Unicode)
+ stkind_en = Column('stkind_en', Unicode)
+ ltkinds_de = Column('ltkinds_de', Unicode)
+ ltkinds_fr = Column('ltkinds_fr', Unicode)
+ ltkinds_it = Column('ltkinds_it', Unicode)
+ ltkinds_en = Column('ltkinds_en', Unicode)
+ infos_url_de = Column('infos_url_de', Unicode)
+ infos_url_fr = Column('infos_url_fr', Unicode)
+ infos_url_it = Column('infos_url_it', Unicode)
+ infos_url_en = Column('infos_url_en', Unicode)
+ the_geom = Column(Geometry2D)
+
+
+class GeologieRohstoffeZementAbbauVerarbeitung(Base, GeologieRohstoffe, Vector):
+ __tablename__ = 'rohstoffe_zementabbauverarbeitung'
+ __template__ = 'templates/htmlpopup/rohstoffe_zement_abbau_verarbeitung.mako'
+ __bodId__ = 'ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung'
+ __label__ = 'obname'
+ info_url_de = Column('info_url_de', Unicode)
+ info_url_fr = Column('info_url_fr', Unicode)
+ info_url_it = Column('info_url_it', Unicode)
+ info_url_en = Column('info_url_en', Unicode)
+
+register('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung', GeologieRohstoffeZementAbbauVerarbeitung)
+
+
+class GeologieRohstoffeZiegelAbbau(Base, GeologieRohstoffe, Vector):
+ __tablename__ = 'rohstoffe_ziegel_abbau'
+ __bodId__ = 'ch.swisstopo.geologie-rohstoffe-ziegel_abbau'
+ __template__ = 'templates/htmlpopup/rohstoffe_ziegel_abbau.mako'
+ __label__ = 'obname'
+
+register(GeologieRohstoffeZiegelAbbau.__bodId__, GeologieRohstoffeZiegelAbbau)
+
+
class GeologieRohstoffeIndustrieminerale(Base, Vector):
__tablename__ = 'rohstoffe_industriemin'
__table_args__ = ({'schema': 'geol', 'autoload': False})
@@ -1545,47 +1591,6 @@ class GeologieRohstoffeGipsAbbauVerarbeitung(Base, Vector):
register('ch.swisstopo.geologie-rohstoffe-gips_abbau_verarbeitung', GeologieRohstoffeGipsAbbauVerarbeitung)
-class GeologieRohstoffeZementAbbauVerarbeitung(Base, Vector):
- __tablename__ = 'rohstoffe_zementabbauverarbeitung'
- __table_args__ = ({'schema': 'geol', 'autoload': False})
- __template__ = 'templates/htmlpopup/rohstoffe_zement_abbau_verarbeitung.mako'
- __bodId__ = 'ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung'
- __label__ = 'obname'
- id = Column('obid', Integer, primary_key=True)
- obname = Column('obname', Unicode)
- tckinds = Column('tckinds', Unicode)
- ltkinds = Column('ltkinds', Unicode)
- emkinds = Column('emkinds', Unicode)
- pckind = Column('pckind', Unicode)
- cpkind = Column('cpkind', Unicode)
- stkind = Column('stkind', Unicode)
- tlyearsformatted = Column('tlyearsformatted', Unicode)
- clkind = Column('clkind', Unicode)
- purl = Column('purl', Unicode)
- the_geom = Column(Geometry2D)
-
-register('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung', GeologieRohstoffeZementAbbauVerarbeitung)
-
-
-class GeologieRohstoffeZiegelAbbau(Base, Vector):
- __tablename__ = 'rohstoffe_ziegel_abbau'
- __table_args__ = ({'schema': 'geol', 'autoload': False})
- __bodId__ = 'ch.swisstopo.geologie-rohstoffe-ziegel_abbau'
- __template__ = 'templates/htmlpopup/rohstoffe_ziegel_abbau.mako'
- __label__ = 'obname'
- id = Column('bgdi_id', Integer, primary_key=True)
- obname = Column('obname', Unicode)
- tckinds = Column('tckinds', Unicode)
- ltkinds = Column('ltkinds', Unicode)
- stkind = Column('stkind', Unicode)
- tlyearsformatted = Column('tlyearsformatted', Unicode)
- purl = Column('purl', Unicode)
- clkind = Column('clkind', Unicode)
- the_geom = Column(Geometry2D)
-
-register(GeologieRohstoffeZiegelAbbau.__bodId__, GeologieRohstoffeZiegelAbbau)
-
-
class GeologieRohstoffeZiegelVerarbeitung(Base, Vector):
__tablename__ = 'rohstoffe_ziegel_verarbeitung'
__table_args__ = ({'schema': 'geol', 'autoload': False})
diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_de.png b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_de.png
index c0575c775c..c38c1524ff 100644
Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_de.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_de.png differ
diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_en.png b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_en.png
index 1332bd08e7..ecdcda88db 100644
Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_en.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_en.png differ
diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_fr.png b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_fr.png
index 51564e4c43..2e38ce168b 100644
Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_fr.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_fr.png differ
diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_it.png b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_it.png
index e63d7c24be..b01b3f1166 100644
Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_it.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_it.png differ
diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_rm.png b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_rm.png
index c0575c775c..c38c1524ff 100644
Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_rm.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung_rm.png differ
diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_de.png b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_de.png
index 1895f84ea3..f9a375ad48 100644
Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_de.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_de.png differ
diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_en.png b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_en.png
index 1c0ba55bad..ab69bda1ba 100644
Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_en.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_en.png differ
diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_fr.png b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_fr.png
index af4ff645b0..478ceafff5 100644
Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_fr.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_fr.png differ
diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_it.png b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_it.png
index f82a25462d..9edaaea057 100644
Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_it.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_it.png differ
diff --git a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_rm.png b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_rm.png
index d80f4d3406..f9a375ad48 100644
Binary files a/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_rm.png and b/chsdi/static/images/legends/ch.swisstopo.geologie-rohstoffe-ziegel_abbau_rm.png differ
diff --git a/chsdi/templates/htmlpopup/rohstoffe_zement_abbau_verarbeitung.mako b/chsdi/templates/htmlpopup/rohstoffe_zement_abbau_verarbeitung.mako
index e620e65552..3649c2964c 100644
--- a/chsdi/templates/htmlpopup/rohstoffe_zement_abbau_verarbeitung.mako
+++ b/chsdi/templates/htmlpopup/rohstoffe_zement_abbau_verarbeitung.mako
@@ -1,23 +1,92 @@
<%inherit file="base.mako"/>
-<%def name="table_body(c,lang)">
- <% c['stable_id'] = True %>
- | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.obname')} | ${c['attributes']['obname'] or '-'} |
-%if c['attributes']['ltkinds']:
- | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.tckinds')} | ${c['attributes']['tckinds'] or '-'} |
- | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.ltkinds')} | ${c['attributes']['ltkinds'] or '-'} |
-%endif
-%if c['attributes']['emkinds']:
- | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.emkinds')} | ${c['attributes']['emkinds'] or '-'} |
-%endif
-%if c['attributes']['pckind']:
- | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.pckind')} | ${c['attributes']['pckind'] or '-'} |
-%endif
-%if c['attributes']['cpkind']:
- | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.cpkind')} | ${c['attributes']['cpkind'] or '-'} |
+<%def name="table_body(c, lang)">
+ <%
+ lang = lang if lang in ('fr','it', 'en') else 'de'
+ stkind_text = 'stkind_%s' %lang
+ info_url_text = 'info_url_%s' %lang
+ ltkinds_text = 'ltkinds_%s' %lang
+ infos_url_text = 'infos_url_%s' %lang
+ %>
+
+%if c['attributes']['type'] == 'production':
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.production_obname')} |
+ ${c['attributes']['obname'] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.production_cpkind')} |
+ ${c['attributes']['cpkind'] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.production_stkind')} |
+ ${c['attributes'][stkind_text] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.production_info_url')} |
+ % if 'http' not in c['attributes'][info_url_text]:
+ - |
+ % else:
+ ${_('link')} |
+ % endif
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.production_purl')} |
+ % if 'http' not in c['attributes']['purl']:
+ - |
+ % else:
+ ${_('layer_url_portal_text')} |
+ % endif
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.production_swissgeol_link')} |
+ % if 'http' not in c['attributes']['swissgeol_link']:
+ - |
+ % else:
+ ${_('link')} |
+ % endif
+
+% else:
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.mining_edkinds')} |
+ ${c['attributes']['edkinds'] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.mining_cpkind')} |
+ ${c['attributes']['cpkind'] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.mining_stkind')} |
+ ${c['attributes'][stkind_text] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.mining_ltkinds')} |
+ ${c['attributes'][ltkinds_text] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.mining_infos_url')} |
+ % if 'http' not in c['attributes'][infos_url_text]:
+ - |
+ % else:
+ ${_('link')} |
+ % endif
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.mining_purl')} |
+ % if 'http' not in c['attributes']['purl']:
+ - |
+ % else:
+ ${_('layer_url_portal_text')} |
+ % endif
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.mining_swissgeol_link')} |
+ % if 'http' not in c['attributes']['swissgeol_link']:
+ - |
+ % else:
+ ${_('link')} |
+ % endif
+
%endif
- | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.stkind')} | ${c['attributes']['stkind'] or '-'} |
- | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.tlyearsformatted')} | ${c['attributes']['tlyearsformatted'] or '-'} |
- | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.clkind')} | ${c['attributes']['clkind'] or '-'} |
- | ${_('ch.swisstopo.geologie-rohstoffe-zement_abbau_verarbeitung.purl')} | ${_('layer_url_portal_text')} |
+
diff --git a/chsdi/templates/htmlpopup/rohstoffe_ziegel_abbau.mako b/chsdi/templates/htmlpopup/rohstoffe_ziegel_abbau.mako
index 4c44e190cb..47a30d0daa 100644
--- a/chsdi/templates/htmlpopup/rohstoffe_ziegel_abbau.mako
+++ b/chsdi/templates/htmlpopup/rohstoffe_ziegel_abbau.mako
@@ -1,26 +1,91 @@
<%inherit file="base.mako"/>
<%def name="table_body(c, lang)">
+ <%
+ lang = lang if lang in ('fr','it', 'en') else 'de'
+ stkind_text = 'stkind_%s' %lang
+ ltkinds_text = 'ltkinds_%s' %lang
+ infos_url_text = 'infos_url_%s' %lang
+ %>
-%if c['attributes']['obname']:
- | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.obname')} | ${c['attributes']['obname'] or '-'} |
-%endif
-%if c['attributes']['tckinds']:
- | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.tckinds')} | ${c['attributes']['tckinds']} |
-%endif
-%if c['attributes']['ltkinds']:
- | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.ltkinds')} | ${c['attributes']['ltkinds'] or '-'} |
-%endif
-%if c['attributes']['stkind']:
- | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.stkind')} | ${c['attributes']['stkind'] or '-'} |
-%endif
-%if c['attributes']['tlyearsformatted']:
- | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.tlyearsformatted')} | ${c['attributes']['tlyearsformatted'] or '-'} |
-%endif
-%if c['attributes']['clkind']:
- | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.clkind')} | ${c['attributes']['clkind'] or '-'} |
-%endif
-%if c['attributes']['purl']:
- | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.purl')} | ${_('layer_url_portal_text')} |
+%if c['attributes']['type'] == 'production':
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.production_obname')} |
+ ${c['attributes']['obname'] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.production_cpkind')} |
+ ${c['attributes']['cpkind'] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.production_stkind')} |
+ ${c['attributes'][stkind_text] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.production_infos_url')} |
+ % if 'http' not in c['attributes'][infos_url_text]:
+ - |
+ % else:
+ ${_('link')} |
+ % endif
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.production_purl')} |
+ % if 'http' not in c['attributes']['purl']:
+ - |
+ % else:
+ ${_('layer_url_portal_text')} |
+ % endif
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.production_swissgeol_link')} |
+ % if 'http' not in c['attributes']['swissgeol_link']:
+ - |
+ % else:
+ ${_('link')} |
+ % endif
+
+% else:
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.mining_edkinds')} |
+ ${c['attributes']['edkinds'] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.mining_cpkind')} |
+ ${c['attributes']['cpkind'] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.mining_stkind')} |
+ ${c['attributes'][stkind_text] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.mining_ltkinds')} |
+ ${c['attributes'][ltkinds_text] or '-'} |
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.mining_infos_url')} |
+ % if 'http' not in c['attributes'][infos_url_text]:
+ - |
+ % else:
+ ${_('link')} |
+ % endif
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.mining_purl')} |
+ % if 'http' not in c['attributes']['purl']:
+ - |
+ % else:
+ ${_('layer_url_portal_text')} |
+ % endif
+
+
+ | ${_('ch.swisstopo.geologie-rohstoffe-ziegel_abbau.mining_swissgeol_link')} |
+ % if 'http' not in c['attributes']['swissgeol_link']:
+ - |
+ % else:
+ ${_('link')} |
+ % endif
+
%endif
+