From 7ab6ff95d7bd659dc20be33c17a84f506d4ae7ac Mon Sep 17 00:00:00 2001 From: Colas Geier Date: Fri, 15 Oct 2021 11:08:41 +0200 Subject: [PATCH] update zh get_site --- pycen/zh.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pycen/zh.py b/pycen/zh.py index c354749..aa7a071 100644 --- a/pycen/zh.py +++ b/pycen/zh.py @@ -218,7 +218,8 @@ class zh(): from .tools import _get_relation_tab self.schema = 'zones_humides' self.con = con - self.typ_milieux = _get_typ_milieux(nom='Tourbières et marais') + self.milieu = 'Tourbières et marais' + self.typ_milieux = _get_typ_milieux(nom=self.milieu) self.id_milieux = self.typ_milieux.id.values[0] self._get_relation_tab = _get_relation_tab self.lst_tab = con.dialect.get_table_names(con,schema=self.schema) @@ -469,8 +470,9 @@ class zh(): def get_sitesInfos(self, id_site=None, nom_site=None, columns=None, with_nameOrga=False, statut='actif'): from .sites.sites import get_sitesInfos - df = get_sitesInfos(ids=id_site, nom=nom_site, columns=columns, with_nameOrga=with_nameOrga, - params_col={'id_type_milieu':self.id_milieux.astype(str)}, statut=statut) + df = get_sitesInfos(ids=id_site, nom=nom_site, columns=columns, with_nameOrga=with_nameOrga,milieu=self.milieu, + # params_col={'id_type_milieu':self.id_milieux.astype(str)}, + statut=statut) return df @@ -479,10 +481,10 @@ class zh(): params_col={}, statut='actif'): from .sites.sites import get_sitesGeom - if params_col: - params_col = {**params_col, 'id_type_milieu':self.id_milieux.astype(str) } + # if params_col: + # params_col = {**params_col, 'id_type_milieu':self.id_milieux.astype(str) } - df = get_sitesGeom(id_site=id_site, nom_site=nom_site, columns=columns, + df = get_sitesGeom(id_site=id_site, nom_site=nom_site, columns=columns, milieu=self.milieu, with_nameOrga=with_nameOrga,last_update=last_update, params_col=params_col , statut=statut)