From 45eb1809c2bec0653048278b24472a4dd793c1d6 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sun, 13 Apr 2025 16:28:48 +0200 Subject: [PATCH] Visualisation des autres lieux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amélioration de l'apparence des marqueurs Fix #378 --- .../static/images/leaflet/circle-icon.png | Bin 0 -> 849 bytes .../static/images/leaflet/circle-shadow.png | Bin 0 -> 712 bytes .../static/images/leaflet/circle.svg | 57 ++++++++++++++++++ .../static/images/leaflet/marker-icon.png | Bin 0 -> 1948 bytes .../static/images/leaflet/marker-icon.svg | 52 ++++++++++++++++ .../images/{ => leaflet}/marker-shadow.png | Bin .../static/images/marker-icon-2x.png | Bin 7731 -> 0 bytes .../static/images/marker-icon.png | Bin 5740 -> 0 bytes .../static/location_field/js/form.js | 23 ++++++- src/agenda_culturel/static/style.scss | 4 +- .../agenda_culturel/place_detail.html | 44 +++++++++++++- .../templates/agenda_culturel/place_form.html | 35 +++++++++++ .../templates/agenda_culturel/place_list.html | 18 ++++-- src/agenda_culturel/views.py | 10 +++ 14 files changed, 235 insertions(+), 8 deletions(-) create mode 100644 src/agenda_culturel/static/images/leaflet/circle-icon.png create mode 100644 src/agenda_culturel/static/images/leaflet/circle-shadow.png create mode 100644 src/agenda_culturel/static/images/leaflet/circle.svg create mode 100644 src/agenda_culturel/static/images/leaflet/marker-icon.png create mode 100644 src/agenda_culturel/static/images/leaflet/marker-icon.svg rename src/agenda_culturel/static/images/{ => leaflet}/marker-shadow.png (100%) delete mode 100644 src/agenda_culturel/static/images/marker-icon-2x.png delete mode 100644 src/agenda_culturel/static/images/marker-icon.png diff --git a/src/agenda_culturel/static/images/leaflet/circle-icon.png b/src/agenda_culturel/static/images/leaflet/circle-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1b33e5ab5d263cb7e8d5edb08a74274c5ae96a15 GIT binary patch literal 849 zcmV-X1FrmuP)EM7OrEDvB5z9tOv8u-om8sZ?qfzvRRy(t8g5Pp})NygbM& zzdtOBV(v1arfGCzVvym_dt0M-Xafx)Jr6)oP%V} zkrL{Lbe$O6lbv2jMbi`r|IxBPjdwM_5)s&zUayD!e&3r+CIkRLL=wmG>f+*Jb#-;+ zwtb^Ev0kr-*Vos+@B0w|94(j2L+6}E#3~4a830U+qOg~jm&GRf7uM}|X*?buSZiB( zo}cD<9#>VR0YCwOXss(_Olpitq9_`joSZz~+}!X#Shw4y`}_OjJkP&cYfqVZ9{@b( zoLaw(hynmBB3eXIlo(@f8;!TrgX=Xl5)6_#|R?fMPKz~5zoMvW)L?nn<0l@ZEcst^GUP(lPaU8FRXr{IP2q;?X z%JaO(IF46191hv{{mI_mUW$mTT_i+Y8DoC7={TEEuYuswTXm?mQfTXVHn;G27>|s0096*#I@V)nK9;j ztyUWm(Jw^gO%xFY5t)d7)oQhoG3K`2ZqG!-0qouyr7 + + + diff --git a/src/agenda_culturel/static/images/leaflet/marker-icon.png b/src/agenda_culturel/static/images/leaflet/marker-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cf969d11854a19eed80c2b1b61a04d1d78950f9d GIT binary patch literal 1948 zcmV;N2V?k&P)JEl&}R#(iBKZ0wQdxcDG_z+NPmesa=T&NOw1F z9&$mgDs`nwN!2RZ^){vsLCNw&(xwSfLnW{vO-KTyh$d_ZD9a_r7+>&ZY>a0-%uF9r zCN>yjdZc;q|6G1P{=WInXNe#PNMwzTjah27`o}7j>WCl+IWn0{!Sg)Naa2 zQ&LiT&!0aZPE<#-5$M>lV})9+)|{D{`DR5$MP_Mfsa&hoihiEw;dZ+*Iy$;EGBOgR zX}Zhr_qUkMW-2L=L?V%#I(6!Ey zxg1`e2O$A6B?Pi)8j3k9_Lr66a7|4NjHYRvJ9loze>rmGh+%Eu z=k4vFcI?1_AsZuhJ63o;rkH{xabWv)L>3qE{K^%4{NaZnh*ztTl9Gbj+S+W3#quiv zeb zBFRuHm7?Rt*I$Fr&%?0Gl{944h8H~$($nGh`$bK!*AohbqL`4$WQyqE|4dH8txzDu zvRek(f^;Ide^!Lg5x+Q`WVur zr9l>Fhb3!rfk%e=^*itL`2b*s5CmajadA;}6z|vpEyqE!zQ(4elF6WpM6fM4SJY-_ zXBmp3dI^f6Zca>0hA znf#_mS16DdTEaUA4~p8eXU{m6WjlfYjfqew)c)kj6J|Bw;J$rGowMRQdVSKM{RRU_ zyB!4u1)}!o(IdCd=j#wbEX)3NXlTf@8X%QQu`?$J70T44Hbn|aqLk-RTUjY;48y?T zaQH4?zWh=InM@`hMN!XPQK!MXhYurjVF4wXnQQB=v+rdaAbUBBs`7GC8y+5}S5{U` ztDnUQ>+yI#?d$6kyGlz-!y5_(YBZXJUCBuj-z5l?7Z-z!TGN4nfkmg&d1W1_t*!0; z`1rU#5{Zbx4fXZNTCk%yL044<15{Qkz8^LCrl+S74u|h{baaH)fdC*9iL{Q4jEI{; ztyUvjsl*|z2Bc(tU#U_lDoFyBB_-mP27un)US}W>_WL(1$d-m0z^wO}xag@uKAlgTu>A;@Sn29}qXyC)|n#lugjRAP5Q z0S?OLP(-akx-%%Kg!F)J6U>Y z7zW?iwoUYN9EX8{0Z%9t>WEh}F34;)PuT7D7t!Mb0Dkt~d)Vb!gyH2&{QUj*V|T*YG`FVNJLxMd!cS0RC+<2ZxPfw3K5C~k@s2&7C z*zjp-X?ZX=HzzO*lkn;9@25|mJo%eMwKnVs0Q`RcC%13kb|#A9I1W8MJ#LQU&L@gX z2x@I@9kp7mFI)+(UW0>!499V%&HnKv1OWg=QNOr#>sH*ZIF5tGVsWu7``Ko7HU+h| zwti)^*(T$4_3+_CIueO|u~|1sfdIhk^?r2o=FOO{IF3Vqf4`Gq7-KRuk^)`2bm`gr z{QS7n`I`0M!Gq;+IBYZ;jZA{nt$_f*^N`o(@pwMz?Ch)xhr@oYR{P~vauc2m@t!kh i&iwJji4$*cHSfO=%)!WG4lP~)0000 + + + diff --git a/src/agenda_culturel/static/images/marker-shadow.png b/src/agenda_culturel/static/images/leaflet/marker-shadow.png similarity index 100% rename from src/agenda_culturel/static/images/marker-shadow.png rename to src/agenda_culturel/static/images/leaflet/marker-shadow.png diff --git a/src/agenda_culturel/static/images/marker-icon-2x.png b/src/agenda_culturel/static/images/marker-icon-2x.png deleted file mode 100644 index cd2eeb8b68f959e0c4d6b8c69a4414edd75bd32c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7731 zcmeHKc{G&m`yZ9EMv_FB24x$w7~5puiDEF8w9Lw6#xgUO5Gq@W5XxGXDP<`_WGUHY z%NAuzi%MCtNBkb@ec#^m`=0YV?>WEkfA5@g&vQTbeO;gXx<1!(p8JyJQDa^%5iSr2 z#A|9|fB~LJU|=}51OGzL!zX~pGd~-9CI;sN_Mp3yDO3`edDepjCizmxAdv4Xnq>`d zEtqFj$* z`UfT?0Q64OK|o~o1``BgyGYU3w=~t)|HB)=htzYinkKb6`|D3xvoLa8-u#{smT6xy zA<>SZ5F3sXz1*D#uLtU03zMp^xAK6hEfv~(d3g5q*4XlI)7D89OBFnkUAHbBDufW< zzxZ~js&VMBj*HC=vRB)dWVe)0M7`Dz*!oWSXB?Rl2d*@=B0osUvX9JoT?L(*8q;{b zK6o?BuI)GvM?~GjRyb{pckGkJ>(R<%`$^Ic(prbaRX<&*yXs`85%|`L=`fmPrF1R* zP_)41`kh$xjRf;3-$=FFXVCAt9j@B8A5SeYiz=CHJ|)~dA^+Uzj`|fTp~7vP5WyZx zBX*Us;?LRkCf$M08nxejm!`|Ule-v8V6%0JIibBIu{zl&XMWVzG7AizHO z5Bq2y78ZZPyD@&T0Pq3x#d*LGif|Z>2K!xu!8G&+Kz@K#jsMB!;^eoj@}5 zCb=;se}^Cv{?zyIqEk2BArfFDDv1V&GJsPNe>>9H)WY&ljSUK%DKw8wEr9I5Nir$q zzsUNVZ5unA?)+{Dp#CTB-=zQWeNz~avamoKxD&iK%riC6glwFTCb|Zd(B5M8q+1 z1~?`O0EHt_XapP$SF%BH5byA`JG+Vc15`_`_oj*#F{0V^iR_CIjgGTmzaH&ZM2>L;_p{1{);C7(ElFtkNEwUu7BzJM-2QU;eWI1U%LJg1OG_)-|YH-ql@dW z>lDci_zLm?E=$PE{g;4?)^_|6V}s2r7id|(A_$mqdYCvcKp^hj8-op$oGJ_~?qHf) z81DGUwUwVsz`wM*2)MnCm>THX_`VuS@u%)@JlCkLRPo5aF>6W9O6XJ(X#kn5l1M9; z726ka8KQH6L$@33by-LzrqpE(dHR-B7Dpu2Au`)On{emM#arIT?--_`@cx$na z++G5lcX8eMTaUY2LuwXdE8h-%CEN~bofMOe^J%>Pg&7>0^M0~@>hQ>jf7tXoF+zEL ztmfiSncLpdAzo(Iyb!<8h38LgFO15ux=PXw@E=>N&%FufZYm^b+V@Ru;e*sAqDPW- zCW0hwMkcJ@1my|E+xNDpqBM9kI9m6f)U*0~ z@1h$|%#W3B6e@uI^%_zyyJgW@7TrxjtDw4057=s3SssvFb{Os$KX5&FRc~U8-m0=v zxuk}-2mVK}hTrt%Y|)(}RXYSY(Z?M>_IF0e=d)jR&9{2dA;6D+!_4U8c|TjJt>q@H z1dGNyoSK@c+&zEK>4c8R;*<}gtt}`N6NJx>W0sb99=h)!Gc_Dpe)ZeEzL}#o2eUx$-;cb05VxW(1OHptP?k0|JHo znfn$3w&T6*-$$?w?7Ec^kiHlmrbCIr3+8J-AFgsv8v^d1n;Cnb%Hc4n;Km1tV~K@sWF){PMB7xEdZ z3=N@aya>f#Y6cTegwtjwOkb9L1&`+EzI-~X>k&KftWjvzh5mxCygA5VLJai!@L|(_ zm2}K%KhmlmVA0 zbTJLqN0^`myuwP7=MzkDCO&h()PrFh?s+i7Z!o-#KdyBfXk6ruT4S_*qBUybe(Z^#3WG-L!@$9;(q z{^ElIC^J)x83yCDclERa&rE!zP4Q0mUEAjN;*7iAOD18zGt^}Sp`$5JC%+}P9a**M z=T2^4@E#1QbrD8l6?)6R$9=sk2u%!?mrmq&x%F;^_#>DYUy3qm-u^tZzBCDb53};x z?2WxpbWFC>^}AG|_*dBc!-=}!CXQ6P5Q~1|dyV-!7 zjBD2{<#Y?TW#AYlj-%)pGf#%~?t+P;A%$7@jk>nI z#}}#`Hog9})S`V>_%XA2kdeC5U$J;a%<7S7entkHYV6aOXh)Vvt(OVs`JMXhe7p%t z16OH-O%g-PR^Ch>#xc9SoRpb`PVf(X{nUW*y{juvL07JLob^kNZa+F`aH05Z3`{V$ z!|vNOlv_16*oKSjoMFFuZuClF?8?--ie7PSb7!0xVo#W$D@(kz4cpiwviJT;WpK#o zixofL58S6tzbvHGQV=+6=%)M>IEx>30iRUYd8G?mD*~)bh}=~(rnS`;7gw+K`b?N_4;ghRTLuZM?6jasogDjkWw_Cjr@I8XNy zW^aq)qrp!(c#73ikpzLvxZ?F!C407(t7&1=D{8&QL3hbt;m611Wb#R6e?s;`T(oastD78TXm z!(%qXl32av9q64#(^$Q~{*0M%`bHZO;x&`oAy(m(AJqz~A4@4ZbnUE|Y+D-sz!v<= zygM^l_X?}T6fUndD?FK<8|fh}5tjD{eIL}GS*?$#FHp?l#MyhIZR2da`xI0qoJFrS zuNN1jp;_fq)#4#bd$Liv`|q1W;ic?}D0#GU{qkMewQpY>UQsX8Xf%{TJ6K$a1%Xu# zb+~J;oM^AxnORkZ9H(Y@`w6lzSFWZ|b!H=d=9+wXE17RixgI`gYvo}wg~f{VJ{#RB zdGR7lFuVH!O_XQnvo8vKRZ9XJ{0IJgN<*#JOycs?aSv#HW5D9^(m)Mrng=0 zgNhQFJQmi#oq(~MHXDGA&vtg6##Ugv4{(@QCorSrhac~0XlP}b^F0a*z~dwn~#j8Lz%c%BioXBZXQ zMDO6ht$C#uT|Rj$G2QO<&hdm^H$(2*cgCgy{B=*|0)d%tU8>tNDpcgqU-m-y8@-gv zEWJDg&V8UhH4lBJGZgoO$H`s7QM812563X;(c*h{sP#i7!2|n6b1R*4I~`hfEyWIZ z2({WOB>T&=#YPAjQf{PPnF@6MG<^TVRIot$sTr;kvkp+Oy3Ld^Pu@XM<=N_cX=5Fuw>`#Bp3S@+pLqRoS3ox?Dd)l1W7Txt zmx#7d%&yzF-v;{;UpTrJrf4R$GC0RqlJAxgt3$B;NS*xvD_0(Xl7)7l_69Qj()_uJYBQHns%s zuI~AwLJe>OuQ*7sKF&d%CCOK6RzgqBacOCI?|$hvZ)2kLtD@lj+JWM84`;DQTY6c` zmke0!$x*r5=Q8^)mG`nCehhDYFNeITD*qURZ9$mU_Sn>gr5nvI(d!+x_#a}9br7T{ zlk-BN%HCiXY{q1Pd~gT?-;NB(Yi*fhN_#nQiWZu&XW%5$0_oC_e4eJ==Op

