From d877fd14c9befdd67ce5adc115e8c58068332181 Mon Sep 17 00:00:00 2001
From: Derek Kniffin <kniffin@colorado.edu>
Date: Fri, 10 May 2013 16:02:05 -0600
Subject: [PATCH 1/4] Added icons for
 amenity=vending_machine,vending=parking_tickets

---
 renders/parking-ticket-12.png | Bin 0 -> 498 bytes
 renders/parking-ticket-18.png | Bin 0 -> 775 bytes
 renders/parking-ticket-24.png | Bin 0 -> 788 bytes
 src/maki-icons.svg            | 157 +++++++++++++++++++++++++++++++---
 4 files changed, 147 insertions(+), 10 deletions(-)
 create mode 100644 renders/parking-ticket-12.png
 create mode 100644 renders/parking-ticket-18.png
 create mode 100644 renders/parking-ticket-24.png

diff --git a/renders/parking-ticket-12.png b/renders/parking-ticket-12.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd5f3bd3d3e02f83c015fdf47dc0ce887081e1ea
GIT binary patch
literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10dGk}K~yM_g^xc=LSYofpZh1Y92Aw1xQ2s?4e2+qDbeA+gF_I6
zevC_N1R7>TlWRkQL&N)yL4%-!qs8S41yPjJAc96*F63#sI!M?L4m_OmJm+vE&N&!k
z3V?MX#25a6G3EuZDTH{F8Dny_T0JS1O1J5BdiSpY0L?Ir3S&%G0eDQ)%nSyDgI=$<
z1Hf{(ZW)Gg0RWv&2gBiT4?t7}VApE3ifNk7OeXUJKmwrD>-A#*AR<a65`Fj5h6-T2
zSS;Q+juY{CJRiEQUrwjffMr?xp-||3JRZlo-EJ%x488(@3}DT1oCpAf!{L6b)jCY2
zQV)~KBnkkwZ3puC{1p+=Jg~s;_kT7T4LzI9w&U@5TaqLxm&;uj3WdkHN1Y2rQAVyD
z2_a_Xa`}`o_GDSsQM1`RcV}mdKr)%Ub01!b{GVYN6~MQqY4@6@J<n#d9{{v6!8r#J
og^9>VL_W^>yyqpN#8UZw0X49m?fxDgy#N3J07*qoM6N<$f)Z)RfdBvi

literal 0
HcmV?d00001

diff --git a/renders/parking-ticket-18.png b/renders/parking-ticket-18.png
new file mode 100644
index 0000000000000000000000000000000000000000..f617fbcea6fd1ac7fd86604ebb68e2f7ebff5884
GIT binary patch
literal 775
zcmV+i1Ni)jP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10)$CKK~y-6#gt!2Q&Akpzs|F6<+w~Cjcuh7iiHvLDFmO~i(~xu
zkWULiFz~@%db%Wp4+~@@q7gw3T!P?(5ZoWa9%?X>$lm(HWDs5(aR&;DyLl&Wy4%Yp
z(}qPaeP0fI&-s1M_xC$+>Qq(5zlezH05mf54giR<DFAe2vsstR<@yd_otdpaux>^o
zk^73GJY(h!TiI+M92|T(G&B@f6h#5x`HN5&QmK>=z{TT4x~^Z|+}yllS(eZ=tp`9O
zfFD(D*ptcR-ApEPt>Vqk&!bo@Hmt0yc!_930D#-=*1TTtD^1gSd_LbIfb6N;FU8|=
zG7O_xmgTLA>2x}^<>h66Z*T8gQTEJ8B=Q=73ZMwUO+>o@ECA;g78dSln${Nx1f~;-
zM96Npo88^rZyXNC*R{2^TL2)4NQy?I!%Is`Vau}Y0MOFX@?mCX=5aEa?2u)-luoB_
z92^`p1Au9oo^Uw)V0?UhDi8=vSJK%4NU2onb_D_exm@o0$jHd^Xf*mXpU;c!?d_|T
zy~D#p$Hc_MSZizRyXxL;sG<J;{ufP6P3r>#15bj%;77wSjzL0*y;v;vaB^~TtW+u;
z9s9LFk|Y&oXJ<zN<N#ceBx$!$C~N^hTU%Q~2w?))sjjIBDl5y(MIy@2&CLxfit=c6
zb+u2H<t;@~MggGu6;FU<S^j1iMtil#%mpIK0D!LReY&pWRL$aVGxGcWu`?2$shY$7
z@1T+-NoIY0ectJGngCE<kIpVVDZ$Kpp-@Qmcs$u)F!(v0PEQfhduA?Gohx*9c7Cb_
z=<4eF0${&RRaFp?4S>YV`$W_LAb<KlD*NYaunNrl^A`qe2u)vK+Xw&v002ovPDHLk
FV1kpMTNVHS

literal 0
HcmV?d00001

diff --git a/renders/parking-ticket-24.png b/renders/parking-ticket-24.png
new file mode 100644
index 0000000000000000000000000000000000000000..91a5183cbadc5de3175a9c7d664d5f75cecd4de1
GIT binary patch
literal 788
zcmV+v1MB>WP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10+C5XK~zYI)s|66Q&AYl|C^f+V=T}lVrGwJBVu@DETZS&vM=aC
zaQHBWufB`|6MPV1kWYIRYQBu@#fN?4z6240v!Lsi%q#R@vKnN}W|<^7+wo<0+^$YG
z(}(^~-~GOGzTY|jbKx9YI-SOO%3=N>A~%4G0JfR=XS>aa$Pd5^pu)^c0AM#2Z)lqK
zU}|bArfJ%JA{scwf-ezK20#}PIU745BA2FV0}~SyPo<R3Y&Khs$K#_!w86}kQ-B&W
zEb3BKbx=y_1OO?eQ&m+Vgm?$w2*6~;Ng4#OWB@9PqP)*$vsEdj(`K_(6-ChiY&Dr|
zSaGa~D8tMlB62zafSG?2(Q-T<A5~RVD2k#9A@t+yA);%>&Y3yX3}D2@8C(F+BZR03
zAzs#Nmx<^$fMo#t0D1r%tgWqy@$vDLwVB)P{uB%bUyO~7y*0xOi*AO);V0#CIbbgO
z{r=?4%uFYMgJd#!ClCk}bGh6V>x#qS@FQK<uP-hxMw$WK*5&|^&*!7DSgf;Ft99tQ
zJ`CV-sZ{E-j$2(_?cdzo?030bU#&H}HDQ*|=bJAS3M0C%5Bq$+`Diryp<FIswT>$m
zi^1;h?qVbonYGp&)`VG!MB@4M^z=6Xn4Fx<0NC5v**RiSC=_}&G&J-Yz-IuWWk9|0
zEC2~$9l+h)-QB+|@_0NSJs!^<fG^CvMMSOdpssaht^xoNeP38u7^%k@07#`$59{Ls
z*5<7O8e--Z04qdv&kQ+9M-I8SxA#>$(6#|{b90Gv1)R11e}M59)$DfreuHX?0o2X{
z@Wbo%zA=)f_!l$(`4@mKolYB<{Vf0;05$;h)#Cy)Z(Ap|c%xOAdC7L(&z3_e*93V!
SV~^GV0000<MNUMnLSTZy7F?kK

literal 0
HcmV?d00001

diff --git a/src/maki-icons.svg b/src/maki-icons.svg
index 2d2d1f4d..d2f2e9e8 100644
--- a/src/maki-icons.svg
+++ b/src/maki-icons.svg
@@ -13,11 +13,10 @@
    height="24"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="maki-icons.svg"
    inkscape:export-xdpi="89.996605"
-   inkscape:export-ydpi="89.996605"
->
+   inkscape:export-ydpi="89.996605">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -27,16 +26,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="631.19107"
-     inkscape:cy="-242.23429"
+     inkscape:zoom="7.9999999"
+     inkscape:cx="475.48273"
+     inkscape:cy="-307.80936"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      inkscape:window-width="1101"
      inkscape:window-height="706"
-     inkscape:window-x="36"
-     inkscape:window-y="0"
+     inkscape:window-x="2038"
+     inkscape:window-y="15"
      inkscape:window-maximized="0"
      showguides="false"
      inkscape:guide-bbox="true"
@@ -523,7 +522,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -8618,5 +8617,143 @@
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccccccccccccccccccccccccc" />
     </g>
+    <g
+       style="display:inline"
+       id="parking-ticket-24"
+       inkscape:label="parking-ticket-24"
+       transform="translate(-437.0625,1114.3622)">
+      <rect
+         y="274"
+         x="754"
+         height="24"
+         width="24"
+         id="rect4516"
+         style="fill:none;stroke:none" />
+      <g
+         id="g5342">
+        <g
+           transform="translate(0.0625,0)"
+           style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+           id="g4522-7">
+          <path
+             inkscape:connector-curvature="0"
+             id="path5220-1"
+             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
+             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             id="path5288-1"
+             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
+             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
+        </g>
+        <g
+           id="g4522">
+          <path
+             id="path5220"
+             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
+             style="fill:#444444;stroke:none"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path5288"
+             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
+             style="fill:#4d4d4d;stroke:none"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
+        </g>
+      </g>
+    </g>
+    <g
+       transform="matrix(0.75,0,0,0.75,-224.41406,1183.2763)"
+       style="display:inline"
+       id="parking-ticket-18"
+       inkscape:label="parking-ticket-18">
+      <rect
+         y="274"
+         x="754"
+         height="24"
+         width="24"
+         id="rect4516-2"
+         style="fill:none;stroke:none" />
+      <g
+         id="g5342-7">
+        <g
+           transform="translate(0.0625,0)"
+           style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+           id="g4522-7-6">
+          <path
+             inkscape:connector-curvature="0"
+             id="path5220-1-1"
+             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
+             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             id="path5288-1-4"
+             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
+             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
+        </g>
+        <g
+           id="g4522-2">
+          <path
+             inkscape:connector-curvature="0"
+             id="path5220-3"
+             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
+             style="fill:#444444;stroke:none" />
+          <path
+             id="path5288-2"
+             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
+             style="fill:#4d4d4d;stroke:none"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
+        </g>
+      </g>
+    </g>
+    <g
+       transform="matrix(0.5,0,0,0.5,-16.5,1252.3622)"
+       style="display:inline"
+       id="parking-ticket-12"
+       inkscape:label="parking-ticket-12">
+      <rect
+         y="274"
+         x="754"
+         height="24"
+         width="24"
+         id="rect4516-2-1"
+         style="fill:none;stroke:none" />
+      <g
+         id="g5342-7-6">
+        <g
+           transform="translate(0.0625,0)"
+           style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+           id="g4522-7-6-8">
+          <path
+             inkscape:connector-curvature="0"
+             id="path5220-1-1-5"
+             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
+             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             id="path5288-1-4-7"
+             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
+             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
+        </g>
+        <g
+           id="g4522-2-6">
+          <path
+             inkscape:connector-curvature="0"
+             id="path5220-3-1"
+             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
+             style="fill:#444444;stroke:none" />
+          <path
+             id="path5288-2-8"
+             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
+             style="fill:#4d4d4d;stroke:none"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
+        </g>
+      </g>
+    </g>
   </g>
 </svg>

From c2c1a3096468327efda9e5bde97c768fbf010d3e Mon Sep 17 00:00:00 2001
From: kniffin <oddityoverseer13@gmail.com>
Date: Mon, 13 May 2013 12:26:00 -0600
Subject: [PATCH 2/4] Added icons for highway=traffic_signals

---
 renders/traffic-signals-12.png | Bin 0 -> 262 bytes
 renders/traffic-signals-18.png | Bin 0 -> 394 bytes
 renders/traffic-signals-24.png | Bin 0 -> 365 bytes
 src/maki-icons.svg             | 115 ++++++++++++++++++++++++++++++---
 4 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 renders/traffic-signals-12.png
 create mode 100644 renders/traffic-signals-18.png
 create mode 100644 renders/traffic-signals-24.png

diff --git a/renders/traffic-signals-12.png b/renders/traffic-signals-12.png
new file mode 100644
index 0000000000000000000000000000000000000000..d857c26bc1a4d5b3cea8dfcf8062ffa87d8f2fdd
GIT binary patch
literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt;`-E{-7@
z6R%D(<YQLkVNsvxdffSsij{qDANvQ1I7ioZo!D72R+@9BOqp5q^kUva_qAUi_;NH#
zC@V2F>^44@aISKmLQIEYkk`VkYz?a>1ugo%Pu!*Dnp7H_!@0_>b8UVK-fXpe9-VkQ
zAuan__#u1$qVkYZ-=NStf8!*QCj|Yf=+)ML-)`FEH@(UU=o|)5S3j3^P6<r_*_T>I

literal 0
HcmV?d00001

diff --git a/renders/traffic-signals-18.png b/renders/traffic-signals-18.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7627ce0ce83ae632b225517635e9a7055545ca2
GIT binary patch
literal 394
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&3=E9yo-U3d
z7QI)eEbMDB5OL*?W@$d4^m;|>|CNvD7g+pj;CEC!5So<jaG~T(icpy~k9Fkca8vW`
z>a{P=cK_P<okgWZ!E;jc_FU<6I|Jreq}<ChZxP@*d|+EHgNmn9XsE^Wi0faaG<<_^
zZ96Ja{NZ@vl69|NFR<t{JT@U!GAf&4*Sf<J&NA%lKZusd2YF3=Zdo~R@f54>dCki*
zlOn~Yr6$f=798+nE`MZp=B#HT1)L(Tg06uK2Ir0MvCn4OBe_<CYs<Bawet`3JM6#s
zGUKz&<<h&K{}`UA{{L;eUgJLTOHsd#e*1Ind~Y4()nnN1<fVD@yDdkT)9)AOubtSn
kjzdx7^r!a!SsU*%vNg7><WH-A2Mjj`Pgg&ebxsLQ0Nd7{NB{r;

literal 0
HcmV?d00001

diff --git a/renders/traffic-signals-24.png b/renders/traffic-signals-24.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe9fa30f6a82628782c479b6218658fc44b7976a
GIT binary patch
literal 365
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQnvux;Tb-
zbiSRovG<6Afb0Kx9y1P1G5G7ysCSSx;==hU4a^>HySj7k&htMIRrG9n)3eM6-4C~}
zdu^U~<cnEEwxf%|v)a|G7ENi2dR^MMRqXb*#7MD@6St*|m0KDzXU&?lep*9^K(dV}
zJA<HOkDyD*UgqR8fpca)+{@0eWQu~4z{JZJYp)#4-}AlT+(FCo4mSz0nAC^~K~Co+
zEz_4wX=A-R<6Q^Gvr0L=J;lETdCNb<cezyrU3uymI9=T}c2@a<RSC}?zx_X3DXndl
z8S7a-FHH``hME4^zfb5aHDO(UZ~dcd3;7wgUdx*(W`BHP?;GX%8#{r%X7F_Nb6Mw<
G&;$UIl#|*3

literal 0
HcmV?d00001

diff --git a/src/maki-icons.svg b/src/maki-icons.svg
index d2f2e9e8..249236d8 100644
--- a/src/maki-icons.svg
+++ b/src/maki-icons.svg
@@ -26,17 +26,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9999999"
-     inkscape:cx="475.48273"
-     inkscape:cy="-307.80936"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="230.87123"
+     inkscape:cy="-226.35415"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1101"
-     inkscape:window-height="706"
-     inkscape:window-x="2038"
-     inkscape:window-y="15"
-     inkscape:window-maximized="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1178"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
      showguides="false"
      inkscape:guide-bbox="true"
      inkscape:object-paths="true"
@@ -530,14 +530,14 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="background"
-     style="display:none">
+     style="display:inline">
     <rect
        style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect5639"
        width="784"
        height="360"
        x="32"
-       y="1.7e-05" />
+       y="1.7e-005" />
   </g>
   <g
      inkscape:label="icons"
@@ -8755,5 +8755,100 @@
         </g>
       </g>
     </g>
+    <g
+       id="traffic-signals-12"
+       transform="translate(-1,7)"
+       inkscape:label="traffic-signals-12">
+      <g
+         id="g5329">
+        <g
+           id="g5326">
+          <path
+             id="path4489-0"
+             d="m 133,1379.3622 c -0.5,0 -1,0.5 -1,1 l 0,8 c 0,0.5 0.5,1 1,1 l 2,0 c 0.5,0 1,-0.5 1,-1 l 0,-8 c 0,-0.5 -0.5,-1 -1,-1 l -2,0 z m 1,1 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z"
+             style="opacity:0.3;fill:#444444;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+             inkscape:connector-curvature="0" />
+        </g>
+        <path
+           style="fill:#444444"
+           d="m 253,329 c -0.5,0 -1,0.5 -1,1 l 0,8 c 0,0.5 0.5,1 1,1 l 2,0 c 0.5,0 1,-0.5 1,-1 l 0,-8 c 0,-0.5 -0.5,-1 -1,-1 l -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
+           transform="translate(-120,1050.3622)"
+           id="path4489"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         transform="translate(-120,1050.3622)"
+         y="328"
+         x="248"
+         height="12"
+         width="12"
+         id="rect4487"
+         style="opacity:0.3;fill:none;stroke:none" />
+    </g>
+    <g
+       transform="matrix(1.5,0,0,1.5,-84,-682.63125)"
+       style="display:inline"
+       id="traffic-signals-18"
+       inkscape:label="traffic-signals-18">
+      <g
+         id="g5329-5">
+        <g
+           id="g5326-1">
+          <path
+             id="path4489-0-7"
+             d="m 133,1379.3622 c -0.5,0 -1,0.5 -1,1 l 0,8 c 0,0.5 0.5,1 1,1 l 2,0 c 0.5,0 1,-0.5 1,-1 l 0,-6.6999 0,-1.3001 c 0,-0.5 -0.5,-1 -1,-1 z m 1,1 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z"
+             style="opacity:0.3;fill:#444444;stroke:#ffffff;stroke-width:1.33333337;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sssssscssssssssssssssssss" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#444444"
+           d="m 253,329 c -0.5,0 -1,0.5 -1,1 l 0,8 c 0,0.5 0.5,1 1,1 l 2,0 c 0.5,0 1,-0.5 1,-1 l 0,-8 c 0,-0.5 -0.5,-1 -1,-1 l -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
+           transform="translate(-120,1050.3622)"
+           id="path4489-1" />
+      </g>
+      <rect
+         transform="translate(-120,1050.3622)"
+         y="328"
+         x="248"
+         height="12"
+         width="12"
+         id="rect4487-1"
+         style="opacity:0.3;fill:none;stroke:none" />
+    </g>
+    <g
+       transform="matrix(2,0,0,2,-172.5,-1372.3622)"
+       style="display:inline"
+       id="traffic-signals-24"
+       inkscape:label="traffic-signals-24">
+      <g
+         id="g5329-5-2">
+        <g
+           id="g5326-1-7"
+           style="stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none">
+          <path
+             id="path4489-0-7-6"
+             d="m 133,1379.3622 c -0.5,0 -1,0.5 -1,1 l 0,8 c 0,0.5 0.5,1 1,1 l 2,0 c 0.5,0 1,-0.5 1,-1 l 0,-6.6063 0,-1.3937 c 0,-0.5 -0.5,-1 -1,-1 z m 1,1 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z"
+             style="opacity:0.3;fill:#444444;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sssssscssssssssssssssssss" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#444444"
+           d="m 253,329 c -0.5,0 -1,0.5 -1,1 l 0,8 c 0,0.5 0.5,1 1,1 l 2,0 c 0.5,0 1,-0.5 1,-1 l 0,-8 c 0,-0.5 -0.5,-1 -1,-1 l -2,0 z m 1,1 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 0,3 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
+           transform="translate(-120,1050.3622)"
+           id="path4489-1-1" />
+      </g>
+      <rect
+         transform="translate(-120,1050.3622)"
+         y="328"
+         x="248"
+         height="12"
+         width="12"
+         id="rect4487-1-4"
+         style="opacity:0.3;fill:none;stroke:none" />
+    </g>
   </g>
 </svg>

From 62284b6cd79134ba12e6b286690b5b29690178af Mon Sep 17 00:00:00 2001
From: kniffin <oddityoverseer13@gmail.com>
Date: Mon, 13 May 2013 12:29:12 -0600
Subject: [PATCH 3/4] Turned off the background and re-rendered

---
 renders/traffic-signals-12.png | Bin 262 -> 268 bytes
 renders/traffic-signals-18.png | Bin 394 -> 440 bytes
 renders/traffic-signals-24.png | Bin 365 -> 388 bytes
 src/maki-icons.svg             |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/renders/traffic-signals-12.png b/renders/traffic-signals-12.png
index d857c26bc1a4d5b3cea8dfcf8062ffa87d8f2fdd..650f679c185f3aaa25915eb9eab6f4e8b19d40da 100644
GIT binary patch
delta 166
zcmV;X09pTr0*nHXZhwhML_t(2k=2qR4#O}EMPH|~V&9^?w}@n#n~a6+CZSPsf#LAp
z!nk~3jg(HUw81@S`TKwAd&oJ{aLx%Z1Jgd*fVGrjZD-`j?7e@O*#aOUHO6=co>zj&
z%obG*04b%=xdCwFM?M|sE}wGhpsJz8`bzNUkv0*jEs}^--XCpW3f8^Z!)x>lFLetp
UuzIyLJ^%m!07*qoM6N<$g5;}DtN;K2

delta 160
zcmV;R0AK%%0)_&RZhwPGL_t(2k=2qh4g(<!1SgS2$3y%iIzNq$2k;nPK}ClwU78#^
zDV&s)nR4aPZsA9*_25kiffyqq0)V?S#$e8Qo*-O^F;YsQwFZEyl2W4gz86G<)*5C8
zK+bu!ojmyw*@ZdhTVdN^W^2}0!aq-PcT{yvQdQjjUKnGLQW^SqjVmwjhc$vumwG|~
O0000<MNUMnLSTZqy+a8A

diff --git a/renders/traffic-signals-18.png b/renders/traffic-signals-18.png
index a7627ce0ce83ae632b225517635e9a7055545ca2..25bb85c647ed0ec95183e2c7c72c7dc6e431fe39 100644
GIT binary patch
delta 339
zcmV-Z0j&Ot1Goc_ZhtjNL_t(Ijm?yyPQy?XhQBUk6BSLCiXw2B`GEn2!Bw}SdjXzc
z38ZNt!SMz&n`lMNYMY=?Y_^%%Oc6}nkX$j*3c#$%LfWP@2!3^P?tj1J<edD<d_Jd4
zrfI6cG0@q!K7scrigsoGqYB7Lk|dYY>GUegG8LfL>+MFP(SNgPnlDily)^;>r>^VX
zNht@1&CO<W5r*Ln&={mjDF@wd_rr0V2Y}gZcDo0wjYlhF7{<b~tXF_Iju&Z~URQZ*
zLEG*2EC_=0qOSASg7Q4?PbQP6I!_}I@TKee5<mzs1e7Xcr|JPf*Y&0E`(xkt#|5wz
z=r^hzO$afxZA|;Is9S>oMF>&5twx}q2bt%2zZK|T9pp~aw3U={aCnfKrmcYHF#@bT
l&$};+5nx^RLHVm-`v!;Ek)*`)``Z8j002ovPDHLkV1kMtrkwx)

delta 293
zcmV+=0owk!1BwHXZhr?!L_t(Ijn$N)j)X82MGsp9gTNx|sD=Nj<DYOi{(uibA;48)
zYe3L+%w!UFI}AHnvsX1Yw<mq+&5QcJ_XH$_AW4#gw{08Fxlo)qWZrH!gb)nFz_x7w
zBuPS5RXFEZ*Yz4GO;g&o#Taw&$8n^t>+7I6jxolNWf@v)0Dro!!x%#x2e0rIbRSYm
zk>@#io}-jHi=Km~X<}IxmStg@rc+S(oex=SX`1E~a0wJe5k*k|FwZmI2b%)C8LcP^
zwAN^?pTLhmztQPv^E}ga-Shl0$b0|xw=RLc7t&h$GW$;ox$iqtN{lgwLP{yw_dN)T
rLi^~?*2uc92p%CQ%kqc+YO&n`27!dB4`zSv00000NkvXXu0mjft!;<7

diff --git a/renders/traffic-signals-24.png b/renders/traffic-signals-24.png
index fe9fa30f6a82628782c479b6218658fc44b7976a..b6412a5866b529635f644a7d78cad1c316075e9a 100644
GIT binary patch
delta 288
zcmV+*0pI@Z0)zvQZGQm)Nkl<ZNQv#1y^exF6on6)?JO=&U}1+3Lou1+QX3y<pTI~>
zF-`(cVzqQ8`UG<eYb}tCYZwOq5(~Zxa>F^fCnvc?Wm)2#eD@90G>rgE0n7kQZpKFd
zI{=5Os!k6X0GJj<p^Pz05lOBGL{w|7SIley?0o`X0fSkWIDY_$NMejxqS?+%XoE>B
z9>?*oQfdtV*4l-0Zho2FMt7INA4;ipmSvmvJ<s!>A>V}}dYZu-SZfzu&o47@&drC$
za?R&N)YYPw8jLLpGPWql*diZCBC16s>1q)X)o4zqmrz7It@Y|6^pEyrqPfdnLK_^I
m*)sDMJx9M!AQ^i1Z_62LP=;l{>#Xwt0000<MNUMnLSTX%V|sD`

delta 265
zcmV+k0rvic1MLEkZGQmjNkl<ZNQv#1v5mwa5Jmr<NSMHsF#SM*F2My@(9e{B14u@?
zi)`JVPrzDo=9hxzY2b_DwXW+oZp8F9SZhH<Fy?)$s-l#FTI+RzwHDj9VObW4$lDq-
zBZPoynwpZYmVk&5V>}fH01-iq5kz#o17plloSEUh2LPm$Ab%ndk<-zA)WL7O_i)a^
zId_Og7#3V*Sddae&KWspq?CpQ-I(r(2<CYnF1&O55e;|nUy4R}Qq<*1QI{u0U7B~G
zs$k~h?f;u1W`?RZ1<ejhDF`8enNMr`$SkEa1+U((;?|)L0JYX`krqG4p^fY#f7rPI
P0000<MNUMnLIPldY)O31

diff --git a/src/maki-icons.svg b/src/maki-icons.svg
index 249236d8..73a176f0 100644
--- a/src/maki-icons.svg
+++ b/src/maki-icons.svg
@@ -530,7 +530,7 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="background"
-     style="display:inline">
+     style="display:none">
     <rect
        style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect5639"

From ac5285d441dfddd81ea4b41e0bfe80f8c7d2e446 Mon Sep 17 00:00:00 2001
From: Derek Kniffin <kniffin@colorado.edu>
Date: Fri, 24 May 2013 10:18:58 -0600
Subject: [PATCH 4/4] Revert "Added icons for
 amenity=vending_machine,vending=parking_tickets"

This reverts commit d877fd14c9befdd67ce5adc115e8c58068332181.

Conflicts:
	src/maki-icons.svg
---
 renders/parking-ticket-12.png | Bin 498 -> 0 bytes
 renders/parking-ticket-18.png | Bin 775 -> 0 bytes
 renders/parking-ticket-24.png | Bin 788 -> 0 bytes
 src/maki-icons.svg            | 148 ++--------------------------------
 4 files changed, 5 insertions(+), 143 deletions(-)
 delete mode 100644 renders/parking-ticket-12.png
 delete mode 100644 renders/parking-ticket-18.png
 delete mode 100644 renders/parking-ticket-24.png

diff --git a/renders/parking-ticket-12.png b/renders/parking-ticket-12.png
deleted file mode 100644
index dd5f3bd3d3e02f83c015fdf47dc0ce887081e1ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10dGk}K~yM_g^xc=LSYofpZh1Y92Aw1xQ2s?4e2+qDbeA+gF_I6
zevC_N1R7>TlWRkQL&N)yL4%-!qs8S41yPjJAc96*F63#sI!M?L4m_OmJm+vE&N&!k
z3V?MX#25a6G3EuZDTH{F8Dny_T0JS1O1J5BdiSpY0L?Ir3S&%G0eDQ)%nSyDgI=$<
z1Hf{(ZW)Gg0RWv&2gBiT4?t7}VApE3ifNk7OeXUJKmwrD>-A#*AR<a65`Fj5h6-T2
zSS;Q+juY{CJRiEQUrwjffMr?xp-||3JRZlo-EJ%x488(@3}DT1oCpAf!{L6b)jCY2
zQV)~KBnkkwZ3puC{1p+=Jg~s;_kT7T4LzI9w&U@5TaqLxm&;uj3WdkHN1Y2rQAVyD
z2_a_Xa`}`o_GDSsQM1`RcV}mdKr)%Ub01!b{GVYN6~MQqY4@6@J<n#d9{{v6!8r#J
og^9>VL_W^>yyqpN#8UZw0X49m?fxDgy#N3J07*qoM6N<$f)Z)RfdBvi

diff --git a/renders/parking-ticket-18.png b/renders/parking-ticket-18.png
deleted file mode 100644
index f617fbcea6fd1ac7fd86604ebb68e2f7ebff5884..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 775
zcmV+i1Ni)jP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10)$CKK~y-6#gt!2Q&Akpzs|F6<+w~Cjcuh7iiHvLDFmO~i(~xu
zkWULiFz~@%db%Wp4+~@@q7gw3T!P?(5ZoWa9%?X>$lm(HWDs5(aR&;DyLl&Wy4%Yp
z(}qPaeP0fI&-s1M_xC$+>Qq(5zlezH05mf54giR<DFAe2vsstR<@yd_otdpaux>^o
zk^73GJY(h!TiI+M92|T(G&B@f6h#5x`HN5&QmK>=z{TT4x~^Z|+}yllS(eZ=tp`9O
zfFD(D*ptcR-ApEPt>Vqk&!bo@Hmt0yc!_930D#-=*1TTtD^1gSd_LbIfb6N;FU8|=
zG7O_xmgTLA>2x}^<>h66Z*T8gQTEJ8B=Q=73ZMwUO+>o@ECA;g78dSln${Nx1f~;-
zM96Npo88^rZyXNC*R{2^TL2)4NQy?I!%Is`Vau}Y0MOFX@?mCX=5aEa?2u)-luoB_
z92^`p1Au9oo^Uw)V0?UhDi8=vSJK%4NU2onb_D_exm@o0$jHd^Xf*mXpU;c!?d_|T
zy~D#p$Hc_MSZizRyXxL;sG<J;{ufP6P3r>#15bj%;77wSjzL0*y;v;vaB^~TtW+u;
z9s9LFk|Y&oXJ<zN<N#ceBx$!$C~N^hTU%Q~2w?))sjjIBDl5y(MIy@2&CLxfit=c6
zb+u2H<t;@~MggGu6;FU<S^j1iMtil#%mpIK0D!LReY&pWRL$aVGxGcWu`?2$shY$7
z@1T+-NoIY0ectJGngCE<kIpVVDZ$Kpp-@Qmcs$u)F!(v0PEQfhduA?Gohx*9c7Cb_
z=<4eF0${&RRaFp?4S>YV`$W_LAb<KlD*NYaunNrl^A`qe2u)vK+Xw&v002ovPDHLk
FV1kpMTNVHS

diff --git a/renders/parking-ticket-24.png b/renders/parking-ticket-24.png
deleted file mode 100644
index 91a5183cbadc5de3175a9c7d664d5f75cecd4de1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 788
zcmV+v1MB>WP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10+C5XK~zYI)s|66Q&AYl|C^f+V=T}lVrGwJBVu@DETZS&vM=aC
zaQHBWufB`|6MPV1kWYIRYQBu@#fN?4z6240v!Lsi%q#R@vKnN}W|<^7+wo<0+^$YG
z(}(^~-~GOGzTY|jbKx9YI-SOO%3=N>A~%4G0JfR=XS>aa$Pd5^pu)^c0AM#2Z)lqK
zU}|bArfJ%JA{scwf-ezK20#}PIU745BA2FV0}~SyPo<R3Y&Khs$K#_!w86}kQ-B&W
zEb3BKbx=y_1OO?eQ&m+Vgm?$w2*6~;Ng4#OWB@9PqP)*$vsEdj(`K_(6-ChiY&Dr|
zSaGa~D8tMlB62zafSG?2(Q-T<A5~RVD2k#9A@t+yA);%>&Y3yX3}D2@8C(F+BZR03
zAzs#Nmx<^$fMo#t0D1r%tgWqy@$vDLwVB)P{uB%bUyO~7y*0xOi*AO);V0#CIbbgO
z{r=?4%uFYMgJd#!ClCk}bGh6V>x#qS@FQK<uP-hxMw$WK*5&|^&*!7DSgf;Ft99tQ
zJ`CV-sZ{E-j$2(_?cdzo?030bU#&H}HDQ*|=bJAS3M0C%5Bq$+`Diryp<FIswT>$m
zi^1;h?qVbonYGp&)`VG!MB@4M^z=6Xn4Fx<0NC5v**RiSC=_}&G&J-Yz-IuWWk9|0
zEC2~$9l+h)-QB+|@_0NSJs!^<fG^CvMMSOdpssaht^xoNeP38u7^%k@07#`$59{Ls
z*5<7O8e--Z04qdv&kQ+9M-I8SxA#>$(6#|{b90Gv1)R11e}M59)$DfreuHX?0o2X{
z@Wbo%zA=)f_!l$(`4@mKolYB<{Vf0;05$;h)#Cy)Z(Ap|c%xOAdC7L(&z3_e*93V!
SV~^GV0000<MNUMnLSTZy7F?kK

diff --git a/src/maki-icons.svg b/src/maki-icons.svg
index 73a176f0..8623a92f 100644
--- a/src/maki-icons.svg
+++ b/src/maki-icons.svg
@@ -13,7 +13,7 @@
    height="24"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.2 r9819"
    sodipodi:docname="maki-icons.svg"
    inkscape:export-xdpi="89.996605"
    inkscape:export-ydpi="89.996605">
@@ -26,14 +26,14 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
+     inkscape:zoom="1.4142136"
      inkscape:cx="230.87123"
      inkscape:cy="-226.35415"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1178"
+     inkscape:window-width="1366"
+     inkscape:window-height="746"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -522,7 +522,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -8617,144 +8617,6 @@
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccccccccccccccccccccccccc" />
     </g>
-    <g
-       style="display:inline"
-       id="parking-ticket-24"
-       inkscape:label="parking-ticket-24"
-       transform="translate(-437.0625,1114.3622)">
-      <rect
-         y="274"
-         x="754"
-         height="24"
-         width="24"
-         id="rect4516"
-         style="fill:none;stroke:none" />
-      <g
-         id="g5342">
-        <g
-           transform="translate(0.0625,0)"
-           style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
-           id="g4522-7">
-          <path
-             inkscape:connector-curvature="0"
-             id="path5220-1"
-             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
-             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
-          <path
-             id="path5288-1"
-             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
-             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
-        </g>
-        <g
-           id="g4522">
-          <path
-             id="path5220"
-             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
-             style="fill:#444444;stroke:none"
-             inkscape:connector-curvature="0" />
-          <path
-             id="path5288"
-             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
-             style="fill:#4d4d4d;stroke:none"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="matrix(0.75,0,0,0.75,-224.41406,1183.2763)"
-       style="display:inline"
-       id="parking-ticket-18"
-       inkscape:label="parking-ticket-18">
-      <rect
-         y="274"
-         x="754"
-         height="24"
-         width="24"
-         id="rect4516-2"
-         style="fill:none;stroke:none" />
-      <g
-         id="g5342-7">
-        <g
-           transform="translate(0.0625,0)"
-           style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
-           id="g4522-7-6">
-          <path
-             inkscape:connector-curvature="0"
-             id="path5220-1-1"
-             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
-             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
-          <path
-             id="path5288-1-4"
-             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
-             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
-        </g>
-        <g
-           id="g4522-2">
-          <path
-             inkscape:connector-curvature="0"
-             id="path5220-3"
-             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
-             style="fill:#444444;stroke:none" />
-          <path
-             id="path5288-2"
-             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
-             style="fill:#4d4d4d;stroke:none"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="matrix(0.5,0,0,0.5,-16.5,1252.3622)"
-       style="display:inline"
-       id="parking-ticket-12"
-       inkscape:label="parking-ticket-12">
-      <rect
-         y="274"
-         x="754"
-         height="24"
-         width="24"
-         id="rect4516-2-1"
-         style="fill:none;stroke:none" />
-      <g
-         id="g5342-7-6">
-        <g
-           transform="translate(0.0625,0)"
-           style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
-           id="g4522-7-6-8">
-          <path
-             inkscape:connector-curvature="0"
-             id="path5220-1-1-5"
-             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
-             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
-          <path
-             id="path5288-1-4-7"
-             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
-             style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
-        </g>
-        <g
-           id="g4522-2-6">
-          <path
-             inkscape:connector-curvature="0"
-             id="path5220-3-1"
-             d="m 758.5,276.5 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z M 757,282 c -0.5,0 -1,0.5 -1,1 l 0,11.5 c 0,2 2,2 2,0 l 0,-4.5 c 0,-1 1,-1 1,0 l 0,4.5 c 0,2 2,2 2,0 l 0,-10.5 1,1 c 1,1 1,1 2,0 l 1,-1 c 1,-1 0,-2 -1,-1 l -1,1 -2.0625,-2 -3.9375,0 z"
-             style="fill:#444444;stroke:none" />
-          <path
-             id="path5288-2-8"
-             d="m 774,276 0,3 -6,0 0,2 -1,0 -1,6 2,0 0,9 8,0 0,-17 -1,0 0,-3 z m -5,4 6,0 0,8 -6,0 z m 1,1 0,5.78125 1.21875,0 0,-2.0625 0.53125,0 c 0.71814,0 1.26811,-0.13865 1.65625,-0.46875 0.39073,-0.33 0.59372,-0.8148 0.59375,-1.4375 -3e-5,-0.5995 -0.19551,-1.04295 -0.5625,-1.34375 C 773.07314,281.16575 772.54603,281 771.84375,281 z m 1.21875,1 0.5625,0 c 0.33531,2e-4 0.59425,0.0817 0.75,0.21875 0.15833,0.1373 0.21871,0.3369 0.21875,0.625 -4e-5,0.285 -0.0938,0.50575 -0.28125,0.65625 -0.18745,0.149 -0.46619,0.21875 -0.84375,0.21875 l -0.40625,0 z"
-             style="fill:#4d4d4d;stroke:none"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccccccccccccccccccscccsccccccscc" />
-        </g>
-      </g>
-    </g>
     <g
        id="traffic-signals-12"
        transform="translate(-1,7)"