From b9298243b2c4c3dc758b887733efed4f31045368 Mon Sep 17 00:00:00 2001 From: CounterPillow Date: Thu, 19 Sep 2013 01:10:42 +0200 Subject: [PATCH 1/2] Added some icons for people to use in their POIs. --- docs/signs.rst | 9 +++ .../data/web_assets/marker_anvil.png | Bin 0 -> 1145 bytes .../data/web_assets/marker_anvil_red.png | Bin 0 -> 1144 bytes .../data/web_assets/marker_base_plain.svg | 69 ++++++++++++++++++ .../data/web_assets/marker_base_plain_red.svg | 69 ++++++++++++++++++ .../data/web_assets/marker_factory.png | Bin 0 -> 948 bytes .../data/web_assets/marker_factory_red.png | Bin 0 -> 948 bytes .../data/web_assets/marker_hoe.png | Bin 0 -> 1028 bytes .../data/web_assets/marker_hoe_red.png | Bin 0 -> 1020 bytes .../data/web_assets/marker_mine.png | Bin 0 -> 1204 bytes .../data/web_assets/marker_mine_red.png | Bin 0 -> 1200 bytes .../data/web_assets/marker_ship.png | Bin 0 -> 1149 bytes .../data/web_assets/marker_ship_red.png | Bin 0 -> 1147 bytes .../data/web_assets/marker_tower.png | Bin 0 -> 1033 bytes .../data/web_assets/marker_tower_red.png | Bin 0 -> 1047 bytes .../data/web_assets/marker_town.png | Bin 0 -> 1042 bytes .../data/web_assets/marker_town_red.png | Bin 0 -> 1043 bytes 17 files changed, 147 insertions(+) create mode 100644 overviewer_core/data/web_assets/marker_anvil.png create mode 100644 overviewer_core/data/web_assets/marker_anvil_red.png create mode 100644 overviewer_core/data/web_assets/marker_base_plain.svg create mode 100644 overviewer_core/data/web_assets/marker_base_plain_red.svg create mode 100644 overviewer_core/data/web_assets/marker_factory.png create mode 100644 overviewer_core/data/web_assets/marker_factory_red.png create mode 100644 overviewer_core/data/web_assets/marker_hoe.png create mode 100644 overviewer_core/data/web_assets/marker_hoe_red.png create mode 100644 overviewer_core/data/web_assets/marker_mine.png create mode 100644 overviewer_core/data/web_assets/marker_mine_red.png create mode 100644 overviewer_core/data/web_assets/marker_ship.png create mode 100644 overviewer_core/data/web_assets/marker_ship_red.png create mode 100644 overviewer_core/data/web_assets/marker_tower.png create mode 100644 overviewer_core/data/web_assets/marker_tower_red.png create mode 100644 overviewer_core/data/web_assets/marker_town.png create mode 100644 overviewer_core/data/web_assets/marker_town_red.png diff --git a/docs/signs.rst b/docs/signs.rst index 9bf8e0f..2bbb092 100644 --- a/docs/signs.rst +++ b/docs/signs.rst @@ -235,3 +235,12 @@ Predefined Filter Functions TODO write some filter functions, then document them here +Marker Icons Overviewer ships by default +======================================== + +Overviewer comes with multiple small icons that you can use for your markers. +You can find them in the ``overviewer_core/data/web_assets/`` directory. + +If you want to make your own in the same style, you can use the provided +``marker_base_plain.svg`` and ``marker_base_plain_red.svg`` as template, with +a vector editing software such as `Inkscape `_. diff --git a/overviewer_core/data/web_assets/marker_anvil.png b/overviewer_core/data/web_assets/marker_anvil.png new file mode 100644 index 0000000000000000000000000000000000000000..a50b4877631377c759a785d47440f7a650ac03db GIT binary patch literal 1145 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU{K{?V_;xV-u~L1fq{Xg*vT`5gM)*kh9jke zfq{Xuz$3Dlfr0lr2s1iq%&uTyV2~_vjVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw z{mw>;fr0s(r;B4qMC;xe=d(r9C63!0Ti-mHS9bZx*@J1@Tc^#s+95VusOa>l>6GY3L@MA#L%ae;jm4aBfRj)X^<^(TXnpI?|svSB>qSSoz{2VaYxm#(URiH@|009$4!)Kn!MlzaG2C@v>0nyVXxnsTwcA0_2d@tpA7J|Az$n-#aPNfj z0gWT)9n3T%@|V37sOPx(_&~1Xsf#QH{1@0a-sC^NJox1oM&IjS%I30~9WUKsUVn1# zUc!zR!gvq|^?!>(nUwQUzV>ODX9@Szdj8z1Z84gW;aj4U=rwiidTL#p%;#*S-F+XT9yp zf{%ZqPQRZm#dvkznp=MgZ$G+zQ)g$+YvZ-Ljl#kFoU^5tt^9oLc4FDvchBzDUc7ZL za7{qLkAJ&E#pI`)c>Y&@Q7&i1wB}UCkcvMm&a9pN`pwO3!=G0jobTG#Z{JbA{eg5u z)C1EG-{UK_w%rccw<(B|=U))ZukEcIlD+P3DxZpudn7Pfx9yreO+EPGTE!3NCfwX& zv-k26b+MXo_B_KWd438h89p+v_^J^6#wacOI#asN^4&(IPi1@b~3-dXxjb?se)zcNbZfP_#BYbJs z((TOmn2Mi@oT%Bml66Pg-zZUkw*v=HU*3Kyr}5=0t{+wbRo`qb8-`pg4@|h(vE|MY z@3W5&7iZ>}x*kvYa51$GvaQAAa#PJ3S_Q21&!9m)r+r1siPw zChZDXr5rqA;;#zwx)zQXAPBp>DI+zdp|>qiGj= zbZOVtl`A8nr|2_we;3#5SKr<*wRdkm*N6K%iryA5T5$f+IZ%AXB_s0XYOS*ir^&6J zzB5XVwY$;WHgJKs1iRn+|4(XI9=zJB|LK580dqy)@`i4W+r76Mm&?`o@;k0QSDN)| zC%*(s8G}2khv1K(DZE`)f)|&?{V?HJ(0fV3RLV#waZf#`+Sb! X+ph{c+oS?l(y zy&=l~Z?AHB$DV~x9<81KnD_lmh0d72TUIoMF|9hVPjBac#t1K`jx($DzA-Q`FnGH9 KxvX;fr0s}r;B4qMC;xe(HSzK636R}t>4v7zOrQHw%P1kw{^}4k(%YSghixQP*l@y z3kz4%mRgU@T1^jK4!h0>P1jlh`K}kvfgifADtT?4K4n{!SMKXp520Jnf+oGoQQJK8 z%nyU-Z|3BbO}<-JZvSJ(!!zd3|IdG4^Zb)M?}e7v4jwT}vqO&C90;w6i?MZXXklR9 z!OziM?b%kX@ThY&OKF3Qf%?1Wyo^Z8WJ?>}bgVmA|$`Rq0zlijtCFmPyc%^%fZ!N7KwNy-uz4S-haI(e}^BaM7>7-fQcJI5B+SUYHfuwW0JWf8L(YZWq%{<;&BH z=5#K8KfNaIDvu7sJc+|LpN%iu*PX3N`}K~4hd0Na-~HmEz(xIAgx}xsShPEQrcL9{ zYdqWSDx`nUU%lg+&rO%jyVEy|ubdUO?c1DDz2oh|UjiN5?BllBUfb9h zuxa5pmZZ0_uD4AOFW6b1ew5`@9QzlSNz-!ICvDj>t;h3Q&cWhmGyc3;{O8R|uErzF z)H7e+ch$JMBPVCocg;t0@A}kyQoLEbUsrlPUt_pd#?^O!Qyaaxmr6x$t^OaRSgBL1 z`M_$1db`8C>)lbTw{vz*J3d*m;N$t1Uya-os&+BWV=Yp?nR7P4_5QX4MFPh^as0bz z!^)$QxWIaE(7wftE*G}c&bB)Ade*7vjCKBZA70pLUu-sSjXwW}bNxNpYBFqn43Y;f zaXgt3;@Zy``y)7{O6tbHv)#25`+iSXD}4G*(>vRL9u#%6+F9`3y0*9{_x{|Cjm!tW|FAMxT(dUx!hG%>K{Zuf-lDGs zRz$dO;b(S^|6_aW`sH1RGO|B-&XJQ{{Qt+z$Ooklb}*Q8y1bZkDLihLbAe4*|C6lQ zB06mUJ{)OeTfkrO{l(_l$#NSWw{I5vAoYQ}fIXh^w#Mb&goDB2`xbRC2zy}FSe3^V z#@x@eo27&IjY#flS0A4}!5TGUoC}^_nJ|lYW~afw{Vf~^)1GlCZDw(u?q9r8U$?zM zYWcro6OCQ+(l%9aAFsGsyG+P7!a`@&f~gH!1(CDw{NM4){_}QG(;fx}1_n=8KbLh* G2~7auLknF1 literal 0 HcmV?d00001 diff --git a/overviewer_core/data/web_assets/marker_base_plain.svg b/overviewer_core/data/web_assets/marker_base_plain.svg new file mode 100644 index 0000000..ed7bd84 --- /dev/null +++ b/overviewer_core/data/web_assets/marker_base_plain.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/overviewer_core/data/web_assets/marker_base_plain_red.svg b/overviewer_core/data/web_assets/marker_base_plain_red.svg new file mode 100644 index 0000000..a89ec26 --- /dev/null +++ b/overviewer_core/data/web_assets/marker_base_plain_red.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/overviewer_core/data/web_assets/marker_factory.png b/overviewer_core/data/web_assets/marker_factory.png new file mode 100644 index 0000000000000000000000000000000000000000..55914c2b0a617c179119701d53b93d5fc564e040 GIT binary patch literal 948 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU{K{?V_;xV-u~L1fq{Xg*vT`5gM)*kh9jke zfq{Xuz$3Dlfr0lr2s1iq%&uTyV2~_vjVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw z{mw>;fq~i3)5S3)qV??zU+<7WiR1O(&&{1#GgH#pv-p^UVq44>L6;_jsz?{^l_o~^ z4tZN9-11hWvFX9@QXSAK{teDMsaz=M6>x`}jevVab)u~bU9S@r5a<0gIF_YJ3)yb>7t<$d; z2%d>?{aF{ucUgzyojT)z$6MYX;p52hdT?s1QTgI`3ePwjjnkd)>6iI-@<~T#czPQ4?Ftb%~PIZ6}#*040RTUnrR2W_8qqFs&qW7r zcG&2 zVQtC6Aa_T_#a|XKow%FfPJXT=pWNE42=PC^`#ss*^=>=JfADI|V7c_jY@J=qRr?27 zsbXd!NkwcweigooEZ(x~Bv*UZ1>K1ihc9%SN$+6qdHCvpYwnhnP5(AIgmwD67cWgR zeiEAF_Gt5gGtXZhe3lWqSd>p*_``Lc{%!iqdk=Us`cD#Hs2vq=naTI_^~O5Y>&adl zB6eI3=4ok6Td@D>rN>GQ6EF6OTwwNL;NHP?!|it76Mmb&52C*dm~h=uSwHV|L)HU} z3z`aM1;I&IFD>)9rzv8W&2nM?k&b!1Q#%>n?QdCNqpZBO@bX%*SiQ5-y(QW#U&?;v z%WQT2vN$GQyEXIvmd9(O9&UNj6vp`KK=iK@e_1s|n1pnBd{r437#KWV{an^LB{Ts5 D^9-MV literal 0 HcmV?d00001 diff --git a/overviewer_core/data/web_assets/marker_factory_red.png b/overviewer_core/data/web_assets/marker_factory_red.png new file mode 100644 index 0000000000000000000000000000000000000000..bf71106808fc6c959c790f0105bf5844728496b6 GIT binary patch literal 948 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU{K{?V_;xV-u~L1fq{Xg*vT`5gM)*kh9jke zfq{Xuz$3Dlfr0lr2s1iq%&uTyV2~_vjVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw z{mw>;fq~i3)5S3)qV??zUyqPLk>mC6&z>&)^H0N3*8FDswt~PV0!MTXMYXuPa4QQm zX>csO0*+rWj;?+jx9acH5A$Zm zq!h1i`}A~^$g-J&F@8)9$1~%5)(Xs+?vVOhkmvID6*JUXyrOTfuq&2~k38CxJWqh( z#QJ=NihZ;H{Ay!8ZllQXKwEeDuP>@zPP@fqKDRJ5Bu1`zXR!~YuP9ZU<)1dwxjB3H zY!{if^UML`jukvBs%m%Yw5CrKiWpF4DEpu;lkf#6Zfr|Xov`Un zfAlPI=DDsHcB<}h+ndbr!?0&^wDf1QDN|EeO)Sj(zOUvlly-ls&t4G6UvI8dz`KLb zhrzIUi%jsU4B-ncyKPQ2A2|5C+WFtHuAiQJ{#&};zWdy)fLmhPOf7kqdtPiw4lysC zmiGN|a(n6Qt$dxUkgNg=s(tb|8u8&YuC?tAoGDEoZT;Db8l+Tbe2h8HCD5u;I0`qbK8LepLTpU`NpVpnV2?6AJU-J|=0X6~9PChaAaYo@?*|~GG>H`MZe)gmTnhzum`c^mOZh7qX>(FKWeUbW(%7=X~z1qpMg7F&j zah4-&eO_zaez826>+{gqnc=T@&x@M@Gfy1;JMF>r`zL&I@06_eo$mEH#`tVo!#)51 zJ&XN1>ZZP~RyBV6nQzY8RK0G!4ABLAbFR+6BcHN^X@klaK6VBM1_n=8KbLh*2~7a6 COqGcM literal 0 HcmV?d00001 diff --git a/overviewer_core/data/web_assets/marker_hoe.png b/overviewer_core/data/web_assets/marker_hoe.png new file mode 100644 index 0000000000000000000000000000000000000000..f99c3f705f6342d5e75a5001674c41fe89172c56 GIT binary patch literal 1028 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU{K{?V_;xV-u~L1fq{Xg*vT`5gM)*kh9jke zfq{Xuz$3Dlfr0lr2s1iq%&uTyV2~_vjVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw z{mw>;fq}Wv)5S3)qIK_#*ldw-iR1Og){}F?HVaN!b@Ej#=T|4M=7YOqOq9A83iXIz zPh@cgW=!%m+noRSsLlCzCwJ|> zS(^Uqz~MLN<`vid|9ocV%+K-M8&q-?)ZBf$3l6cLa+~(#g*8(rBi{q2*iVs1FEk3o z_i^bmRW4AN@7?Dh^T2q4v?>k5wFFs zCbsd~<|n+ZelW2^E1KyZ+-)p{;<7R%t z|Ax}o9KHz+IrSn147WG^EPAko^=8O{LyS410?dzY8LTom*2jI>EW9$~$;8K=Zhh*r zvjo+uq_fIoUS5p5w3zWusczcx@K>g*4c^Y0EZhEiR??)Jeb+Np7&tb*k&>4FH|>41 zyO8hgb}a?lTc@`t?>*zU-pG0{*MabObMb)fcJsOX`_)+GV!j_#=KS`3r|<99pvJ0# zhMmWyZ-09m;h=1BK;B;ezphA-O=bl306V98;>K4a(2AKU%KE@;U-c;7lf`vTvd zsTtl5H$H4*abe7lbO`wn#aOqOP4J+$&Theo!=(?;z5S5B&go0+g5O{JA3Y0EdBEkb z9iVn&`TzJpk!AVPA4(PWZ<^KFqm^8JNK5JVCyRsE_OM&dUJlm{6$yM=H)?M8aU)%c>-$@h{{&^Bo z^MBvLT_2X#Ki^T7e1=)A(VEMU<%y~-Q+-62qFJJ@T~pZ{9oyZy_?*FD>h z*5{;U|{fc^>bP0l+XkKv-i?D literal 0 HcmV?d00001 diff --git a/overviewer_core/data/web_assets/marker_hoe_red.png b/overviewer_core/data/web_assets/marker_hoe_red.png new file mode 100644 index 0000000000000000000000000000000000000000..60ef1179bb8a84f9b20e5c153ec936983ad88712 GIT binary patch literal 1020 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU{K{?V_;xV-u~L1fq{Xg*vT`5gM)*kh9jke zfq{Xuz$3Dlfr0lr2s1iq%&uTyV2~_vjVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw z{mw>;fq}Ww)5S3)qIK_#)7ip-BJKNU`Uu@#X1X%s%CdDe3%d1cL`815zHpkTaMjhN zV5PKUY?lbjb*)GC3l`|r1YSsTWf7JC%E`4)JS%!a*S1?rGLvQ%8h%$XH}nlQdfa%} zr>*+^_uc95&fJOTIS`P^WLG-Hq(D7KVfoW3R=1`#{b1n!z|2^xm$bsMV{ISPStiK` z{Z{igi5y{i#!%{DYapHxpp>^$R?D>K$K~FfoXq)|)unL*y@CX-Qbl`&A7d zI)0ze?d|y%cV_y&#ItQ(wL0bxCr0eykbCt)<-)EVN%rAd0epNDBzBl5-=D?m!_Mwu zSN&jZgI7VrnGfM=_WM4%9q=jWyqNv`u6Tg1jKbGmtq*D|{aRIIKDUT6|bqrnBMX`HlM1?fA+{b$TK$1~?1;xwu{MQEmU_1A!0J z`uJt8r_I)q)MtNkq~=ysSNGYVf{l@-wE{nCzFsc4zH3^?)oV{WDokt+&HLBr`GDiX z`Ujj`YG3-z!tTv-POM&&fAVW~QiRT&+rj)MjIjqgi=(YxlHE+=I`3(v2|r|?HQxTqCfj*p6Q6=UFpK` ze1D5VYiwy4=gcJ=UVKWOm$&RH$A#N3>mQ#GR+2Z4+_Uuijz{HbW=ti5N-pMGn64Z& dKE(KsX?j9n8UN=1a|Q+m22WQ%mvv4FO#p2=!?gea literal 0 HcmV?d00001 diff --git a/overviewer_core/data/web_assets/marker_mine.png b/overviewer_core/data/web_assets/marker_mine.png new file mode 100644 index 0000000000000000000000000000000000000000..f03eea29af8ac9327e079dee3e2e42765732c8af GIT binary patch literal 1204 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 PFfe$!`njxgN@xNAV7@M# literal 0 HcmV?d00001 diff --git a/overviewer_core/data/web_assets/marker_ship.png b/overviewer_core/data/web_assets/marker_ship.png new file mode 100644 index 0000000000000000000000000000000000000000..9b349a13effacf91c3bdf1a822fe6465eeeba141 GIT binary patch literal 1149 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU{K{?V_;xV-u~L1fq{Xg*vT`5gM)*kh9jke zfq{Xuz$3Dlfr0lr2s1iq%&uTyV2~_vjVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw z{mw>;fr0s#r;B4qMC;ZW_p?R9MULAWThA^uf2TIv*ZWM~(ty`N3)c#9>|5#@t+jCL z(urnb%28e44hGfe1f8%~aQ*eb`QyQD%QiYrREp4O;@4feVTs5u<$W0^yI6aV{hfF= zudKXgMs<0f`R>ieub&-AY_ono@BR0A)z8oU?PJS0RH~q`?vm-QWU+wYJzDFgDLODU zFtRkt73!b-z~Z7)ICX*O0-iOUzgHtgznw z;`_F*yFVkY<&Ru~q{fM(X$*-c)XkV=9IltddB|Q+n7?JC0Yj`12g5R+I~u`7vzda! z!*}LCF;1V)nDBhvgnT`w&2`Fqm1ob9QZN(vaCvFpN^_I4l!X({UAbs6>pRca6Mbqm z*F7p?Zx`S8iMuKMaqemJ#^v+OEG$efe7QM0|NBG_HuF9Qg$0E_GGs32#AP48VDTq$ zPQr!XF+Y?({Mx4xJ^yWCujDPEls{|ty%WB%?e3G_k1Lkn2>&9&ct_qnv2$( z*>3OXy}x*8*n`FW?3Eu=zt_gq@kia1-!K02)tkT5&c|vOJbcamWK(E3gZb&y)n{rx zA22;O)j=^nIj?MIGE?#9(;}bVv1?ClxT=$2xA#y@)lu_`*>$Bldqp>7iKol`n$;Dv z?bOkk?Qu@Jk&Kmb`B`<#4>`YlUBT9uv0}&97bRLz5v~bQyO`n_PW5k^nb)|+c;arA z4O$(^J3DJl`We&{K6j=Rg?zin(Bv3=+qP&^y1~3pEG6}sjq#V4pU%!!-MMd#Lg?!- zwY84_cs{63VD6IYlbO6KgZ+chw=W+4Ozi6F>t;58lwJ4W`@6p<%cp;v+Q9AL))Vr} zHz6)$0mqc3dQ)DV5J_2LXChLxo^ihaoBcU?l2Vymb>H`!6o=o_WW0R9U&uu1E&RR%;9T|mZ@8gw$+#} zP&>MO>5h<%qB5eG2GKh_94yyc6`GEGsf+VEd>hQ<8PT?(7JHoth4 znr9lM&vM1$t9f6I^OdzRvD&?<<-TvON-cL4-69mgn#axeK|*wf{blQae@Yn`7#KWV L{an^LB{Ts5oR;fr0slr;B4qMC;ZWu^rN(BFF2EXP(V5`~7#~BeTjCH>R!Kl;FKPU}CMnch|Rz zTmz#8#qNGfy&5)ujR?!fLeW@_x6NHk_ldB&9_`{#y1hPuRbFKElvD4Tj%_)Tb1dhQ z%HzX#X75a!d~>FWWx*{p(tB+NZ-|I~_v&1Z2?7ZW zvJMen(4KDz4w<_ zh9z9SW4P$MUxnI)`^|1?u{%%1bLX4Yyo+r7^8000YDL0a_ zGH(5Rg9jl$G-^f99}wkLT`w0_G%@?+v-{trv^jmE!w={#*pU;tmMJn_soXJPs=)Cg z;pZ9mn9r0RzO%04YsFH=85y@G-c5d(`*-iYhIMJ1_Dub=G~&Rt*QeRu$WQx!t>^>a z28K0EmAv77o}pWqC63ROds+D4<@x36XE!?L3)$a4^Wntu`{E7#4XK7fFT)$H|1Trty(;F8q%fy1Ubp_J>*Pu39j)LF+@?1BU;M#!YtWMJ+4;F)%PN Nc)I$ztaD0e0sxoP9hU$A literal 0 HcmV?d00001 diff --git a/overviewer_core/data/web_assets/marker_tower.png b/overviewer_core/data/web_assets/marker_tower.png new file mode 100644 index 0000000000000000000000000000000000000000..2f4f7b5f13bd890addea01de7c3e2ddaca24776e GIT binary patch literal 1033 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU{K{?V_;xV-u~L1fq{Xg*vT`5gM)*kh9jke zfq{Xuz$3Dlfr0lr2s1iq%&uTyV2~_vjVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw z{mw>;fq}Wr)5S3)qV?^J^WGtWBFF9DpWU2!Y>sADpw(3^74b%nN9SDKcsvzVzdYtY z5!!OP<3O#)maZs?FU*TQw3=8rqeK)t1il;&>k?*7efp=U?!_Ll_w&rJKezb2M1+Yy z=HAnNpWl72KKIw~xiwqDiZmw1uT#=Klii!^Mza6B&c!23ugYGK*lpowm+p4%; zCSc?M<(;&i-Kjx6{|Nr76}*{NPPV z*&OL0amn{JBVU4)8vE>OUXSB4IywhLm>3l_`d+8ry5rcI8I|SG_mFFMUGnN5YeQq7)>w7YC zOio^&SSfx%x^$1V)5Z*Avsr6Q)^?|^W7F9d^@Qo&+uuLK)RnvyzW#EX*{v?A@$kw^ z>D2CwLoNr59rElfh5OvT?Vh)KN{IHE{`)mWY%;zR1cliA8YP&d8tiUdlkeVoE8zLG z%+gZF#f#V0pI$fj?7kC!X3T!{_DI6Qh%=}EZCaS2E;N~K$$BR9Mv)B(0n?JB3%@vW z7jQgp@#tnuKR>5R@XprFOSOJ{fB#;xPUbxG_r{j45<&OAz07v2c%C#gy>JS2cXW08 zvT*4y#RnV(Pp@=Nd@%2BuIR!2b+aE_oIKCQfT8E%lHCg?YA{ru`cEb;y2 zeL%(AHcVxcf8+kNCqHM(6mUv}KFBgUhvGWc!^!g8x3vIJH1#P7#aatNWp4zY4-R05uG&@G~m8sx`zhCwjK52OozH?vr sp3L=D8{zopr0F!Fb`v3p{ literal 0 HcmV?d00001 diff --git a/overviewer_core/data/web_assets/marker_tower_red.png b/overviewer_core/data/web_assets/marker_tower_red.png new file mode 100644 index 0000000000000000000000000000000000000000..d0142225d6c8ab303c349218025adfd414c5a9e5 GIT binary patch literal 1047 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 CgwDJG literal 0 HcmV?d00001 diff --git a/overviewer_core/data/web_assets/marker_town_red.png b/overviewer_core/data/web_assets/marker_town_red.png new file mode 100644 index 0000000000000000000000000000000000000000..94a7118453eb245b65edd0810da9e47410fbb6f0 GIT binary patch literal 1043 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU{K{?V_;xV-u~L1fq{Xg*vT`5gM)*kh9jke zfq{Xuz$3Dlfr0lr2s1iq%&uTyV2~_vjVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw z{mw>;fq{8~r;B4qMC;WVo*BY{GRNvS-zf1lUlVe^k_q3D z2Kz^LiCjX$D_B-FWG#?eA*kfl+oXEp@B#e?<^qgrf`SGc_V3|(v8wsAV}wG;bm1!5 z9=3-9A7VPZvYK|VWvpmzSHGtBJtz9gvX?7gOlS9;6jT3xyPtjCWB!9y2}~TP52i6) zRg5r@e!^g7Wj$?6rs9W$@iou5b(LGJCw_O&R38g5#Ro!jc4_`* zNuQr9=fk-#qxebhC=uG1*R!Ou^>pdnYD|PkrnCagL0~#OJGu8$_1R z3!EvO_ueh)_xXe?=6=;_SIjTns%P6?o~+2kP_1C$lyJg5;l%Mnr?+pi`@g4r_vLlV z7W_H1+3lZIj1IzE}TFw_Wc0E0e>*w1AddMh+H6m8S84~qF^uQpH3 zWtqdg>&q9+m|*47r|3LY;K|8{W?pG5>W zdwA8eQ{^TM;K*DN)A51oL=_DIQ4vK zU#662TaZ+6S?YS%v}bFctUp$_>GQeA8U-H-tH>< z4^NLB56lnuUVQV}Hdh--+2rl-Z>kjVeBk^fkSYAj{iSy5S;bnLu>L1mb4_&A%Bof| znm=GY7khKVu2W3k?$nDh_Axj+Fx+Nz4_qewlGQ)<$0og|D7TBAyPvZq*j-?JBd!vd zFn`5t{aYcOX)1@9B2@%a7c(XJBAp@O1TaS?83{1OPL6 B!yf Date: Mon, 23 Sep 2013 16:02:06 +0200 Subject: [PATCH 2/2] Moved icons to subdirectory, adjusted docs I also added one of the icons to the manualpois example, so people have an exmaple of how they can use these in their configurations. --- docs/signs.rst | 6 ++++-- .../data/web_assets/{ => icons}/marker_anvil.png | Bin .../web_assets/{ => icons}/marker_anvil_red.png | Bin .../web_assets/{ => icons}/marker_base_plain.svg | 0 .../{ => icons}/marker_base_plain_red.svg | 0 .../data/web_assets/{ => icons}/marker_factory.png | Bin .../web_assets/{ => icons}/marker_factory_red.png | Bin .../data/web_assets/{ => icons}/marker_hoe.png | Bin .../data/web_assets/{ => icons}/marker_hoe_red.png | Bin .../data/web_assets/{ => icons}/marker_mine.png | Bin .../data/web_assets/{ => icons}/marker_mine_red.png | Bin .../data/web_assets/{ => icons}/marker_ship.png | Bin .../data/web_assets/{ => icons}/marker_ship_red.png | Bin .../data/web_assets/{ => icons}/marker_tower.png | Bin .../web_assets/{ => icons}/marker_tower_red.png | Bin .../data/web_assets/{ => icons}/marker_town.png | Bin .../data/web_assets/{ => icons}/marker_town_red.png | Bin 17 files changed, 4 insertions(+), 2 deletions(-) rename overviewer_core/data/web_assets/{ => icons}/marker_anvil.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_anvil_red.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_base_plain.svg (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_base_plain_red.svg (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_factory.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_factory_red.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_hoe.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_hoe_red.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_mine.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_mine_red.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_ship.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_ship_red.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_tower.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_tower_red.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_town.png (100%) rename overviewer_core/data/web_assets/{ => icons}/marker_town_red.png (100%) diff --git a/docs/signs.rst b/docs/signs.rst index 2bbb092..6490230 100644 --- a/docs/signs.rst +++ b/docs/signs.rst @@ -147,10 +147,12 @@ Here is a more complex example where not every marker of a certain id has a cert 'y':85, 'z':-234, 'name':'Bar'}], - 'markers': [dict(name="Towns", filterFunction=townFilter, icon="town.png")], + 'markers': [dict(name="Towns", filterFunction=townFilter, icon="icons/marker_town.png")], ### Note: The 'icon' parameter allows you to specify a custom icon, as per ### standard markers. This icon must exist in the same folder as your ### custom webassets or in the same folder as the generated index.html + ### in this case, we use the marker_town.png icon which comes with + ### the Overviewer by default, located in a subdirectory of web_assets. } @@ -239,7 +241,7 @@ Marker Icons Overviewer ships by default ======================================== Overviewer comes with multiple small icons that you can use for your markers. -You can find them in the ``overviewer_core/data/web_assets/`` directory. +You can find them in the ``overviewer_core/data/web_assets/icons`` directory. If you want to make your own in the same style, you can use the provided ``marker_base_plain.svg`` and ``marker_base_plain_red.svg`` as template, with diff --git a/overviewer_core/data/web_assets/marker_anvil.png b/overviewer_core/data/web_assets/icons/marker_anvil.png similarity index 100% rename from overviewer_core/data/web_assets/marker_anvil.png rename to overviewer_core/data/web_assets/icons/marker_anvil.png diff --git a/overviewer_core/data/web_assets/marker_anvil_red.png b/overviewer_core/data/web_assets/icons/marker_anvil_red.png similarity index 100% rename from overviewer_core/data/web_assets/marker_anvil_red.png rename to overviewer_core/data/web_assets/icons/marker_anvil_red.png diff --git a/overviewer_core/data/web_assets/marker_base_plain.svg b/overviewer_core/data/web_assets/icons/marker_base_plain.svg similarity index 100% rename from overviewer_core/data/web_assets/marker_base_plain.svg rename to overviewer_core/data/web_assets/icons/marker_base_plain.svg diff --git a/overviewer_core/data/web_assets/marker_base_plain_red.svg b/overviewer_core/data/web_assets/icons/marker_base_plain_red.svg similarity index 100% rename from overviewer_core/data/web_assets/marker_base_plain_red.svg rename to overviewer_core/data/web_assets/icons/marker_base_plain_red.svg diff --git a/overviewer_core/data/web_assets/marker_factory.png b/overviewer_core/data/web_assets/icons/marker_factory.png similarity index 100% rename from overviewer_core/data/web_assets/marker_factory.png rename to overviewer_core/data/web_assets/icons/marker_factory.png diff --git a/overviewer_core/data/web_assets/marker_factory_red.png b/overviewer_core/data/web_assets/icons/marker_factory_red.png similarity index 100% rename from overviewer_core/data/web_assets/marker_factory_red.png rename to overviewer_core/data/web_assets/icons/marker_factory_red.png diff --git a/overviewer_core/data/web_assets/marker_hoe.png b/overviewer_core/data/web_assets/icons/marker_hoe.png similarity index 100% rename from overviewer_core/data/web_assets/marker_hoe.png rename to overviewer_core/data/web_assets/icons/marker_hoe.png diff --git a/overviewer_core/data/web_assets/marker_hoe_red.png b/overviewer_core/data/web_assets/icons/marker_hoe_red.png similarity index 100% rename from overviewer_core/data/web_assets/marker_hoe_red.png rename to overviewer_core/data/web_assets/icons/marker_hoe_red.png diff --git a/overviewer_core/data/web_assets/marker_mine.png b/overviewer_core/data/web_assets/icons/marker_mine.png similarity index 100% rename from overviewer_core/data/web_assets/marker_mine.png rename to overviewer_core/data/web_assets/icons/marker_mine.png diff --git a/overviewer_core/data/web_assets/marker_mine_red.png b/overviewer_core/data/web_assets/icons/marker_mine_red.png similarity index 100% rename from overviewer_core/data/web_assets/marker_mine_red.png rename to overviewer_core/data/web_assets/icons/marker_mine_red.png diff --git a/overviewer_core/data/web_assets/marker_ship.png b/overviewer_core/data/web_assets/icons/marker_ship.png similarity index 100% rename from overviewer_core/data/web_assets/marker_ship.png rename to overviewer_core/data/web_assets/icons/marker_ship.png diff --git a/overviewer_core/data/web_assets/marker_ship_red.png b/overviewer_core/data/web_assets/icons/marker_ship_red.png similarity index 100% rename from overviewer_core/data/web_assets/marker_ship_red.png rename to overviewer_core/data/web_assets/icons/marker_ship_red.png diff --git a/overviewer_core/data/web_assets/marker_tower.png b/overviewer_core/data/web_assets/icons/marker_tower.png similarity index 100% rename from overviewer_core/data/web_assets/marker_tower.png rename to overviewer_core/data/web_assets/icons/marker_tower.png diff --git a/overviewer_core/data/web_assets/marker_tower_red.png b/overviewer_core/data/web_assets/icons/marker_tower_red.png similarity index 100% rename from overviewer_core/data/web_assets/marker_tower_red.png rename to overviewer_core/data/web_assets/icons/marker_tower_red.png diff --git a/overviewer_core/data/web_assets/marker_town.png b/overviewer_core/data/web_assets/icons/marker_town.png similarity index 100% rename from overviewer_core/data/web_assets/marker_town.png rename to overviewer_core/data/web_assets/icons/marker_town.png diff --git a/overviewer_core/data/web_assets/marker_town_red.png b/overviewer_core/data/web_assets/icons/marker_town_red.png similarity index 100% rename from overviewer_core/data/web_assets/marker_town_red.png rename to overviewer_core/data/web_assets/icons/marker_town_red.png