aOih zc;%;FDxjKG61HR@J9hWIxYJ27{%)Ao7C#Yf_)t{&yjNAP#0{S|?*@*$?^LmJ?Jehl zPu(qb)<()j30n4=U$gqH*=tg@5&|>RFSfYyZHvHqgn&~!BKd6}waHP<>y1;4Ojt+r zj09b6b&lR#7?}6ut~(@~aLZG_*tosxPQd;~;x?R1W%@w$8h5nVO7j^52Qf*V;yB5W zmb_`F;|{IX^-oe-8mLYb^Mf}X@`ZDE(3d>KYjm$oTcivZ@Lv|K7WMj^fP^|&muaRS z4k(+e*~*r=rwVW1Y_#0%RSGeX?lZU(87vQEs!yNZc2}s@Selj?eO-~SKWZxFYjN43 zJ?ObKy5NyKzY9U;^+xI(qLh=Vu2bb1Loa(!N(t&G~Rb6 z&^2F+`L##3t>A>i=&W!0z`<+CS967ODY*#IX_jj^U)4kG?EQU`+>ZGJ>Ymc%+o_S$ zMm?Z+`kcg*xysjbQ-?44Jdg_#UYIYLJf8PM!e-0r^7VDmep57U0rK{CsCxeN_H$K> z1@rOr6Tx*BRRLPBs^;a46~{(?VBmQBW!UK2H`7kN7gX-K`5zzr%n!ZfHL3g-if8r8 zeReH9R~Fn#D@m@){apGqd~eercH-I1AkM~gO>JUFxj VGokHa<;LaE)bOZ5f!^s0{{zT1)7k(4 diff --git a/src/agenda_culturel/static/images/marker-icon.png b/src/agenda_culturel/static/images/marker-icon.png deleted file mode 100644 index 2ca8663a7d5ec38b1c8e5db196afe73dfb1233fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5740 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 diff --git a/src/agenda_culturel/static/location_field/js/form.js b/src/agenda_culturel/static/location_field/js/form.js index b6b48c5..4cd34ab 100644 --- a/src/agenda_culturel/static/location_field/js/form.js +++ b/src/agenda_culturel/static/location_field/js/form.js @@ -397,6 +397,26 @@ var SequentialLoader = function() { map.addLayer(layer); + if ((window.other_markers !== null) && (window.other_markers.length > 0)) { + var layerGroup = L.layerGroup(); + window.other_markers.forEach(x => + layerGroup.addLayer(x) + ); + map.on('zoomend', function () { + var currentZoom = map.getZoom(); + + if (currentZoom > 12) { + if (!map.hasLayer(layerGroup)) { + map.addLayer(layerGroup); + } + } else { + if (map.hasLayer(layerGroup)) { + map.removeLayer(layerGroup); + } + } + }); + } + return map; }, @@ -414,7 +434,8 @@ var SequentialLoader = function() { _getMarker: function(map, center) { var self = this, markerOptions = { - draggable: true + draggable: true, + icon: window.pinIcon }; var marker = L.marker(center, markerOptions).addTo(map); diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index 612a0ee..c0d774f 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -1356,9 +1356,11 @@ img.preview { .leaflet-container { width: 100%; border-radius: var(--border-radius); - [role="button"].leaflet-marker-icon { + [role="button"].leaflet-marker-icon, + [role="button"].leaflet-marker-icon:focus { background: none; border: none; + --box-shadow: none; } .leaflet-control { diff --git a/src/agenda_culturel/templates/agenda_culturel/place_detail.html b/src/agenda_culturel/templates/agenda_culturel/place_detail.html index a1286be..c1dbfe2 100644 --- a/src/agenda_culturel/templates/agenda_culturel/place_detail.html +++ b/src/agenda_culturel/templates/agenda_culturel/place_detail.html @@ -80,13 +80,53 @@

Voir aussi les autres lieux diff --git a/src/agenda_culturel/templates/agenda_culturel/place_form.html b/src/agenda_culturel/templates/agenda_culturel/place_form.html index 0d86ba9..50390d1 100644 --- a/src/agenda_culturel/templates/agenda_culturel/place_form.html +++ b/src/agenda_culturel/templates/agenda_culturel/place_form.html @@ -1,5 +1,7 @@ {% extends "agenda_culturel/page.html" %} {% load static %} +{% load cache %} +{% load utils_extra %} {% block title %} {% block og_title %} {% if form.instance.pk %} @@ -15,6 +17,39 @@ {% css_categories %} + + +