CEN38/pycen
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update zh get_site

Browse Source
This commit is contained in:
Colas Geier 2021-10-15 11:08:41 +02:00
parent d4479086bf
commit 7ab6ff95d7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pycen/zh.py
View File

@ -218,7 +218,8 @@ class zh():
from .tools import _get_relation_tab from .tools import _get_relation_tab
self.schema = 'zones_humides' self.schema = 'zones_humides'
self.con = con 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.id_milieux = self.typ_milieux.id.values[0]
self._get_relation_tab = _get_relation_tab self._get_relation_tab = _get_relation_tab
self.lst_tab = con.dialect.get_table_names(con,schema=self.schema) 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'): def get_sitesInfos(self, id_site=None, nom_site=None, columns=None, with_nameOrga=False, statut='actif'):
from .sites.sites import get_sitesInfos from .sites.sites import get_sitesInfos
df = get_sitesInfos(ids=id_site, nom=nom_site, columns=columns, with_nameOrga=with_nameOrga, 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) # params_col={'id_type_milieu':self.id_milieux.astype(str)},
statut=statut)
return df return df
@ -479,10 +481,10 @@ class zh():
params_col={}, statut='actif'): params_col={}, statut='actif'):
from .sites.sites import get_sitesGeom from .sites.sites import get_sitesGeom
if params_col: # if params_col:
params_col = {**params_col, 'id_type_milieu':self.id_milieux.astype(str) } # 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, with_nameOrga=with_nameOrga,last_update=last_update,
params_col=params_col , statut=statut) params_col=params_col , statut=statut)