From 326a46370e23736b06cba9c6d6bd73545b88ed5f Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Fri, 8 Nov 2024 09:53:21 +0100 Subject: [PATCH 01/15] BREAKING CHANGE : install.xml for J5 component --- com_leaflet/install.xml | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/com_leaflet/install.xml b/com_leaflet/install.xml index cb59a67..70d4860 100644 --- a/com_leaflet/install.xml +++ b/com_leaflet/install.xml @@ -1,5 +1,5 @@ - + leaflet @@ -24,15 +24,19 @@ - - index.html - leaflet.php - controller.php - views + + leaflet.php assets - models + services + language + src + tmpl + + site/language/fr-FR/fr-FR.com_leaflet.ini + + index.html js @@ -45,14 +49,20 @@ - + - index.html - leaflet.php language + services + src + tmpl sql + + + admin/language/fr-FR/fr-FR.com_leaflet.ini + admin/language/fr-FR/fr-FR.com_leaflet.sys.ini + From 0e94341e999ac5708fa76156ab2efc1807888b8d Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Fri, 8 Nov 2024 11:06:03 +0100 Subject: [PATCH 02/15] BREAKING CHANGE : adapt "site" part for J5 --- .../site/assets/css/images/layers-2x.png | Bin 1259 -> 0 bytes com_leaflet/site/assets/css/images/layers.png | Bin 696 -> 0 bytes .../site/assets/css/images/marker-icon-2x.png | Bin 2464 -> 0 bytes .../site/assets/css/images/marker-icon.png | Bin 1466 -> 0 bytes .../site/assets/css/images/marker-shadow.png | Bin 618 -> 0 bytes .../site/assets/css/leaflet_v1.7.1.css | 640 ------------------ com_leaflet/site/assets/leaflet_v1.7.1.js | 6 - com_leaflet/site/controller.php | 30 - com_leaflet/site/index.html | 2 - .../site/language/fr-FR/fr-FR.com_leaflet.ini | 6 + com_leaflet/site/leaflet.php | 9 +- com_leaflet/site/services/provider.php | 25 + .../site/src/Controller/AjaxController.php | 30 + .../site/src/Controller/DisplayController.php | 20 + .../site/src/Controller/LeafletController.php | 30 + .../Model/LeafletModel.php} | 44 +- .../site/src/View/Leaflet/HtmlView.php | 36 + .../View/Leaflet/JsonView.php} | 33 +- com_leaflet/site/tmpl/leaflet/default.php | 46 ++ .../leaflet/tmpl => tmpl/leaflet}/default.xml | 0 com_leaflet/site/views/index.html | 0 com_leaflet/site/views/leaflet/index.html | 0 .../site/views/leaflet/tmpl/default.php | 84 --- .../site/views/leaflet/tmpl/index.html | 0 com_leaflet/site/views/leaflet/view.html.php | 46 -- 25 files changed, 237 insertions(+), 850 deletions(-) delete mode 100644 com_leaflet/site/assets/css/images/layers-2x.png delete mode 100644 com_leaflet/site/assets/css/images/layers.png delete mode 100644 com_leaflet/site/assets/css/images/marker-icon-2x.png delete mode 100644 com_leaflet/site/assets/css/images/marker-icon.png delete mode 100644 com_leaflet/site/assets/css/images/marker-shadow.png delete mode 100644 com_leaflet/site/assets/css/leaflet_v1.7.1.css delete mode 100644 com_leaflet/site/assets/leaflet_v1.7.1.js delete mode 100644 com_leaflet/site/controller.php delete mode 100644 com_leaflet/site/index.html create mode 100644 com_leaflet/site/language/fr-FR/fr-FR.com_leaflet.ini create mode 100644 com_leaflet/site/services/provider.php create mode 100644 com_leaflet/site/src/Controller/AjaxController.php create mode 100644 com_leaflet/site/src/Controller/DisplayController.php create mode 100644 com_leaflet/site/src/Controller/LeafletController.php rename com_leaflet/site/{models/leaflet.php => src/Model/LeafletModel.php} (82%) create mode 100644 com_leaflet/site/src/View/Leaflet/HtmlView.php rename com_leaflet/site/{views/leaflet/view.json.php => src/View/Leaflet/JsonView.php} (58%) create mode 100644 com_leaflet/site/tmpl/leaflet/default.php rename com_leaflet/site/{views/leaflet/tmpl => tmpl/leaflet}/default.xml (100%) delete mode 100644 com_leaflet/site/views/index.html delete mode 100644 com_leaflet/site/views/leaflet/index.html delete mode 100644 com_leaflet/site/views/leaflet/tmpl/default.php delete mode 100644 com_leaflet/site/views/leaflet/tmpl/index.html delete mode 100644 com_leaflet/site/views/leaflet/view.html.php diff --git a/com_leaflet/site/assets/css/images/layers-2x.png b/com_leaflet/site/assets/css/images/layers-2x.png deleted file mode 100644 index 200c333dca9652ac4cba004d609e5af4eee168c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1259 zcmVFhCYNy;#0irRPomHqW|G1C*;4?@4#E?jH>?v@U%cy?3dQAc-DchXVErpOh~ z-jbon+tNbnl6hoEb;)TVk+%hTDDi_G%i3*RZ&15!$Fjr^f;Ke&A@|?=`2&+{zr+3a z{D*=t(`AXyS%X7N z%a#RZw6vD^t_rnM`L4E>m=U&R!A-&}nZIi$BOPvkhrCuUe@BN~-lRD)f44;J%TwgE zcze8u!PQ_NR7?o(NylLXVTfDO zxs5=@|GsYEsNo4M#nT%N!UE(?dnS)t2+{ELYAFp*3=iF=|EQnTp`#vlSXuGVraYo? z+RCzXo6h3qA8{KG?S4nE(lM+;Eb4nT3XV;7gcAxUi5m)`k5tv}cPy()8ZR3TLW3I- zAS^}cq-IJvL7a4RgR!yk@~RT%$lA7{L5ES*hyx)M4(yxI$Ub(4f)K|^v1>zvwQY!_ zIrWw8q9GS^!Dp~}+?mbnB6jDF8mVlbQ!jFKDY;w=7;XO{9bq7>LXGK24WA`;rL)_Z z)&j}pbV(;6gY;VMhbxgvn`X;6x}VUEE-7 z%)7j-%t8S=ZL3yc)HbXDAqJZvBTPoiW_A-+a8m3_Z?v{DN7Tnr#O_VUMT0UBt$;p` zDh6JbGHN8JJ*JN%y2%msb97@_S>9!%Egwk;?PEkU9ntz&3uR}%Fj5d$JHQbQb3}a{ zSzFT^#n=VInPpcAS}CNxj?_ zVscANk5Cfz(51EI1pz};AWWb|kgbYNb4wCEGUn3+eMUMV?1-{=I4TlmLJMot@rd07 zZuo2hk1ccu{YmGkcYdWAVdk{Z4Nm?^cTD&}jGm+Q1SYIXMwmG*oO*83&#>l%nbR`G zhh=lZ%xIb7kU3#;TBbfECrnC9P=-XpL|TG2BoZdj61*XiFbW8?1Z_wp%#;>${SUIy V$8qr;L*)Pf002ovPDHLkV1hYLS~36t diff --git a/com_leaflet/site/assets/css/images/layers.png b/com_leaflet/site/assets/css/images/layers.png deleted file mode 100644 index 1a72e5784b2b456eac5d7670738db80697af3377..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 696 zcmV;p0!RIcP)*@&l2<6p=!C&s@#ZL+%BQvF&b?w6S%wp=I>1QHj7AP5C)IWy#b znXXB;g;j=$a-tW89K%FbDceHVq&unY*Wx3L#=EGWH=rjqnp|4c_Ulec!ql3#G-5ZF zVlbBA@XP=)C8U&+Lrc)S4O5%1$&{(;7R^K(CSnvSr$v;+B$8q&7Bf|h$#PARo1^%M zf1H^nG-EiXVXr07OH(*8R)xa|FD;lXUlg_-%)~ZGsL2cX0NXaAzN2q%jqLRR6ruVk8`Jb7n#{`T;o@`F= z#3YcynIR^s83UNF3D!f5m#Mg)NJ24&Qfrqb&_z=yF;=B)#9Iq7u-@^O!(mW{D;qvr zPc)gVb%aowtS8m@ElL4A9G>w#ffQ~q{i&_i)*6f^)Sz|C?C>zb4Uo?H<-&Hz@a?J; z$ml@zGygWofb9$ZBj6aLjpLhsT2AzjOu=-*u_gSCUYnU^5s62$4H-fe}gSR(=wKRaTHh!@*b)YV6mo|a4Fn6Rgc&Rpk zvn_X|3VY?v=>nJ{slE^V1GaGWk}m@aIWGIpghbfPh8m@aIWEo_%AZI>==moIFVE^L=C zZJ91?mo03UEp3-BY?wBGur6$uD{Yr9Y?m%SHF8Fk1pc(Nva%QJ+{FLkalfypz3&M|||Fn`7|g3c~4(nXHKFmRnwn$J#_$xE8i z|Ns9!kC;(oC1qQk>LMp3_a2(odYyMT@>voX=UI)k>1cJdn;gjmJ-|6v4nb1Oryh)eQMwHP(i@!36%vGJyFK(JTj?Vb{{C=jx&)@1l zlFmnw%0`&bqruifkkHKC=vbiAM3&E`#Mv>2%tw;VK8?_|&E89cs{a1}$J*!f_xd-C z&F%B|oxRgPlh0F!txkxrQjNA`m9~?&&|jw4W0<`_iNHsX$VQXVK!B}Xkh4>av|f_8 zLY2?t?ejE=%(TnfV5iqOjm?d;&qI~ZGl|SzU77a)002XDQchC<95+*MjE@82?VLm= z3xf6%Vd@99z|q|-ua5l3kJxvZwan-8K1cPiwQAtlcNX~ZqLeoMB+a;7)WA|O#HOB% zg6SX;754xD1{Fy}K~#8Ntklac&zTpadXZ& zC*_=T&g7hfbI$R?v%9?sknIb97gJOJ=`-8YyS3ndqN+Jm+x33!p&Hc@@L$w))s2@N ztv~i}Emc?DykgwFWwma($8+~b>l?tqj$dh13R^nMZnva9 zn0Vflzv2Dvp`oVQw{Guby~i`JGbyBGTEC{y>yzCkg>K&CIeQ$u;lyQ+M{O~gEJ^)Z zrF3p)^>|uT;57}WY&IRwyOQ=dq%Az}_t=_hKowP!Z79q0;@Zu(SWEJJcHY+5T6I({ zw)wj*SNi4wrd+POUfZe4gF77vW?j zoFS}|r2n&$U9Y!S4VEOyN}OpZZi|?cr1VcE_tHsDQgp-ga(SwkBrkCm{|*-yb=}ZW zvcYvLvfA90TPn|!-TuYJV<6`}+RJeRgP3EA=qQcF9k0*#*{f&I_pjam%I6Dd#YE|G zqB!R}tW-K!wV1w+4JcFA_s6~=@9F&j8`u$-ifLN3vK;`lvaA-`jRn_}(8|)!3?-}I zvFi{H;@A$gEZYh?%|Qr_y#*UkOPjwiRCsJQ>mb6h5yGIk6C5_XA=8T?IBfm_?+P0; zhhUs)-(0R*H<&Kku(1>#cGtOpk&Z&kQcw&SJv-4VY<+;=8hYnoX zfNJMCa9)^5Z0;2dCUk;x-%#yS!I~Jr3pNuI!g_tHz!$hKwt1GL~sFvx)3u4TA zv>CLGdQtoZ7Du7ctJRfTqY;FPxs1G{ZJ?73D5J@OO{6BHcPbk{_mjg&p2QFeke%QI zlAJ-kvjuwy1<5D-6>su68A+i998aSZNnQX)+Q}6(GK-C%8G-!1bOJBONU{gT%IOOE z;Yk24YC@^lFW77>r6x7eS1Omc;8=GUp#&zLQ&L{ zv8$hGC`wp~$9pR>f%-_Ps3>YhzP(+vC(E*zr1CVO8ChN^MI-VGMX7+|(r!SGZ9gd5 zzO9sQd>sm|f1|X&oh=8lOzd6+ITvo zCXInR?>RZ#>Hb*PO=7dI!dZ(wY4O}ZGv zdfQFio7+0~PN*RFCZGM6@9-o~y*@?;k00NvOsw54t1^tt{*ATMs^2j}4Wp=4t3RH* z_+8b`F-{E=0sOgM<;VHTo!Ij3u zmmI`2?K7g(GOcGA)@h?$SW&pwHdtj1n57PLI8&6RHhx4R%Q7b z^JEqR)@06V!pbS*@D_ZyRMo_LlT}r{#sXOx4kM-V<_V{!5SSuM^SIVCA37|nY7LWQ zZA#B1h4l`6asz=Lvax_#GMRX|NF>=$=p{Qn0i@ExX1jGhy@B8a*_uR+ODEbVi8ObL zezG?azy>E~S~dl43&8<$(2H}P&*tuBdESUP83KQ?8B z?K(!uS>H1wlWQz;qOfB`T#TZ=EoSp~vZ5XtCvwm1h*Ex6mzTsn_y@_=xREIslV-%- zpdWkEzMjeNOGWrSM32gpBt27*O29NdhGzuDgYxcf`Jjjqw@B;Vmdb@fxdhCRi`Kg> zmUTr$=&@#i!%F4Q6mb&4QKfR^95KJ!<6~fqx-f^66AV!|ywG{6D^Vay-3b99>XOe# e-I|>x8~*?ZhF3snGbtJX0000cOl4 diff --git a/com_leaflet/site/assets/css/images/marker-icon.png b/com_leaflet/site/assets/css/images/marker-icon.png deleted file mode 100644 index 950edf24677ded147df13b26f91baa2b0fa70513..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1466 zcmV;r1x5OaP)P001cn1^@s6z>|W`000GnNklGNuHDcIX17Zdjl&3`L?0sTjIws<{((Dh&g-s0<@jYQyl?D*X^?%13;ml^gy> ziMrY_^1WI=(g@LMizu=zCoA>C`6|QEq1eV92k*7m>G65*&@&6)aC&e}G zI)pf-Za|N`DT&Cn1J|o`19mumxW~hiKiKyc-P`S@q)rdTo84@QI@;0yXrG%9uhI>A zG5QHb6s4=<6xy{1 z@NMxEkryp{LS44%z$3lP^cX!9+2-;CTt3wM4(k*#C{aiIiLuB>jJj;KPhPzIC00bL zU3a#;aJld94lCW=`4&aAy8M7PY=HQ>O%$YEP4c4UY#CRxfgbE~(|uiI=YS8q;O9y6 zmIkXzR`}p7ti|PrM3a}WMnR=3NVnWdAAR>b9X@)DKL6=YsvmH%?I24wdq?Gh54_;# z$?_LvgjEdspdQlft#4CQ z`2Zyvy?*)N1Ftw|{_hakhG9WjS?Az@I@+IZ8JbWewR!XUK4&6346+d#~gsE0SY(LX8&JfY>Aj)RxGy96nwhs2rv zzW6pTnMpFkDSkT*a*6Dx|u@ds6ISVn0@^RmIsKZ5Y;bazbc;tTSq(kg(=481ODrPyNB6n z-$+U}(w$m6U6H$w17Bw+wDaFIe~GvNMYvnw31MpY0eQKT9l>SU``8k7w4)z!GZKMI z#_cEKq7k~i%nlK@6c-K?+R;B#5$?T#YpKD`t_4bAs^#E+@5QW$@OX3*`;(#{U^d-vY)&xEE>n5lYl&T?Amke9$Lam@{1K@O ze*LXqlKQHiv=gx+V^Cbb2?z@ISBQ*3amF;9UJ3SBg(N|710TLamQmYZ&Qjn2LuO<* zCZlB4n%@pc&7NNnY1}x+NWpHlq`OJEo|`aYN9<`RBUB+79g;>dgb6YlfN#kGL?lO_ z!6~M^7sOnbsUkKk<@Ysie&`G>ruxH&Mgy&8;i=A zB9OO!xR{AyODw>DS-q5YM{0ExFEAzt zm>RdS+ssW(-8|?xr0(?$vBVB*%(xDLtq3Hf0I5yFm<_g=W2`QWAax{1rWVH=I!VrP zs(rTFX@W#t$hXNvbgX`gK&^w_YD;CQ!B@e0QbLIWaKAXQe2-kkloo;{iF#6}z!4=W zi$giRj1{ zt;2w`VSCF#WE&*ev7jpsC=6175@(~nTE2;7M-L((0bH@yG}-TB$R~WXd?tA$s3|%y zA`9$sA(>F%J3ioz<-LJl*^o1|w84l>HBR`>3l9c8$5Xr@xCiIQ7{x$fMCzOk_-M=% z+{a_Q#;42`#KfUte@$NT77uaTz?b-fBe)1s5XE$yA79fm?KqM^VgLXD07*qoM6N<$ Ef<_J(9smFU diff --git a/com_leaflet/site/assets/css/leaflet_v1.7.1.css b/com_leaflet/site/assets/css/leaflet_v1.7.1.css deleted file mode 100644 index 017fa0e..0000000 --- a/com_leaflet/site/assets/css/leaflet_v1.7.1.css +++ /dev/null @@ -1,640 +0,0 @@ -/* required styles */ - -.leaflet-pane, -.leaflet-tile, -.leaflet-marker-icon, -.leaflet-marker-shadow, -.leaflet-tile-container, -.leaflet-pane > svg, -.leaflet-pane > canvas, -.leaflet-zoom-box, -.leaflet-image-layer, -.leaflet-layer { - position: absolute; - left: 0; - top: 0; - } -.leaflet-container { - overflow: hidden; - } -.leaflet-tile, -.leaflet-marker-icon, -.leaflet-marker-shadow { - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; - -webkit-user-drag: none; - } -/* Prevents IE11 from highlighting tiles in blue */ -.leaflet-tile::selection { - background: transparent; -} -/* Safari renders non-retina tile on retina better with this, but Chrome is worse */ -.leaflet-safari .leaflet-tile { - image-rendering: -webkit-optimize-contrast; - } -/* hack that prevents hw layers "stretching" when loading new tiles */ -.leaflet-safari .leaflet-tile-container { - width: 1600px; - height: 1600px; - -webkit-transform-origin: 0 0; - } -.leaflet-marker-icon, -.leaflet-marker-shadow { - display: block; - } -/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */ -/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */ -.leaflet-container .leaflet-overlay-pane svg, -.leaflet-container .leaflet-marker-pane img, -.leaflet-container .leaflet-shadow-pane img, -.leaflet-container .leaflet-tile-pane img, -.leaflet-container img.leaflet-image-layer, -.leaflet-container .leaflet-tile { - max-width: none !important; - max-height: none !important; - } - -.leaflet-container.leaflet-touch-zoom { - -ms-touch-action: pan-x pan-y; - touch-action: pan-x pan-y; - } -.leaflet-container.leaflet-touch-drag { - -ms-touch-action: pinch-zoom; - /* Fallback for FF which doesn't support pinch-zoom */ - touch-action: none; - touch-action: pinch-zoom; -} -.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom { - -ms-touch-action: none; - touch-action: none; -} -.leaflet-container { - -webkit-tap-highlight-color: transparent; -} -.leaflet-container a { - -webkit-tap-highlight-color: rgba(51, 181, 229, 0.4); -} -.leaflet-tile { - filter: inherit; - visibility: hidden; - } -.leaflet-tile-loaded { - visibility: inherit; - } -.leaflet-zoom-box { - width: 0; - height: 0; - -moz-box-sizing: border-box; - box-sizing: border-box; - z-index: 800; - } -/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */ -.leaflet-overlay-pane svg { - -moz-user-select: none; - } - -.leaflet-pane { z-index: 400; } - -.leaflet-tile-pane { z-index: 200; } -.leaflet-overlay-pane { z-index: 400; } -.leaflet-shadow-pane { z-index: 500; } -.leaflet-marker-pane { z-index: 600; } -.leaflet-tooltip-pane { z-index: 650; } -.leaflet-popup-pane { z-index: 700; } - -.leaflet-map-pane canvas { z-index: 100; } -.leaflet-map-pane svg { z-index: 200; } - -.leaflet-vml-shape { - width: 1px; - height: 1px; - } -.lvml { - behavior: url(#default#VML); - display: inline-block; - position: absolute; - } - - -/* control positioning */ - -.leaflet-control { - position: relative; - z-index: 800; - pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */ - pointer-events: auto; - } -.leaflet-top, -.leaflet-bottom { - position: absolute; - z-index: 1000; - pointer-events: none; - } -.leaflet-top { - top: 0; - } -.leaflet-right { - right: 0; - } -.leaflet-bottom { - bottom: 0; - } -.leaflet-left { - left: 0; - } -.leaflet-control { - float: left; - clear: both; - } -.leaflet-right .leaflet-control { - float: right; - } -.leaflet-top .leaflet-control { - margin-top: 10px; - } -.leaflet-bottom .leaflet-control { - margin-bottom: 10px; - } -.leaflet-left .leaflet-control { - margin-left: 10px; - } -.leaflet-right .leaflet-control { - margin-right: 10px; - } - - -/* zoom and fade animations */ - -.leaflet-fade-anim .leaflet-tile { - will-change: opacity; - } -.leaflet-fade-anim .leaflet-popup { - opacity: 0; - -webkit-transition: opacity 0.2s linear; - -moz-transition: opacity 0.2s linear; - transition: opacity 0.2s linear; - } -.leaflet-fade-anim .leaflet-map-pane .leaflet-popup { - opacity: 1; - } -.leaflet-zoom-animated { - -webkit-transform-origin: 0 0; - -ms-transform-origin: 0 0; - transform-origin: 0 0; - } -.leaflet-zoom-anim .leaflet-zoom-animated { - will-change: transform; - } -.leaflet-zoom-anim .leaflet-zoom-animated { - -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1); - -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1); - transition: transform 0.25s cubic-bezier(0,0,0.25,1); - } -.leaflet-zoom-anim .leaflet-tile, -.leaflet-pan-anim .leaflet-tile { - -webkit-transition: none; - -moz-transition: none; - transition: none; - } - -.leaflet-zoom-anim .leaflet-zoom-hide { - visibility: hidden; - } - - -/* cursors */ - -.leaflet-interactive { - cursor: pointer; - } -.leaflet-grab { - cursor: -webkit-grab; - cursor: -moz-grab; - cursor: grab; - } -.leaflet-crosshair, -.leaflet-crosshair .leaflet-interactive { - cursor: crosshair; - } -.leaflet-popup-pane, -.leaflet-control { - cursor: auto; - } -.leaflet-dragging .leaflet-grab, -.leaflet-dragging .leaflet-grab .leaflet-interactive, -.leaflet-dragging .leaflet-marker-draggable { - cursor: move; - cursor: -webkit-grabbing; - cursor: -moz-grabbing; - cursor: grabbing; - } - -/* marker & overlays interactivity */ -.leaflet-marker-icon, -.leaflet-marker-shadow, -.leaflet-image-layer, -.leaflet-pane > svg path, -.leaflet-tile-container { - pointer-events: none; - } - -.leaflet-marker-icon.leaflet-interactive, -.leaflet-image-layer.leaflet-interactive, -.leaflet-pane > svg path.leaflet-interactive, -svg.leaflet-image-layer.leaflet-interactive path { - pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */ - pointer-events: auto; - } - -/* visual tweaks */ - -.leaflet-container { - background: #ddd; - outline: 0; - } -.leaflet-container a { - color: #0078A8; - } -.leaflet-container a.leaflet-active { - outline: 2px solid orange; - } -.leaflet-zoom-box { - border: 2px dotted #38f; - background: rgba(255,255,255,0.5); - } - - -/* general typography */ -.leaflet-container { - font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; - } - - -/* general toolbar styles */ - -.leaflet-bar { - box-shadow: 0 1px 5px rgba(0,0,0,0.65); - border-radius: 4px; - } -.leaflet-bar a, -.leaflet-bar a:hover { - background-color: #fff; - border-bottom: 1px solid #ccc; - width: 26px; - height: 26px; - line-height: 26px; - display: block; - text-align: center; - text-decoration: none; - color: black; - } -.leaflet-bar a, -.leaflet-control-layers-toggle { - background-position: 50% 50%; - background-repeat: no-repeat; - display: block; - } -.leaflet-bar a:hover { - background-color: #f4f4f4; - } -.leaflet-bar a:first-child { - border-top-left-radius: 4px; - border-top-right-radius: 4px; - } -.leaflet-bar a:last-child { - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - border-bottom: none; - } -.leaflet-bar a.leaflet-disabled { - cursor: default; - background-color: #f4f4f4; - color: #bbb; - } - -.leaflet-touch .leaflet-bar a { - width: 30px; - height: 30px; - line-height: 30px; - } -.leaflet-touch .leaflet-bar a:first-child { - border-top-left-radius: 2px; - border-top-right-radius: 2px; - } -.leaflet-touch .leaflet-bar a:last-child { - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; - } - -/* zoom control */ - -.leaflet-control-zoom-in, -.leaflet-control-zoom-out { - font: bold 18px 'Lucida Console', Monaco, monospace; - text-indent: 1px; - } - -.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out { - font-size: 22px; - } - - -/* layers control */ - -.leaflet-control-layers { - box-shadow: 0 1px 5px rgba(0,0,0,0.4); - background: #fff; - border-radius: 5px; - } -.leaflet-control-layers-toggle { - background-image: url(images/layers.png); - width: 36px; - height: 36px; - } -.leaflet-retina .leaflet-control-layers-toggle { - background-image: url(images/layers-2x.png); - background-size: 26px 26px; - } -.leaflet-touch .leaflet-control-layers-toggle { - width: 44px; - height: 44px; - } -.leaflet-control-layers .leaflet-control-layers-list, -.leaflet-control-layers-expanded .leaflet-control-layers-toggle { - display: none; - } -.leaflet-control-layers-expanded .leaflet-control-layers-list { - display: block; - position: relative; - } -.leaflet-control-layers-expanded { - padding: 6px 10px 6px 6px; - color: #333; - background: #fff; - } -.leaflet-control-layers-scrollbar { - overflow-y: scroll; - overflow-x: hidden; - padding-right: 5px; - } -.leaflet-control-layers-selector { - margin-top: 2px; - position: relative; - top: 1px; - } -.leaflet-control-layers label { - display: block; - } -.leaflet-control-layers-separator { - height: 0; - border-top: 1px solid #ddd; - margin: 5px -10px 5px -6px; - } - -/* Default icon URLs */ -.leaflet-default-icon-path { - background-image: url(images/marker-icon.png); - } - - -/* attribution and scale controls */ - -.leaflet-container .leaflet-control-attribution { - background: #fff; - background: rgba(255, 255, 255, 0.7); - margin: 0; - } -.leaflet-control-attribution, -.leaflet-control-scale-line { - padding: 0 5px; - color: #333; - } -.leaflet-control-attribution a { - text-decoration: none; - } -.leaflet-control-attribution a:hover { - text-decoration: underline; - } -.leaflet-container .leaflet-control-attribution, -.leaflet-container .leaflet-control-scale { - font-size: 11px; - } -.leaflet-left .leaflet-control-scale { - margin-left: 5px; - } -.leaflet-bottom .leaflet-control-scale { - margin-bottom: 5px; - } -.leaflet-control-scale-line { - border: 2px solid #777; - border-top: none; - line-height: 1.1; - padding: 2px 5px 1px; - font-size: 11px; - white-space: nowrap; - overflow: hidden; - -moz-box-sizing: border-box; - box-sizing: border-box; - - background: #fff; - background: rgba(255, 255, 255, 0.5); - } -.leaflet-control-scale-line:not(:first-child) { - border-top: 2px solid #777; - border-bottom: none; - margin-top: -2px; - } -.leaflet-control-scale-line:not(:first-child):not(:last-child) { - border-bottom: 2px solid #777; - } - -.leaflet-touch .leaflet-control-attribution, -.leaflet-touch .leaflet-control-layers, -.leaflet-touch .leaflet-bar { - box-shadow: none; - } -.leaflet-touch .leaflet-control-layers, -.leaflet-touch .leaflet-bar { - border: 2px solid rgba(0,0,0,0.2); - background-clip: padding-box; - } - - -/* popup */ - -.leaflet-popup { - position: absolute; - text-align: center; - margin-bottom: 20px; - } -.leaflet-popup-content-wrapper { - padding: 1px; - text-align: left; - border-radius: 12px; - } -.leaflet-popup-content { - margin: 13px 19px; - line-height: 1.4; - } -.leaflet-popup-content p { - margin: 18px 0; - } -.leaflet-popup-tip-container { - width: 40px; - height: 20px; - position: absolute; - left: 50%; - margin-left: -20px; - overflow: hidden; - pointer-events: none; - } -.leaflet-popup-tip { - width: 17px; - height: 17px; - padding: 1px; - - margin: -10px auto 0; - - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - transform: rotate(45deg); - } -.leaflet-popup-content-wrapper, -.leaflet-popup-tip { - background: white; - color: #333; - box-shadow: 0 3px 14px rgba(0,0,0,0.4); - } -.leaflet-container a.leaflet-popup-close-button { - position: absolute; - top: 0; - right: 0; - padding: 4px 4px 0 0; - border: none; - text-align: center; - width: 18px; - height: 14px; - font: 16px/14px Tahoma, Verdana, sans-serif; - color: #c3c3c3; - text-decoration: none; - font-weight: bold; - background: transparent; - } -.leaflet-container a.leaflet-popup-close-button:hover { - color: #999; - } -.leaflet-popup-scrolled { - overflow: auto; - border-bottom: 1px solid #ddd; - border-top: 1px solid #ddd; - } - -.leaflet-oldie .leaflet-popup-content-wrapper { - -ms-zoom: 1; - } -.leaflet-oldie .leaflet-popup-tip { - width: 24px; - margin: 0 auto; - - -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)"; - filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678); - } -.leaflet-oldie .leaflet-popup-tip-container { - margin-top: -1px; - } - -.leaflet-oldie .leaflet-control-zoom, -.leaflet-oldie .leaflet-control-layers, -.leaflet-oldie .leaflet-popup-content-wrapper, -.leaflet-oldie .leaflet-popup-tip { - border: 1px solid #999; - } - - -/* div icon */ - -.leaflet-div-icon { - background: #fff; - border: 1px solid #666; - } - - -/* Tooltip */ -/* Base styles for the element that has a tooltip */ -.leaflet-tooltip { - position: absolute; - padding: 6px; - background-color: #fff; - border: 1px solid #fff; - border-radius: 3px; - color: #222; - white-space: nowrap; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - pointer-events: none; - box-shadow: 0 1px 3px rgba(0,0,0,0.4); - } -.leaflet-tooltip.leaflet-clickable { - cursor: pointer; - pointer-events: auto; - } -.leaflet-tooltip-top:before, -.leaflet-tooltip-bottom:before, -.leaflet-tooltip-left:before, -.leaflet-tooltip-right:before { - position: absolute; - pointer-events: none; - border: 6px solid transparent; - background: transparent; - content: ""; - } - -/* Directions */ - -.leaflet-tooltip-bottom { - margin-top: 6px; -} -.leaflet-tooltip-top { - margin-top: -6px; -} -.leaflet-tooltip-bottom:before, -.leaflet-tooltip-top:before { - left: 50%; - margin-left: -6px; - } -.leaflet-tooltip-top:before { - bottom: 0; - margin-bottom: -12px; - border-top-color: #fff; - } -.leaflet-tooltip-bottom:before { - top: 0; - margin-top: -12px; - margin-left: -6px; - border-bottom-color: #fff; - } -.leaflet-tooltip-left { - margin-left: -6px; -} -.leaflet-tooltip-right { - margin-left: 6px; -} -.leaflet-tooltip-left:before, -.leaflet-tooltip-right:before { - top: 50%; - margin-top: -6px; - } -.leaflet-tooltip-left:before { - right: 0; - margin-right: -12px; - border-left-color: #fff; - } -.leaflet-tooltip-right:before { - left: 0; - margin-left: -12px; - border-right-color: #fff; - } diff --git a/com_leaflet/site/assets/leaflet_v1.7.1.js b/com_leaflet/site/assets/leaflet_v1.7.1.js deleted file mode 100644 index ac492b8..0000000 --- a/com_leaflet/site/assets/leaflet_v1.7.1.js +++ /dev/null @@ -1,6 +0,0 @@ -/* @preserve - * Leaflet 1.7.1, a JS library for interactive maps. http://leafletjs.com - * (c) 2010-2019 Vladimir Agafonkin, (c) 2010-2011 CloudMade - */ -!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?i(exports):"function"==typeof define&&define.amd?define(["exports"],i):i(t.L={})}(this,function(t){"use strict";function h(t){for(var i,e,n=1,o=arguments.length;n=this.min.x&&e.x<=this.max.x&&i.y>=this.min.y&&e.y<=this.max.y},intersects:function(t){t=O(t);var i=this.min,e=this.max,n=t.min,o=t.max,s=o.x>=i.x&&n.x<=e.x,r=o.y>=i.y&&n.y<=e.y;return s&&r},overlaps:function(t){t=O(t);var i=this.min,e=this.max,n=t.min,o=t.max,s=o.x>i.x&&n.xi.y&&n.y=n.lat&&e.lat<=o.lat&&i.lng>=n.lng&&e.lng<=o.lng},intersects:function(t){t=N(t);var i=this._southWest,e=this._northEast,n=t.getSouthWest(),o=t.getNorthEast(),s=o.lat>=i.lat&&n.lat<=e.lat,r=o.lng>=i.lng&&n.lng<=e.lng;return s&&r},overlaps:function(t){t=N(t);var i=this._southWest,e=this._northEast,n=t.getSouthWest(),o=t.getNorthEast(),s=o.lat>i.lat&&n.lati.lng&&n.lng';var i=t.firstChild;return i.style.behavior="url(#default#VML)",i&&"object"==typeof i.adj}catch(t){return!1}}();function kt(t){return 0<=navigator.userAgent.toLowerCase().indexOf(t)}var Bt={ie:tt,ielt9:it,edge:et,webkit:nt,android:ot,android23:st,androidStock:at,opera:ht,chrome:ut,gecko:lt,safari:ct,phantom:_t,opera12:dt,win:pt,ie3d:mt,webkit3d:ft,gecko3d:gt,any3d:vt,mobile:yt,mobileWebkit:xt,mobileWebkit3d:wt,msPointer:Pt,pointer:Lt,touch:bt,mobileOpera:Tt,mobileGecko:Mt,retina:zt,passiveEvents:Ct,canvas:St,svg:Zt,vml:Et},At=Pt?"MSPointerDown":"pointerdown",It=Pt?"MSPointerMove":"pointermove",Ot=Pt?"MSPointerUp":"pointerup",Rt=Pt?"MSPointerCancel":"pointercancel",Nt={},Dt=!1;function jt(t,i,e,n){function o(t){Ut(t,r)}var s,r,a,h,u,l,c,_;function d(t){t.pointerType===(t.MSPOINTER_TYPE_MOUSE||"mouse")&&0===t.buttons||Ut(t,h)}return"touchstart"===i?(u=t,l=e,c=n,_=p(function(t){t.MSPOINTER_TYPE_TOUCH&&t.pointerType===t.MSPOINTER_TYPE_TOUCH&&Ri(t),Ut(t,l)}),u["_leaflet_touchstart"+c]=_,u.addEventListener(At,_,!1),Dt||(document.addEventListener(At,Wt,!0),document.addEventListener(It,Ht,!0),document.addEventListener(Ot,Ft,!0),document.addEventListener(Rt,Ft,!0),Dt=!0)):"touchmove"===i?(h=e,(a=t)["_leaflet_touchmove"+n]=d,a.addEventListener(It,d,!1)):"touchend"===i&&(r=e,(s=t)["_leaflet_touchend"+n]=o,s.addEventListener(Ot,o,!1),s.addEventListener(Rt,o,!1)),this}function Wt(t){Nt[t.pointerId]=t}function Ht(t){Nt[t.pointerId]&&(Nt[t.pointerId]=t)}function Ft(t){delete Nt[t.pointerId]}function Ut(t,i){for(var e in t.touches=[],Nt)t.touches.push(Nt[e]);t.changedTouches=[t],i(t)}var Vt=Pt?"MSPointerDown":Lt?"pointerdown":"touchstart",qt=Pt?"MSPointerUp":Lt?"pointerup":"touchend",Gt="_leaflet_";var Kt,Yt,Xt,Jt,$t,Qt,ti=fi(["transform","webkitTransform","OTransform","MozTransform","msTransform"]),ii=fi(["webkitTransition","transition","OTransition","MozTransition","msTransition"]),ei="webkitTransition"===ii||"OTransition"===ii?ii+"End":"transitionend";function ni(t){return"string"==typeof t?document.getElementById(t):t}function oi(t,i){var e,n=t.style[i]||t.currentStyle&&t.currentStyle[i];return n&&"auto"!==n||!document.defaultView||(n=(e=document.defaultView.getComputedStyle(t,null))?e[i]:null),"auto"===n?null:n}function si(t,i,e){var n=document.createElement(t);return n.className=i||"",e&&e.appendChild(n),n}function ri(t){var i=t.parentNode;i&&i.removeChild(t)}function ai(t){for(;t.firstChild;)t.removeChild(t.firstChild)}function hi(t){var i=t.parentNode;i&&i.lastChild!==t&&i.appendChild(t)}function ui(t){var i=t.parentNode;i&&i.firstChild!==t&&i.insertBefore(t,i.firstChild)}function li(t,i){if(void 0!==t.classList)return t.classList.contains(i);var e=pi(t);return 0this.options.maxZoom)?this.setZoom(t):this},panInsideBounds:function(t,i){this._enforcingBounds=!0;var e=this.getCenter(),n=this._limitCenter(e,this._zoom,N(t));return e.equals(n)||this.panTo(n,i),this._enforcingBounds=!1,this},panInside:function(t,i){var e,n,o=A((i=i||{}).paddingTopLeft||i.padding||[0,0]),s=A(i.paddingBottomRight||i.padding||[0,0]),r=this.getCenter(),a=this.project(r),h=this.project(t),u=this.getPixelBounds(),l=u.getSize().divideBy(2),c=O([u.min.add(o),u.max.subtract(s)]);return c.contains(h)||(this._enforcingBounds=!0,e=a.subtract(h),n=A(h.x+e.x,h.y+e.y),(h.xc.max.x)&&(n.x=a.x-e.x,0c.max.y)&&(n.y=a.y-e.y,0=this.options.transform3DLimit&&this._resetView(this.getCenter(),this.getZoom())},_findEventTargets:function(t,i){for(var e,n=[],o="mouseout"===i||"mouseover"===i,s=t.target||t.srcElement,r=!1;s;){if((e=this._targets[m(s)])&&("click"===i||"preclick"===i)&&!t._simulated&&this._draggableMoved(e)){r=!0;break}if(e&&e.listens(i,!0)){if(o&&!Vi(s,t))break;if(n.push(e),o)break}if(s===this._container)break;s=s.parentNode}return n.length||r||o||!Vi(s,t)||(n=[this]),n},_handleDOMEvent:function(t){var i;this._loaded&&!Ui(t)&&("mousedown"!==(i=t.type)&&"keypress"!==i&&"keyup"!==i&&"keydown"!==i||Pi(t.target||t.srcElement),this._fireDOMEvent(t,i))},_mouseEvents:["click","dblclick","mouseover","mouseout","contextmenu"],_fireDOMEvent:function(t,i,e){var n;if("click"===t.type&&((n=h({},t)).type="preclick",this._fireDOMEvent(n,n.type,e)),!t._stopped&&(e=(e||[]).concat(this._findEventTargets(t,i))).length){var o=e[0];"contextmenu"===i&&o.listens(i,!0)&&Ri(t);var s,r={originalEvent:t};"keypress"!==t.type&&"keydown"!==t.type&&"keyup"!==t.type&&(s=o.getLatLng&&(!o._radius||o._radius<=10),r.containerPoint=s?this.latLngToContainerPoint(o.getLatLng()):this.mouseEventToContainerPoint(t),r.layerPoint=this.containerPointToLayerPoint(r.containerPoint),r.latlng=s?o.getLatLng():this.layerPointToLatLng(r.layerPoint));for(var a=0;athis.options.zoomAnimationThreshold)return!1;var n=this.getZoomScale(i),o=this._getCenterOffset(t)._divideBy(1-1/n);return!(!0!==e.animate&&!this.getSize().contains(o))&&(M(function(){this._moveStart(!0,!1)._animateZoom(t,i,!0)},this),!0)},_animateZoom:function(t,i,e,n){this._mapPane&&(e&&(this._animatingZoom=!0,this._animateToCenter=t,this._animateToZoom=i,ci(this._mapPane,"leaflet-zoom-anim")),this.fire("zoomanim",{center:t,zoom:i,noUpdate:n}),setTimeout(p(this._onZoomTransitionEnd,this),250))},_onZoomTransitionEnd:function(){this._animatingZoom&&(this._mapPane&&_i(this._mapPane,"leaflet-zoom-anim"),this._animatingZoom=!1,this._move(this._animateToCenter,this._animateToZoom),M(function(){this._moveEnd(!0)},this))}});function Yi(t){return new Xi(t)}var Xi=S.extend({options:{position:"topright"},initialize:function(t){c(this,t)},getPosition:function(){return this.options.position},setPosition:function(t){var i=this._map;return i&&i.removeControl(this),this.options.position=t,i&&i.addControl(this),this},getContainer:function(){return this._container},addTo:function(t){this.remove(),this._map=t;var i=this._container=this.onAdd(t),e=this.getPosition(),n=t._controlCorners[e];return ci(i,"leaflet-control"),-1!==e.indexOf("bottom")?n.insertBefore(i,n.firstChild):n.appendChild(i),this._map.on("unload",this.remove,this),this},remove:function(){return this._map&&(ri(this._container),this.onRemove&&this.onRemove(this._map),this._map.off("unload",this.remove,this),this._map=null),this},_refocusOnMap:function(t){this._map&&t&&0",n=document.createElement("div");return n.innerHTML=e,n.firstChild},_addItem:function(t){var i,e=document.createElement("label"),n=this._map.hasLayer(t.layer);t.overlay?((i=document.createElement("input")).type="checkbox",i.className="leaflet-control-layers-selector",i.defaultChecked=n):i=this._createRadioElement("leaflet-base-layers_"+m(this),n),this._layerControlInputs.push(i),i.layerId=m(t.layer),zi(i,"click",this._onInputClick,this);var o=document.createElement("span");o.innerHTML=" "+t.name;var s=document.createElement("div");return e.appendChild(s),s.appendChild(i),s.appendChild(o),(t.overlay?this._overlaysList:this._baseLayersList).appendChild(e),this._checkDisabledLayers(),e},_onInputClick:function(){var t,i,e=this._layerControlInputs,n=[],o=[];this._handlingClick=!0;for(var s=e.length-1;0<=s;s--)t=e[s],i=this._getLayer(t.layerId).layer,t.checked?n.push(i):t.checked||o.push(i);for(s=0;si.options.maxZoom},_expandIfNotCollapsed:function(){return this._map&&!this.options.collapsed&&this.expand(),this},_expand:function(){return this.expand()},_collapse:function(){return this.collapse()}}),$i=Xi.extend({options:{position:"topleft",zoomInText:"+",zoomInTitle:"Zoom in",zoomOutText:"−",zoomOutTitle:"Zoom out"},onAdd:function(t){var i="leaflet-control-zoom",e=si("div",i+" leaflet-bar"),n=this.options;return this._zoomInButton=this._createButton(n.zoomInText,n.zoomInTitle,i+"-in",e,this._zoomIn),this._zoomOutButton=this._createButton(n.zoomOutText,n.zoomOutTitle,i+"-out",e,this._zoomOut),this._updateDisabled(),t.on("zoomend zoomlevelschange",this._updateDisabled,this),e},onRemove:function(t){t.off("zoomend zoomlevelschange",this._updateDisabled,this)},disable:function(){return this._disabled=!0,this._updateDisabled(),this},enable:function(){return this._disabled=!1,this._updateDisabled(),this},_zoomIn:function(t){!this._disabled&&this._map._zoomthis._map.getMinZoom()&&this._map.zoomOut(this._map.options.zoomDelta*(t.shiftKey?3:1))},_createButton:function(t,i,e,n,o){var s=si("a",e,n);return s.innerHTML=t,s.href="#",s.title=i,s.setAttribute("role","button"),s.setAttribute("aria-label",i),Oi(s),zi(s,"click",Ni),zi(s,"click",o,this),zi(s,"click",this._refocusOnMap,this),s},_updateDisabled:function(){var t=this._map,i="leaflet-disabled";_i(this._zoomInButton,i),_i(this._zoomOutButton,i),!this._disabled&&t._zoom!==t.getMinZoom()||ci(this._zoomOutButton,i),!this._disabled&&t._zoom!==t.getMaxZoom()||ci(this._zoomInButton,i)}});Ki.mergeOptions({zoomControl:!0}),Ki.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new $i,this.addControl(this.zoomControl))});var Qi=Xi.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0},onAdd:function(t){var i="leaflet-control-scale",e=si("div",i),n=this.options;return this._addScales(n,i+"-line",e),t.on(n.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),e},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,i,e){t.metric&&(this._mScale=si("div",i,e)),t.imperial&&(this._iScale=si("div",i,e))},_update:function(){var t=this._map,i=t.getSize().y/2,e=t.distance(t.containerPointToLatLng([0,i]),t.containerPointToLatLng([this.options.maxWidth,i]));this._updateScales(e)},_updateScales:function(t){this.options.metric&&t&&this._updateMetric(t),this.options.imperial&&t&&this._updateImperial(t)},_updateMetric:function(t){var i=this._getRoundNum(t),e=i<1e3?i+" m":i/1e3+" km";this._updateScale(this._mScale,e,i/t)},_updateImperial:function(t){var i,e,n,o=3.2808399*t;5280Leaflet'},initialize:function(t){c(this,t),this._attributions={}},onAdd:function(t){for(var i in(t.attributionControl=this)._container=si("div","leaflet-control-attribution"),Oi(this._container),t._layers)t._layers[i].getAttribution&&this.addAttribution(t._layers[i].getAttribution());return this._update(),this._container},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t&&(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update()),this},removeAttribution:function(t){return t&&this._attributions[t]&&(this._attributions[t]--,this._update()),this},_update:function(){if(this._map){var t=[];for(var i in this._attributions)this._attributions[i]&&t.push(i);var e=[];this.options.prefix&&e.push(this.options.prefix),t.length&&e.push(t.join(", ")),this._container.innerHTML=e.join(" | ")}}});Ki.mergeOptions({attributionControl:!0}),Ki.addInitHook(function(){this.options.attributionControl&&(new te).addTo(this)});Xi.Layers=Ji,Xi.Zoom=$i,Xi.Scale=Qi,Xi.Attribution=te,Yi.layers=function(t,i,e){return new Ji(t,i,e)},Yi.zoom=function(t){return new $i(t)},Yi.scale=function(t){return new Qi(t)},Yi.attribution=function(t){return new te(t)};var ie=S.extend({initialize:function(t){this._map=t},enable:function(){return this._enabled||(this._enabled=!0,this.addHooks()),this},disable:function(){return this._enabled&&(this._enabled=!1,this.removeHooks()),this},enabled:function(){return!!this._enabled}});ie.addTo=function(t,i){return t.addHandler(i,this),this};var ee,ne={Events:Z},oe=bt?"touchstart mousedown":"mousedown",se={mousedown:"mouseup",touchstart:"touchend",pointerdown:"touchend",MSPointerDown:"touchend"},re={mousedown:"mousemove",touchstart:"touchmove",pointerdown:"touchmove",MSPointerDown:"touchmove"},ae=E.extend({options:{clickTolerance:3},initialize:function(t,i,e,n){c(this,n),this._element=t,this._dragStartTarget=i||t,this._preventOutline=e},enable:function(){this._enabled||(zi(this._dragStartTarget,oe,this._onDown,this),this._enabled=!0)},disable:function(){this._enabled&&(ae._dragging===this&&this.finishDrag(),Si(this._dragStartTarget,oe,this._onDown,this),this._enabled=!1,this._moved=!1)},_onDown:function(t){var i,e;!t._simulated&&this._enabled&&(this._moved=!1,li(this._element,"leaflet-zoom-anim")||ae._dragging||t.shiftKey||1!==t.which&&1!==t.button&&!t.touches||((ae._dragging=this)._preventOutline&&Pi(this._element),xi(),Xt(),this._moving||(this.fire("down"),i=t.touches?t.touches[0]:t,e=bi(this._element),this._startPoint=new k(i.clientX,i.clientY),this._parentScale=Ti(e),zi(document,re[t.type],this._onMove,this),zi(document,se[t.type],this._onUp,this))))},_onMove:function(t){var i,e;!t._simulated&&this._enabled&&(t.touches&&1i&&(e.push(t[n]),o=n);oi.max.x&&(e|=2),t.yi.max.y&&(e|=8),e}function de(t,i,e,n){var o,s=i.x,r=i.y,a=e.x-s,h=e.y-r,u=a*a+h*h;return 0this._layersMaxZoom&&this.setZoom(this._layersMaxZoom),void 0===this.options.minZoom&&this._layersMinZoom&&this.getZoom()t.y!=n.y>t.y&&t.x<(n.x-e.x)*(t.y-e.y)/(n.y-e.y)+e.x&&(u=!u);return u||Oe.prototype._containsPoint.call(this,t,!0)}});var Ne=Ce.extend({initialize:function(t,i){c(this,i),this._layers={},t&&this.addData(t)},addData:function(t){var i,e,n,o=g(t)?t:t.features;if(o){for(i=0,e=o.length;iu.x&&(l=s.x+n-u.x+h.x),s.x-l-a.x<0&&(l=s.x-a.x),s.y+e+h.y>u.y&&(c=s.y+e-u.y+h.y),s.y-c-a.y<0&&(c=s.y-a.y),(l||c)&&t.fire("autopanstart").panBy([l,c]))},_onCloseButtonClick:function(t){this._close(),Ni(t)},_getAnchor:function(){return A(this._source&&this._source._getPopupAnchor?this._source._getPopupAnchor():[0,0])}});Ki.mergeOptions({closePopupOnClick:!0}),Ki.include({openPopup:function(t,i,e){return t instanceof tn||(t=new tn(e).setContent(t)),i&&t.setLatLng(i),this.hasLayer(t)?this:(this._popup&&this._popup.options.autoClose&&this.closePopup(),this._popup=t,this.addLayer(t))},closePopup:function(t){return t&&t!==this._popup||(t=this._popup,this._popup=null),t&&this.removeLayer(t),this}}),Me.include({bindPopup:function(t,i){return t instanceof tn?(c(t,i),(this._popup=t)._source=this):(this._popup&&!i||(this._popup=new tn(i,this)),this._popup.setContent(t)),this._popupHandlersAdded||(this.on({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!0),this},unbindPopup:function(){return this._popup&&(this.off({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!1,this._popup=null),this},openPopup:function(t,i){return this._popup&&this._map&&(i=this._popup._prepareOpen(this,t,i),this._map.openPopup(this._popup,i)),this},closePopup:function(){return this._popup&&this._popup._close(),this},togglePopup:function(t){return this._popup&&(this._popup._map?this.closePopup():this.openPopup(t)),this},isPopupOpen:function(){return!!this._popup&&this._popup.isOpen()},setPopupContent:function(t){return this._popup&&this._popup.setContent(t),this},getPopup:function(){return this._popup},_openPopup:function(t){var i=t.layer||t.target;this._popup&&this._map&&(Ni(t),i instanceof Be?this.openPopup(t.layer||t.target,t.latlng):this._map.hasLayer(this._popup)&&this._popup._source===i?this.closePopup():this.openPopup(i,t.latlng))},_movePopup:function(t){this._popup.setLatLng(t.latlng)},_onKeyPress:function(t){13===t.originalEvent.keyCode&&this._openPopup(t)}});var en=Qe.extend({options:{pane:"tooltipPane",offset:[0,0],direction:"auto",permanent:!1,sticky:!1,interactive:!1,opacity:.9},onAdd:function(t){Qe.prototype.onAdd.call(this,t),this.setOpacity(this.options.opacity),t.fire("tooltipopen",{tooltip:this}),this._source&&this._source.fire("tooltipopen",{tooltip:this},!0)},onRemove:function(t){Qe.prototype.onRemove.call(this,t),t.fire("tooltipclose",{tooltip:this}),this._source&&this._source.fire("tooltipclose",{tooltip:this},!0)},getEvents:function(){var t=Qe.prototype.getEvents.call(this);return bt&&!this.options.permanent&&(t.preclick=this._close),t},_close:function(){this._map&&this._map.closeTooltip(this)},_initLayout:function(){var t="leaflet-tooltip "+(this.options.className||"")+" leaflet-zoom-"+(this._zoomAnimated?"animated":"hide");this._contentNode=this._container=si("div",t)},_updateLayout:function(){},_adjustPan:function(){},_setPosition:function(t){var i,e=this._map,n=this._container,o=e.latLngToContainerPoint(e.getCenter()),s=e.layerPointToContainerPoint(t),r=this.options.direction,a=n.offsetWidth,h=n.offsetHeight,u=A(this.options.offset),l=this._getAnchor(),c="top"===r?(i=a/2,h):"bottom"===r?(i=a/2,0):(i="center"===r?a/2:"right"===r?0:"left"===r?a:s.xthis.options.maxZoom||nthis.options.maxZoom||void 0!==this.options.minZoom&&oe.max.x)||!i.wrapLat&&(t.ye.max.y))return!1}if(!this.options.bounds)return!0;var n=this._tileCoordsToBounds(t);return N(this.options.bounds).overlaps(n)},_keyToBounds:function(t){return this._tileCoordsToBounds(this._keyToTileCoords(t))},_tileCoordsToNwSe:function(t){var i=this._map,e=this.getTileSize(),n=t.scaleBy(e),o=n.add(e);return[i.unproject(n,t.z),i.unproject(o,t.z)]},_tileCoordsToBounds:function(t){var i=this._tileCoordsToNwSe(t),e=new R(i[0],i[1]);return this.options.noWrap||(e=this._map.wrapLatLngBounds(e)),e},_tileCoordsToKey:function(t){return t.x+":"+t.y+":"+t.z},_keyToTileCoords:function(t){var i=t.split(":"),e=new k(+i[0],+i[1]);return e.z=+i[2],e},_removeTile:function(t){var i=this._tiles[t];i&&(ri(i.el),delete this._tiles[t],this.fire("tileunload",{tile:i.el,coords:this._keyToTileCoords(t)}))},_initTile:function(t){ci(t,"leaflet-tile");var i=this.getTileSize();t.style.width=i.x+"px",t.style.height=i.y+"px",t.onselectstart=a,t.onmousemove=a,it&&this.options.opacity<1&&mi(t,this.options.opacity),ot&&!st&&(t.style.WebkitBackfaceVisibility="hidden")},_addTile:function(t,i){var e=this._getTilePos(t),n=this._tileCoordsToKey(t),o=this.createTile(this._wrapCoords(t),p(this._tileReady,this,t));this._initTile(o),this.createTile.length<2&&M(p(this._tileReady,this,t,null,o)),vi(o,e),this._tiles[n]={el:o,coords:t,current:!0},i.appendChild(o),this.fire("tileloadstart",{tile:o,coords:t})},_tileReady:function(t,i,e){i&&this.fire("tileerror",{error:i,tile:e,coords:t});var n=this._tileCoordsToKey(t);(e=this._tiles[n])&&(e.loaded=+new Date,this._map._fadeAnimated?(mi(e.el,0),z(this._fadeFrame),this._fadeFrame=M(this._updateOpacity,this)):(e.active=!0,this._pruneTiles()),i||(ci(e.el,"leaflet-tile-loaded"),this.fire("tileload",{tile:e.el,coords:t})),this._noTilesToLoad()&&(this._loading=!1,this.fire("load"),it||!this._map._fadeAnimated?M(this._pruneTiles,this):setTimeout(p(this._pruneTiles,this),250)))},_getTilePos:function(t){return t.scaleBy(this.getTileSize()).subtract(this._level.origin)},_wrapCoords:function(t){var i=new k(this._wrapX?o(t.x,this._wrapX):t.x,this._wrapY?o(t.y,this._wrapY):t.y);return i.z=t.z,i},_pxBoundsToTileRange:function(t){var i=this.getTileSize();return new I(t.min.unscaleBy(i).floor(),t.max.unscaleBy(i).ceil().subtract([1,1]))},_noTilesToLoad:function(){for(var t in this._tiles)if(!this._tiles[t].loaded)return!1;return!0}});var sn=on.extend({options:{minZoom:0,maxZoom:18,subdomains:"abc",errorTileUrl:"",zoomOffset:0,tms:!1,zoomReverse:!1,detectRetina:!1,crossOrigin:!1},initialize:function(t,i){this._url=t,(i=c(this,i)).detectRetina&&zt&&0')}}catch(t){return function(t){return document.createElement("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}}(),_n={_initContainer:function(){this._container=si("div","leaflet-vml-container")},_update:function(){this._map._animatingZoom||(hn.prototype._update.call(this),this.fire("update"))},_initPath:function(t){var i=t._container=cn("shape");ci(i,"leaflet-vml-shape "+(this.options.className||"")),i.coordsize="1 1",t._path=cn("path"),i.appendChild(t._path),this._updateStyle(t),this._layers[m(t)]=t},_addPath:function(t){var i=t._container;this._container.appendChild(i),t.options.interactive&&t.addInteractiveTarget(i)},_removePath:function(t){var i=t._container;ri(i),t.removeInteractiveTarget(i),delete this._layers[m(t)]},_updateStyle:function(t){var i=t._stroke,e=t._fill,n=t.options,o=t._container;o.stroked=!!n.stroke,o.filled=!!n.fill,n.stroke?(i=i||(t._stroke=cn("stroke")),o.appendChild(i),i.weight=n.weight+"px",i.color=n.color,i.opacity=n.opacity,n.dashArray?i.dashStyle=g(n.dashArray)?n.dashArray.join(" "):n.dashArray.replace(/( *, *)/g," "):i.dashStyle="",i.endcap=n.lineCap.replace("butt","flat"),i.joinstyle=n.lineJoin):i&&(o.removeChild(i),t._stroke=null),n.fill?(e=e||(t._fill=cn("fill")),o.appendChild(e),e.color=n.fillColor||n.color,e.opacity=n.fillOpacity):e&&(o.removeChild(e),t._fill=null)},_updateCircle:function(t){var i=t._point.round(),e=Math.round(t._radius),n=Math.round(t._radiusY||e);this._setPath(t,t._empty()?"M0 0":"AL "+i.x+","+i.y+" "+e+","+n+" 0,23592600")},_setPath:function(t,i){t._path.v=i},_bringToFront:function(t){hi(t._container)},_bringToBack:function(t){ui(t._container)}},dn=Et?cn:J,pn=hn.extend({getEvents:function(){var t=hn.prototype.getEvents.call(this);return t.zoomstart=this._onZoomStart,t},_initContainer:function(){this._container=dn("svg"),this._container.setAttribute("pointer-events","none"),this._rootGroup=dn("g"),this._container.appendChild(this._rootGroup)},_destroyContainer:function(){ri(this._container),Si(this._container),delete this._container,delete this._rootGroup,delete this._svgSize},_onZoomStart:function(){this._update()},_update:function(){var t,i,e;this._map._animatingZoom&&this._bounds||(hn.prototype._update.call(this),i=(t=this._bounds).getSize(),e=this._container,this._svgSize&&this._svgSize.equals(i)||(this._svgSize=i,e.setAttribute("width",i.x),e.setAttribute("height",i.y)),vi(e,t.min),e.setAttribute("viewBox",[t.min.x,t.min.y,i.x,i.y].join(" ")),this.fire("update"))},_initPath:function(t){var i=t._path=dn("path");t.options.className&&ci(i,t.options.className),t.options.interactive&&ci(i,"leaflet-interactive"),this._updateStyle(t),this._layers[m(t)]=t},_addPath:function(t){this._rootGroup||this._initContainer(),this._rootGroup.appendChild(t._path),t.addInteractiveTarget(t._path)},_removePath:function(t){ri(t._path),t.removeInteractiveTarget(t._path),delete this._layers[m(t)]},_updatePath:function(t){t._project(),t._update()},_updateStyle:function(t){var i=t._path,e=t.options;i&&(e.stroke?(i.setAttribute("stroke",e.color),i.setAttribute("stroke-opacity",e.opacity),i.setAttribute("stroke-width",e.weight),i.setAttribute("stroke-linecap",e.lineCap),i.setAttribute("stroke-linejoin",e.lineJoin),e.dashArray?i.setAttribute("stroke-dasharray",e.dashArray):i.removeAttribute("stroke-dasharray"),e.dashOffset?i.setAttribute("stroke-dashoffset",e.dashOffset):i.removeAttribute("stroke-dashoffset")):i.setAttribute("stroke","none"),e.fill?(i.setAttribute("fill",e.fillColor||e.color),i.setAttribute("fill-opacity",e.fillOpacity),i.setAttribute("fill-rule",e.fillRule||"evenodd")):i.setAttribute("fill","none"))},_updatePoly:function(t,i){this._setPath(t,$(t._parts,i))},_updateCircle:function(t){var i=t._point,e=Math.max(Math.round(t._radius),1),n="a"+e+","+(Math.max(Math.round(t._radiusY),1)||e)+" 0 1,0 ",o=t._empty()?"M0 0":"M"+(i.x-e)+","+i.y+n+2*e+",0 "+n+2*-e+",0 ";this._setPath(t,o)},_setPath:function(t,i){t._path.setAttribute("d",i)},_bringToFront:function(t){hi(t._path)},_bringToBack:function(t){ui(t._path)}});function mn(t){return Zt||Et?new pn(t):null}Et&&pn.include(_n),Ki.include({getRenderer:function(t){var i=(i=t.options.renderer||this._getPaneRenderer(t.options.pane)||this.options.renderer||this._renderer)||(this._renderer=this._createRenderer());return this.hasLayer(i)||this.addLayer(i),i},_getPaneRenderer:function(t){if("overlayPane"===t||void 0===t)return!1;var i=this._paneRenderers[t];return void 0===i&&(i=this._createRenderer({pane:t}),this._paneRenderers[t]=i),i},_createRenderer:function(t){return this.options.preferCanvas&&ln(t)||mn(t)}});var fn=Re.extend({initialize:function(t,i){Re.prototype.initialize.call(this,this._boundsToLatLngs(t),i)},setBounds:function(t){return this.setLatLngs(this._boundsToLatLngs(t))},_boundsToLatLngs:function(t){return[(t=N(t)).getSouthWest(),t.getNorthWest(),t.getNorthEast(),t.getSouthEast()]}});pn.create=dn,pn.pointsToPath=$,Ne.geometryToLayer=De,Ne.coordsToLatLng=We,Ne.coordsToLatLngs=He,Ne.latLngToCoords=Fe,Ne.latLngsToCoords=Ue,Ne.getFeature=Ve,Ne.asFeature=qe,Ki.mergeOptions({boxZoom:!0});var gn=ie.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane,this._resetStateTimeout=0,t.on("unload",this._destroy,this)},addHooks:function(){zi(this._container,"mousedown",this._onMouseDown,this)},removeHooks:function(){Si(this._container,"mousedown",this._onMouseDown,this)},moved:function(){return this._moved},_destroy:function(){ri(this._pane),delete this._pane},_resetState:function(){this._resetStateTimeout=0,this._moved=!1},_clearDeferredResetState:function(){0!==this._resetStateTimeout&&(clearTimeout(this._resetStateTimeout),this._resetStateTimeout=0)},_onMouseDown:function(t){if(!t.shiftKey||1!==t.which&&1!==t.button)return!1;this._clearDeferredResetState(),this._resetState(),Xt(),xi(),this._startPoint=this._map.mouseEventToContainerPoint(t),zi(document,{contextmenu:Ni,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseMove:function(t){this._moved||(this._moved=!0,this._box=si("div","leaflet-zoom-box",this._container),ci(this._container,"leaflet-crosshair"),this._map.fire("boxzoomstart")),this._point=this._map.mouseEventToContainerPoint(t);var i=new I(this._point,this._startPoint),e=i.getSize();vi(this._box,i.min),this._box.style.width=e.x+"px",this._box.style.height=e.y+"px"},_finish:function(){this._moved&&(ri(this._box),_i(this._container,"leaflet-crosshair")),Jt(),wi(),Si(document,{contextmenu:Ni,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseUp:function(t){var i;1!==t.which&&1!==t.button||(this._finish(),this._moved&&(this._clearDeferredResetState(),this._resetStateTimeout=setTimeout(p(this._resetState,this),0),i=new R(this._map.containerPointToLatLng(this._startPoint),this._map.containerPointToLatLng(this._point)),this._map.fitBounds(i).fire("boxzoomend",{boxZoomBounds:i})))},_onKeyDown:function(t){27===t.keyCode&&this._finish()}});Ki.addInitHook("addHandler","boxZoom",gn),Ki.mergeOptions({doubleClickZoom:!0});var vn=ie.extend({addHooks:function(){this._map.on("dblclick",this._onDoubleClick,this)},removeHooks:function(){this._map.off("dblclick",this._onDoubleClick,this)},_onDoubleClick:function(t){var i=this._map,e=i.getZoom(),n=i.options.zoomDelta,o=t.originalEvent.shiftKey?e-n:e+n;"center"===i.options.doubleClickZoom?i.setZoom(o):i.setZoomAround(t.containerPoint,o)}});Ki.addInitHook("addHandler","doubleClickZoom",vn),Ki.mergeOptions({dragging:!0,inertia:!st,inertiaDeceleration:3400,inertiaMaxSpeed:1/0,easeLinearity:.2,worldCopyJump:!1,maxBoundsViscosity:0});var yn=ie.extend({addHooks:function(){var t;this._draggable||(t=this._map,this._draggable=new ae(t._mapPane,t._container),this._draggable.on({dragstart:this._onDragStart,drag:this._onDrag,dragend:this._onDragEnd},this),this._draggable.on("predrag",this._onPreDragLimit,this),t.options.worldCopyJump&&(this._draggable.on("predrag",this._onPreDragWrap,this),t.on("zoomend",this._onZoomEnd,this),t.whenReady(this._onZoomEnd,this))),ci(this._map._container,"leaflet-grab leaflet-touch-drag"),this._draggable.enable(),this._positions=[],this._times=[]},removeHooks:function(){_i(this._map._container,"leaflet-grab"),_i(this._map._container,"leaflet-touch-drag"),this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},moving:function(){return this._draggable&&this._draggable._moving},_onDragStart:function(){var t,i=this._map;i._stop(),this._map.options.maxBounds&&this._map.options.maxBoundsViscosity?(t=N(this._map.options.maxBounds),this._offsetLimit=O(this._map.latLngToContainerPoint(t.getNorthWest()).multiplyBy(-1),this._map.latLngToContainerPoint(t.getSouthEast()).multiplyBy(-1).add(this._map.getSize())),this._viscosity=Math.min(1,Math.max(0,this._map.options.maxBoundsViscosity))):this._offsetLimit=null,i.fire("movestart").fire("dragstart"),i.options.inertia&&(this._positions=[],this._times=[])},_onDrag:function(t){var i,e;this._map.options.inertia&&(i=this._lastTime=+new Date,e=this._lastPos=this._draggable._absPos||this._draggable._newPos,this._positions.push(e),this._times.push(i),this._prunePositions(i)),this._map.fire("move",t).fire("drag",t)},_prunePositions:function(t){for(;1i.max.x&&(t.x=this._viscousLimit(t.x,i.max.x)),t.y>i.max.y&&(t.y=this._viscousLimit(t.y,i.max.y)),this._draggable._newPos=this._draggable._startPos.add(t))},_onPreDragWrap:function(){var t=this._worldWidth,i=Math.round(t/2),e=this._initialWorldOffset,n=this._draggable._newPos.x,o=(n-i+e)%t+i-e,s=(n+i+e)%t-i-e,r=Math.abs(o+e)i.getMaxZoom()&&1 - \ No newline at end of file diff --git a/com_leaflet/site/language/fr-FR/fr-FR.com_leaflet.ini b/com_leaflet/site/language/fr-FR/fr-FR.com_leaflet.ini new file mode 100644 index 0000000..b66853a --- /dev/null +++ b/com_leaflet/site/language/fr-FR/fr-FR.com_leaflet.ini @@ -0,0 +1,6 @@ +; Joomla! Project +; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php +; Note : All ini files need to be saved as UTF-8 + +COM_LEAFLET_TITLE_LEAFLET="Cartographie des projets d'enedis coorace" \ No newline at end of file diff --git a/com_leaflet/site/leaflet.php b/com_leaflet/site/leaflet.php index 8301dbe..b0f0ef3 100644 --- a/com_leaflet/site/leaflet.php +++ b/com_leaflet/site/leaflet.php @@ -10,12 +10,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Factory; +use Joomla\CMS\MVC\Controller\BaseController; + // Get an instance of the controller prefixed by HelloWorld -$controller = JControllerLegacy::getInstance('leaflet'); +$controller = BaseController::getInstance('leaflet'); // Perform the Request task -$input = JFactory::getApplication()->input; -$controller->execute($input->getCmd('task')); +$input = Factory::getApplication()->input; +$controller->execute($input->getCmd('task', 'display')); // Redirect if set by the controller $controller->redirect(); diff --git a/com_leaflet/site/services/provider.php b/com_leaflet/site/services/provider.php new file mode 100644 index 0000000..e2eaab8 --- /dev/null +++ b/com_leaflet/site/services/provider.php @@ -0,0 +1,25 @@ + [ + RouterServiceInterface::class => function (RouterFactoryInterface $routerFactory) { + $router = $routerFactory->create('site'); + + $router->addRoute( + 'com_leaflet', + [ + 'pattern' => 'ajax', + 'controller' => 'ajax', + 'task' => 'myAjaxFunction', + ] + ); + return $router; + }, + ], +]; diff --git a/com_leaflet/site/src/Controller/AjaxController.php b/com_leaflet/site/src/Controller/AjaxController.php new file mode 100644 index 0000000..ce86b25 --- /dev/null +++ b/com_leaflet/site/src/Controller/AjaxController.php @@ -0,0 +1,30 @@ +input->checkToken('get') or die('Invalid Token'); + + // Récupérer les données envoyées par AJAX + $input = Factory::getApplication()->input; + $param1 = $input->get('param1', '', 'STRING'); + + // Traiter les données ou exécuter une fonction + $result = ['status' => 'success', 'message' => 'Votre requête a été traitée avec succès.']; + + // Retourner la réponse en format JSON + echo json_encode($result); + + // Fermer l'application Joomla pour arrêter l'exécution + Factory::getApplication()->close(); + } +} diff --git a/com_leaflet/site/src/Controller/DisplayController.php b/com_leaflet/site/src/Controller/DisplayController.php new file mode 100644 index 0000000..eef8593 --- /dev/null +++ b/com_leaflet/site/src/Controller/DisplayController.php @@ -0,0 +1,20 @@ +getQuery(true) ->select('id') @@ -43,7 +37,7 @@ class leafletModelleaflet extends JModelItem catch (Exception $e) { $msg = $e->getMessage(); - JFactory::getApplication()->enqueueMessage($msg, 'error'); + Factory::getApplication()->enqueueMessage($msg, 'error'); $results = null; } @@ -56,7 +50,7 @@ class leafletModelleaflet extends JModelItem { try { - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true); $query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams'))); @@ -68,7 +62,7 @@ class leafletModelleaflet extends JModelItem catch (Exception $e) { $msg = $e->getMessage(); - JFactory::getApplication()->enqueueMessage($msg, 'error'); + Factory::getApplication()->enqueueMessage($msg, 'error'); $results = null; } @@ -79,7 +73,7 @@ class leafletModelleaflet extends JModelItem { try { - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true); $query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams'))); @@ -93,7 +87,7 @@ class leafletModelleaflet extends JModelItem catch (Exception $e) { $msg = $e->getMessage(); - JFactory::getApplication()->enqueueMessage($msg, 'error'); + Factory::getApplication()->enqueueMessage($msg, 'error'); $results = null; } @@ -104,7 +98,7 @@ class leafletModelleaflet extends JModelItem { try { - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true); $query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams'))); @@ -117,7 +111,7 @@ class leafletModelleaflet extends JModelItem catch (Exception $e) { $msg = $e->getMessage(); - JFactory::getApplication()->enqueueMessage($msg, 'error'); + Factory::getApplication()->enqueueMessage($msg, 'error'); $results = null; } @@ -129,7 +123,7 @@ class leafletModelleaflet extends JModelItem { try { - $db = JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true); $groupId = 4; @@ -176,10 +170,10 @@ class leafletModelleaflet extends JModelItem catch (Exception $e) { $msg = $e->getMessage(); - JFactory::getApplication()->enqueueMessage($msg, 'error'); + Factory::getApplication()->enqueueMessage($msg, 'error'); $results = null; } return $results; } -} +} \ No newline at end of file diff --git a/com_leaflet/site/src/View/Leaflet/HtmlView.php b/com_leaflet/site/src/View/Leaflet/HtmlView.php new file mode 100644 index 0000000..40c8aec --- /dev/null +++ b/com_leaflet/site/src/View/Leaflet/HtmlView.php @@ -0,0 +1,36 @@ +loadTemplateHeader(); + // Call the parent display to display the layout file + parent::display($template); + } + + /** + * Load the template header data here to simplify the template + */ + protected function loadTemplateHeader() + { + // Import CSS + $document = Factory::getDocument(); + $document->addStyleSheet('components/com_leaflet/assets/css/global.css'); + } +} \ No newline at end of file diff --git a/com_leaflet/site/views/leaflet/view.json.php b/com_leaflet/site/src/View/Leaflet/JsonView.php similarity index 58% rename from com_leaflet/site/views/leaflet/view.json.php rename to com_leaflet/site/src/View/Leaflet/JsonView.php index 7b82202..3eb1bf3 100644 --- a/com_leaflet/site/views/leaflet/view.json.php +++ b/com_leaflet/site/src/View/Leaflet/JsonView.php @@ -3,11 +3,17 @@ * View file for responding to Ajax request for performing Search Here on the map * */ +namespace Digitanie\Component\Leaflet\Site\View\Leaflet; + + use Joomla\CMS\Factory; + use Joomla\CMS\Response\JsonResponse; + use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; + use Joomla\CMS\Language\Text; // No direct access to this file defined('_JEXEC') or die('Restricted access'); -class leafletViewleaflet extends JViewLegacy +class JsonView extends BaseHtmlView { /** * This display function returns in json format the Helloworld greetings @@ -18,7 +24,7 @@ class leafletViewleaflet extends JViewLegacy function display($tpl = null) { - $input = JFactory::getApplication()->input; + $input = Factory::getApplication()->input; $type = $input->get('type', null, 'string'); $catId = $input->get('catId', null, 'string'); @@ -28,58 +34,57 @@ class leafletViewleaflet extends JViewLegacy $records = $model->getCategory(); if ($records) { - echo new JResponseJson($records); + echo new JsonResponse($records); } else { - echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true); + echo new JsonResponse(null, Text::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true); } } else if ($type == "departement") { $records = $model->getTerritoires(); if ($records) { - echo new JResponseJson($records); + echo new JsonResponse($records); } else { - echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true); + echo new JsonResponse(null, Text::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true); } } else if ($type == "categorie") { $records = $model->getCategoriesExperience(); if ($records) { - echo new JResponseJson($records); + echo new JsonResponse($records); } else { - echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true); + echo new JsonResponse(null, Text::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true); } } else if ($type == "activite") { $records = $model->getActivite(); if ($records) { - echo new JResponseJson($records); + echo new JsonResponse($records); } else { - echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true); + echo new JsonResponse(null, Text::_('COM_HELLOWORLD_ERROR_NO_RECORDS'), true); } } else if ($type == "markers" && isset($catId)) { $records = $model->getMarkers($catId); if ($records) { - echo new JResponseJson($records); + echo new JsonResponse($records); } else { - echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_RECORDS_1'), true); + echo new JsonResponse(null, Text::_('COM_HELLOWORLD_ERROR_NO_RECORDS_1'), true); } } else { $records = array(); - //echo new JResponseJson(null, JText::_('COM_HELLOWORLD_ERROR_NO_MAP_BOUNDS'), true); - echo new JResponseJson($type); + echo new JsonResponse($type); } } } \ No newline at end of file diff --git a/com_leaflet/site/tmpl/leaflet/default.php b/com_leaflet/site/tmpl/leaflet/default.php new file mode 100644 index 0000000..0af295b --- /dev/null +++ b/com_leaflet/site/tmpl/leaflet/default.php @@ -0,0 +1,46 @@ + 'auto', 'relative' => true)); + JHtml::_('script', JUri::root() . 'media/com_leaflet/js/leaflet-1.7.1/leaflet.js'); + JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-1.7.1/leaflet.css'); + + JHtml::_('script', 'com_leaflet/leaflet-panel-layers-master/src/leaflet-panel-layers.js', array('version' => 'auto', 'relative' => true)); + JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-panel-layers-master/src/leaflet-panel-layers.css'); + JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-search-master/src/leaflet-search.css'); + JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-sidebar-master/src/L.Control.Sidebar.css'); + JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.css'); + JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.Default.css'); + + JHtml::_('script', 'com_leaflet/nouvelles_regionsV3.js', array('version' => 'auto', 'relative' => true)); + JHtml::_('script', 'com_leaflet/mapbox_token.js', array('version' => 'auto', 'relative' => true)); + JHtml::_('script', 'media/com_leaflet/js/leaflet-omnivore.min.js'); + + JHtml::_('script', 'com_leaflet/leaflet-search-master/src/leaflet-search.js', array('version' => 'auto', 'relative' => true)); + JHtml::_('script', 'com_leaflet/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js', array('version' => 'auto', 'relative' => true)); + JHtml::_('script', 'com_leaflet/leaflet-sidebar-master/src/L.Control.Sidebar.js', array('version' => 'auto', 'relative' => true)); + + JHtml::_('script', 'com_leaflet/app.js', array('version' => 'auto', 'relative' => true)); + + +?> + +'; ?> + +
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/com_leaflet/site/views/leaflet/tmpl/default.xml b/com_leaflet/site/tmpl/leaflet/default.xml similarity index 100% rename from com_leaflet/site/views/leaflet/tmpl/default.xml rename to com_leaflet/site/tmpl/leaflet/default.xml diff --git a/com_leaflet/site/views/index.html b/com_leaflet/site/views/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/com_leaflet/site/views/leaflet/index.html b/com_leaflet/site/views/leaflet/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/com_leaflet/site/views/leaflet/tmpl/default.php b/com_leaflet/site/views/leaflet/tmpl/default.php deleted file mode 100644 index b6c1f14..0000000 --- a/com_leaflet/site/views/leaflet/tmpl/default.php +++ /dev/null @@ -1,84 +0,0 @@ - - - 'auto', 'relative' => true)); - JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-panel-layers-master/src/leaflet-panel-layers.css'); - JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-search-master/src/leaflet-search.css'); - JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-sidebar-master/src/L.Control.Sidebar.css'); - JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.css'); - JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.Default.css'); - // JHtml::_('script', JUri::root() . 'media/com_leaflet/js/leaflet-menu-master/src/leaflet.menu.min.js'); - // JHtml::_('stylesheet', JUri::root() . 'media/com_leaflet/js/leaflet-menu-master/src/leaflet.menu.min.css'); - // JHtml::_('stylesheet', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css'); - - - // JHtml::_('script', 'com_leaflet/chflieu_communesV2.js', array('version' => 'auto', 'relative' => true)); - JHtml::_('script', 'com_leaflet/nouvelles_regionsV3.js', array('version' => 'auto', 'relative' => true)); - JHtml::_('script', 'com_leaflet/mapbox_token.js', array('version' => 'auto', 'relative' => true)); - JHtml::_('script', 'media/com_leaflet/js/leaflet-omnivore.min.js'); - //JHtml::_('script', 'media/com_leaflet/jsChainesGeomWKT.js'); - // JHtml::_('script', 'com_leaflet/themes.js', array('version' => 'auto', 'relative' => true)); - - JHtml::_('script', 'com_leaflet/leaflet-search-master/src/leaflet-search.js', array('version' => 'auto', 'relative' => true)); - JHtml::_('script', 'com_leaflet/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js', array('version' => 'auto', 'relative' => true)); - JHtml::_('script', 'com_leaflet/leaflet-sidebar-master/src/L.Control.Sidebar.js', array('version' => 'auto', 'relative' => true)); - - JHtml::_('script', 'com_leaflet/app.js', array('version' => 'auto', 'relative' => true)); - - - - ?> - - - '; ?> - - - -
-
-
-
-
- - - -
- - - - - - \ No newline at end of file diff --git a/com_leaflet/site/views/leaflet/tmpl/index.html b/com_leaflet/site/views/leaflet/tmpl/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/com_leaflet/site/views/leaflet/view.html.php b/com_leaflet/site/views/leaflet/view.html.php deleted file mode 100644 index ff24d2b..0000000 --- a/com_leaflet/site/views/leaflet/view.html.php +++ /dev/null @@ -1,46 +0,0 @@ -loadTemplateHeader(); - - // Display the view - parent::display($tpl); - - } - /** - * Load the template header data here to simplify the template - */ - protected function loadTemplateHeader() - { - // Import CSS - $document = JFactory::getDocument(); - $document->addStyleSheet('components/com_leaflet/assets/css/global.css'); - } -} - -// SEND THE DATA TO THE VIEW FRONT \ No newline at end of file From 39fe6e96e032446398431307b54d2a5735a2c427 Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Fri, 8 Nov 2024 11:13:02 +0100 Subject: [PATCH 03/15] BREAKING CHANGE : replace jquery file --- com_leaflet/media/com_leaflet/js/jquery-3.6.0.min.js | 2 ++ com_leaflet/media/com_leaflet/js/jquery-3.6.0.slim.min.js | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 com_leaflet/media/com_leaflet/js/jquery-3.6.0.min.js delete mode 100644 com_leaflet/media/com_leaflet/js/jquery-3.6.0.slim.min.js diff --git a/com_leaflet/media/com_leaflet/js/jquery-3.6.0.min.js b/com_leaflet/media/com_leaflet/js/jquery-3.6.0.min.js new file mode 100644 index 0000000..7f37b5d --- /dev/null +++ b/com_leaflet/media/com_leaflet/js/jquery-3.6.0.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="",le.option=!!xe.lastChild;var ke={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n",""]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="
",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0+~]|"+R+")"+R+"*"),U=new RegExp(R+"|>"),V=new RegExp(W),X=new RegExp("^"+B+"$"),Q={ID:new RegExp("^#("+B+")"),CLASS:new RegExp("^\\.("+B+")"),TAG:new RegExp("^("+B+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+R+"*(even|odd|(([+-]|)(\\d*)n|)"+R+"*(?:([+-]|)"+R+"*(\\d+)|))"+R+"*\\)|)","i"),bool:new RegExp("^(?:"+I+")$","i"),needsContext:new RegExp("^"+R+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+R+"*((?:-\\d)?\\d*)"+R+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,G=/^(?:input|select|textarea|button)$/i,K=/^h\d$/i,J=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+R+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){C()},ae=xe(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{O.apply(t=P.call(d.childNodes),d.childNodes),t[d.childNodes.length].nodeType}catch(e){O={apply:t.length?function(e,t){q.apply(e,P.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,d=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==d&&9!==d&&11!==d)return n;if(!r&&(C(e),e=e||T,E)){if(11!==d&&(u=Z.exec(t)))if(i=u[1]){if(9===d){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return O.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&p.getElementsByClassName&&e.getElementsByClassName)return O.apply(n,e.getElementsByClassName(i)),n}if(p.qsa&&!k[t+" "]&&(!v||!v.test(t))&&(1!==d||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===d&&(U.test(t)||_.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&p.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=A)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+be(l[o]);c=l.join(",")}try{return O.apply(n,f.querySelectorAll(c)),n}catch(e){k(t,!0)}finally{s===A&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>x.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[A]=!0,e}function ce(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)x.attrHandle[n[r]]=t}function de(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function pe(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in p=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},C=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:d;return r!=T&&9===r.nodeType&&r.documentElement&&(a=(T=r).documentElement,E=!i(T),d!=T&&(n=T.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),p.scope=ce(function(e){return a.appendChild(e).appendChild(T.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),p.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),p.getElementsByTagName=ce(function(e){return e.appendChild(T.createComment("")),!e.getElementsByTagName("*").length}),p.getElementsByClassName=J.test(T.getElementsByClassName),p.getById=ce(function(e){return a.appendChild(e).id=A,!T.getElementsByName||!T.getElementsByName(A).length}),p.getById?(x.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},x.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(x.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},x.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),x.find.TAG=p.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):p.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},x.find.CLASS=p.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(p.qsa=J.test(T.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+R+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+R+"*(?:value|"+I+")"),e.querySelectorAll("[id~="+A+"-]").length||v.push("~="),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+R+"*name"+R+"*="+R+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+A+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=T.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+R+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(p.matchesSelector=J.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){p.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",W)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=J.test(a.compareDocumentPosition),y=t||J.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!p.sortDetached&&t.compareDocumentPosition(e)===n?e==T||e.ownerDocument==d&&y(d,e)?-1:t==T||t.ownerDocument==d&&y(d,t)?1:u?H(u,e)-H(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==T?-1:t==T?1:i?-1:o?1:u?H(u,e)-H(u,t):0;if(i===o)return de(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?de(a[r],s[r]):a[r]==d?-1:s[r]==d?1:0}),T},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(C(e),p.matchesSelector&&E&&!k[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||p.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){k(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&V.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+R+")"+e+"("+R+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return b(n)?E.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?E.grep(e,function(e){return e===n!==r}):"string"!=typeof n?E.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(E.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||L,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:j.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof E?t[0]:t,E.merge(this,E.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:w,!0)),k.test(r[1])&&E.isPlainObject(t))for(r in t)b(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=w.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):b(e)?void 0!==n.ready?n.ready(e):e(E):E.makeArray(e,this)}).prototype=E.fn,L=E(w);var q=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}E.fn.extend({has:function(e){var t=E(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,pe=/^$|^module$|\/(?:java|ecma)script/i;le=w.createDocumentFragment().appendChild(w.createElement("div")),(ce=w.createElement("input")).setAttribute("type","radio"),ce.setAttribute("checked","checked"),ce.setAttribute("name","t"),le.appendChild(ce),m.checkClone=le.cloneNode(!0).cloneNode(!0).lastChild.checked,le.innerHTML="",m.noCloneChecked=!!le.cloneNode(!0).lastChild.defaultValue,le.innerHTML="",m.option=!!le.lastChild;var he={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ge(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&S(e,t)?E.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n",""]);var ye=/<|&#?\w+;/;function me(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),d=[],p=0,h=e.length;p\s*$/g;function ke(e,t){return S(e,"table")&&S(11!==t.nodeType?t:t.firstChild,"tr")&&E(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Le(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function je(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n
",2===lt.childNodes.length),E.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(m.createHTMLDocument?((r=(t=w.implementation.createHTMLDocument("")).createElement("base")).href=w.location.href,t.head.appendChild(r)):t=w),o=!n&&[],(i=k.exec(e))?[t.createElement(i[1])]:(i=me([e],t,o),o&&o.length&&E(o).remove(),E.merge([],i.childNodes)));var r,i,o},E.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=E.css(e,"position"),c=E(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=E.css(e,"top"),u=E.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),b(t)&&(t=t.call(e,n,E.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},E.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){E.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===E.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===E.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=E(e).offset()).top+=E.css(e,"borderTopWidth",!0),i.left+=E.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-E.css(r,"marginTop",!0),left:t.left-i.left-E.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===E.css(e,"position"))e=e.offsetParent;return e||re})}}),E.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;E.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),E.each(["top","left"],function(e,n){E.cssHooks[n]=Me(m.pixelPosition,function(e,t){if(t)return t=Be(e,n),Pe.test(t)?E(e).position()[n]+"px":t})}),E.each({Height:"height",Width:"width"},function(a,s){E.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){E.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?E.css(e,t,i):E.style(e,t,n,i)},s,n?e:void 0,n)}})}),E.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),E.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){E.fn[n]=function(e,t){return 0 Date: Fri, 8 Nov 2024 11:37:21 +0100 Subject: [PATCH 04/15] BREAKING CHANGE : adapt "admin" part for J5 --- com_leaflet/admin/.gitkeep | 0 com_leaflet/admin/index.html | 2 -- com_leaflet/admin/leaflet.php | 1 - com_leaflet/admin/services/provider.php | 29 +++++++++++++++++++ .../src/Controller/DisplayController.php | 27 +++++++++++++++++ .../admin/src/View/Leaflet/HtmlView.php | 23 +++++++++++++++ com_leaflet/admin/tmpl/leaflet/default.php | 6 ++++ 7 files changed, 85 insertions(+), 3 deletions(-) delete mode 100644 com_leaflet/admin/.gitkeep delete mode 100644 com_leaflet/admin/index.html delete mode 100644 com_leaflet/admin/leaflet.php create mode 100644 com_leaflet/admin/services/provider.php create mode 100644 com_leaflet/admin/src/Controller/DisplayController.php create mode 100644 com_leaflet/admin/src/View/Leaflet/HtmlView.php create mode 100644 com_leaflet/admin/tmpl/leaflet/default.php diff --git a/com_leaflet/admin/.gitkeep b/com_leaflet/admin/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/com_leaflet/admin/index.html b/com_leaflet/admin/index.html deleted file mode 100644 index 6e4ffbf..0000000 --- a/com_leaflet/admin/index.html +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/com_leaflet/admin/leaflet.php b/com_leaflet/admin/leaflet.php deleted file mode 100644 index 84e4380..0000000 --- a/com_leaflet/admin/leaflet.php +++ /dev/null @@ -1 +0,0 @@ -Hello World administration \ No newline at end of file diff --git a/com_leaflet/admin/services/provider.php b/com_leaflet/admin/services/provider.php new file mode 100644 index 0000000..905f288 --- /dev/null +++ b/com_leaflet/admin/services/provider.php @@ -0,0 +1,29 @@ +registerServiceProvider(new MVCFactory('\\Digitanie\\Component\\Leaflet')); + $container->registerServiceProvider(new ComponentDispatcherFactory('\\Digitanie\\Component\\Leaflet')); + $container->set( + ComponentInterface::class, + function (Container $container) { + $component = new MVCComponent($container->get(ComponentDispatcherFactoryInterface::class)); + $component->setMVCFactory($container->get(MVCFactoryInterface::class)); + + return $component; + } + ); + } +}; \ No newline at end of file diff --git a/com_leaflet/admin/src/Controller/DisplayController.php b/com_leaflet/admin/src/Controller/DisplayController.php new file mode 100644 index 0000000..4b1b41c --- /dev/null +++ b/com_leaflet/admin/src/Controller/DisplayController.php @@ -0,0 +1,27 @@ + +

Leaflet administration

\ No newline at end of file From 151b94c37196f84ca2ed64e81cc880d2725e9e65 Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Fri, 8 Nov 2024 12:02:40 +0100 Subject: [PATCH 05/15] BREAKING CHANGE : adapt "media" part for J5 --- com_leaflet/media/com_leaflet/.gitkeep | 0 com_leaflet/media/index.html | 1 + .../js/Leaflet.markercluster-1.4.1/.gitignore | 0 .../js/Leaflet.markercluster-1.4.1/.travis.yml | 0 .../js/Leaflet.markercluster-1.4.1/CHANGELOG.md | 0 .../js/Leaflet.markercluster-1.4.1/CONTRIBUTING.md | 0 .../Leaflet.markercluster-1.4.1/ISSUE_TEMPLATE.md | 0 .../js/Leaflet.markercluster-1.4.1/Jakefile.js | 0 .../js/Leaflet.markercluster-1.4.1/MIT-LICENCE.txt | 0 .../js/Leaflet.markercluster-1.4.1/README.md | 0 .../js/Leaflet.markercluster-1.4.1/bower.json | 0 .../js/Leaflet.markercluster-1.4.1/build/hintrc.js | 0 .../build/rollup-config.js | 0 .../dist/MarkerCluster.Default.css | 0 .../dist/MarkerCluster.css | 0 .../dist/WhereAreTheJavascriptFiles.txt | 0 .../dist/leaflet.markercluster-src.js | 0 .../dist/leaflet.markercluster-src.js.map | 0 .../dist/leaflet.markercluster.js | 0 .../dist/leaflet.markercluster.js.map | 0 .../example/geojson-sample.js | 0 .../example/geojson.html | 0 .../js/Leaflet.markercluster-1.4.1/example/map.png | Bin .../example/marker-clustering-convexhull.html | 0 .../example/marker-clustering-custom.html | 0 .../example/marker-clustering-dragging.html | 0 .../example/marker-clustering-everything.html | 0 .../example/marker-clustering-geojson.html | 0 .../example/marker-clustering-pane.html | 0 .../marker-clustering-realworld-maxzoom.388.html | 0 .../marker-clustering-realworld-mobile.388.html | 0 .../example/marker-clustering-realworld.10000.html | 0 .../example/marker-clustering-realworld.388.html | 0 .../example/marker-clustering-realworld.50000.html | 0 .../example/marker-clustering-singlemarkermode.html | 0 .../example/marker-clustering-spiderfier.html | 0 .../example/marker-clustering-zoomtobounds.html | 0 .../example/marker-clustering-zoomtoshowlayer.html | 0 .../example/marker-clustering.html | 0 .../Leaflet.markercluster-1.4.1/example/mobile.css | 0 .../example/old-bugs/add-1000-after.html | 0 .../example/old-bugs/add-markers-offscreen.html | 0 .../old-bugs/add-remove-before-addtomap.html | 0 .../example/old-bugs/animationless-zoom.html | 0 .../old-bugs/click-cluster-at-screen-edge.html | 0 .../old-bugs/disappearing-marker-from-spider.html | 0 .../doesnt-update-cluster-on-bottom-level.html | 0 .../example/old-bugs/drag-with-spiderfying.html | 0 .../example/old-bugs/remove-add-clustering.html | 0 .../example/old-bugs/remove-when-spiderfied.html | 0 .../old-bugs/removelayer-after-remove-from-map.html | 0 .../example/old-bugs/setView-doesnt-remove.html | 0 .../zoomtoshowlayer-doesnt-need-to-zoom.html | 0 .../zoomtoshowlayer-doesnt-zoom-if-centered-on.html | 0 .../example/realworld.10000.js | 0 .../example/realworld.388.js | 0 .../example/realworld.50000.1.js | 0 .../example/realworld.50000.2.js | 0 .../example/remove-geoJSON-when-spiderfied.html | 0 .../Leaflet.markercluster-1.4.1/example/screen.css | 0 .../js/Leaflet.markercluster-1.4.1/package.json | 0 .../js/Leaflet.markercluster-1.4.1/spec/after.js | 0 .../js/Leaflet.markercluster-1.4.1/spec/expect.js | 0 .../js/Leaflet.markercluster-1.4.1/spec/index.html | 0 .../Leaflet.markercluster-1.4.1/spec/karma.conf.js | 0 .../js/Leaflet.markercluster-1.4.1/spec/sinon.js | 0 .../spec/suites/AddLayer.MultipleSpec.js | 0 .../spec/suites/AddLayer.SingleSpec.js | 0 .../spec/suites/AddLayersSpec.js | 0 .../spec/suites/ChildChangingIconSupportSpec.js | 0 .../spec/suites/CircleMarkerSupportSpec.js | 0 .../spec/suites/CircleSupportSpec.js | 0 .../spec/suites/DistanceGridSpec.js | 0 .../spec/suites/LeafletSpec.js | 0 .../spec/suites/NonPointSpec.js | 0 .../spec/suites/PaneSpec.js | 0 .../spec/suites/QuickHullSpec.js | 0 .../spec/suites/RefreshSpec.js | 0 .../spec/suites/RememberOpacity.js | 0 .../spec/suites/RemoveLayerSpec.js | 0 .../spec/suites/SpecHelper.js | 0 .../spec/suites/animateOptionSpec.js | 0 .../spec/suites/clearLayersSpec.js | 0 .../spec/suites/disableClusteringAtZoomSpec.js | 0 .../spec/suites/eachLayerSpec.js | 0 .../spec/suites/eventsSpec.js | 0 .../spec/suites/getBoundsSpec.js | 0 .../spec/suites/getLayersSpec.js | 0 .../spec/suites/getVisibleParentSpec.js | 0 .../spec/suites/markerMoveSupportSpec.js | 0 .../spec/suites/nonIntegerZoomSpec.js | 0 .../spec/suites/onAddSpec.js | 0 .../spec/suites/onRemoveSpec.js | 0 .../spec/suites/removeLayersSpec.js | 0 .../spec/suites/removeOutsideVisibleBoundsSpec.js | 0 .../spec/suites/singleMarkerModeSpec.js | 0 .../spec/suites/spiderfySpec.js | 0 .../spec/suites/supportNegativeZoomSpec.js | 0 .../spec/suites/unspiderfySpec.js | 0 .../spec/suites/zoomAnimationSpec.js | 0 .../Leaflet.markercluster-1.4.1/src/DistanceGrid.js | 0 .../src/MarkerCluster.QuickHull.js | 0 .../src/MarkerCluster.Spiderfier.js | 0 .../src/MarkerCluster.js | 0 .../src/MarkerClusterGroup.Refresh.js | 0 .../src/MarkerClusterGroup.js | 0 .../src/MarkerOpacity.js | 0 .../js/Leaflet.markercluster-1.4.1/src/index.js | 0 com_leaflet/media/{com_leaflet => }/js/app.js | 0 .../media/{com_leaflet => }/js/jquery-3.6.0.min.js | 0 .../js/leaflet-1.7.1/images/layers-2x.png | Bin .../js/leaflet-1.7.1/images/layers.png | Bin .../js/leaflet-1.7.1/images/marker-icon-2x.png | Bin .../js/leaflet-1.7.1/images/marker-icon.png | Bin .../js/leaflet-1.7.1/images/marker-shadow.png | Bin .../{com_leaflet => }/js/leaflet-1.7.1/leaflet.css | 0 .../{com_leaflet => }/js/leaflet-1.7.1/leaflet.js | 0 .../js/leaflet-omnivore-master/.gitignore | 0 .../js/leaflet-omnivore-master/.travis.yml | 0 .../js/leaflet-omnivore-master/.zuul.yml | 0 .../js/leaflet-omnivore-master/CHANGELOG.md | 0 .../js/leaflet-omnivore-master/LICENSE | 0 .../js/leaflet-omnivore-master/README.md | 0 .../js/leaflet-omnivore-master/component.json | 0 .../js/leaflet-omnivore-master/index.js | 0 .../js/leaflet-omnivore-master/package.json | 0 .../js/leaflet-omnivore-master/test/a.csv | 0 .../js/leaflet-omnivore-master/test/a.geojson | 0 .../js/leaflet-omnivore-master/test/a.gpx | 0 .../js/leaflet-omnivore-master/test/a.kml | 0 .../js/leaflet-omnivore-master/test/a.polyline | 0 .../js/leaflet-omnivore-master/test/a.topojson | 0 .../js/leaflet-omnivore-master/test/a.wkt | 0 .../js/leaflet-omnivore-master/test/demo.html | 0 .../js/leaflet-omnivore-master/test/options.csv | 0 .../js/leaflet-omnivore-master/test/server.js | 0 .../js/leaflet-omnivore-master/test/test.js | 0 .../{com_leaflet => }/js/leaflet-omnivore.min.js | 0 .../js/leaflet-panel-layers-master/.gitignore | 0 .../js/leaflet-panel-layers-master/Gruntfile.js | 0 .../js/leaflet-panel-layers-master/README.md | 0 .../dist/leaflet-panel-layers.min.css | 0 .../dist/leaflet-panel-layers.min.js | 0 .../dist/leaflet-panel-layers.src.css | 0 .../dist/leaflet-panel-layers.src.js | 0 .../examples/collapsible-panel.html | 0 .../examples/config-layers.json | 0 .../examples/custom-item.html | 0 .../examples/data/bar.js | 0 .../examples/data/drinking_water.js | 0 .../examples/data/fuel.js | 0 .../examples/data/parking.js | 0 .../examples/data/river.json | 0 .../examples/dynamic-layers.html | 0 .../examples/embedded-layers.html | 0 .../examples/group-layers.html | 0 .../examples/icon-layer.html | 0 .../leaflet-panel-layers-master/examples/icons.css | 0 .../examples/images/icons/bar.png | Bin .../examples/images/icons/drinking_water.png | Bin .../examples/images/icons/fuel.png | Bin .../examples/images/icons/parking.png | Bin .../examples/images/leaflet-panel.png | Bin .../examples/images/markers/bar.png | Bin .../examples/images/markers/drinking_water.png | Bin .../examples/images/markers/fuel.png | Bin .../examples/images/markers/parking.png | Bin .../screenshot/leaflet-panel-layers-layout.jpg | Bin .../examples/layer-thumbnails.html | 0 .../examples/multiple-panels.html | 0 .../leaflet-panel-layers-master/examples/style.css | 0 .../js/leaflet-panel-layers-master/index.html | 0 .../js/leaflet-panel-layers-master/license.txt | 0 .../js/leaflet-panel-layers-master/package.json | 0 .../src/leaflet-panel-layers.css | 0 .../src/leaflet-panel-layers.js | 0 .../js/leaflet-search-master/.gitignore | 0 .../js/leaflet-search-master/Gruntfile.js | 0 .../js/leaflet-search-master/README.md | 0 .../{com_leaflet => }/js/leaflet-search-master/TODO | 0 .../dist/leaflet-search.min.css | 0 .../dist/leaflet-search.min.js | 0 .../dist/leaflet-search.mobile.min.css | 0 .../dist/leaflet-search.mobile.src.css | 0 .../dist/leaflet-search.src.css | 0 .../dist/leaflet-search.src.js | 0 .../leaflet-search-master/examples/ajax-jquery.html | 0 .../js/leaflet-search-master/examples/ajax.html | 0 .../examples/custom-source-data.html | 0 .../leaflet-search-master/examples/custom-tip.html | 0 .../examples/data/bar.geojson.js | 0 .../examples/data/cities15000.json | 0 .../examples/data/cities15000.raw.txt | 0 .../leaflet-search-master/examples/data/colors.js | 0 .../examples/data/csv2json.php | 0 .../examples/data/custom-icon.png | Bin .../examples/data/htmlcolors.txt | 0 .../examples/data/pharmacy.geojson.js | 0 .../examples/data/restaurant.geojson.js | 0 .../examples/data/restaurant500.geojson.js | 0 .../examples/data/us-states.js | 0 .../js/leaflet-search-master/examples/fuzzy.html | 0 .../js/leaflet-search-master/examples/geocoder.html | 0 .../examples/geocoding-google.html | 0 .../examples/geocoding-nominatim.html | 0 .../examples/geojson-layer.html | 0 .../examples/jsonp-filtered.html | 0 .../js/leaflet-search-master/examples/jsonp.html | 0 .../examples/location-url.html | 0 .../js/leaflet-search-master/examples/methods.html | 0 .../js/leaflet-search-master/examples/mobile.css | 0 .../js/leaflet-search-master/examples/mobile.html | 0 .../examples/multiple-layers.html | 0 .../examples/multiple-results.html | 0 .../leaflet-search-master/examples/nominatim.html | 0 .../js/leaflet-search-master/examples/outside.html | 0 .../leaflet-search-master/examples/requirejs.html | 0 .../js/leaflet-search-master/examples/search.php | 0 .../js/leaflet-search-master/examples/simple.html | 0 .../js/leaflet-search-master/examples/style.css | 0 .../js/leaflet-search-master/examples/tests.html | 0 .../js/leaflet-search-master/examples/twitter.html | 0 .../js/leaflet-search-master/images/back.png | Bin .../leaflet-search-master/images/leaflet-search.jpg | Bin .../js/leaflet-search-master/images/loader.gif | Bin .../images/search-icon-mobile.png | Bin .../js/leaflet-search-master/images/search-icon.png | Bin .../js/leaflet-search-master/index.html | 0 .../js/leaflet-search-master/license.txt | 0 .../js/leaflet-search-master/package.json | 0 .../src/leaflet-search-geocoder.js | 0 .../js/leaflet-search-master/src/leaflet-search.css | 0 .../js/leaflet-search-master/src/leaflet-search.js | 0 .../src/leaflet-search.mobile.css | 0 .../js/leaflet-sidebar-master/.github/FUNDING.yml | 0 .../js/leaflet-sidebar-master/.gitignore | 0 .../js/leaflet-sidebar-master/.travis.yml | 0 .../js/leaflet-sidebar-master/.travis/deploy.sh | 0 .../.travis/deploy_key.pem.enc | Bin .../js/leaflet-sidebar-master/CHANGELOG.md | 0 .../js/leaflet-sidebar-master/L.Control.Sidebar.js | 0 .../js/leaflet-sidebar-master/LICENSE | 0 .../js/leaflet-sidebar-master/README.md | 0 .../js/leaflet-sidebar-master/bower.json | 0 .../leaflet-sidebar-master/examples/bootstrap.html | 0 .../js/leaflet-sidebar-master/examples/index.html | 0 .../examples/listing-markers.html | 0 .../examples/multiple-maps.html | 0 .../examples/two-sidebars.html | 0 .../js/leaflet-sidebar-master/gulpfile.js | 0 .../js/leaflet-sidebar-master/leaflet-sidebar.gif | Bin .../js/leaflet-sidebar-master/package.json | 0 .../src/L.Control.Sidebar.css | 0 .../leaflet-sidebar-master/src/L.Control.Sidebar.js | 0 .../src/L.Control.Sidebar.scss | 0 .../js/leaflet-sidebar-master/yarn.lock | 0 .../media/{com_leaflet => }/js/mapbox_token.js | 0 .../{com_leaflet => }/js/nouvelles_regionsV3.js | 0 .../js/sidebar-v2-master/.eslintignore | 0 .../js/sidebar-v2-master/.eslintrc.js | 0 .../js/sidebar-v2-master/.github/FUNDING.yml | 0 .../js/sidebar-v2-master/.github/dependabot.yml | 0 .../js/sidebar-v2-master/.gitignore | 0 .../js/sidebar-v2-master/.stylelintrc.js | 0 .../js/sidebar-v2-master/.travis.yml | 0 .../js/sidebar-v2-master/CHANGELOG.md | 0 .../{com_leaflet => }/js/sidebar-v2-master/LICENSE | 0 .../js/sidebar-v2-master/README.md | 0 .../js/sidebar-v2-master/bower.json | 0 .../js/sidebar-v2-master/css/gmaps-sidebar.css | 0 .../js/sidebar-v2-master/css/gmaps-sidebar.min.css | 0 .../js/sidebar-v2-master/css/leaflet-sidebar.css | 0 .../sidebar-v2-master/css/leaflet-sidebar.min.css | 0 .../js/sidebar-v2-master/css/ol2-sidebar.css | 0 .../js/sidebar-v2-master/css/ol2-sidebar.min.css | 0 .../js/sidebar-v2-master/css/ol3-sidebar.css | 0 .../js/sidebar-v2-master/css/ol3-sidebar.min.css | 0 .../js/sidebar-v2-master/doc/gmaps-1.png | Bin .../js/sidebar-v2-master/doc/gmaps-2.png | Bin .../js/sidebar-v2-master/doc/leaflet-1.png | Bin .../js/sidebar-v2-master/doc/leaflet-2.png | Bin .../js/sidebar-v2-master/doc/ol2-1.png | Bin .../js/sidebar-v2-master/doc/ol2-2.png | Bin .../js/sidebar-v2-master/doc/ol3-1.png | Bin .../js/sidebar-v2-master/doc/ol3-2.png | Bin .../js/sidebar-v2-master/doc/sidebar-v2.gif | Bin .../js/sidebar-v2-master/doc/usage.md | 0 .../js/sidebar-v2-master/examples/gmaps.html | 0 .../js/sidebar-v2-master/examples/index.html | 0 .../js/sidebar-v2-master/examples/ol2.html | 0 .../js/sidebar-v2-master/examples/ol3.html | 0 .../sidebar-v2-master/examples/position-right.html | 0 .../js/sidebar-v2-master/gulpfile.js | 0 .../js/sidebar-v2-master/js/jquery-sidebar.js | 0 .../js/sidebar-v2-master/js/jquery-sidebar.min.js | 0 .../js/sidebar-v2-master/js/leaflet-sidebar.js | 0 .../js/sidebar-v2-master/js/leaflet-sidebar.min.js | 0 .../js/sidebar-v2-master/js/ol3-sidebar.js | 0 .../js/sidebar-v2-master/js/ol3-sidebar.min.js | 0 .../js/sidebar-v2-master/package.json | 0 .../js/sidebar-v2-master/scss/_base.scss | 0 .../js/sidebar-v2-master/scss/_ol-base.scss | 0 .../js/sidebar-v2-master/scss/gmaps-sidebar.scss | 0 .../js/sidebar-v2-master/scss/leaflet-sidebar.scss | 0 .../js/sidebar-v2-master/scss/ol2-sidebar.scss | 0 .../js/sidebar-v2-master/scss/ol3-sidebar.scss | 0 .../typescript/leaflet-sidebar.d.ts | 0 .../js/sidebar-v2-master/yarn.lock | 0 308 files changed, 1 insertion(+) delete mode 100644 com_leaflet/media/com_leaflet/.gitkeep create mode 100644 com_leaflet/media/index.html rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/.gitignore (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/.travis.yml (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/CHANGELOG.md (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/CONTRIBUTING.md (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/ISSUE_TEMPLATE.md (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/Jakefile.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/MIT-LICENCE.txt (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/README.md (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/bower.json (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/build/hintrc.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/build/rollup-config.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.Default.css (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.css (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/dist/WhereAreTheJavascriptFiles.txt (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster-src.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster-src.js.map (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js.map (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/geojson-sample.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/geojson.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/map.png (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-convexhull.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-custom.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-dragging.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-everything.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-geojson.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-pane.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld-maxzoom.388.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld-mobile.388.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.10000.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.388.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.50000.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-singlemarkermode.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-spiderfier.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-zoomtobounds.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering-zoomtoshowlayer.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/marker-clustering.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/mobile.css (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-1000-after.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-markers-offscreen.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-remove-before-addtomap.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/animationless-zoom.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/click-cluster-at-screen-edge.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/disappearing-marker-from-spider.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/doesnt-update-cluster-on-bottom-level.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/drag-with-spiderfying.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/remove-add-clustering.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/remove-when-spiderfied.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/removelayer-after-remove-from-map.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/setView-doesnt-remove.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/zoomtoshowlayer-doesnt-need-to-zoom.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/old-bugs/zoomtoshowlayer-doesnt-zoom-if-centered-on.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/realworld.10000.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/realworld.388.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/realworld.50000.1.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/realworld.50000.2.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/remove-geoJSON-when-spiderfied.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/example/screen.css (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/package.json (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/after.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/expect.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/index.html (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/karma.conf.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/sinon.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayer.MultipleSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayer.SingleSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayersSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/ChildChangingIconSupportSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/CircleMarkerSupportSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/CircleSupportSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/DistanceGridSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/LeafletSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/NonPointSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/PaneSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/QuickHullSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/RefreshSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/RememberOpacity.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/RemoveLayerSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/SpecHelper.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/animateOptionSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/clearLayersSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/disableClusteringAtZoomSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/eachLayerSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/eventsSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/getBoundsSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/getLayersSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/getVisibleParentSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/markerMoveSupportSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/nonIntegerZoomSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/onAddSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/onRemoveSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/removeLayersSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/removeOutsideVisibleBoundsSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/singleMarkerModeSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/spiderfySpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/supportNegativeZoomSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/unspiderfySpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/spec/suites/zoomAnimationSpec.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/src/DistanceGrid.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.QuickHull.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.Spiderfier.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/src/MarkerClusterGroup.Refresh.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/src/MarkerClusterGroup.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/src/MarkerOpacity.js (100%) rename com_leaflet/media/{com_leaflet => }/js/Leaflet.markercluster-1.4.1/src/index.js (100%) rename com_leaflet/media/{com_leaflet => }/js/app.js (100%) rename com_leaflet/media/{com_leaflet => }/js/jquery-3.6.0.min.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-1.7.1/images/layers-2x.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-1.7.1/images/layers.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-1.7.1/images/marker-icon-2x.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-1.7.1/images/marker-icon.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-1.7.1/images/marker-shadow.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-1.7.1/leaflet.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-1.7.1/leaflet.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/.gitignore (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/.travis.yml (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/.zuul.yml (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/CHANGELOG.md (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/LICENSE (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/README.md (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/component.json (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/index.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/package.json (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/test/a.csv (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/test/a.geojson (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/test/a.gpx (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/test/a.kml (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/test/a.polyline (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/test/a.topojson (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/test/a.wkt (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/test/demo.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/test/options.csv (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/test/server.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore-master/test/test.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-omnivore.min.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/.gitignore (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/Gruntfile.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/README.md (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.min.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.min.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.src.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.src.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/collapsible-panel.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/config-layers.json (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/custom-item.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/data/bar.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/data/drinking_water.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/data/fuel.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/data/parking.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/data/river.json (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/dynamic-layers.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/embedded-layers.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/group-layers.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/icon-layer.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/icons.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/images/icons/bar.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/images/icons/drinking_water.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/images/icons/fuel.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/images/icons/parking.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/images/leaflet-panel.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/images/markers/bar.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/images/markers/drinking_water.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/images/markers/fuel.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/images/markers/parking.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/images/screenshot/leaflet-panel-layers-layout.jpg (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/layer-thumbnails.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/multiple-panels.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/examples/style.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/index.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/license.txt (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/package.json (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/src/leaflet-panel-layers.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-panel-layers-master/src/leaflet-panel-layers.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/.gitignore (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/Gruntfile.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/README.md (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/TODO (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/dist/leaflet-search.min.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/dist/leaflet-search.min.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/dist/leaflet-search.mobile.min.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/dist/leaflet-search.mobile.src.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/dist/leaflet-search.src.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/dist/leaflet-search.src.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/ajax-jquery.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/ajax.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/custom-source-data.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/custom-tip.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/data/bar.geojson.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/data/cities15000.json (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/data/cities15000.raw.txt (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/data/colors.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/data/csv2json.php (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/data/custom-icon.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/data/htmlcolors.txt (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/data/pharmacy.geojson.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/data/restaurant.geojson.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/data/restaurant500.geojson.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/data/us-states.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/fuzzy.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/geocoder.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/geocoding-google.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/geocoding-nominatim.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/geojson-layer.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/jsonp-filtered.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/jsonp.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/location-url.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/methods.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/mobile.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/mobile.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/multiple-layers.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/multiple-results.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/nominatim.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/outside.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/requirejs.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/search.php (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/simple.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/style.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/tests.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/examples/twitter.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/images/back.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/images/leaflet-search.jpg (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/images/loader.gif (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/images/search-icon-mobile.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/images/search-icon.png (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/index.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/license.txt (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/package.json (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/src/leaflet-search-geocoder.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/src/leaflet-search.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/src/leaflet-search.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-search-master/src/leaflet-search.mobile.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/.github/FUNDING.yml (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/.gitignore (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/.travis.yml (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/.travis/deploy.sh (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/.travis/deploy_key.pem.enc (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/CHANGELOG.md (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/L.Control.Sidebar.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/LICENSE (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/README.md (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/bower.json (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/examples/bootstrap.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/examples/index.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/examples/listing-markers.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/examples/multiple-maps.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/examples/two-sidebars.html (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/gulpfile.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/leaflet-sidebar.gif (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/package.json (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/src/L.Control.Sidebar.css (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/src/L.Control.Sidebar.js (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/src/L.Control.Sidebar.scss (100%) rename com_leaflet/media/{com_leaflet => }/js/leaflet-sidebar-master/yarn.lock (100%) rename com_leaflet/media/{com_leaflet => }/js/mapbox_token.js (100%) rename com_leaflet/media/{com_leaflet => }/js/nouvelles_regionsV3.js (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/.eslintignore (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/.eslintrc.js (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/.github/FUNDING.yml (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/.github/dependabot.yml (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/.gitignore (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/.stylelintrc.js (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/.travis.yml (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/CHANGELOG.md (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/LICENSE (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/README.md (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/bower.json (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/css/gmaps-sidebar.css (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/css/gmaps-sidebar.min.css (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/css/leaflet-sidebar.css (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/css/leaflet-sidebar.min.css (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/css/ol2-sidebar.css (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/css/ol2-sidebar.min.css (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/css/ol3-sidebar.css (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/css/ol3-sidebar.min.css (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/doc/gmaps-1.png (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/doc/gmaps-2.png (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/doc/leaflet-1.png (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/doc/leaflet-2.png (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/doc/ol2-1.png (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/doc/ol2-2.png (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/doc/ol3-1.png (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/doc/ol3-2.png (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/doc/sidebar-v2.gif (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/doc/usage.md (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/examples/gmaps.html (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/examples/index.html (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/examples/ol2.html (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/examples/ol3.html (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/examples/position-right.html (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/gulpfile.js (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/js/jquery-sidebar.js (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/js/jquery-sidebar.min.js (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/js/leaflet-sidebar.js (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/js/leaflet-sidebar.min.js (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/js/ol3-sidebar.js (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/js/ol3-sidebar.min.js (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/package.json (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/scss/_base.scss (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/scss/_ol-base.scss (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/scss/gmaps-sidebar.scss (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/scss/leaflet-sidebar.scss (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/scss/ol2-sidebar.scss (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/scss/ol3-sidebar.scss (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/typescript/leaflet-sidebar.d.ts (100%) rename com_leaflet/media/{com_leaflet => }/js/sidebar-v2-master/yarn.lock (100%) diff --git a/com_leaflet/media/com_leaflet/.gitkeep b/com_leaflet/media/com_leaflet/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/com_leaflet/media/index.html b/com_leaflet/media/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_leaflet/media/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/.gitignore b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/.gitignore similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/.gitignore rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/.gitignore diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/.travis.yml b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/.travis.yml similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/.travis.yml rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/.travis.yml diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/CHANGELOG.md b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/CHANGELOG.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/CHANGELOG.md rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/CHANGELOG.md diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/CONTRIBUTING.md b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/CONTRIBUTING.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/CONTRIBUTING.md rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/CONTRIBUTING.md diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/ISSUE_TEMPLATE.md b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/ISSUE_TEMPLATE.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/ISSUE_TEMPLATE.md rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/ISSUE_TEMPLATE.md diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/Jakefile.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/Jakefile.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/Jakefile.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/Jakefile.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/MIT-LICENCE.txt b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/MIT-LICENCE.txt similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/MIT-LICENCE.txt rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/MIT-LICENCE.txt diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/README.md b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/README.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/README.md rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/README.md diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/bower.json b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/bower.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/bower.json rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/bower.json diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/build/hintrc.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/build/hintrc.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/build/hintrc.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/build/hintrc.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/build/rollup-config.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/build/rollup-config.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/build/rollup-config.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/build/rollup-config.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.Default.css b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.Default.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.Default.css rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.Default.css diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.css b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.css rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/MarkerCluster.css diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/WhereAreTheJavascriptFiles.txt b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/WhereAreTheJavascriptFiles.txt similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/WhereAreTheJavascriptFiles.txt rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/WhereAreTheJavascriptFiles.txt diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster-src.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster-src.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster-src.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster-src.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster-src.js.map b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster-src.js.map similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster-src.js.map rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster-src.js.map diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js.map b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js.map similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js.map rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/dist/leaflet.markercluster.js.map diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/geojson-sample.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/geojson-sample.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/geojson-sample.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/geojson-sample.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/geojson.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/geojson.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/geojson.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/geojson.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/map.png b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/map.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/map.png rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/map.png diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-convexhull.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-convexhull.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-convexhull.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-convexhull.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-custom.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-custom.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-custom.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-custom.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-dragging.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-dragging.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-dragging.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-dragging.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-everything.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-everything.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-everything.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-everything.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-geojson.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-geojson.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-geojson.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-geojson.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-pane.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-pane.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-pane.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-pane.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld-maxzoom.388.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld-maxzoom.388.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld-maxzoom.388.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld-maxzoom.388.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld-mobile.388.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld-mobile.388.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld-mobile.388.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld-mobile.388.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.10000.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.10000.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.10000.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.10000.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.388.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.388.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.388.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.388.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.50000.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.50000.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.50000.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-realworld.50000.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-singlemarkermode.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-singlemarkermode.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-singlemarkermode.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-singlemarkermode.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-spiderfier.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-spiderfier.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-spiderfier.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-spiderfier.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-zoomtobounds.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-zoomtobounds.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-zoomtobounds.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-zoomtobounds.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-zoomtoshowlayer.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-zoomtoshowlayer.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering-zoomtoshowlayer.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering-zoomtoshowlayer.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/marker-clustering.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/marker-clustering.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/mobile.css b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/mobile.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/mobile.css rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/mobile.css diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-1000-after.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-1000-after.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-1000-after.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-1000-after.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-markers-offscreen.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-markers-offscreen.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-markers-offscreen.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-markers-offscreen.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-remove-before-addtomap.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-remove-before-addtomap.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-remove-before-addtomap.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/add-remove-before-addtomap.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/animationless-zoom.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/animationless-zoom.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/animationless-zoom.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/animationless-zoom.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/click-cluster-at-screen-edge.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/click-cluster-at-screen-edge.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/click-cluster-at-screen-edge.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/click-cluster-at-screen-edge.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/disappearing-marker-from-spider.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/disappearing-marker-from-spider.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/disappearing-marker-from-spider.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/disappearing-marker-from-spider.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/doesnt-update-cluster-on-bottom-level.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/doesnt-update-cluster-on-bottom-level.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/doesnt-update-cluster-on-bottom-level.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/doesnt-update-cluster-on-bottom-level.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/drag-with-spiderfying.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/drag-with-spiderfying.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/drag-with-spiderfying.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/drag-with-spiderfying.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/remove-add-clustering.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/remove-add-clustering.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/remove-add-clustering.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/remove-add-clustering.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/remove-when-spiderfied.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/remove-when-spiderfied.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/remove-when-spiderfied.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/remove-when-spiderfied.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/removelayer-after-remove-from-map.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/removelayer-after-remove-from-map.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/removelayer-after-remove-from-map.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/removelayer-after-remove-from-map.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/setView-doesnt-remove.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/setView-doesnt-remove.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/setView-doesnt-remove.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/setView-doesnt-remove.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/zoomtoshowlayer-doesnt-need-to-zoom.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/zoomtoshowlayer-doesnt-need-to-zoom.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/zoomtoshowlayer-doesnt-need-to-zoom.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/zoomtoshowlayer-doesnt-need-to-zoom.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/zoomtoshowlayer-doesnt-zoom-if-centered-on.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/zoomtoshowlayer-doesnt-zoom-if-centered-on.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/old-bugs/zoomtoshowlayer-doesnt-zoom-if-centered-on.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/old-bugs/zoomtoshowlayer-doesnt-zoom-if-centered-on.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/realworld.10000.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/realworld.10000.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/realworld.10000.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/realworld.10000.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/realworld.388.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/realworld.388.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/realworld.388.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/realworld.388.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/realworld.50000.1.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/realworld.50000.1.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/realworld.50000.1.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/realworld.50000.1.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/realworld.50000.2.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/realworld.50000.2.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/realworld.50000.2.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/realworld.50000.2.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/remove-geoJSON-when-spiderfied.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/remove-geoJSON-when-spiderfied.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/remove-geoJSON-when-spiderfied.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/remove-geoJSON-when-spiderfied.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/screen.css b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/screen.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/example/screen.css rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/example/screen.css diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/package.json b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/package.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/package.json rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/package.json diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/after.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/after.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/after.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/after.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/expect.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/expect.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/expect.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/expect.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/index.html b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/index.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/index.html rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/index.html diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/karma.conf.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/karma.conf.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/karma.conf.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/karma.conf.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/sinon.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/sinon.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/sinon.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/sinon.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayer.MultipleSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayer.MultipleSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayer.MultipleSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayer.MultipleSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayer.SingleSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayer.SingleSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayer.SingleSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayer.SingleSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayersSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayersSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayersSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/AddLayersSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/ChildChangingIconSupportSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/ChildChangingIconSupportSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/ChildChangingIconSupportSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/ChildChangingIconSupportSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/CircleMarkerSupportSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/CircleMarkerSupportSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/CircleMarkerSupportSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/CircleMarkerSupportSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/CircleSupportSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/CircleSupportSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/CircleSupportSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/CircleSupportSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/DistanceGridSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/DistanceGridSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/DistanceGridSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/DistanceGridSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/LeafletSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/LeafletSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/LeafletSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/LeafletSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/NonPointSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/NonPointSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/NonPointSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/NonPointSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/PaneSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/PaneSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/PaneSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/PaneSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/QuickHullSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/QuickHullSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/QuickHullSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/QuickHullSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/RefreshSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/RefreshSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/RefreshSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/RefreshSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/RememberOpacity.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/RememberOpacity.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/RememberOpacity.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/RememberOpacity.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/RemoveLayerSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/RemoveLayerSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/RemoveLayerSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/RemoveLayerSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/SpecHelper.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/SpecHelper.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/SpecHelper.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/SpecHelper.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/animateOptionSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/animateOptionSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/animateOptionSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/animateOptionSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/clearLayersSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/clearLayersSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/clearLayersSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/clearLayersSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/disableClusteringAtZoomSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/disableClusteringAtZoomSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/disableClusteringAtZoomSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/disableClusteringAtZoomSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/eachLayerSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/eachLayerSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/eachLayerSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/eachLayerSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/eventsSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/eventsSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/eventsSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/eventsSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/getBoundsSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/getBoundsSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/getBoundsSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/getBoundsSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/getLayersSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/getLayersSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/getLayersSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/getLayersSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/getVisibleParentSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/getVisibleParentSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/getVisibleParentSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/getVisibleParentSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/markerMoveSupportSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/markerMoveSupportSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/markerMoveSupportSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/markerMoveSupportSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/nonIntegerZoomSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/nonIntegerZoomSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/nonIntegerZoomSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/nonIntegerZoomSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/onAddSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/onAddSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/onAddSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/onAddSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/onRemoveSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/onRemoveSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/onRemoveSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/onRemoveSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/removeLayersSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/removeLayersSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/removeLayersSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/removeLayersSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/removeOutsideVisibleBoundsSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/removeOutsideVisibleBoundsSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/removeOutsideVisibleBoundsSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/removeOutsideVisibleBoundsSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/singleMarkerModeSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/singleMarkerModeSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/singleMarkerModeSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/singleMarkerModeSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/spiderfySpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/spiderfySpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/spiderfySpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/spiderfySpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/supportNegativeZoomSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/supportNegativeZoomSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/supportNegativeZoomSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/supportNegativeZoomSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/unspiderfySpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/unspiderfySpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/unspiderfySpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/unspiderfySpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/zoomAnimationSpec.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/zoomAnimationSpec.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/spec/suites/zoomAnimationSpec.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/spec/suites/zoomAnimationSpec.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/DistanceGrid.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/DistanceGrid.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/DistanceGrid.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/DistanceGrid.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.QuickHull.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.QuickHull.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.QuickHull.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.QuickHull.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.Spiderfier.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.Spiderfier.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.Spiderfier.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.Spiderfier.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerCluster.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerClusterGroup.Refresh.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerClusterGroup.Refresh.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerClusterGroup.Refresh.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerClusterGroup.Refresh.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerClusterGroup.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerClusterGroup.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerClusterGroup.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerClusterGroup.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerOpacity.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerOpacity.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/MarkerOpacity.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/MarkerOpacity.js diff --git a/com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/index.js b/com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/index.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/Leaflet.markercluster-1.4.1/src/index.js rename to com_leaflet/media/js/Leaflet.markercluster-1.4.1/src/index.js diff --git a/com_leaflet/media/com_leaflet/js/app.js b/com_leaflet/media/js/app.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/app.js rename to com_leaflet/media/js/app.js diff --git a/com_leaflet/media/com_leaflet/js/jquery-3.6.0.min.js b/com_leaflet/media/js/jquery-3.6.0.min.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/jquery-3.6.0.min.js rename to com_leaflet/media/js/jquery-3.6.0.min.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-1.7.1/images/layers-2x.png b/com_leaflet/media/js/leaflet-1.7.1/images/layers-2x.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-1.7.1/images/layers-2x.png rename to com_leaflet/media/js/leaflet-1.7.1/images/layers-2x.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-1.7.1/images/layers.png b/com_leaflet/media/js/leaflet-1.7.1/images/layers.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-1.7.1/images/layers.png rename to com_leaflet/media/js/leaflet-1.7.1/images/layers.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-1.7.1/images/marker-icon-2x.png b/com_leaflet/media/js/leaflet-1.7.1/images/marker-icon-2x.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-1.7.1/images/marker-icon-2x.png rename to com_leaflet/media/js/leaflet-1.7.1/images/marker-icon-2x.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-1.7.1/images/marker-icon.png b/com_leaflet/media/js/leaflet-1.7.1/images/marker-icon.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-1.7.1/images/marker-icon.png rename to com_leaflet/media/js/leaflet-1.7.1/images/marker-icon.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-1.7.1/images/marker-shadow.png b/com_leaflet/media/js/leaflet-1.7.1/images/marker-shadow.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-1.7.1/images/marker-shadow.png rename to com_leaflet/media/js/leaflet-1.7.1/images/marker-shadow.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-1.7.1/leaflet.css b/com_leaflet/media/js/leaflet-1.7.1/leaflet.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-1.7.1/leaflet.css rename to com_leaflet/media/js/leaflet-1.7.1/leaflet.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-1.7.1/leaflet.js b/com_leaflet/media/js/leaflet-1.7.1/leaflet.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-1.7.1/leaflet.js rename to com_leaflet/media/js/leaflet-1.7.1/leaflet.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/.gitignore b/com_leaflet/media/js/leaflet-omnivore-master/.gitignore similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/.gitignore rename to com_leaflet/media/js/leaflet-omnivore-master/.gitignore diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/.travis.yml b/com_leaflet/media/js/leaflet-omnivore-master/.travis.yml similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/.travis.yml rename to com_leaflet/media/js/leaflet-omnivore-master/.travis.yml diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/.zuul.yml b/com_leaflet/media/js/leaflet-omnivore-master/.zuul.yml similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/.zuul.yml rename to com_leaflet/media/js/leaflet-omnivore-master/.zuul.yml diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/CHANGELOG.md b/com_leaflet/media/js/leaflet-omnivore-master/CHANGELOG.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/CHANGELOG.md rename to com_leaflet/media/js/leaflet-omnivore-master/CHANGELOG.md diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/LICENSE b/com_leaflet/media/js/leaflet-omnivore-master/LICENSE similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/LICENSE rename to com_leaflet/media/js/leaflet-omnivore-master/LICENSE diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/README.md b/com_leaflet/media/js/leaflet-omnivore-master/README.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/README.md rename to com_leaflet/media/js/leaflet-omnivore-master/README.md diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/component.json b/com_leaflet/media/js/leaflet-omnivore-master/component.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/component.json rename to com_leaflet/media/js/leaflet-omnivore-master/component.json diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/index.js b/com_leaflet/media/js/leaflet-omnivore-master/index.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/index.js rename to com_leaflet/media/js/leaflet-omnivore-master/index.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/package.json b/com_leaflet/media/js/leaflet-omnivore-master/package.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/package.json rename to com_leaflet/media/js/leaflet-omnivore-master/package.json diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.csv b/com_leaflet/media/js/leaflet-omnivore-master/test/a.csv similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.csv rename to com_leaflet/media/js/leaflet-omnivore-master/test/a.csv diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.geojson b/com_leaflet/media/js/leaflet-omnivore-master/test/a.geojson similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.geojson rename to com_leaflet/media/js/leaflet-omnivore-master/test/a.geojson diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.gpx b/com_leaflet/media/js/leaflet-omnivore-master/test/a.gpx similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.gpx rename to com_leaflet/media/js/leaflet-omnivore-master/test/a.gpx diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.kml b/com_leaflet/media/js/leaflet-omnivore-master/test/a.kml similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.kml rename to com_leaflet/media/js/leaflet-omnivore-master/test/a.kml diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.polyline b/com_leaflet/media/js/leaflet-omnivore-master/test/a.polyline similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.polyline rename to com_leaflet/media/js/leaflet-omnivore-master/test/a.polyline diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.topojson b/com_leaflet/media/js/leaflet-omnivore-master/test/a.topojson similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.topojson rename to com_leaflet/media/js/leaflet-omnivore-master/test/a.topojson diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.wkt b/com_leaflet/media/js/leaflet-omnivore-master/test/a.wkt similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/a.wkt rename to com_leaflet/media/js/leaflet-omnivore-master/test/a.wkt diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/demo.html b/com_leaflet/media/js/leaflet-omnivore-master/test/demo.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/demo.html rename to com_leaflet/media/js/leaflet-omnivore-master/test/demo.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/options.csv b/com_leaflet/media/js/leaflet-omnivore-master/test/options.csv similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/options.csv rename to com_leaflet/media/js/leaflet-omnivore-master/test/options.csv diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/server.js b/com_leaflet/media/js/leaflet-omnivore-master/test/server.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/server.js rename to com_leaflet/media/js/leaflet-omnivore-master/test/server.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/test.js b/com_leaflet/media/js/leaflet-omnivore-master/test/test.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore-master/test/test.js rename to com_leaflet/media/js/leaflet-omnivore-master/test/test.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-omnivore.min.js b/com_leaflet/media/js/leaflet-omnivore.min.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-omnivore.min.js rename to com_leaflet/media/js/leaflet-omnivore.min.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/.gitignore b/com_leaflet/media/js/leaflet-panel-layers-master/.gitignore similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/.gitignore rename to com_leaflet/media/js/leaflet-panel-layers-master/.gitignore diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/Gruntfile.js b/com_leaflet/media/js/leaflet-panel-layers-master/Gruntfile.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/Gruntfile.js rename to com_leaflet/media/js/leaflet-panel-layers-master/Gruntfile.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/README.md b/com_leaflet/media/js/leaflet-panel-layers-master/README.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/README.md rename to com_leaflet/media/js/leaflet-panel-layers-master/README.md diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.min.css b/com_leaflet/media/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.min.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.min.css rename to com_leaflet/media/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.min.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.min.js b/com_leaflet/media/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.min.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.min.js rename to com_leaflet/media/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.min.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.src.css b/com_leaflet/media/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.src.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.src.css rename to com_leaflet/media/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.src.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.src.js b/com_leaflet/media/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.src.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.src.js rename to com_leaflet/media/js/leaflet-panel-layers-master/dist/leaflet-panel-layers.src.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/collapsible-panel.html b/com_leaflet/media/js/leaflet-panel-layers-master/examples/collapsible-panel.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/collapsible-panel.html rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/collapsible-panel.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/config-layers.json b/com_leaflet/media/js/leaflet-panel-layers-master/examples/config-layers.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/config-layers.json rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/config-layers.json diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/custom-item.html b/com_leaflet/media/js/leaflet-panel-layers-master/examples/custom-item.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/custom-item.html rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/custom-item.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/data/bar.js b/com_leaflet/media/js/leaflet-panel-layers-master/examples/data/bar.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/data/bar.js rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/data/bar.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/data/drinking_water.js b/com_leaflet/media/js/leaflet-panel-layers-master/examples/data/drinking_water.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/data/drinking_water.js rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/data/drinking_water.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/data/fuel.js b/com_leaflet/media/js/leaflet-panel-layers-master/examples/data/fuel.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/data/fuel.js rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/data/fuel.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/data/parking.js b/com_leaflet/media/js/leaflet-panel-layers-master/examples/data/parking.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/data/parking.js rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/data/parking.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/data/river.json b/com_leaflet/media/js/leaflet-panel-layers-master/examples/data/river.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/data/river.json rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/data/river.json diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/dynamic-layers.html b/com_leaflet/media/js/leaflet-panel-layers-master/examples/dynamic-layers.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/dynamic-layers.html rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/dynamic-layers.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/embedded-layers.html b/com_leaflet/media/js/leaflet-panel-layers-master/examples/embedded-layers.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/embedded-layers.html rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/embedded-layers.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/group-layers.html b/com_leaflet/media/js/leaflet-panel-layers-master/examples/group-layers.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/group-layers.html rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/group-layers.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/icon-layer.html b/com_leaflet/media/js/leaflet-panel-layers-master/examples/icon-layer.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/icon-layer.html rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/icon-layer.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/icons.css b/com_leaflet/media/js/leaflet-panel-layers-master/examples/icons.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/icons.css rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/icons.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/icons/bar.png b/com_leaflet/media/js/leaflet-panel-layers-master/examples/images/icons/bar.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/icons/bar.png rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/images/icons/bar.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/icons/drinking_water.png b/com_leaflet/media/js/leaflet-panel-layers-master/examples/images/icons/drinking_water.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/icons/drinking_water.png rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/images/icons/drinking_water.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/icons/fuel.png b/com_leaflet/media/js/leaflet-panel-layers-master/examples/images/icons/fuel.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/icons/fuel.png rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/images/icons/fuel.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/icons/parking.png b/com_leaflet/media/js/leaflet-panel-layers-master/examples/images/icons/parking.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/icons/parking.png rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/images/icons/parking.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/leaflet-panel.png b/com_leaflet/media/js/leaflet-panel-layers-master/examples/images/leaflet-panel.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/leaflet-panel.png rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/images/leaflet-panel.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/markers/bar.png b/com_leaflet/media/js/leaflet-panel-layers-master/examples/images/markers/bar.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/markers/bar.png rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/images/markers/bar.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/markers/drinking_water.png b/com_leaflet/media/js/leaflet-panel-layers-master/examples/images/markers/drinking_water.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/markers/drinking_water.png rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/images/markers/drinking_water.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/markers/fuel.png b/com_leaflet/media/js/leaflet-panel-layers-master/examples/images/markers/fuel.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/markers/fuel.png rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/images/markers/fuel.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/markers/parking.png b/com_leaflet/media/js/leaflet-panel-layers-master/examples/images/markers/parking.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/markers/parking.png rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/images/markers/parking.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/screenshot/leaflet-panel-layers-layout.jpg b/com_leaflet/media/js/leaflet-panel-layers-master/examples/images/screenshot/leaflet-panel-layers-layout.jpg similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/images/screenshot/leaflet-panel-layers-layout.jpg rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/images/screenshot/leaflet-panel-layers-layout.jpg diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/layer-thumbnails.html b/com_leaflet/media/js/leaflet-panel-layers-master/examples/layer-thumbnails.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/layer-thumbnails.html rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/layer-thumbnails.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/multiple-panels.html b/com_leaflet/media/js/leaflet-panel-layers-master/examples/multiple-panels.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/multiple-panels.html rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/multiple-panels.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/style.css b/com_leaflet/media/js/leaflet-panel-layers-master/examples/style.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/examples/style.css rename to com_leaflet/media/js/leaflet-panel-layers-master/examples/style.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/index.html b/com_leaflet/media/js/leaflet-panel-layers-master/index.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/index.html rename to com_leaflet/media/js/leaflet-panel-layers-master/index.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/license.txt b/com_leaflet/media/js/leaflet-panel-layers-master/license.txt similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/license.txt rename to com_leaflet/media/js/leaflet-panel-layers-master/license.txt diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/package.json b/com_leaflet/media/js/leaflet-panel-layers-master/package.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/package.json rename to com_leaflet/media/js/leaflet-panel-layers-master/package.json diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/src/leaflet-panel-layers.css b/com_leaflet/media/js/leaflet-panel-layers-master/src/leaflet-panel-layers.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/src/leaflet-panel-layers.css rename to com_leaflet/media/js/leaflet-panel-layers-master/src/leaflet-panel-layers.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/src/leaflet-panel-layers.js b/com_leaflet/media/js/leaflet-panel-layers-master/src/leaflet-panel-layers.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-panel-layers-master/src/leaflet-panel-layers.js rename to com_leaflet/media/js/leaflet-panel-layers-master/src/leaflet-panel-layers.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/.gitignore b/com_leaflet/media/js/leaflet-search-master/.gitignore similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/.gitignore rename to com_leaflet/media/js/leaflet-search-master/.gitignore diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/Gruntfile.js b/com_leaflet/media/js/leaflet-search-master/Gruntfile.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/Gruntfile.js rename to com_leaflet/media/js/leaflet-search-master/Gruntfile.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/README.md b/com_leaflet/media/js/leaflet-search-master/README.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/README.md rename to com_leaflet/media/js/leaflet-search-master/README.md diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/TODO b/com_leaflet/media/js/leaflet-search-master/TODO similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/TODO rename to com_leaflet/media/js/leaflet-search-master/TODO diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.min.css b/com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.min.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.min.css rename to com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.min.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.min.js b/com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.min.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.min.js rename to com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.min.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.mobile.min.css b/com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.mobile.min.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.mobile.min.css rename to com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.mobile.min.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.mobile.src.css b/com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.mobile.src.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.mobile.src.css rename to com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.mobile.src.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.src.css b/com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.src.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.src.css rename to com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.src.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.src.js b/com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.src.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/dist/leaflet-search.src.js rename to com_leaflet/media/js/leaflet-search-master/dist/leaflet-search.src.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/ajax-jquery.html b/com_leaflet/media/js/leaflet-search-master/examples/ajax-jquery.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/ajax-jquery.html rename to com_leaflet/media/js/leaflet-search-master/examples/ajax-jquery.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/ajax.html b/com_leaflet/media/js/leaflet-search-master/examples/ajax.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/ajax.html rename to com_leaflet/media/js/leaflet-search-master/examples/ajax.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/custom-source-data.html b/com_leaflet/media/js/leaflet-search-master/examples/custom-source-data.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/custom-source-data.html rename to com_leaflet/media/js/leaflet-search-master/examples/custom-source-data.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/custom-tip.html b/com_leaflet/media/js/leaflet-search-master/examples/custom-tip.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/custom-tip.html rename to com_leaflet/media/js/leaflet-search-master/examples/custom-tip.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/bar.geojson.js b/com_leaflet/media/js/leaflet-search-master/examples/data/bar.geojson.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/bar.geojson.js rename to com_leaflet/media/js/leaflet-search-master/examples/data/bar.geojson.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/cities15000.json b/com_leaflet/media/js/leaflet-search-master/examples/data/cities15000.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/cities15000.json rename to com_leaflet/media/js/leaflet-search-master/examples/data/cities15000.json diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/cities15000.raw.txt b/com_leaflet/media/js/leaflet-search-master/examples/data/cities15000.raw.txt similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/cities15000.raw.txt rename to com_leaflet/media/js/leaflet-search-master/examples/data/cities15000.raw.txt diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/colors.js b/com_leaflet/media/js/leaflet-search-master/examples/data/colors.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/colors.js rename to com_leaflet/media/js/leaflet-search-master/examples/data/colors.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/csv2json.php b/com_leaflet/media/js/leaflet-search-master/examples/data/csv2json.php similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/csv2json.php rename to com_leaflet/media/js/leaflet-search-master/examples/data/csv2json.php diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/custom-icon.png b/com_leaflet/media/js/leaflet-search-master/examples/data/custom-icon.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/custom-icon.png rename to com_leaflet/media/js/leaflet-search-master/examples/data/custom-icon.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/htmlcolors.txt b/com_leaflet/media/js/leaflet-search-master/examples/data/htmlcolors.txt similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/htmlcolors.txt rename to com_leaflet/media/js/leaflet-search-master/examples/data/htmlcolors.txt diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/pharmacy.geojson.js b/com_leaflet/media/js/leaflet-search-master/examples/data/pharmacy.geojson.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/pharmacy.geojson.js rename to com_leaflet/media/js/leaflet-search-master/examples/data/pharmacy.geojson.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/restaurant.geojson.js b/com_leaflet/media/js/leaflet-search-master/examples/data/restaurant.geojson.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/restaurant.geojson.js rename to com_leaflet/media/js/leaflet-search-master/examples/data/restaurant.geojson.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/restaurant500.geojson.js b/com_leaflet/media/js/leaflet-search-master/examples/data/restaurant500.geojson.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/restaurant500.geojson.js rename to com_leaflet/media/js/leaflet-search-master/examples/data/restaurant500.geojson.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/us-states.js b/com_leaflet/media/js/leaflet-search-master/examples/data/us-states.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/data/us-states.js rename to com_leaflet/media/js/leaflet-search-master/examples/data/us-states.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/fuzzy.html b/com_leaflet/media/js/leaflet-search-master/examples/fuzzy.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/fuzzy.html rename to com_leaflet/media/js/leaflet-search-master/examples/fuzzy.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/geocoder.html b/com_leaflet/media/js/leaflet-search-master/examples/geocoder.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/geocoder.html rename to com_leaflet/media/js/leaflet-search-master/examples/geocoder.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/geocoding-google.html b/com_leaflet/media/js/leaflet-search-master/examples/geocoding-google.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/geocoding-google.html rename to com_leaflet/media/js/leaflet-search-master/examples/geocoding-google.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/geocoding-nominatim.html b/com_leaflet/media/js/leaflet-search-master/examples/geocoding-nominatim.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/geocoding-nominatim.html rename to com_leaflet/media/js/leaflet-search-master/examples/geocoding-nominatim.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/geojson-layer.html b/com_leaflet/media/js/leaflet-search-master/examples/geojson-layer.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/geojson-layer.html rename to com_leaflet/media/js/leaflet-search-master/examples/geojson-layer.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/jsonp-filtered.html b/com_leaflet/media/js/leaflet-search-master/examples/jsonp-filtered.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/jsonp-filtered.html rename to com_leaflet/media/js/leaflet-search-master/examples/jsonp-filtered.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/jsonp.html b/com_leaflet/media/js/leaflet-search-master/examples/jsonp.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/jsonp.html rename to com_leaflet/media/js/leaflet-search-master/examples/jsonp.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/location-url.html b/com_leaflet/media/js/leaflet-search-master/examples/location-url.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/location-url.html rename to com_leaflet/media/js/leaflet-search-master/examples/location-url.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/methods.html b/com_leaflet/media/js/leaflet-search-master/examples/methods.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/methods.html rename to com_leaflet/media/js/leaflet-search-master/examples/methods.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/mobile.css b/com_leaflet/media/js/leaflet-search-master/examples/mobile.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/mobile.css rename to com_leaflet/media/js/leaflet-search-master/examples/mobile.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/mobile.html b/com_leaflet/media/js/leaflet-search-master/examples/mobile.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/mobile.html rename to com_leaflet/media/js/leaflet-search-master/examples/mobile.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/multiple-layers.html b/com_leaflet/media/js/leaflet-search-master/examples/multiple-layers.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/multiple-layers.html rename to com_leaflet/media/js/leaflet-search-master/examples/multiple-layers.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/multiple-results.html b/com_leaflet/media/js/leaflet-search-master/examples/multiple-results.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/multiple-results.html rename to com_leaflet/media/js/leaflet-search-master/examples/multiple-results.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/nominatim.html b/com_leaflet/media/js/leaflet-search-master/examples/nominatim.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/nominatim.html rename to com_leaflet/media/js/leaflet-search-master/examples/nominatim.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/outside.html b/com_leaflet/media/js/leaflet-search-master/examples/outside.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/outside.html rename to com_leaflet/media/js/leaflet-search-master/examples/outside.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/requirejs.html b/com_leaflet/media/js/leaflet-search-master/examples/requirejs.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/requirejs.html rename to com_leaflet/media/js/leaflet-search-master/examples/requirejs.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/search.php b/com_leaflet/media/js/leaflet-search-master/examples/search.php similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/search.php rename to com_leaflet/media/js/leaflet-search-master/examples/search.php diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/simple.html b/com_leaflet/media/js/leaflet-search-master/examples/simple.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/simple.html rename to com_leaflet/media/js/leaflet-search-master/examples/simple.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/style.css b/com_leaflet/media/js/leaflet-search-master/examples/style.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/style.css rename to com_leaflet/media/js/leaflet-search-master/examples/style.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/tests.html b/com_leaflet/media/js/leaflet-search-master/examples/tests.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/tests.html rename to com_leaflet/media/js/leaflet-search-master/examples/tests.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/twitter.html b/com_leaflet/media/js/leaflet-search-master/examples/twitter.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/examples/twitter.html rename to com_leaflet/media/js/leaflet-search-master/examples/twitter.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/images/back.png b/com_leaflet/media/js/leaflet-search-master/images/back.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/images/back.png rename to com_leaflet/media/js/leaflet-search-master/images/back.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/images/leaflet-search.jpg b/com_leaflet/media/js/leaflet-search-master/images/leaflet-search.jpg similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/images/leaflet-search.jpg rename to com_leaflet/media/js/leaflet-search-master/images/leaflet-search.jpg diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/images/loader.gif b/com_leaflet/media/js/leaflet-search-master/images/loader.gif similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/images/loader.gif rename to com_leaflet/media/js/leaflet-search-master/images/loader.gif diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/images/search-icon-mobile.png b/com_leaflet/media/js/leaflet-search-master/images/search-icon-mobile.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/images/search-icon-mobile.png rename to com_leaflet/media/js/leaflet-search-master/images/search-icon-mobile.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/images/search-icon.png b/com_leaflet/media/js/leaflet-search-master/images/search-icon.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/images/search-icon.png rename to com_leaflet/media/js/leaflet-search-master/images/search-icon.png diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/index.html b/com_leaflet/media/js/leaflet-search-master/index.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/index.html rename to com_leaflet/media/js/leaflet-search-master/index.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/license.txt b/com_leaflet/media/js/leaflet-search-master/license.txt similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/license.txt rename to com_leaflet/media/js/leaflet-search-master/license.txt diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/package.json b/com_leaflet/media/js/leaflet-search-master/package.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/package.json rename to com_leaflet/media/js/leaflet-search-master/package.json diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/src/leaflet-search-geocoder.js b/com_leaflet/media/js/leaflet-search-master/src/leaflet-search-geocoder.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/src/leaflet-search-geocoder.js rename to com_leaflet/media/js/leaflet-search-master/src/leaflet-search-geocoder.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/src/leaflet-search.css b/com_leaflet/media/js/leaflet-search-master/src/leaflet-search.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/src/leaflet-search.css rename to com_leaflet/media/js/leaflet-search-master/src/leaflet-search.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/src/leaflet-search.js b/com_leaflet/media/js/leaflet-search-master/src/leaflet-search.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/src/leaflet-search.js rename to com_leaflet/media/js/leaflet-search-master/src/leaflet-search.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-search-master/src/leaflet-search.mobile.css b/com_leaflet/media/js/leaflet-search-master/src/leaflet-search.mobile.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-search-master/src/leaflet-search.mobile.css rename to com_leaflet/media/js/leaflet-search-master/src/leaflet-search.mobile.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/.github/FUNDING.yml b/com_leaflet/media/js/leaflet-sidebar-master/.github/FUNDING.yml similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/.github/FUNDING.yml rename to com_leaflet/media/js/leaflet-sidebar-master/.github/FUNDING.yml diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/.gitignore b/com_leaflet/media/js/leaflet-sidebar-master/.gitignore similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/.gitignore rename to com_leaflet/media/js/leaflet-sidebar-master/.gitignore diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/.travis.yml b/com_leaflet/media/js/leaflet-sidebar-master/.travis.yml similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/.travis.yml rename to com_leaflet/media/js/leaflet-sidebar-master/.travis.yml diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/.travis/deploy.sh b/com_leaflet/media/js/leaflet-sidebar-master/.travis/deploy.sh similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/.travis/deploy.sh rename to com_leaflet/media/js/leaflet-sidebar-master/.travis/deploy.sh diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/.travis/deploy_key.pem.enc b/com_leaflet/media/js/leaflet-sidebar-master/.travis/deploy_key.pem.enc similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/.travis/deploy_key.pem.enc rename to com_leaflet/media/js/leaflet-sidebar-master/.travis/deploy_key.pem.enc diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/CHANGELOG.md b/com_leaflet/media/js/leaflet-sidebar-master/CHANGELOG.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/CHANGELOG.md rename to com_leaflet/media/js/leaflet-sidebar-master/CHANGELOG.md diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/L.Control.Sidebar.js b/com_leaflet/media/js/leaflet-sidebar-master/L.Control.Sidebar.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/L.Control.Sidebar.js rename to com_leaflet/media/js/leaflet-sidebar-master/L.Control.Sidebar.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/LICENSE b/com_leaflet/media/js/leaflet-sidebar-master/LICENSE similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/LICENSE rename to com_leaflet/media/js/leaflet-sidebar-master/LICENSE diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/README.md b/com_leaflet/media/js/leaflet-sidebar-master/README.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/README.md rename to com_leaflet/media/js/leaflet-sidebar-master/README.md diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/bower.json b/com_leaflet/media/js/leaflet-sidebar-master/bower.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/bower.json rename to com_leaflet/media/js/leaflet-sidebar-master/bower.json diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/examples/bootstrap.html b/com_leaflet/media/js/leaflet-sidebar-master/examples/bootstrap.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/examples/bootstrap.html rename to com_leaflet/media/js/leaflet-sidebar-master/examples/bootstrap.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/examples/index.html b/com_leaflet/media/js/leaflet-sidebar-master/examples/index.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/examples/index.html rename to com_leaflet/media/js/leaflet-sidebar-master/examples/index.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/examples/listing-markers.html b/com_leaflet/media/js/leaflet-sidebar-master/examples/listing-markers.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/examples/listing-markers.html rename to com_leaflet/media/js/leaflet-sidebar-master/examples/listing-markers.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/examples/multiple-maps.html b/com_leaflet/media/js/leaflet-sidebar-master/examples/multiple-maps.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/examples/multiple-maps.html rename to com_leaflet/media/js/leaflet-sidebar-master/examples/multiple-maps.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/examples/two-sidebars.html b/com_leaflet/media/js/leaflet-sidebar-master/examples/two-sidebars.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/examples/two-sidebars.html rename to com_leaflet/media/js/leaflet-sidebar-master/examples/two-sidebars.html diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/gulpfile.js b/com_leaflet/media/js/leaflet-sidebar-master/gulpfile.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/gulpfile.js rename to com_leaflet/media/js/leaflet-sidebar-master/gulpfile.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/leaflet-sidebar.gif b/com_leaflet/media/js/leaflet-sidebar-master/leaflet-sidebar.gif similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/leaflet-sidebar.gif rename to com_leaflet/media/js/leaflet-sidebar-master/leaflet-sidebar.gif diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/package.json b/com_leaflet/media/js/leaflet-sidebar-master/package.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/package.json rename to com_leaflet/media/js/leaflet-sidebar-master/package.json diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/src/L.Control.Sidebar.css b/com_leaflet/media/js/leaflet-sidebar-master/src/L.Control.Sidebar.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/src/L.Control.Sidebar.css rename to com_leaflet/media/js/leaflet-sidebar-master/src/L.Control.Sidebar.css diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/src/L.Control.Sidebar.js b/com_leaflet/media/js/leaflet-sidebar-master/src/L.Control.Sidebar.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/src/L.Control.Sidebar.js rename to com_leaflet/media/js/leaflet-sidebar-master/src/L.Control.Sidebar.js diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/src/L.Control.Sidebar.scss b/com_leaflet/media/js/leaflet-sidebar-master/src/L.Control.Sidebar.scss similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/src/L.Control.Sidebar.scss rename to com_leaflet/media/js/leaflet-sidebar-master/src/L.Control.Sidebar.scss diff --git a/com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/yarn.lock b/com_leaflet/media/js/leaflet-sidebar-master/yarn.lock similarity index 100% rename from com_leaflet/media/com_leaflet/js/leaflet-sidebar-master/yarn.lock rename to com_leaflet/media/js/leaflet-sidebar-master/yarn.lock diff --git a/com_leaflet/media/com_leaflet/js/mapbox_token.js b/com_leaflet/media/js/mapbox_token.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/mapbox_token.js rename to com_leaflet/media/js/mapbox_token.js diff --git a/com_leaflet/media/com_leaflet/js/nouvelles_regionsV3.js b/com_leaflet/media/js/nouvelles_regionsV3.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/nouvelles_regionsV3.js rename to com_leaflet/media/js/nouvelles_regionsV3.js diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/.eslintignore b/com_leaflet/media/js/sidebar-v2-master/.eslintignore similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/.eslintignore rename to com_leaflet/media/js/sidebar-v2-master/.eslintignore diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/.eslintrc.js b/com_leaflet/media/js/sidebar-v2-master/.eslintrc.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/.eslintrc.js rename to com_leaflet/media/js/sidebar-v2-master/.eslintrc.js diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/.github/FUNDING.yml b/com_leaflet/media/js/sidebar-v2-master/.github/FUNDING.yml similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/.github/FUNDING.yml rename to com_leaflet/media/js/sidebar-v2-master/.github/FUNDING.yml diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/.github/dependabot.yml b/com_leaflet/media/js/sidebar-v2-master/.github/dependabot.yml similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/.github/dependabot.yml rename to com_leaflet/media/js/sidebar-v2-master/.github/dependabot.yml diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/.gitignore b/com_leaflet/media/js/sidebar-v2-master/.gitignore similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/.gitignore rename to com_leaflet/media/js/sidebar-v2-master/.gitignore diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/.stylelintrc.js b/com_leaflet/media/js/sidebar-v2-master/.stylelintrc.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/.stylelintrc.js rename to com_leaflet/media/js/sidebar-v2-master/.stylelintrc.js diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/.travis.yml b/com_leaflet/media/js/sidebar-v2-master/.travis.yml similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/.travis.yml rename to com_leaflet/media/js/sidebar-v2-master/.travis.yml diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/CHANGELOG.md b/com_leaflet/media/js/sidebar-v2-master/CHANGELOG.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/CHANGELOG.md rename to com_leaflet/media/js/sidebar-v2-master/CHANGELOG.md diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/LICENSE b/com_leaflet/media/js/sidebar-v2-master/LICENSE similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/LICENSE rename to com_leaflet/media/js/sidebar-v2-master/LICENSE diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/README.md b/com_leaflet/media/js/sidebar-v2-master/README.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/README.md rename to com_leaflet/media/js/sidebar-v2-master/README.md diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/bower.json b/com_leaflet/media/js/sidebar-v2-master/bower.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/bower.json rename to com_leaflet/media/js/sidebar-v2-master/bower.json diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/gmaps-sidebar.css b/com_leaflet/media/js/sidebar-v2-master/css/gmaps-sidebar.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/gmaps-sidebar.css rename to com_leaflet/media/js/sidebar-v2-master/css/gmaps-sidebar.css diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/gmaps-sidebar.min.css b/com_leaflet/media/js/sidebar-v2-master/css/gmaps-sidebar.min.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/gmaps-sidebar.min.css rename to com_leaflet/media/js/sidebar-v2-master/css/gmaps-sidebar.min.css diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/leaflet-sidebar.css b/com_leaflet/media/js/sidebar-v2-master/css/leaflet-sidebar.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/leaflet-sidebar.css rename to com_leaflet/media/js/sidebar-v2-master/css/leaflet-sidebar.css diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/leaflet-sidebar.min.css b/com_leaflet/media/js/sidebar-v2-master/css/leaflet-sidebar.min.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/leaflet-sidebar.min.css rename to com_leaflet/media/js/sidebar-v2-master/css/leaflet-sidebar.min.css diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/ol2-sidebar.css b/com_leaflet/media/js/sidebar-v2-master/css/ol2-sidebar.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/ol2-sidebar.css rename to com_leaflet/media/js/sidebar-v2-master/css/ol2-sidebar.css diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/ol2-sidebar.min.css b/com_leaflet/media/js/sidebar-v2-master/css/ol2-sidebar.min.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/ol2-sidebar.min.css rename to com_leaflet/media/js/sidebar-v2-master/css/ol2-sidebar.min.css diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/ol3-sidebar.css b/com_leaflet/media/js/sidebar-v2-master/css/ol3-sidebar.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/ol3-sidebar.css rename to com_leaflet/media/js/sidebar-v2-master/css/ol3-sidebar.css diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/ol3-sidebar.min.css b/com_leaflet/media/js/sidebar-v2-master/css/ol3-sidebar.min.css similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/css/ol3-sidebar.min.css rename to com_leaflet/media/js/sidebar-v2-master/css/ol3-sidebar.min.css diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/gmaps-1.png b/com_leaflet/media/js/sidebar-v2-master/doc/gmaps-1.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/gmaps-1.png rename to com_leaflet/media/js/sidebar-v2-master/doc/gmaps-1.png diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/gmaps-2.png b/com_leaflet/media/js/sidebar-v2-master/doc/gmaps-2.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/gmaps-2.png rename to com_leaflet/media/js/sidebar-v2-master/doc/gmaps-2.png diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/leaflet-1.png b/com_leaflet/media/js/sidebar-v2-master/doc/leaflet-1.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/leaflet-1.png rename to com_leaflet/media/js/sidebar-v2-master/doc/leaflet-1.png diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/leaflet-2.png b/com_leaflet/media/js/sidebar-v2-master/doc/leaflet-2.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/leaflet-2.png rename to com_leaflet/media/js/sidebar-v2-master/doc/leaflet-2.png diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/ol2-1.png b/com_leaflet/media/js/sidebar-v2-master/doc/ol2-1.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/ol2-1.png rename to com_leaflet/media/js/sidebar-v2-master/doc/ol2-1.png diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/ol2-2.png b/com_leaflet/media/js/sidebar-v2-master/doc/ol2-2.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/ol2-2.png rename to com_leaflet/media/js/sidebar-v2-master/doc/ol2-2.png diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/ol3-1.png b/com_leaflet/media/js/sidebar-v2-master/doc/ol3-1.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/ol3-1.png rename to com_leaflet/media/js/sidebar-v2-master/doc/ol3-1.png diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/ol3-2.png b/com_leaflet/media/js/sidebar-v2-master/doc/ol3-2.png similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/ol3-2.png rename to com_leaflet/media/js/sidebar-v2-master/doc/ol3-2.png diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/sidebar-v2.gif b/com_leaflet/media/js/sidebar-v2-master/doc/sidebar-v2.gif similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/sidebar-v2.gif rename to com_leaflet/media/js/sidebar-v2-master/doc/sidebar-v2.gif diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/usage.md b/com_leaflet/media/js/sidebar-v2-master/doc/usage.md similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/doc/usage.md rename to com_leaflet/media/js/sidebar-v2-master/doc/usage.md diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/examples/gmaps.html b/com_leaflet/media/js/sidebar-v2-master/examples/gmaps.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/examples/gmaps.html rename to com_leaflet/media/js/sidebar-v2-master/examples/gmaps.html diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/examples/index.html b/com_leaflet/media/js/sidebar-v2-master/examples/index.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/examples/index.html rename to com_leaflet/media/js/sidebar-v2-master/examples/index.html diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/examples/ol2.html b/com_leaflet/media/js/sidebar-v2-master/examples/ol2.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/examples/ol2.html rename to com_leaflet/media/js/sidebar-v2-master/examples/ol2.html diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/examples/ol3.html b/com_leaflet/media/js/sidebar-v2-master/examples/ol3.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/examples/ol3.html rename to com_leaflet/media/js/sidebar-v2-master/examples/ol3.html diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/examples/position-right.html b/com_leaflet/media/js/sidebar-v2-master/examples/position-right.html similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/examples/position-right.html rename to com_leaflet/media/js/sidebar-v2-master/examples/position-right.html diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/gulpfile.js b/com_leaflet/media/js/sidebar-v2-master/gulpfile.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/gulpfile.js rename to com_leaflet/media/js/sidebar-v2-master/gulpfile.js diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/jquery-sidebar.js b/com_leaflet/media/js/sidebar-v2-master/js/jquery-sidebar.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/jquery-sidebar.js rename to com_leaflet/media/js/sidebar-v2-master/js/jquery-sidebar.js diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/jquery-sidebar.min.js b/com_leaflet/media/js/sidebar-v2-master/js/jquery-sidebar.min.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/jquery-sidebar.min.js rename to com_leaflet/media/js/sidebar-v2-master/js/jquery-sidebar.min.js diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/leaflet-sidebar.js b/com_leaflet/media/js/sidebar-v2-master/js/leaflet-sidebar.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/leaflet-sidebar.js rename to com_leaflet/media/js/sidebar-v2-master/js/leaflet-sidebar.js diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/leaflet-sidebar.min.js b/com_leaflet/media/js/sidebar-v2-master/js/leaflet-sidebar.min.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/leaflet-sidebar.min.js rename to com_leaflet/media/js/sidebar-v2-master/js/leaflet-sidebar.min.js diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/ol3-sidebar.js b/com_leaflet/media/js/sidebar-v2-master/js/ol3-sidebar.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/ol3-sidebar.js rename to com_leaflet/media/js/sidebar-v2-master/js/ol3-sidebar.js diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/ol3-sidebar.min.js b/com_leaflet/media/js/sidebar-v2-master/js/ol3-sidebar.min.js similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/js/ol3-sidebar.min.js rename to com_leaflet/media/js/sidebar-v2-master/js/ol3-sidebar.min.js diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/package.json b/com_leaflet/media/js/sidebar-v2-master/package.json similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/package.json rename to com_leaflet/media/js/sidebar-v2-master/package.json diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/_base.scss b/com_leaflet/media/js/sidebar-v2-master/scss/_base.scss similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/_base.scss rename to com_leaflet/media/js/sidebar-v2-master/scss/_base.scss diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/_ol-base.scss b/com_leaflet/media/js/sidebar-v2-master/scss/_ol-base.scss similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/_ol-base.scss rename to com_leaflet/media/js/sidebar-v2-master/scss/_ol-base.scss diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/gmaps-sidebar.scss b/com_leaflet/media/js/sidebar-v2-master/scss/gmaps-sidebar.scss similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/gmaps-sidebar.scss rename to com_leaflet/media/js/sidebar-v2-master/scss/gmaps-sidebar.scss diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/leaflet-sidebar.scss b/com_leaflet/media/js/sidebar-v2-master/scss/leaflet-sidebar.scss similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/leaflet-sidebar.scss rename to com_leaflet/media/js/sidebar-v2-master/scss/leaflet-sidebar.scss diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/ol2-sidebar.scss b/com_leaflet/media/js/sidebar-v2-master/scss/ol2-sidebar.scss similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/ol2-sidebar.scss rename to com_leaflet/media/js/sidebar-v2-master/scss/ol2-sidebar.scss diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/ol3-sidebar.scss b/com_leaflet/media/js/sidebar-v2-master/scss/ol3-sidebar.scss similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/scss/ol3-sidebar.scss rename to com_leaflet/media/js/sidebar-v2-master/scss/ol3-sidebar.scss diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/typescript/leaflet-sidebar.d.ts b/com_leaflet/media/js/sidebar-v2-master/typescript/leaflet-sidebar.d.ts similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/typescript/leaflet-sidebar.d.ts rename to com_leaflet/media/js/sidebar-v2-master/typescript/leaflet-sidebar.d.ts diff --git a/com_leaflet/media/com_leaflet/js/sidebar-v2-master/yarn.lock b/com_leaflet/media/js/sidebar-v2-master/yarn.lock similarity index 100% rename from com_leaflet/media/com_leaflet/js/sidebar-v2-master/yarn.lock rename to com_leaflet/media/js/sidebar-v2-master/yarn.lock From bab93bf3b69131cf800557932612886d528613da Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Fri, 8 Nov 2024 14:49:47 +0100 Subject: [PATCH 06/15] fix : change xml file to locate the component --- com_leaflet/leaflet.xml | 72 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 com_leaflet/leaflet.xml diff --git a/com_leaflet/leaflet.xml b/com_leaflet/leaflet.xml new file mode 100644 index 0000000..a7da9af --- /dev/null +++ b/com_leaflet/leaflet.xml @@ -0,0 +1,72 @@ + + + + leaflet + + January 2018 + Digitanie + Digitanie + john.doe@example.org + http://www.example.org + License Info + + 0.0.2 + + leaflet joomla component + + + + sql/updates/mysql + + + + + + Digitanie\Component\Leaflet + + + + + leaflet.php + assets + services + language + src + tmpl + + + + site/language/fr-FR/fr-FR.com_leaflet.ini + + + + index.html + js + + + + + Leaflet + + + + + language + services + src + tmpl + + sql + + + + admin/language/fr-FR/fr-FR.com_leaflet.ini + admin/language/fr-FR/fr-FR.com_leaflet.sys.ini + + + + From ecfa92680a9219d0eb9c9073bc20e357783c363d Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Fri, 8 Nov 2024 15:03:29 +0100 Subject: [PATCH 07/15] fix : add getItem function to get leaflet data --- com_leaflet/site/src/Model/LeafletModel.php | 29 +++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/com_leaflet/site/src/Model/LeafletModel.php b/com_leaflet/site/src/Model/LeafletModel.php index f46a420..30dcd64 100644 --- a/com_leaflet/site/src/Model/LeafletModel.php +++ b/com_leaflet/site/src/Model/LeafletModel.php @@ -16,6 +16,35 @@ class LeafletModel extends ItemModel { */ protected $message; + /** + * Returns a message for display + * @param integer $pk Primary key of the "message item", currently unused + * @return object Message object + */ + public function getItem($pk= null): object { + + // Utiliser la méthode getState pour obtenir l'ID de l'élément si $pk n'est pas fourni + $pk = !empty($pk) ? $pk : $this->getState($this->getName() . '.id'); + + // Vérifiez si l'ID est null + if ($pk === null) { + return false; + } + + + // Charger l'élément depuis la base de données + $table = $this->getTable(); + + // Tenter de charger l'élément avec l'ID fourni + if (!$table->load($pk)) { + $this->setError($table->getError()); + return false; + } + + // Retourne l'objet de l'élément chargé + return $table; + } + //------------------- ID CATEGORIES public function getCategory() { From 7fed37ee1ff49c562a4a5cbe802649545fe3ba43 Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Fri, 8 Nov 2024 15:13:27 +0100 Subject: [PATCH 08/15] fix : change xml file to locate the component --- com_leaflet/install.xml | 68 ----------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 com_leaflet/install.xml diff --git a/com_leaflet/install.xml b/com_leaflet/install.xml deleted file mode 100644 index 70d4860..0000000 --- a/com_leaflet/install.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - leaflet - - January 2018 - John Doe - john.doe@example.org - http://www.example.org - Copyright Info - License Info - - 0.0.2 - - leaflet joomla component - - - - sql/updates/mysql - - - - - - - leaflet.php - assets - services - language - src - tmpl - - - - site/language/fr-FR/fr-FR.com_leaflet.ini - - - - index.html - js - - - - - leaflet - - - - - language - services - src - tmpl - - sql - - - - admin/language/fr-FR/fr-FR.com_leaflet.ini - admin/language/fr-FR/fr-FR.com_leaflet.sys.ini - - - - From 255c0e0ef3f77e34272951974222b3137adea595 Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Tue, 12 Nov 2024 10:42:26 +0100 Subject: [PATCH 09/15] fix : add images and icons for relative path --- com_leaflet/site/assets/css/images/layers-2x.png | Bin 0 -> 1259 bytes com_leaflet/site/assets/css/images/layers.png | Bin 0 -> 696 bytes .../site/assets/css/images/marker-icon-2x.png | Bin 0 -> 2464 bytes .../site/assets/css/images/marker-icon.png | Bin 0 -> 1466 bytes .../site/assets/css/images/marker-shadow.png | Bin 0 -> 618 bytes .../site/assets/css/images/marqueur-commun.png | Bin 0 -> 1277 bytes .../site/assets/css/images/marqueur-coorace.png | Bin 0 -> 763 bytes .../site/assets/css/images/marqueur-enedis.png | Bin 0 -> 776 bytes .../site/assets/css/images/marqueur-selected.png | Bin 0 -> 809 bytes 9 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 com_leaflet/site/assets/css/images/layers-2x.png create mode 100644 com_leaflet/site/assets/css/images/layers.png create mode 100644 com_leaflet/site/assets/css/images/marker-icon-2x.png create mode 100644 com_leaflet/site/assets/css/images/marker-icon.png create mode 100644 com_leaflet/site/assets/css/images/marker-shadow.png create mode 100644 com_leaflet/site/assets/css/images/marqueur-commun.png create mode 100644 com_leaflet/site/assets/css/images/marqueur-coorace.png create mode 100644 com_leaflet/site/assets/css/images/marqueur-enedis.png create mode 100644 com_leaflet/site/assets/css/images/marqueur-selected.png diff --git a/com_leaflet/site/assets/css/images/layers-2x.png b/com_leaflet/site/assets/css/images/layers-2x.png new file mode 100644 index 0000000000000000000000000000000000000000..200c333dca9652ac4cba004d609e5af4eee168c1 GIT binary patch literal 1259 zcmVFhCYNy;#0irRPomHqW|G1C*;4?@4#E?jH>?v@U%cy?3dQAc-DchXVErpOh~ z-jbon+tNbnl6hoEb;)TVk+%hTDDi_G%i3*RZ&15!$Fjr^f;Ke&A@|?=`2&+{zr+3a z{D*=t(`AXyS%X7N z%a#RZw6vD^t_rnM`L4E>m=U&R!A-&}nZIi$BOPvkhrCuUe@BN~-lRD)f44;J%TwgE zcze8u!PQ_NR7?o(NylLXVTfDO zxs5=@|GsYEsNo4M#nT%N!UE(?dnS)t2+{ELYAFp*3=iF=|EQnTp`#vlSXuGVraYo? z+RCzXo6h3qA8{KG?S4nE(lM+;Eb4nT3XV;7gcAxUi5m)`k5tv}cPy()8ZR3TLW3I- zAS^}cq-IJvL7a4RgR!yk@~RT%$lA7{L5ES*hyx)M4(yxI$Ub(4f)K|^v1>zvwQY!_ zIrWw8q9GS^!Dp~}+?mbnB6jDF8mVlbQ!jFKDY;w=7;XO{9bq7>LXGK24WA`;rL)_Z z)&j}pbV(;6gY;VMhbxgvn`X;6x}VUEE-7 z%)7j-%t8S=ZL3yc)HbXDAqJZvBTPoiW_A-+a8m3_Z?v{DN7Tnr#O_VUMT0UBt$;p` zDh6JbGHN8JJ*JN%y2%msb97@_S>9!%Egwk;?PEkU9ntz&3uR}%Fj5d$JHQbQb3}a{ zSzFT^#n=VInPpcAS}CNxj?_ zVscANk5Cfz(51EI1pz};AWWb|kgbYNb4wCEGUn3+eMUMV?1-{=I4TlmLJMot@rd07 zZuo2hk1ccu{YmGkcYdWAVdk{Z4Nm?^cTD&}jGm+Q1SYIXMwmG*oO*83&#>l%nbR`G zhh=lZ%xIb7kU3#;TBbfECrnC9P=-XpL|TG2BoZdj61*XiFbW8?1Z_wp%#;>${SUIy V$8qr;L*)Pf002ovPDHLkV1hYLS~36t literal 0 HcmV?d00001 diff --git a/com_leaflet/site/assets/css/images/layers.png b/com_leaflet/site/assets/css/images/layers.png new file mode 100644 index 0000000000000000000000000000000000000000..1a72e5784b2b456eac5d7670738db80697af3377 GIT binary patch literal 696 zcmV;p0!RIcP)*@&l2<6p=!C&s@#ZL+%BQvF&b?w6S%wp=I>1QHj7AP5C)IWy#b znXXB;g;j=$a-tW89K%FbDceHVq&unY*Wx3L#=EGWH=rjqnp|4c_Ulec!ql3#G-5ZF zVlbBA@XP=)C8U&+Lrc)S4O5%1$&{(;7R^K(CSnvSr$v;+B$8q&7Bf|h$#PARo1^%M zf1H^nG-EiXVXr07OH(*8R)xa|FD;lXUlg_-%)~ZGsL2cX0NXaAzN2q%jqLRR6ruVk8`Jb7n#{`T;o@`F= z#3YcynIR^s83UNF3D!f5m#Mg)NJ24&Qfrqb&_z=yF;=B)#9Iq7u-@^O!(mW{D;qvr zPc)gVb%aowtS8m@ElL4A9G>w#ffQ~q{i&_i)*6f^)Sz|C?C>zb4Uo?H<-&Hz@a?J; z$ml@zGygWofb9$ZBj6aLjpLhsT2AzjOu=-*u_gSCUYnU^5s62$4H-fe}gSR(=wKRaTHh!@*b)YV6mo|a4Fn6Rgc&Rpk zvn_X|3VY?v=>nJ{slE^V1GaGWk}m@aIWGIpghbfPh8m@aIWEo_%AZI>==moIFVE^L=C zZJ91?mo03UEp3-BY?wBGur6$uD{Yr9Y?m%SHF8Fk1pc(Nva%QJ+{FLkalfypz3&M|||Fn`7|g3c~4(nXHKFmRnwn$J#_$xE8i z|Ns9!kC;(oC1qQk>LMp3_a2(odYyMT@>voX=UI)k>1cJdn;gjmJ-|6v4nb1Oryh)eQMwHP(i@!36%vGJyFK(JTj?Vb{{C=jx&)@1l zlFmnw%0`&bqruifkkHKC=vbiAM3&E`#Mv>2%tw;VK8?_|&E89cs{a1}$J*!f_xd-C z&F%B|oxRgPlh0F!txkxrQjNA`m9~?&&|jw4W0<`_iNHsX$VQXVK!B}Xkh4>av|f_8 zLY2?t?ejE=%(TnfV5iqOjm?d;&qI~ZGl|SzU77a)002XDQchC<95+*MjE@82?VLm= z3xf6%Vd@99z|q|-ua5l3kJxvZwan-8K1cPiwQAtlcNX~ZqLeoMB+a;7)WA|O#HOB% zg6SX;754xD1{Fy}K~#8Ntklac&zTpadXZ& zC*_=T&g7hfbI$R?v%9?sknIb97gJOJ=`-8YyS3ndqN+Jm+x33!p&Hc@@L$w))s2@N ztv~i}Emc?DykgwFWwma($8+~b>l?tqj$dh13R^nMZnva9 zn0Vflzv2Dvp`oVQw{Guby~i`JGbyBGTEC{y>yzCkg>K&CIeQ$u;lyQ+M{O~gEJ^)Z zrF3p)^>|uT;57}WY&IRwyOQ=dq%Az}_t=_hKowP!Z79q0;@Zu(SWEJJcHY+5T6I({ zw)wj*SNi4wrd+POUfZe4gF77vW?j zoFS}|r2n&$U9Y!S4VEOyN}OpZZi|?cr1VcE_tHsDQgp-ga(SwkBrkCm{|*-yb=}ZW zvcYvLvfA90TPn|!-TuYJV<6`}+RJeRgP3EA=qQcF9k0*#*{f&I_pjam%I6Dd#YE|G zqB!R}tW-K!wV1w+4JcFA_s6~=@9F&j8`u$-ifLN3vK;`lvaA-`jRn_}(8|)!3?-}I zvFi{H;@A$gEZYh?%|Qr_y#*UkOPjwiRCsJQ>mb6h5yGIk6C5_XA=8T?IBfm_?+P0; zhhUs)-(0R*H<&Kku(1>#cGtOpk&Z&kQcw&SJv-4VY<+;=8hYnoX zfNJMCa9)^5Z0;2dCUk;x-%#yS!I~Jr3pNuI!g_tHz!$hKwt1GL~sFvx)3u4TA zv>CLGdQtoZ7Du7ctJRfTqY;FPxs1G{ZJ?73D5J@OO{6BHcPbk{_mjg&p2QFeke%QI zlAJ-kvjuwy1<5D-6>su68A+i998aSZNnQX)+Q}6(GK-C%8G-!1bOJBONU{gT%IOOE z;Yk24YC@^lFW77>r6x7eS1Omc;8=GUp#&zLQ&L{ zv8$hGC`wp~$9pR>f%-_Ps3>YhzP(+vC(E*zr1CVO8ChN^MI-VGMX7+|(r!SGZ9gd5 zzO9sQd>sm|f1|X&oh=8lOzd6+ITvo zCXInR?>RZ#>Hb*PO=7dI!dZ(wY4O}ZGv zdfQFio7+0~PN*RFCZGM6@9-o~y*@?;k00NvOsw54t1^tt{*ATMs^2j}4Wp=4t3RH* z_+8b`F-{E=0sOgM<;VHTo!Ij3u zmmI`2?K7g(GOcGA)@h?$SW&pwHdtj1n57PLI8&6RHhx4R%Q7b z^JEqR)@06V!pbS*@D_ZyRMo_LlT}r{#sXOx4kM-V<_V{!5SSuM^SIVCA37|nY7LWQ zZA#B1h4l`6asz=Lvax_#GMRX|NF>=$=p{Qn0i@ExX1jGhy@B8a*_uR+ODEbVi8ObL zezG?azy>E~S~dl43&8<$(2H}P&*tuBdESUP83KQ?8B z?K(!uS>H1wlWQz;qOfB`T#TZ=EoSp~vZ5XtCvwm1h*Ex6mzTsn_y@_=xREIslV-%- zpdWkEzMjeNOGWrSM32gpBt27*O29NdhGzuDgYxcf`Jjjqw@B;Vmdb@fxdhCRi`Kg> zmUTr$=&@#i!%F4Q6mb&4QKfR^95KJ!<6~fqx-f^66AV!|ywG{6D^Vay-3b99>XOe# e-I|>x8~*?ZhF3snGbtJX0000cOl4 literal 0 HcmV?d00001 diff --git a/com_leaflet/site/assets/css/images/marker-icon.png b/com_leaflet/site/assets/css/images/marker-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..950edf24677ded147df13b26f91baa2b0fa70513 GIT binary patch literal 1466 zcmV;r1x5OaP)P001cn1^@s6z>|W`000GnNklGNuHDcIX17Zdjl&3`L?0sTjIws<{((Dh&g-s0<@jYQyl?D*X^?%13;ml^gy> ziMrY_^1WI=(g@LMizu=zCoA>C`6|QEq1eV92k*7m>G65*&@&6)aC&e}G zI)pf-Za|N`DT&Cn1J|o`19mumxW~hiKiKyc-P`S@q)rdTo84@QI@;0yXrG%9uhI>A zG5QHb6s4=<6xy{1 z@NMxEkryp{LS44%z$3lP^cX!9+2-;CTt3wM4(k*#C{aiIiLuB>jJj;KPhPzIC00bL zU3a#;aJld94lCW=`4&aAy8M7PY=HQ>O%$YEP4c4UY#CRxfgbE~(|uiI=YS8q;O9y6 zmIkXzR`}p7ti|PrM3a}WMnR=3NVnWdAAR>b9X@)DKL6=YsvmH%?I24wdq?Gh54_;# z$?_LvgjEdspdQlft#4CQ z`2Zyvy?*)N1Ftw|{_hakhG9WjS?Az@I@+IZ8JbWewR!XUK4&6346+d#~gsE0SY(LX8&JfY>Aj)RxGy96nwhs2rv zzW6pTnMpFkDSkT*a*6Dx|u@ds6ISVn0@^RmIsKZ5Y;bazbc;tTSq(kg(=481ODrPyNB6n z-$+U}(w$m6U6H$w17Bw+wDaFIe~GvNMYvnw31MpY0eQKT9l>SU``8k7w4)z!GZKMI z#_cEKq7k~i%nlK@6c-K?+R;B#5$?T#YpKD`t_4bAs^#E+@5QW$@OX3*`;(#{U^d-vY)&xEE>n5lYl&T?Amke9$Lam@{1K@O ze*LXqlKQHiv=gx+V^Cbb2?z@ISBQ*3amF;9UJ3SBg(N|710TLamQmYZ&Qjn2LuO<* zCZlB4n%@pc&7NNnY1}x+NWpHlq`OJEo|`aYN9<`RBUB+79g;>dgb6YlfN#kGL?lO_ z!6~M^7sOnbsUkKk<@Ysie&`G>ruxH&Mgy&8;i=A zB9OO!xR{AyODw>DS-q5YM{0ExFEAzt zm>RdS+ssW(-8|?xr0(?$vBVB*%(xDLtq3Hf0I5yFm<_g=W2`QWAax{1rWVH=I!VrP zs(rTFX@W#t$hXNvbgX`gK&^w_YD;CQ!B@e0QbLIWaKAXQe2-kkloo;{iF#6}z!4=W zi$giRj1{ zt;2w`VSCF#WE&*ev7jpsC=6175@(~nTE2;7M-L((0bH@yG}-TB$R~WXd?tA$s3|%y zA`9$sA(>F%J3ioz<-LJl*^o1|w84l>HBR`>3l9c8$5Xr@xCiIQ7{x$fMCzOk_-M=% z+{a_Q#;42`#KfUte@$NT77uaTz?b-fBe)1s5XE$yA79fm?KqM^VgLXD07*qoM6N<$ Ef<_J(9smFU literal 0 HcmV?d00001 diff --git a/com_leaflet/site/assets/css/images/marqueur-commun.png b/com_leaflet/site/assets/css/images/marqueur-commun.png new file mode 100644 index 0000000000000000000000000000000000000000..90a2b932da97a5225d263d0d26bc6313ccbe90c3 GIT binary patch literal 1277 zcmV}WVv_)!fjh=jCJ!!#2;lW=)A9X1&{ zGF%2G$ci+6^Ukf3JK34BZn4!k&oOM4TFzfww8WyjKZfT8UKpEm=FGjjS}SVkpr&x) zN{~hMYJOTcI4>!BbGR4qIKACn2aYGC8(UK8eOBKbU&Gj1993liL{?WTePCg(@Z4$j zf_&tqWyB7r4(o>c^-kFSz~D$)ssIx{zHxcf+__>jwnwdPSNu?&Pqin22hG-%njI}~ z6$U}5!d{|#($|x+2tn#qm;S0y$0gf+v4KAIl4Fn~8X!=P1rM+5k(9rlg`R8QJlUK2 zds7Am|5vh$i19CMs>g!Gu!Zgo3KxR>d|cOGQhVPdgrb10tLwKco9e?()XsfxyLj9e zOHc<1Fc0sug2O6|3|mM6q~ZMTU{3ZQAr^EP7%c zMlLHMD%v3#2zYg>S2N;~PWjfth;W=Z(T*C5jag=D=#ZAh{<8*6BBNWO5=Pe%gWbsi zf`s{Q-wxO$CQG8j4&XRZMERXA)|Uzk`rGK`qwDglBpXK#5uK6}@W|zGyO}_3^oMl~ zRuQ_c-hgk&m}9ha0J%lGlycO#dEuIv-f46v3}WQ66QVZl-F%PNk4jehan*t|q9`Zp zrX|SB`v8lN--;Fk_vwa=5LbZ*W^Y_SHmb)Fh`w=2x9u4=p+?q|sYQ*Ijv5Bft_U}6 zDwCA$D@Qkfw)}BD*<%n<2cQZZ^NJc6R|cd{R7thlo)_;XZ#5nDy`5Jzx1@bABlVqNQyN?(a@tSC=di#`#C$XN%Pul4ai zugalAkhJ!+>rXdVt)i~p2A0W&RBy|>p4}|w$IGxl(%rTRqVLxmLh;!z*TgwZF${K~ z9?g3Z?YLA>DF7U0GN6iSE2qogl8 zGp5yhMqZ)irh6Rk;dFq6|Gd%xz`N50*?mHvZbI=~xIV`HXjG4*WL}*P=tpyAIn#kZ z(#EIcQiUjFt+w>e()KdO&w~|2hA?8jhTSsP3l|UNvWx?PqwKqCm)y@itR3UwXJZs9XWy{NqK;)`{PPBpIxa7bG+5X{85!xoE n^ONIxS>2z3W6f7kr&_8aXW8zw)KOMZ05c9&Agwp zwb^Wj802Zz0MKC3CVziaM!$^F4-&EQ0e}vGi-OoM0G|Q$mC>&&5#?!?09XfbH|n^5 zu>;_mGJ3C+C{HtT%Lu@7MG^}#cuN`mTqI(W34rq_BoWDuh}d0k1F<*+u;4LR3y?LH z(eLP??ktQ1l0*KsB-;SC>_!8psyT9hi1IXR1Gph55CH{u4ZsCuH0`pjj3z@}CYF%o zY4!xxb$Oc6X;wWaSztqCcwe$6=v#bOMxU)syFH4{7eT0$#37?3S`n68i%ymMFt8+? zEJH3{%F3tiIu$Gzt`GMqMr~nnPZ>RNo~?Uq>aTJs%%P0lb%S3(qb@8Eb{)4QLb5D# zB3Vp4GKeN}n(2uVB04gzjHW{V8nK~7koi$B2)bBdmst!vGHVj&D`CtI+g>36k|ea8^dj9WHFF9LR6|UVgyet*;vzqc zh4i&;=rNOxoD^igdpNx=;aHt^4*Afc6U|-6ZDbs&_>J!gG1#~F2)B;bBbCpU z)Srt-_IGiVhuVEr{8UDtu{y<_#hxk#4_%pmh`7o({sRfcW+)OdhCI4YgF8jtV?>;R zVu42BP4P}AoruWBCEY>-^~jsPwNRS&1EWF01K)KR5tn>wF`JPj{ z%l`aI6%r_|aAowMbSOlPSQ`Re(L#rpYMEsoZ5Ii zMhS#6O;)?je}rADqaR*Z(tK}#YzVkZr za6P3Q!CD~N&k=>E_{(2Eq@%?Cz2N_3Z>&d7ah1PrEPylbL!d_o^pho)R1QC=jwoB+ zBorQTM)}65Zm5Ut_`QrWGUbugvbK_l>luJ6WQ+!$GibH!1L%j!oa(8tP4?Df8=2&c zGjhPye*x4Zg)$V@?F0#2_D;q`#%<>r_~Hi~fd=1UD(!tdwpxC3M7cS1%AH~noLDWd z!K*2x86rk6*FqM+Ox;b1=J2WnGv0(A zfr*M9gcS(8Nc6cy)xWz0$+6Y)W+=SSy}9~_OAx(|31eddT!@P##?Wf{Iku2|doS>q zoEB#cDUaM}2Te-y~5u;t0h5b~>94dbw6};Pytd@7GPEzHOdrEZ@%k-GvsIpN+ zg!B9A24V^Yy<(UD#TSBy+)I{kR^7|OL`?P$z}I<50N@|65E7%_K6^X>0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0=`K^K~z{rt(V(w z(?Af0y=yyE;vjm3#0>}`R3t8-hoqH&$KWA2?$%LwI3~rXrvq6KoPN<3PHW@rZ*u;#7#C+AtB@I%CkV_{h0=A zw7^CCa6ng(&YBS-5s${*H_Apd2vf}%2m}9De|>zK-2zn=N>L^ER(GYa6#!OD)ze{D zq4SKU=A9!4SwnYVCJN+xQ8polM4rE#jf^Wckm)%4K)*%i|w{K2UE zn_cjM#{yyCt(6KTu{>fET;g#G&kq-LDoOZ@x>-W0P*Y6DPM&fhk(^`;mGhU)0$L#7 zoF+5Cy${S_MZU&Y9M>f%C*VrsV3zcysBX*}iv!T-1bo4xa3av+P~*){_i8&(AR9XLOvRh3AG(nJ{ph-fwrQWjRs5!Au4n~ zyK^%e4KOxZ-M%srPWY_+7=`F}!cyHPo?*yi0qYsnB!y)u z(-RDgyMI7fJttU}n Date: Tue, 12 Nov 2024 10:50:39 +0100 Subject: [PATCH 10/15] fix : Define basics attr before browser versions --- com_leaflet/media/js/leaflet-1.7.1/leaflet.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/com_leaflet/media/js/leaflet-1.7.1/leaflet.css b/com_leaflet/media/js/leaflet-1.7.1/leaflet.css index 017fa0e..4097899 100644 --- a/com_leaflet/media/js/leaflet-1.7.1/leaflet.css +++ b/com_leaflet/media/js/leaflet-1.7.1/leaflet.css @@ -37,6 +37,7 @@ .leaflet-safari .leaflet-tile-container { width: 1600px; height: 1600px; + transform-origin: 0 0; -webkit-transform-origin: 0 0; } .leaflet-marker-icon, @@ -91,6 +92,7 @@ } /* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */ .leaflet-overlay-pane svg { + user-select: none; -moz-user-select: none; } From 67efb6efa09c3f3b75eda94f1b07ce083190e720 Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Tue, 12 Nov 2024 10:57:37 +0100 Subject: [PATCH 11/15] fix : add '/' to the global.css relative path --- com_leaflet/site/src/View/Leaflet/HtmlView.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com_leaflet/site/src/View/Leaflet/HtmlView.php b/com_leaflet/site/src/View/Leaflet/HtmlView.php index 40c8aec..ab90643 100644 --- a/com_leaflet/site/src/View/Leaflet/HtmlView.php +++ b/com_leaflet/site/src/View/Leaflet/HtmlView.php @@ -31,6 +31,6 @@ class HtmlView extends BaseHtmlView { { // Import CSS $document = Factory::getDocument(); - $document->addStyleSheet('components/com_leaflet/assets/css/global.css'); + $document->addStyleSheet('/components/com_leaflet/assets/css/global.css'); } } \ No newline at end of file From a1fec90b181b5bf3faa64960eba731ac686a3d88 Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Tue, 12 Nov 2024 11:00:08 +0100 Subject: [PATCH 12/15] BREAKING CHANGE: adapt DB connexion for J5 & query --- com_leaflet/site/src/Model/LeafletModel.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/com_leaflet/site/src/Model/LeafletModel.php b/com_leaflet/site/src/Model/LeafletModel.php index 30dcd64..27a54b1 100644 --- a/com_leaflet/site/src/Model/LeafletModel.php +++ b/com_leaflet/site/src/Model/LeafletModel.php @@ -50,7 +50,7 @@ class LeafletModel extends ItemModel { { try { - $db = Factory::getDbo(); + $db = Factory::getContainer()->get('DatabaseDriver'); $query = $db ->getQuery(true) ->select('id') @@ -79,7 +79,7 @@ class LeafletModel extends ItemModel { { try { - $db = Factory::getDbo(); + $db = Factory::getContainer()->get('DatabaseDriver'); $query = $db->getQuery(true); $query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams'))); @@ -102,7 +102,7 @@ class LeafletModel extends ItemModel { { try { - $db = Factory::getDbo(); + $db = Factory::getContainer()->get('DatabaseDriver'); $query = $db->getQuery(true); $query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams'))); @@ -127,7 +127,7 @@ class LeafletModel extends ItemModel { { try { - $db = Factory::getDbo(); + $db = Factory::getContainer()->get('DatabaseDriver'); $query = $db->getQuery(true); $query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams'))); @@ -152,7 +152,7 @@ class LeafletModel extends ItemModel { { try { - $db = Factory::getDbo(); + $db = Factory::getContainer()->get('DatabaseDriver'); $query = $db->getQuery(true); $groupId = 4; @@ -171,6 +171,7 @@ class LeafletModel extends ItemModel { 'c.title', 'c.alias', 'c.state', + 'c.catid', 'c.introtext'); foreach($fields as $field) { array_push($fieldsSelect, 'GROUP_CONCAT(DISTINCT IF(field_id = ' . $field->id . ', value, NULL) SEPARATOR ",") AS ' . $field->name); @@ -205,4 +206,4 @@ class LeafletModel extends ItemModel { return $results; } -} \ No newline at end of file +} From d40720f80cbac699faa07edc8dbbd1fb4d8adea7 Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Tue, 12 Nov 2024 12:28:09 +0100 Subject: [PATCH 13/15] BREAKING CHANGE : replace app.js with prod app.js adapted for J5 --- com_leaflet/media/js/app.js | 234 +++++++++++++++++++++++++++--------- 1 file changed, 175 insertions(+), 59 deletions(-) diff --git a/com_leaflet/media/js/app.js b/com_leaflet/media/js/app.js index 1a287e8..a076b34 100644 --- a/com_leaflet/media/js/app.js +++ b/com_leaflet/media/js/app.js @@ -18,12 +18,12 @@ jQuery(() => { let markersDT = null; // INIT MAP - var map = L.map('mapid').setView([43.821871, 2.245650], 7.5); + var map = L.map('mapid').setView([44.032156, 1.634136], 7.5); L.tileLayer('https://api.mapbox.com/styles/v1/dgtnarmelle/cl6vzlpvx000f14upjewi4mfl/tiles/{z}/{x}/{y}?access_token={accessToken}', { attribution: 'Map data © OpenStreetMap contributors, Imagery © Mapbox', - maxZoom: 13, + maxZoom: 20, minZoom: 7, tileSize: 512, zoomOffset: -1, @@ -64,7 +64,10 @@ jQuery(() => { data: { [token]: "1", task: "initData", format: "json", type: "markers", catId: category[0] }, async: false, success: function (result) { - markersExperience = result.data; + //On garde la liste de côté pour pouvoir l'afficher lors du clic sur un marker DT*/ + + markersDT = result.data; + }, error: function () { console.log('ajax call failed'); }, }); @@ -74,7 +77,11 @@ jQuery(() => { data: { [token]: "1", task: "initData", format: "json", type: "markers", catId: category[1] }, async: false, success: function (result) { - markersSIAE = markersExperience.concat(result.data); + if (markersDT) { + markersExperience = markersDT.concat(result.data); + } else { + markersExperience = result.data; + } }, error: function () { console.log('ajax call failed'); }, }); @@ -85,7 +92,7 @@ jQuery(() => { async: false, success: function (result) { //On ajoute tout dans le tableau final unique que l'on appelle markersFetch par soucis de comptabilité avec l'ancien code - markersFetch = markersSIAE.concat(result.data); + markersFetch = markersExperience.concat(result.data); //Maintenant qu'on a tous nos projets on peut les ajouter a la carte //onAdd: C'est la fonction d'initialisation qui est appelée lorsqu'on ajoute cet objet à la carte. //Elle permet de construire le div HTML qui contiendra la légende. Ce div est associé à la classe CSS info. @@ -95,8 +102,6 @@ jQuery(() => { } listeProjets.addTo(map); - //On garde la liste de côté pour pouvoir l'afficher lors du clic sur un marker DT - markersDT = result.data; }, error: function () { console.log('ajax call failed'); }, }); @@ -124,7 +129,7 @@ jQuery(() => { data: { [token]: "1", task: "initData", format: "json", type: "activite" }, async: false, success: function (result) { - activites = Object.values(JSON.parse(result.data.fieldparams).options);; + activites = Object.values(JSON.parse(result.data.fieldparams).options); }, error: function () { console.log('ajax call failed'); }, }); @@ -208,7 +213,6 @@ jQuery(() => { div.innerHTML += ''; return div; }; - departementsLists.addTo(map); categoriesLists.addTo(map); activiteLists.addTo(map); @@ -219,6 +223,7 @@ jQuery(() => { $('.leaflet-control').mouseover(function () { map.dragging.disable(); map.doubleClickZoom.disable() + map.scrollWheelZoom.disable(); }) $('.leaflet-control').mouseout(function () { map.dragging.enable(); @@ -261,12 +266,13 @@ jQuery(() => { }); }); + dpt_active = [] $(".leaflet-control:not(.reset , .listeProjets)").click((event) => { var arrayActiveDpt = $('.departements img').hasClass('active'); var arrayActiveCtg = $('.categorie img').hasClass('active'); var arrayActiveAct = $('.activite img').hasClass('active'); - active = [] + var activeDepartement = document.getElementsByClassName("active"); for (i = 0; i < activeDepartement.length; i++) { active.push(activeDepartement[i].id); @@ -284,7 +290,6 @@ jQuery(() => { listeProjets.addTo(map); } else { reg_tile_temp.clearLayers(); - var articlesByDepartement = []; var articlesByCategories = []; var articlesByActivites = []; @@ -313,7 +318,7 @@ jQuery(() => { if (arrayOfArticlesByDepartement.length != 0 && arrayOfArticlesByCategories.length != 0) { for (let ABD in arrayOfArticlesByDepartement) { for (let ABC in arrayOfArticlesByCategories) { - if (arrayOfArticlesByDepartement[ABD].id.indexOf(arrayOfArticlesByCategories[ABC].id) != '-1') { + if (arrayOfArticlesByDepartement[ABD].id == arrayOfArticlesByCategories[ABC].id) { articleAfterActivate.push(arrayOfArticlesByDepartement[ABD]); } } @@ -322,7 +327,7 @@ jQuery(() => { if (arrayOfArticlesByDepartement.length != 0 && arrayOfArticlesByActivites.length != 0) { for (let ABD in arrayOfArticlesByDepartement) { for (let ABA in arrayOfArticlesByActivites) { - if (arrayOfArticlesByDepartement[ABD].id.indexOf(arrayOfArticlesByActivites[ABA].id) != '-1') { + if (arrayOfArticlesByDepartement[ABD].id == arrayOfArticlesByActivites[ABA].id) { articleAfterActivate.push(arrayOfArticlesByDepartement[ABD]); } } @@ -331,7 +336,7 @@ jQuery(() => { if (arrayOfArticlesByActivites.length != 0 && arrayOfArticlesByCategories.length != 0) { for (let ABA in arrayOfArticlesByActivites) { for (let ABC in arrayOfArticlesByCategories) { - if (arrayOfArticlesByActivites[ABA].id.indexOf(arrayOfArticlesByCategories[ABC].id) != '-1') { + if (arrayOfArticlesByActivites[ABA].id == arrayOfArticlesByCategories[ABC].id) { articleAfterActivate.push(arrayOfArticlesByActivites[ABA]); } } @@ -364,7 +369,6 @@ jQuery(() => { if (articleAfterActivate != markersFetch || articleAfterActivate.length != 0) { map.removeLayer(group); sidebar.hide(); - map.setView([46, 0], 6); initMarkersAndGroup(articleAfterActivate); map.addLayer(group); } @@ -410,9 +414,7 @@ jQuery(() => { }); $(".close").click(() => { - - $(".listeProjets p").hide(); - $(".listeProjets").show(); + displayListOfArticles(); }); }); @@ -421,23 +423,39 @@ jQuery(() => { reg_tile_temp = new L.layerGroup().addTo(map); //---Markers and Cluster - const markerIcon = L.icon({ + const enedisMarkerIcon = L.icon({ iconSize: [25, 41], iconAnchor: [10, 41], popupAnchor: [2, -40], - iconUrl: 'https://unpkg.com/leaflet@1.4.0/dist/images/marker-icon.png', - shadowUrl: 'https://unpkg.com/leaflet@1.4.0/dist/images/marker-shadow.png' + iconUrl: '/components/com_leaflet/assets/css/images/marqueur-enedis.png', + shadowUrl: '/components/com_leaflet/assets/css/images/marker-shadow.png' + }); + + const cooraceMarkerIcon = L.icon({ + iconSize: [25, 41], + iconAnchor: [10, 41], + popupAnchor: [2, -40], + iconUrl: '/components/com_leaflet/assets/css/images/marqueur-coorace.png', + shadowUrl: '/components/com_leaflet/assets/css/images/marker-shadow.png' + }); + + const expMarkerIcon = L.icon({ + iconSize: [25, 41], + iconAnchor: [10, 41], + popupAnchor: [2, -40], + iconUrl: '/components/com_leaflet/assets/css/images/marqueur-commun.png', + shadowUrl: '/components/com_leaflet/assets/css/images/marker-shadow.png' }); var LeafIcon = L.Icon.extend({ options: { - shadowUrl: 'https://unpkg.com/leaflet@1.4.0/dist/images/marker-shadow.png', + shadowUrl: '/components/com_leaflet/assets/css/images/marker-shadow.png', iconSize: [25, 41], iconAnchor: [10, 41], popupAnchor: [2, -40] } }); - var orangeIcon = new LeafIcon({ iconUrl: 'https://eolab.cnes.fr/images/Projets/icon_orange.png' }); + var selectedIcon = new LeafIcon({ iconUrl: '/components/com_leaflet/assets/css/images/marqueur-selected.png' }); initMarkersAndGroup(markersFetch); @@ -449,20 +467,26 @@ jQuery(() => { dataOfTheme.forEach((theme) => { var img = document.createElement("IMG"); img.setAttribute("src", `${window.location.origin}/images/cartographie/${nameOfTheme}/${theme.value}.png`); - img.setAttribute("width", "40px"); - img.setAttribute("height", "40px"); + img.setAttribute("width", "60px"); + img.setAttribute("height", "60px"); img.setAttribute("style", "margin-right: 10px;margin-top: 10px;"); img.setAttribute("id", theme.value); img.setAttribute("title", theme.name); icons.push(img); }) - } + } function addListOfArticles(article) { _div = L.DomUtil.create('div', 'listeProjets'), article; _div.innerHTML = `

Liste (` + article.length + `)

`; for (var i = 0; i < article.length; i++) { - _div.innerHTML += `

` + article[i].title + `

`; + if(article[i].catid == 18){ + _div.innerHTML += `

` + article[i].title + `

`; + }else if (article[i].catid == 19){ + _div.innerHTML += `

` + article[i].title + `

`; + }else if (article[i].catid == 20){ + _div.innerHTML += `

` + article[i].title + `

`;s + } } } @@ -484,13 +508,16 @@ jQuery(() => { } function displayListOfArticlesOnSidebarClosed() { $(".close").click(() => { - - $(".listeProjets p").hide(); - $(".listeProjets").show(); + displayListOfArticles(); }); } + function displayListOfArticles() { + $(".listeProjets p").hide(); + $(".listeProjets").show(); + } + //Fonction qui vérifie si l'état du champs contenant la chaîne WKT de la zone d'intérêt des projets. function checkInterestZone(zone) { if (zone == null) { @@ -500,9 +527,61 @@ jQuery(() => { } } + //Détecte les niveaux de zoom et gère le comportement du marker sélectionné selon le niveau + var zoomInZone = document.getElementsByClassName('leaflet-control-zoom-in'); + var zoomOutZone = document.getElementsByClassName('leaflet-control-zoom-out'); + for (i = 0; i < zoomInZone.length; i++) { + zoomInZone[i].addEventListener('click', function () { + if (map.getZoom() < 9) { + reg_tile_temp.clearLayers(); + sidebar.hide(); + displayListOfArticles(); + } + }) + } + for (i = 0; i < zoomOutZone.length; i++) { + zoomOutZone[i].addEventListener('click', function () { + if (map.getZoom() < 9) { + reg_tile_temp.clearLayers(); + sidebar.hide(); + displayListOfArticles(); + } + }) + } + //EOF Fonction gestion sélection zoom + + function getDepartementName(departementValue) { + + if (departementValue == "ariege") { + return "Ariège"; + } else if (departementValue == "aude") { + return "Aude"; + } else if (departementValue == "aveyron") { + return "Aveyron"; + } else if (departementValue == "gard") { + return "Gard"; + } else if (departementValue == "haute-garonne") { + return "Haute-Garonne"; + } else if (departementValue == "gers") { + return "Gers"; + } else if (departementValue == "herault") { + return "Hérault"; + } else if (departementValue == "lot") { + return "Lot"; + } else if (departementValue == "lozere") { + return "Lozere"; + } else if (departementValue == "pyrenees-orientales") { + return "Pyrenees-Orientales"; + } else if (departementValue == "tarn") { + return "Tarn"; + } else if (departementValue == "tarn-garonne") { + return "Tarn et Garonne"; + } + } + function initMarkersAndGroup(items) { - group = new L.markerClusterGroup({ showCoverageOnHover: false, zoomToBoundsOnClick: true, spiderfyOnMaxZoom: false, disableClusteringAtZoom : 8}); - + group = new L.markerClusterGroup({ showCoverageOnHover: false, zoomToBoundsOnClick: true, spiderfyOnMaxZoom: false, disableClusteringAtZoom: 8 }); + for (let article = 0; article < items.length; article++) { var articleMarker = items[article].localisation; // mise au format des coordonnées pour affichage avec L.marker @@ -510,64 +589,101 @@ jQuery(() => { let lat = coordArticleMarker[0]; let long = coordArticleMarker[1]; let title = items[article].title; - - var _mar = L.marker(new L.LatLng(lat, long), { - icon: markerIcon - }); - + + var _mar; + var idOfCategory = items[article].catid; + if (idOfCategory == 18) { + _mar = L.marker(new L.LatLng(lat, long), { + icon: expMarkerIcon + }); + } else if (idOfCategory == 19) { + _mar = L.marker(new L.LatLng(lat, long), { + icon: cooraceMarkerIcon + }); + } else if (idOfCategory == 20) { + _mar = L.marker(new L.LatLng(lat, long), { + icon: enedisMarkerIcon + }); + } + _mar.bindPopup(title); _mar.on('click', function clicMarker() { + reg_tile_temp.clearLayers(); $(".listeProjets").hide(); const _marActive = L.marker(new L.LatLng(lat, long), { - icon: orangeIcon - }); - + icon: selectedIcon + }); + //Récupérer les coordonnées du point, stocker dans une variable (appelée dans la sidebar.setContent plus bas) sidebar.show(); //Vérifier si marqueur est de type DT ou autres //On se base sur nomdelasiae car le champ n'est pas présent sur les projets DT mais est présent sur les autres - if (items[article].nomdelasiae == null) - { - content = `
+ if (items[article].catid == 20) { + dpt = getDepartementName(items[article].departement); + content = `
-

- Liste (${markersDT.length}) -

+

+ Liste des Appels à projet du département : `+ dpt + + `

`; for (var i = 0; i < markersDT.length; i++) { - content += `

- ` + markersDT[i].title + ` + if (markersDT[i].departement == items[article].departement) { + content += `

+ ` + markersDT[i].title + `

`; + } } content += `
`; - - } else { - content = `

${title}


-
${items[article].introtext}
- Voir l'article complet`; + } else if (items[article].catid == 18) { + content = `

${title}


+
${items[article].introtext}
+ Voir l'article complet`; + + } else if (items[article].catid == 19) { + actName = getActiviteName(items[article].activite); + content = `

${title}


+
Domaine d'activité :
    `; + for (var i = 0; i < actName.length; i++) { + content += `
  • ` + actName[i] + `
  • `; + } + content += `

Adresse : ${items[article].adresse}
`; + if (items[article].zonedintervention != null) { + content += `
Zone d'intervention : ${items[article].zonedintervention}
`; + } + content += `Voir l'article complet`; } sidebar.setContent(content); sidebar.on('close', displayListOfArticlesOnSidebarClosed()); - + //Remet reg_tile_temp à 0 avant d'y intégrer geom_temp si le champs contenant le WKT de la zone d'intérêt est complété reg_tile_temp.clearLayers(); var zoneDefined = checkInterestZone(items[article].jce); if (zoneDefined) { geom_temp = omnivore.wkt(items[article].jce); - //console.log("geom_temp " + geom_temp); - // reg_tile_temp.clearLayers(); geom_temp.addTo(reg_tile_temp); } _marActive.addTo(reg_tile_temp); - + }); if (map.getZoom() > 15 && map.hasLayer(_mar)) { map.closePopup(); } - + group.addLayer(_mar); - } } + + function getActiviteName(act) { + actList = activites; + var actOfArticle = []; + for (var i = 0; i < actList.length; i++) { + for (var j = 0; j < act.length; j++) { + if (actList[i].value == act[j]) { + actOfArticle.push(actList[i].name); + } + } + } + return actOfArticle; + } }); From 1edc6b384269e5ff71fff5b6c76285c64d419de6 Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Tue, 12 Nov 2024 12:33:54 +0100 Subject: [PATCH 14/15] BREAKING CHANGE : replace css with prod css --- com_leaflet/site/assets/css/global.css | 52 ++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/com_leaflet/site/assets/css/global.css b/com_leaflet/site/assets/css/global.css index 9e5554a..792fc90 100644 --- a/com_leaflet/site/assets/css/global.css +++ b/com_leaflet/site/assets/css/global.css @@ -27,9 +27,21 @@ } #mapid { - height:800px; + margin-top: 0px; + margin-bottom: 0px; + height: 95vh; + width: 98vw; } +#footer\#0 { + width: 95vw; +} + +#tm-main > div:nth-child(1) { + width: 100vw; + margin-left: 6px; + } + /* MAKE FILTERS INLINE */ .leaflet-panel-layer, .leaflet-panel-layers { background : white!important; @@ -62,27 +74,43 @@ border: 3px solid #004f90; } -.thematiques, .typesdacteurs , .observations { +.departements, .categorie , .activite { background-color: white; padding: 10px; - width: 150px; + width: 500px; border-radius: 5px; + max-height : max-content; } .leaflet-control h6{ cursor: pointer; margin:0; + font-size : 20px; + font : Ubuntu; + color : #35276c; } .listeProjets { font: 16px Roboto; background: white; box-shadow: 0 0 15px rgba(0,0,0,0.2); border-radius: 5px; - overflow: auto; + max-height : 700px; + overflow-y: auto; } +/* .listeArticles{ + overflow: hidden; +} */ + +/*Margin négatif pour contrer le padding de leaflet-control */ +.listeProjetsDT { + font: 16px Roboto; + margin: -8px -24px; +} + .listeArticles h3{ margin : 0; font-size: 18px Ubuntu; padding:10px; +color : #35276c; } .active { @@ -93,6 +121,7 @@ border: 3px solid #004f90; .listeArticles:hover, .leaflet-control > img { cursor: pointer; + } .view , .unview{ @@ -103,14 +132,14 @@ border: 3px solid #004f90; display:none; } -.listeProjets > :nth-child(even) { +.listeProjets > :nth-child(even), .listeProjetsDT > :nth-child(even) { background: whitesmoke; border-left: 6px solid whitesmoke; } -.listeProjets > :nth-child(odd){ +.listeProjets > :nth-child(odd), .listeProjetsDT > :nth-child(odd){ border-left: 6px solid white; } -.listeProjets > p{ +.listeProjets > p, .listeProjetsDT > p{ margin:0; padding: 20px 30px 20px 20px; } @@ -118,7 +147,7 @@ border: 3px solid #004f90; padding: 5px 10px; margin:0; } -.listeProjets > p:hover{ +.listeProjets > p:hover, .listeProjetsDT > p:hover{ border-left: 6px solid #96cd32!important; } @@ -128,3 +157,10 @@ border: 3px solid #004f90; .leaflet-container a:hover{ color:#ea5153!important; } +.cartographie_enecoo .tm-main{ + padding-bottom : 0; +} +.cartographie_enecoo .uk-sticky .uk-navbar-sticky{ + display: none; +} + From 30beea31b311b8fc541e07aaaff29d45665c04ec Mon Sep 17 00:00:00 2001 From: "vincent.tisseyre" Date: Tue, 12 Nov 2024 12:35:23 +0100 Subject: [PATCH 15/15] fix : delete unused folder --- .../com_leaflet/assets/css/global.css | 137 ------------------ 1 file changed, 137 deletions(-) delete mode 100644 com_leaflet/components/com_leaflet/assets/css/global.css diff --git a/com_leaflet/components/com_leaflet/assets/css/global.css b/com_leaflet/components/com_leaflet/assets/css/global.css deleted file mode 100644 index 9915c57..0000000 --- a/com_leaflet/components/com_leaflet/assets/css/global.css +++ /dev/null @@ -1,137 +0,0 @@ -#refreshButton{ - display: flex; - align-items: center; - position: absolute; - top: 20px; - right: 20px; - width: 50px; - height: 50px; - background-color: white; - border-radius: 5px; - border-color: gray; - border-style: solid; - border-width: 1px 1px 1px 1px; - opacity: 0.6; - text-align: center; - z-index: 500; -} - - -#refreshButton:hover{ - opacity: 1; - background-color: blueviolet; - cursor: pointer; -} -.leaflet-tile-container { - background-color: red!important; -} - -#mapid { - height:800px; -} - -/* MAKE FILTERS INLINE */ -.leaflet-panel-layer, .leaflet-panel-layers { - background : white!important; -} -.leaflet-panel-layers-grouplabel { - font-size: 16px; - font-weight: bold; -} - -.leaflet-panel-layers-group { - width: 170px!important; - border:none!important; - background: white!important; -} -.leaflet-panel-layers-item { - max-width: 40px; - margin: 5px!important; - display: inline-block!important; - -} -.leaflet-panel-layers-item, .leaflet-panel-layers-overlays .leaflet-panel-layers-item:hover { - border:none!important; -} -.leaflet-panel-layers-selector { - visibility: hidden; -} -.leaflet-panel-layers-selector:checked~img { - transform: scale(1.1); - border-radius: 50px; - border: 3px solid #004f90; -} - -.departements, .categorie , .activite { - background-color: white; - padding: 10px; - width: 150px; - border-radius: 5px; -} -.leaflet-control h6{ - cursor: pointer; - margin:0; -} -.listeProjets { - font: 16px Roboto; - background: white; - box-shadow: 0 0 15px rgba(0,0,0,0.2); - border-radius: 5px; - overflow: auto; -} - -/*Margin négatif pour contrer le padding de leaflet-control */ -.listeProjetsDT { - font: 16px Roboto; - margin: -8px -24px; -} - -.listeArticles h3{ -margin : 0; -font-size: 18px Ubuntu; -padding:10px; -} - -.active { -transform: scale(1.1); -border-radius: 50px; -border: 3px solid #004f90; -} - -.listeArticles:hover, .leaflet-control > img { - cursor: pointer; -} - -.view , .unview{ - font-size: 22px; - font-weight: bold; -} -.view, .listeProjets p{ - display:none; -} - -.listeProjets > :nth-child(even), .listeProjetsDT > :nth-child(even) { - background: whitesmoke; - border-left: 6px solid whitesmoke; -} -.listeProjets > :nth-child(odd), .listeProjetsDT > :nth-child(odd){ - border-left: 6px solid white; -} -.listeProjets > p, .listeProjetsDT > p{ - margin:0; - padding: 20px 30px 20px 20px; -} -.listeProjets > div{ - padding: 5px 10px; - margin:0; -} -.listeProjets > p:hover, .listeProjetsDT > p:hover{ - border-left: 6px solid #96cd32!important; -} - -.leaflet-container a{ - color :#35276c!important; -} -.leaflet-container a:hover{ - color:#ea5153!important; -}