From 0416810bf2b4e65d7ad8f9777b5e69ca2512c457 Mon Sep 17 00:00:00 2001 From: Colas Geier Date: Wed, 1 Dec 2021 14:40:51 +0100 Subject: [PATCH] UPDATE pycen pour script rapport --- .../pers/__pycache__/__init__.cpython-38.pyc | Bin 168 -> 206 bytes pycen/pers/__pycache__/pers.cpython-38.pyc | Bin 3802 -> 5348 bytes pycen/rapport.py | 22 ++++--- pycen/ref/__pycache__/__init__.cpython-38.pyc | Bin 173 -> 211 bytes .../__pycache__/__init__.cpython-38.pyc | Bin 207 -> 245 bytes .../__pycache__/territoire.cpython-38.pyc | Bin 413 -> 451 bytes .../sites/__pycache__/__init__.cpython-38.pyc | Bin 148 -> 186 bytes pycen/sites/__pycache__/sites.cpython-38.pyc | Bin 3702 -> 3722 bytes pycen/sites/sites.py | 6 +- pycen/tools.py | 2 +- .../Modif_caract_connect.cpython-38.pyc | Bin 0 -> 2154 bytes .../Modif_caract_delim.cpython-38.pyc | Bin 0 -> 2027 bytes .../Modif_caract_fct.cpython-38.pyc | Bin 0 -> 2092 bytes .../Modif_caract_hab.cpython-38.pyc | Bin 0 -> 2008 bytes .../Modif_caract_reghydro.cpython-38.pyc | Bin 0 -> 2383 bytes .../Modif_caract_sub.cpython-38.pyc | Bin 0 -> 2414 bytes .../Modif_caract_usageprocess.cpython-38.pyc | Bin 0 -> 2519 bytes pycen/wfs/__pycache__/__init__.cpython-38.pyc | Bin 166 -> 204 bytes pycen/wfs/__pycache__/wfs.cpython-38.pyc | Bin 761 -> 996 bytes pycen/zh.py | 62 ++++++++++-------- 20 files changed, 50 insertions(+), 42 deletions(-) create mode 100644 pycen/vrac/__pycache__/Modif_caract_connect.cpython-38.pyc create mode 100644 pycen/vrac/__pycache__/Modif_caract_delim.cpython-38.pyc create mode 100644 pycen/vrac/__pycache__/Modif_caract_fct.cpython-38.pyc create mode 100644 pycen/vrac/__pycache__/Modif_caract_hab.cpython-38.pyc create mode 100644 pycen/vrac/__pycache__/Modif_caract_reghydro.cpython-38.pyc create mode 100644 pycen/vrac/__pycache__/Modif_caract_sub.cpython-38.pyc create mode 100644 pycen/vrac/__pycache__/Modif_caract_usageprocess.cpython-38.pyc diff --git a/pycen/pers/__pycache__/__init__.cpython-38.pyc b/pycen/pers/__pycache__/__init__.cpython-38.pyc index 2cfc26cc67e9c3748eed9b6dd2ebc71982129267..e9aa75d0efe73d588924248184252a39b1f87f79 100644 GIT binary patch delta 98 zcmZ3%c#e@fl$V!_0SNxbRZir#6NzFeNG&Q}$xy@$6ay2#;wHvQ8HZ&Sm6Rstq~?|B v7o`^D7nSJeWG3ksRF-7q=Nao+=oe>}r0NzVCTAz6rxpXnlT-61wx|FAf%YGv delta 60 zcmX@dxPp;8l$V!_0SH7wkXlr{lA(wNCJdu- diff --git a/pycen/pers/__pycache__/pers.cpython-38.pyc b/pycen/pers/__pycache__/pers.cpython-38.pyc index b6d5eb16782a68509365ae3d9385455307a570a7..93137ef83d098687993afc9345611ded026fb6a3 100644 GIT binary patch literal 5348 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 delta 1841 zcmZ8hOK;mo5Z+xrL{gF;l44nj9kh;(lt}Yz4D?|*Xp_3hp=yA{7b1X4YiXJaMG8v_ zwF4SDI0cHf0vhmE^dKK|E09xuL2o_uxaZz`@2NACngo`x!`YeHZ)Rs_=5JfB&h1vK z7J=Ub{gGQ;crmv^e|~Z0$!3F_++j8i-RmEF?kz`b40|6*&~ z$clL&QVHX(s3WHaN#xp^c&pP=cQ5qB0%{rGe@R3O*ne;5+sgUsL$~|X^}Xc!;ON;w z{*$t!H|RPO7xH20-bk9U@ZBg#`ku|C67Zyel`P=4D$0N&sz@3LZ6;pY2_o(tf^HSX zMF>sgmXV;>DLD_EtomU827d!Yi4KHNmDZ?u54cyC3_+_esVoK2AauK)Sjm4gzqo`z zAf<NROoE4hG?oxPk`jNG_q3RwO{GT*L!gFYfJF$si2U z4n&ej1uiTVcbLiz+LbC|p1nl5)Axk$72#aTSIaj?cK~^(s{;N1hc#%xx(h4$krI-U z6EdNkp3-9#stIa`D@~{$uC_>%^w>l>#hr###`PANs3|+8$fE?RPUEGgaH^+sqeYIj zjARscG}E{_;?|f^G82_}*#}2Z@RhNGG5{c4&!`W_C&no`)-%|_Vb(LD2~0jWX2+#W zpIBK5!qc--ugvGciIG;)YG$0!6MAf9O#GS7!AawU9h>+Cv{Di5h)m|E(Sr!MQ-{;J zQ*jN%l68)tH(4A>BN^`R2ZvrF)zI5dZB;4<@prN;0{>vvnbJbdv`fVf9#^68k8DNU zhmH6W35xB8xPV%HKM2G1$dyWx3aJ4J2I3Z46}^qu5x0?C&+k_^ib55exUT?_y6_?w ziuqHNVENkCv?H)9J8%t0#r}7UIGTmD1xAhqAq7!4j-sKXicY{C6X_%DB1i8QU-21Y zo|!1C)miHR^g%2>2a^PS6IP)YY5vc`Cf$9tvG^^$T_ji$4-ure&ezD{3_61;E~5GX{1:s}'.format(fontsize, text) + def paragraph(self, text, style="Normal", + # fontsize=12,color="black" + ): + # ptext = u'{2:s}'.format(fontsize, color, text) + ptext = text self.story.append(Paragraph(ptext, styles[style])) - self.spacer() + # self.spacer() def table(self, data): TableStyle() @@ -69,7 +73,7 @@ class Rapport(object): lista = [df.columns[:, ].values.astype(str).tolist()] + df.values.tolist() ts = [('LINEABOVE', (0, 0), (-1, 0), 1, colors.purple), ('LINEBELOW', (0, 0), (-1, 0), 1, colors.purple), - ('FONT', (0, 0), (-1, 0), 'Times-Bold'), + ('FONT', (0, 0), (-1, 0), 'Times'), ] self.story.append(Table(lista, style=ts)) @@ -87,15 +91,15 @@ class Rapport(object): def myFirstPage(self, canvas, doc): canvas.saveState() - canvas.setFont('Times-Bold', 22) + canvas.setFont('Times', 22) canvas.drawCentredString(page_with / 2.0, page_height - 108, self.titre) - canvas.setFont('Times-Roman', 9) + canvas.setFont('Times', 9) canvas.drawString(0.5 * inch, 0.5 * inch, "%s" % self.pied_de_page) canvas.restoreState() def myLaterPages(self, canvas, doc): canvas.saveState() - canvas.setFont('Times-Roman', 9) + canvas.setFont('Times', 9) canvas.drawString(0.5 * inch, 0.5 * inch, "%s" % self.pied_de_page) canvas.drawString(4 * inch, 0.5 * inch, "Page %d " % doc.page) canvas.restoreState() diff --git a/pycen/ref/__pycache__/__init__.cpython-38.pyc b/pycen/ref/__pycache__/__init__.cpython-38.pyc index c01fc21ef6b35b076523a88cece963add1e0ea56..98fdea069a1fd776bbd94bb65b99b7e2b60af8a4 100644 GIT binary patch delta 101 zcmZ3>c$twql$V!_0SNxbRZip%_lwof$j?pHPtMOtEY^1_ElN!+)eopF$;i*s56dhn zDNW2t%`4L{N-fAQD$&o$Owum^OB(B0=oe>}r0NzVCTAz6rxpXnlT-61b}0h@u6QG^ delta 63 zcmcc2xR#MSl$V!_0SJ~ThfL%S*D%-5$j?pHPtMOtEY^1_ElN!+)eopF$;i*s4@gYT RPE1cN)-R~6%9yx882~$V6ny{y diff --git a/pycen/ref/territoire/__pycache__/__init__.cpython-38.pyc b/pycen/ref/territoire/__pycache__/__init__.cpython-38.pyc index b4eb026c37beb69f0be413f38d69c94d90e95ea7..cf8392e8ae81aa38e28f309817cfd0b41541ca9d 100644 GIT binary patch delta 109 zcmX@l_?3}6l$V!_0SNxbRZip%kdNXjNi8bMEXmI-N-bgnimzlSVg^!R;#bDRDk-o%A^ E0Q8$9V*mgE delta 71 zcmey$c%G3vl$V!_0SNR}LMCzt$lu~BNi8bMEXmI-N-bgnimzlSVgXWM;+NCJDk6fLSk)NBYpPZkQSgh|jG7$H G=mY@J-X&cC delta 70 zcmX@iJeQd}l$V!_0SNvnhfL(Yso|oZk)NBYpPZkQSgh|}r0NzVCTAz6rxpXnlT-61=Bok#lAR+; delta 63 zcmdnRIE9frl$V!_0SF@AicI9T(XiCd$j?pHPtMOtEY^1_ElN!+)eopF$;i*s4@gYT RPE1cN)-R~6%9uD+6#zDl6juNM diff --git a/pycen/sites/__pycache__/sites.cpython-38.pyc b/pycen/sites/__pycache__/sites.cpython-38.pyc index b21de50f1581853a865dd9c9ba01f949972ffbfa..8fade4798ce9bd028f05eeb25dbae87b3c0dd794 100644 GIT binary patch delta 450 zcmWmA%}X0W6aetN$z~JxGYv#kl0!xOz?zi?qG+tz8cGkTUK&(H-Da00W|IxG8zB%6 zLJne8l;_$03xz_jy(-0XWe+{|R&pynNpWTlKi<4~^X4)CQm1M4gQ`j)w#L_w&EA!o z9t_yV3R&QU8n6w(W8#pjwO`LjpzSqmTCw-cwqJGWOPqtBu!A}o$(Cx=Z<~(YJT$1? za;a}PwU0)t!|IyZ%)H^%e0!#4mg{E4_E^4bH^1gc72pCthnvttO_+^a+BrGWExoHB zD0Pwk#tq>OOyV`Og%83iD;tU2>x3rQj6t;QI(!m*jNFMimZ5X_L;Ma)_$f+3!T-@& zD4-Eb!xuZx#JPw;lYW0&&M<>UhIvdAHv2q(q}MBjC4 zo*xKxyW`Pi{3}hwm-wl`33FcIv^Hqx`llu1zRYodDzFdY6*&XqrQh-?5ksPfp^;E>|;uM0dah%%{&2|413A| delta 447 zcmXw!O-mb56ozwV#&MjT5%_?U36Ut5^$59J8`S$EJ3Lv!-C{kap4YI0G=)KQsEnn3A8t=3lp+E=zFRVC?u;n{$81Ts1=m?*8 zoXQD3A3GK9HhJBToF6AY8-KTz20#yQ)nhoryjDoZs%M|8rztNLr;d_MT?{eMHem^` zhytIrb!uE0`A6Yt89quGGP$pXqRug`-|L^r7hmvEzk?F~9u;6?#wbjGC)+g$@0BDW z*WIKOU7%~+Ko=**t}?OaeV{*>-pANHN;UN!h%P>iMKrEr_VlmRFN!!cXJ8EtYks^W z4NXFoSjAOqKD#dEjD(yoW+lGiFDo`|B?)Oo?BT2Rlr59Ls8+3Z7zWX&=&E|l>PD?<&zp0ng0Vo!o&!OlYl5A5YPmgsUO diff --git a/pycen/sites/sites.py b/pycen/sites/sites.py index c843cf4..49ca16c 100644 --- a/pycen/sites/sites.py +++ b/pycen/sites/sites.py @@ -7,7 +7,7 @@ #Version : 1.0 from ..tools import _get_table -from ..pers.pers import _merge_author,_merge_relation +from ..pers.pers import _merge_author2,_merge_relation @@ -61,7 +61,7 @@ def get_sitesInfos(ids=None, nom=None, columns=None, with_nameOrga=False, detail if 'id_auteur' in df.columns: df.drop(columns='id_auteur', inplace=True) df = _merge_relation(df=df,table='r_sites_auteur',schema=schema, left_id='id',right_id='id_site') - df = _merge_author(df=df, col_aut='id_auteur', orga=with_nameOrga) + df = _merge_author2(df=df, col_aut='id_auteur') # merge type_site if 'id_type_site' in df.columns: df = merge(df, typ_site, how='left', left_on='id_type_site', right_on='id', suffixes=('','_y') ) \ @@ -120,7 +120,7 @@ def get_sitesGeom(id_site=None, nom_site=None, columns=None, last_update=False, if 'id_auteur' in df.columns: df.drop(columns='id_auteur', inplace=True) df = _merge_relation(df=df,table='r_geomsites_auteur',schema=schema, left_id='id',right_id='id_geom_site') - df = _merge_author(df=df, col_aut='id_auteur', orga=with_nameOrga) + df = _merge_author2(df=df, col_aut='id_auteur') if 'auteur' in df.columns: df.rename(columns={'auteur': 'auteur_geom'}, inplace=True) diff --git a/pycen/tools.py b/pycen/tools.py index cea4a35..87ce7a5 100644 --- a/pycen/tools.py +++ b/pycen/tools.py @@ -6,7 +6,6 @@ #Auteur : Colas Geier #Version : 1.0 -from numpy.core.numeric import True_ from pandas import Series, Index, read_sql, merge @@ -131,6 +130,7 @@ def _set_geom(df, hex=True): return df + def _get_param(schema, param_table, type_table=None, type_court=True): from .params import con diff --git a/pycen/vrac/__pycache__/Modif_caract_connect.cpython-38.pyc b/pycen/vrac/__pycache__/Modif_caract_connect.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..eaf96af248873fd89c0b1254cca28635adaed70f GIT binary patch literal 2154 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 Y?d9e8mu;Q&FH)WsThp1Qac|cB4S!Wt(EtDd literal 0 HcmV?d00001 diff --git a/pycen/vrac/__pycache__/Modif_caract_fct.cpython-38.pyc b/pycen/vrac/__pycache__/Modif_caract_fct.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b7c22406253b0b0be68506845c39b07396c529f0 GIT binary patch literal 2092 zcmbVNNpIUm6y^*mYO`cJb}TEavYWOeCbhE^4vL}(TA)CSB3%xHwk*Tw3BGwAo``vd=ns$u-D zg_FMu2_Mp%{mKmk3}BHVSV6hq$S3C15GL}WB`n~g1SVL0E^H`)O|*>Wu!1&}kC>|19j-zX7GVjN;S{X&ZCHiVuy$lJ z15ac5NA}S8?$Nhgtce!3X!kn3ZM1Q%Z9L)7>hT8#)=66@ZHqL`9&a1NGhnoh$yq!% zWye0+y548nWB(V@o+tYSZHIM=QH6F}uV)JW40&I~m0@RcX=)I?tm%}$wGXclcUJGD z>RZr;bA6NQK7YiiY90CNbe>&YgA2p!Si(iPIJtq>rVKhqrr1C>ac~2zDHof#Io#6q z{>qq5r3O)tZx9(z#g0F7@ITE~14cxB^$<8eBiJnE^N6 zorP+u4sYWoY+&~l1BWWE(uuq1zM}3<-lLiBU~|}k&6YuQSFf-|{bBgKp7Xy-#f}`+2^?9ZQ~BrzVxr!*_Vdn{-N>vxo8|FF=pOi zJPH9bQQ5iw=;5u~yLXSddvCeByT{xehpBQ1UKZvkTC$*CFUT=SvLpzT)X!xomZc~4 z4l;QDILEORwYd|iL_77RKhka<`FVw-H}h=f2PqOiw>wtuF$xoJPIs7!k2!p(X&%-RwHs;c1rzew9 z=S3C_UUpy5DPDG-4Nzj|WU5XWcQ#%`S?-1K(sA})vu!HYBp+pxi?C;=!}ozwF>lI4_CdgcRd5QSM`2jE+N3G_;^MW}j%ZRP=-kEL$ncOw_b_j#!hZZ0hJ0NsZTP zQK#ApWNV>D_{itzD$z8;5q;xjlBz1k;}J>?5Ed$yDKkof8LDgo?3iww?PnT~G}l~8 z`d=}W8OFIPODv!$TUur3NksT5njq_iW*mq6W4Z@35a{Za-Am-iCqxdDFcxOEA5p>R z(;eN9lqoSITo*7b@Tn@)wA>E~_td^f*tF=wP_DwEM1}WJSwWH>2)Y?rac+AyAi1X7 zVTD=j|7OT83B~fd=MIt)x;j+mel(`+WA}>#!b|La6Uuz-M;JeK>1>J2-6(wQriF2* zd*9W~znS{M6Tgoc=>v@2r_vAH&k`UI2J|JM&jj7DZhD|94@L=$Bm6+aBKwJ!3ZsYH z%+i!C&{N|UNfv9G^fJ!)pLS`9t+QReMAi=3SJ@KTxWSFe8`~rw@;H|G8e64ES|(q; W{$-a=*x4zHv&ydONR;K|zP|y;hA(g}q za%q9yToeUzmyW&k2hFvo{)GT-`i4>s7X<>eA~^H*`R2Wk(3kak#h~AtZ;!lR%ZBlr zR?hxPq`XgW`U5u%Fo1=IVEN7kM?N+uhA@#2EMWl`1u((tabZINY}$)x4oYZ4@q~#o z$rUW-a+NY_<2vOwpd{v?ESgXe^H3EFP!o$#7fVm~AE)_!PFjWRB_^tzPG3tEPAS|)^RxQGiqlaQT1;e<=)wkNat z;tE_CT*U&;!Nu`4yfR^M>BJQ4$i~-k9jyr$8@MsJp%MMWu*1WFqH>4aRWAR>lK3=gt$yM z-ofox)W7jAP0hi^;1+DI8noZmD|DzI4eE7c@Xq+o#DFc`>wj1}`8*ulrW$*B+}(+e zxHqPK!jU{wV;;79B)gmF5ccN3u(QvN&duL7Lq8Su<2b_9?T>~5U@A&?9z1?@>-OHg zQ|bQS(!IS?>28OqVgPO$WGEUk-`&1<5M*8^=A|pOgLKy$WjKUueJW$D8@T-xN4MOuzOPBBD3Yvc1E z&C<=8w$<*+c-VfC`u&%?FEa1oW&2qlCAQC2YX?z#^F^3uZU8Sko&DErhwzw`qfAN> z_SAL!F3=Gf{`Zpm!k%_S*@i#}YOjgF{c0gRVQpt_nc}_*~gT%=$4L z@Bjb1>?MvL&7sP-^BWfzC8sB41`PCwH8DCt4wRJ0P5si@W-3`A<3yD)8VykrO%w|hOO+YM z{*+2K5q3nMj_swIk2L8_O8Ofxlo>>svPV&HI6_gGj$LC_b~lzoFH_ba4kBTuhatg3 zk3OiwP?-`_B5O{(oRO+TZOXiW$V?3jg-wfwZf9|xP#|DERF)qnM}p{{>RZYceQA3- z7rCqzD@Y?x6(!EThb#_>-1&rlG2{+~(~pPf=u=YXgAoB6IiDR7c_QblKxQK^ z#OSF*Wn!5*VQ}Cix%1BM14mEcX5#rzydI`x_c3ywO3!ybiGdjD(`W1Fv)oONRO#U` zhEa&`X^x~n(o$mdaGP0rXEk~%+#+rESQcwC&iEg8p~=?R9&fT5ukj_;G%dyrZj|2G lCS_61sm52>64lZ=W$N`$yKu(O7O2V+TW4)np>xj0{RL!LNlX9$ literal 0 HcmV?d00001 diff --git a/pycen/vrac/__pycache__/Modif_caract_reghydro.cpython-38.pyc b/pycen/vrac/__pycache__/Modif_caract_reghydro.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3c47021e776c1c68882c79aadb087d6a19f23a70 GIT binary patch literal 2383 zcmbUj%Wm67kh`R)r)Bw>C{7&ZSu1g@_?g5`gQ5u9qCkrxeH<2T37R{SsPN?_nZyoq z>e)aqxl70XMn7Y(J@pp?wCU_hbyO4x(2C&Bdv<1aW~pyyW-12$-u`&(lB!|+rikfZ z35k#JO&g|RaD$V;U_?X8DA1ufGMEW;U@?nRR^TSLdX(9`z-@#@Fb5^DdGVC6GU62| zYP^aTwc!lf)_IA|@-l1i3Y+6qHqUEpfzPl-US~^umMx>zIo{xNeEyWO^O{b|U*wlgO=7@hDE>qq8$Uexp0XCZ0#{J)D!$ji zhE~&fO8IJ+J~W_;+$wUfAZMvdo5tWeH=4%q2CR(8nT?WO?h$2i^eb|2qWl9T=a+W))SWA3wP$#!wqe{hkvhuQ679q+*`SWw_=czSJq>(nL&zy1DQ zFsAb0K5X-K*nLg-9gMh)`R~BqYdo3Z1MHuDs1MqF?00t@PAs)X%Do67(_0H+vNJoeQv!u{Zt|JNepZ@BXf4%}F*uB58y`3{`w@qZx=T7Qpz-EPpj(}eOn2VS#2uCQ1rW`lV zAQ!AQQ6H;RxSPS)g4NK_55Z9qpH&hNp&LQufwn=Rmc(oZJxmE_6IZyQ@-dcw(x$9B z=4I|-0IZT7C*XK-E;7~_3*MPa3$yhk^|>rOa{~lr9a0bCP*%q=JDRYR8(9txoxXeM zbj3H)_Ipt*pl!;c7YBJ5rC5w830x1P4MM~s6%>mrRnE$Xt`F{rIWrrgOaQd0z&pzj zHC#?UPayy=YrzXY&C<0Ab*t4CaoBp9di_@$FEOWAt>=9Z(3qO_P83-c9R4m&I(~3WPaOXHtqtU%gTP&8HX+l ze#GI0v_r`HF+Vx@|EU~ED}Zj+rqb-k&n1ncH>4#i5mqx1fIynK;NE=FVQouTs-gw8 z*lH=_f^}Bk0Z~>s(HiYX%ud{hyQ!oJXI652(w7up(~Bc9hl;GGs-{}li32`GMev-} zdXTBE`%L#b6|BQmA*!|SOr@xb9A5MM+^c#+?>EI-D=nrnUE#SF?0P0Cmnm& zQA2>AKM^Og3{f6}z#f&vmn4;D5PRc3wsAsoyc}#dRl^|an1D3>D3e72y6?q`V%b?7 zU8))dhfYy+nJl7rB}ETv{nIW?$;mu=TO`-fR|WT( G*82+rPPsV% literal 0 HcmV?d00001 diff --git a/pycen/vrac/__pycache__/Modif_caract_sub.cpython-38.pyc b/pycen/vrac/__pycache__/Modif_caract_sub.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..dbb3bac76a3d4191703d5725eed46a196c1a1c78 GIT binary patch literal 2414 zcmbVNNpIUm6efohwR+#PII^?Ki7nf*W2bi8pa@!^K#L-2dlvGWg{oKdbp=%y+K9JS@N>EWri12$xz}xD3m1<;*e-EMxXZ^MUdG z!|xbh;j6ex=P%NG6&+kzG9EK1H`$?qMUoatx=NDyCPnI817pePUB?^e=FmoIS6ZgB zIR1sCH%Wg>>0yO@j>3Q;6!ONYs-tBXP_B(1nXG6OMtzRDK zmq+w{U(?DLtSVnrc^PML7Uyufm7%Jyo-wLf<+Xl3$enM%wN4c?I04sto49dq!VT){ z7Mi_n+(P@D@fy}TJF42Bm{^9J??0{m?^2B2&W+w(pz0^clJ68A8c;z+#OPTe^GaLhSYAwlvxkzv6mn(2))u#E0DtKXVPN{R?Ca4akGZg$$delWa9tP#tuM!L(#dPjnc~iW8b(~^A zVTz&fT3(>dwbQ1+W976+0Z^GMMnzKx6`hY<;dXUic^&$Uh#p1<2m$*kh)u8pG zbR$efBAEv~^ThRO%j?`*7TC8+mg|1 zHNrrY=mamRo+u>OLmx)C0H5+~3rR-+W63>m#k<4R|(yb);Nz;?&0G$rqfs{TEjvFh86L=CK^5jKYUXaMF zKn-azuS8A~`UFzlYU!kbM>m)k`XE#7kxnxdT{n?-C-eet#m7E%1YP=`9Q)D|7}M3z zFxU8(Ihso1dUSPYK0bG7QQe|2+8{&ewouxQFgoFMxnkW|r;h-kJ}BJw;=p}nh;?H0 z@}^mBhh3~HS8?@|l%l8AuTBV%LG@ctB&q9T@T5v*g(9i?-cdEu%G$<$RZVw2avP7` z7RDrRU{HM`+(z|_5D4WB`sg$?J~pBgnLF%;kox$M!d?6`Ejg1O=9sqH%@REYW)t_% zXVRp{vT0=|``yV*nv3QRo75I1vrJEkE$S1@U`Fn(W05cNH00R4IZF`~Paf3zhm#r6 Ro73cN*1SfZ3KV_x+@Cr5#UTIy literal 0 HcmV?d00001 diff --git a/pycen/vrac/__pycache__/Modif_caract_usageprocess.cpython-38.pyc b/pycen/vrac/__pycache__/Modif_caract_usageprocess.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6a7c3e3e16fb7a008f54417eee944ba5b98d0e7d GIT binary patch literal 2519 zcmbVOTW=dh6yBL#udi{^#JRO8b(^$}+cZw%+)6^JPz4AHgv#Y%1X!D$V|(58?q+tK zHmUl=b0l8+Zok1lf_deMzfcLvnX&6SAXNgdcIMn?<~!%i`kRS~oPodBKb$(h8=rMSthCS^8HaU16}nC%SMJbg}B z7U>+MHJwL~LT>_ni#)?7d6rG_9J|ExY?>F?44+^nUSzX;lFjicHqS4y1@vCz(|m@P z&MCXBx!ECiMRRjQZV9sOtLkmP*Sp5&`()8zW#q5(9VqkNmnOf)%l!JeNes9F=^x1> z_61lq@vpqS3z1jYXrk3h(vF$VX|H zn?!jW|BBKI>hCB$U&a_&m|0ZgoTf{fp4arOrWZ6lhf(js<@Q?dUf;lZUCn(u@|)NC zD?|O2G5sLcg4Qn$^-E*=LHud87GF_oAtEM(Zc;d` zUxh>5`_#YoPQEfK`+uk&`+`lJg#pC%R=4AEh*_q#|M=0y=JxK0+IvIoZjY#)3Xy4# z*JCdMHY4<0@5W9OA`!X}$4V%aRtxJ+7b(FCLl-S%IqoDd@L~nWO}rDdR~uor*NIRd zGf{{!yfDz7+C=NK7-wL@@<@)XCL>2Uo%+b|;|gW@fh=*3d|jFqW%X{G5O!pKaGd&pQHH{c)HbE1;>)amRBt&)^@jLb+FmmV z1yoF#c0<4031S2;hr~Ev2TQAn1;~`&^pSD0ic|2O#3(Bj{{Wz(6{6(d5@QSSAeoXX{Cb}?t zpgOzHaft-}d&mQ34u&mdp54J8-Uclj*v^$WrLVkAe z|BrGYEgu?5g-Wv(K9w{KUXilQ1&CrK04HhUfNS$%1y(GPQi$4WNUK48Tq>r>Dq4Mp z1b%^x3ejejhs=(gfIG3I5ocC(de)K@U(*c(F@uJzprBKAUJrdf#s%<{O*J98*c6mE z*o2ZQkN6YJHp{4-D;C3ph*?glhwWnGEJ|vbjKDl8v95RBSc(~RklS)P5!0vErEMP;{I`TJ6vam>D1Y2opGXDINRL6cA&7>0VLk@|lf;!VKeT zixlp!3DR=I=#*hg#u{FGP&Z;pp>BC`;QV5U8Zvr#6;@ke2dXMmT>Yqv%XO-3W4sbs!B{z5Y25B_M|J}s>XD6no76ZkTQ}ZS^D+2&p)E_MX delta 59 zcmX@ZxQvlIl$V!_0SMA>N>Ajr6TZbsh)p@;=21SWo&PmGb`4M^WfhNqJ6De!WcwRU2&Er$I8zOj@-{$N$LFkWFZaxaiTOjoa7)Kmu zXo_Qu5%)Re&MA%wce!_pV#>(?^@6_;hkDrD`XWYKg6WwQ10j#nMD!Dz?E1Aq@POU} zsb9c2=ENqiDI~|7W@Jih2P5rNh&u~hyV|YXGw&Ro;0mv!+N->Y&p|p1&Qa}amxF)O z;$DThzi{fHa(GaoD&VaJJqyp#q+PcvTD2;|!v(3sDx7pGpSO8uK`;WTdqCw+uy*+h zSXUcs2u-c^B?g4hRZ9xShkI!zK=D6{!4`V{;*;-DFd-sblEzo-&TDAUoD$ z@5|srD9tpxK=K~w|Gq~1#Z*K|kuep$gBxM9XlJhXi#+@s&OB?09X=DhpMXnwIL%0LK5U=4C;N;RHcR*jk0gzk= ze`0rg{p{o{HD`Gr1dZVQFq|LOaCQ@Nf@@OQODBElg1<+vCYz;7n;1jS5cb&KpR70p(MjP)kboUsFr5+jNN;~~qFZ}f`g;BW8imjkWriP1xC-W`>?3`+kkr6eXF zZ4=bb2oR75>4uXups4snGy<5Fj-gyaBW;9{lgBZ}4lr5DCUOE($6SOfOL38WV#jF{ zJMQ9-&?GLQak6#`Hv3-e4~9N_s_nmta_QR_a1VU@0q*h@-+qC7VZuN7WM=eC8EwLJ zdD;aZRcfw{5mYiVyb`CcYI8GW@YYLIR()n>jrh-p#dtc=MLDfhT|A-f)k(2Cx8v!X zVpo-~)uFD7+5G*uAcf!$W^{LkG4Dg#{^I4MK3#ZG)wXN( i7w&{wuR5yjhy=PhZ&9g}Vx59nC%zL_J{Q|O&He!H0(BAq diff --git a/pycen/zh.py b/pycen/zh.py index 8f0e7ba..afdf17c 100644 --- a/pycen/zh.py +++ b/pycen/zh.py @@ -16,7 +16,7 @@ import pandas as pd from geoalchemy2 import Geometry from .pers.pers import _get_table from .sites.sites import _get_typ_milieux -from .tools import _get_relation_autor +from .tools import _get_relation_autor2 ##################################### @@ -277,7 +277,7 @@ class zh(): dic = self._get_param(type_table='type_param_delim_fct', param_table='param_delim_fct', type_court=nom_type_court) if not df.empty: - df = _get_relation_autor(df, relation_tab='r_rsitedelim_auteur', schema=self.schema, + df = _get_relation_autor2(df, relation_tab='r_rsitedelim_auteur', schema=self.schema, id_df='id', id_relation='id_sitedelim', id_rela_auth='id_auteur' ) df = pd.merge(df,dic, how='left', left_on='id_crit_delim', right_on='id', suffixes=(None,'_y')) \ @@ -304,7 +304,7 @@ class zh(): dic = self._get_param(type_table='type_param_fct', param_table='param_fct_eco_socio_patri', type_court=nom_type_court) if not df.empty: - df = _get_relation_autor(df, relation_tab='r_rsitefct_auteur', schema=self.schema, + df = _get_relation_autor2(df, relation_tab='r_rsitefct_auteur', schema=self.schema, id_df='id', id_relation='id_sitefct', id_rela_auth='id_auteur' ) df = pd.merge(df,dic, how='left', left_on='id_fct', right_on='id', suffixes=(None,'_y')) \ @@ -325,7 +325,7 @@ class zh(): dic = self._get_param(param_table='param_type_connect') if not df.empty: - df = _get_relation_autor(df, relation_tab='r_rsiteconnect_auteur', schema=self.schema, + df = _get_relation_autor2(df, relation_tab='r_rsiteconnect_auteur', schema=self.schema, id_df='id', id_relation='id_siteconnect', id_rela_auth='id_auteur' ) df = pd.merge(df,dic, how='left', left_on='id_param_connect', right_on='id', suffixes=(None,'_y')) \ .drop(columns=['id_y','id_param_connect']) \ @@ -345,9 +345,11 @@ class zh(): d2 = dic[dic.type == 'Submersion fréquente'] if not df.empty: - df = _get_relation_autor(df, relation_tab='r_rsitesub_auteur', schema=self.schema, + df = _get_relation_autor2(df, relation_tab='r_rsitesub_auteur', schema=self.schema, id_df='id', id_relation='id_sitesub', id_rela_auth='id_auteur' ) + df.id_etendsub = df.id_etendsub.astype(float) + df = pd.merge(df,d1, how='left', left_on='id_etendsub', right_on='id', suffixes=(None,'_y')) \ .drop(columns=['id_y','id_etendsub', 'type']) \ .rename(columns={'description':'desc_param_etend', 'nom':'Submersion étendue'}) @@ -375,7 +377,7 @@ class zh(): dic3 = self._get_param(param_table='param_impact') if not df.empty: - df = _get_relation_autor(df, relation_tab='r_rsiteusage_auteur', schema=self.schema, + df = _get_relation_autor2(df, relation_tab='r_rsiteusage_auteur', schema=self.schema, id_df='id', id_relation='id_siteusage', id_rela_auth='id_auteur' ) df = pd.merge(df,dic1, how='left', left_on='id_activ_hum', right_on='id', suffixes=(None,'_y')) \ @@ -422,7 +424,7 @@ class zh(): dic2 = self._get_param(param_table='param_permanence') if not df.empty: - df = _get_relation_autor(df, relation_tab='r_rsitehydro_auteur', schema=self.schema, + df = _get_relation_autor2(df, relation_tab='r_rsitehydro_auteur', schema=self.schema, id_df='id', id_relation='id_sitehydro', id_rela_auth='id_auteur' ) # dic3 = self._get_r_toponymie(ids=df.rmq_toponymie.unique().tolist()) @@ -454,7 +456,7 @@ class zh(): params_col={'id_type_milieu':self.id_milieux.astype(str)}, statut=statut) if not df.empty: - df = _get_relation_autor(df, relation_tab='r_rsitehab_auteur', schema=self.schema, + df = _get_relation_autor2(df, relation_tab='r_rsitehab_auteur', schema=self.schema, id_df='id', id_relation='id_sitehab', id_rela_auth='id_auteur' ) ids = df[~df.id_cb.isna()].id_cb.unique().tolist() @@ -638,8 +640,7 @@ class ref_hydro: ##################################### ### Update ### ##################################### -def update_to_sql(df,con,table_name,schema_name,key_name,geom_col='geom'): - from geopandas import GeoDataFrame +def update_to_sql(df, con, table_name, schema_name, key_name): a = [] b = [] table = table_name @@ -651,24 +652,14 @@ def update_to_sql(df,con,table_name,schema_name,key_name,geom_col='geom'): b.append("t.{col}=f.{col}".format(col=col)) else: a.append("{col}=t.{col}".format(col=col)) - if isinstance(df,GeoDataFrame): - df.to_postgis( - name = 'temp_table', - con = con, - schema = schema, - if_exists = 'replace', - index = False, - geom_col=geom_col, - ) - else: - df.to_sql( - name = 'temp_table', - con = con, - schema = schema, - if_exists = 'replace', - index = False, - method = 'multi' - ) + df.to_sql( + name = 'temp_table', + con = con, + schema = schema, + if_exists = 'replace', + index = False, + method = 'multi' + ) update_stmt_1 = "UPDATE {sch}.{final_table} f".format(sch=schema,final_table=table) update_stmt_2 = " FROM {sch}.temp_table t".format(sch=schema) update_stmt_6 = " WHERE %s"%' AND '.join(b) @@ -681,4 +672,17 @@ def update_to_sql(df,con,table_name,schema_name,key_name,geom_col='geom'): cnx.execute(drop_stmt) return print('END update') - \ No newline at end of file + +# [SQL: INSERT INTO zones_humides.r_site_reghydro (id, id_geom_site, id_reg_hydro, id_permanence, rmq_toponymie, in_out) +# VALUES (%(id)s, %(id_geom_site)s, %(id_reg_hydro)s, %(id_permanence)s, %(rmq_toponymie)s, %(in_out)s)] +# [parameters: ({'id': 0, 'id_geom_site': 5, 'id_reg_hydro': '0', 'id_permanence': '1', 'rmq_toponymie': '', 'in_out': True}, +# {'id': 1, 'id_geom_site': 5, 'id_reg_hydro': '1', 'id_permanence': '1', 'rmq_toponymie': '', 'in_out': False}, +# {'id': 2, 'id_geom_site': 6, 'id_reg_hydro': '0', 'id_permanence': '1', 'rmq_toponymie': '', 'in_out': True}, +# {'id': 3, 'id_geom_site': 6, 'id_reg_hydro': '1', 'id_permanence': '1', 'rmq_toponymie': '', 'in_out': False}, +# {'id': 4, 'id_geom_site': 7, 'id_reg_hydro': '2', 'id_permanence': '2', 'rmq_toponymie': 'plusieurs petites sources dans versant', 'in_out': True}, +# {'id': 5, 'id_geom_site': 7, 'id_reg_hydro': '1', 'id_permanence': '2', 'rmq_toponymie': 'longe la route D209a', 'in_out': False}, +# {'id': 6, 'id_geom_site': 8, 'id_reg_hydro': '0', 'id_permanence': '2', 'rmq_toponymie': '', 'in_out': True}, +# {'id': 7, 'id_geom_site': 8, 'id_reg_hydro': '3', 'id_permanence': None, 'rmq_toponymie': '', 'in_out': False} +# ... displaying 10 of 5779 total bound parameter sets ... +# {'id': 5777, 'id_geom_site': 1951, 'id_reg_hydro': '0', 'id_permanence': None, 'rmq_toponymie': '', 'in_out': True}, +# {'id': 5778, 'id_geom_site': 1951, 'id_reg_hydro': '3', 'id_permanence': None, 'rmq_toponymie': '', 'in_out': False})]