Merge lp:~mbruzek/charms/trusty/apache-hbase/icon-code-fix into lp:~bigdata-dev/charms/trusty/apache-hbase/trunk

[Matt Bruzek]

[Matt Bruzek (mbruzek)]

The icon in the bigdata-dev branch is not very good. I could not fix it because everything was on the same layer. I put the image on the "pictogram" layer and made a white squircle.

Also I had a problem when removing relations and unprotected use of a possible None value. I did a search for "spark_home" and could not find it but I am not an expert on this code, so I put a guard in the broken relation to prevent the charm from going into error state. Probably not the right fix in the end, but something you should be aware of none-the-less.

Unmerged revisions

19. By Matt Bruzek on 2015-10-02

Adding a properly created icon with a white background and fixing the potential error condition in master-relation-broken.

=== modified file 'hooks/master-relation-broken'
--- hooks/master-relation-broken	2015-08-14 17:03:10 +0000
+++ hooks/master-relation-broken	2015-10-02 18:26:07 +0000
@@ -14,4 +14,5 @@
 from charmhelpers.contrib.bigdata import utils
 
 spark_home = unitdata.kv().get('spark_home')
-utils.run_as("ubuntu", spark_home+'/'+'stop-all.sh')
 \ No newline at end of file
+if spark_home:
+    utils.run_as("ubuntu", spark_home+'/'+'stop-all.sh')
 
=== modified file 'icon.svg'
--- icon.svg	2015-08-09 03:39:30 +0000
+++ icon.svg	2015-10-02 18:26:07 +0000
@@ -15,7 +15,7 @@
    id="svg6517"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="icon.svg">
+   sodipodi:docname="apachehbase.svg">
   <defs
      id="defs6519">
     <linearGradient
@@ -27,17 +27,17 @@
        y1="970.29498"
        x2="144"
        y2="970.29498"
-       gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.21231,731.51526)" />
+       gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" />
     <linearGradient
        id="Background">
       <stop
          id="stop4178"
          offset="0"
-         style="stop-color:#b8b8b8;stop-opacity:1" />
+         style="stop-color:#ffffff;stop-opacity:1" />
       <stop
          id="stop4180"
          offset="1"
-         style="stop-color:#c9c9c9;stop-opacity:1" />
+         style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
     <filter
        style="color-interpolation-filters:sRGB;"
@@ -136,21 +136,21 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.5086803"
-     inkscape:cx="44.318602"
-     inkscape:cy="47.509138"
+     inkscape:zoom="4.0745362"
+     inkscape:cx="-18.053908"
+     inkscape:cy="49.018169"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer3"
      showgrid="true"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1031"
-     inkscape:window-height="1896"
-     inkscape:window-x="49"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
+     inkscape:window-width="2308"
+     inkscape:window-height="1071"
+     inkscape:window-x="378"
+     inkscape:window-y="97"
+     inkscape:window-maximized="0"
      showborder="true"
      showguides="true"
      inkscape:guide-bbox="true"
@@ -183,7 +183,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>
@@ -195,27 +195,28 @@
      style="display:inline">
     <path
        style="display:inline;fill:url(#linearGradient6461);fill-opacity:1;stroke:none;filter:url(#filter1121)"
-       d="m -267.95239,700.38012 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 c -27.21517,0 -31.10302,-3.89189 -31.10302,-31.13514 z"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 c -27.21517,0 -31.10302,-3.89189 -31.10302,-31.13514 z"
        id="path6455"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssssssss"
-       transform="matrix(0.97887006,0,0,0.99686635,-4.9805282,2.1418986)" />
+       sodipodi:nodetypes="sssssssss" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="APACHE-H-BASE"
+     style="display:inline">
     <image
-       width="85"
-       height="74.999985"
+       style="display:inline"
+       y="14.000011"
+       x="3"
+       id="image4197"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAP8AAADFCAYAAACb6SQBAAAABHNCSVQICAgIfAhkiAAAFHxJREFU eJzt3X9wFFWCB/BvJ0zPhAyT32OIP1hviSKHVCBYZQJKLUJyICn8sd5WOJbbEt1SFI+9XREsD6+s ulXUlAos3B0KtasXqIhIwINLgl5ATNiTuFnqKuQHnCQU2TgkJBk6P6aHZO6POGOSmWR+dc+EvO+n yiqc6e73pnu+0++9ft2RXC6XC0QknJhoV4CIooPhJxIUw08kKIafSFAMP5GgGH4iQTH8RIJi+IkE xfATCYrhJxIUw08kKIafSFAMP5GgGH4iQTH8RIJi+IkExfATCYrhJxIUw08kKIafSFAMP5GgpkS7 AnRzUVXV829ZlqNYEwoXw/+9F154AQDQ29uLbdu2ISUlJeRtNTU1Ydu2bZg6deqYyyQnJyM7Oxu5 ublhleW2f/9+VFdXo7e3F+vWrUNOTk7Y2xyutrYWBw4cQF1dHex2OwAgLS0NixcvRmFhYcif4amn ngIArFq1CgUFBX7rsHPnTgAI6hh1dHTgpZdeGvd4jNbb24v3338/4OVvRgw/hsJ69uxZpKamwm63 o6qqyu8XcTw9PT2oq6tDamoq+vv74etPI0iShMrKSmzfvh1vvfUWsrKywvkI2LdvHwDA5XKhtLRU s/CrqoqtW7fi1KlTMJvNns9iMBjQ3d2N0tJSHDlyBG+++WZIn6Gurg6yLKOzs9Pvsn19fairqwu6 DIfD4fd4jNbe3h50OTcbhh9AdXU14uPjAQw1ZUtLS8MKv3s7ADB//nyYTKYR7/X39+PixYu4evUq 4uLisHHjRnzyySchnz2bmpqgqiosFgsA4MyZM+jo6NCkRbF+/Xo0NzcjPj4eCQkJKCgoQHp6OhwO ByoqKnDu3DlYLBZs3LgRxcXFyMjICGr7sizDYDAEtfzwrkcw6wHArFmzkJyc7Hf5/v7+oMu42TD8 AA4ePAgAKCwsxKFDh3DhwgW0trYG/UUerb29HS+++OKYITx69CiKioogyzL279+P559/PqRyysrK YDAYMHv2bNx2220oLi4Ou/UCADt37kRzczOcTieefPJJrF27dsT7BQUFIz7DG2+8ge3bt4dVpp7s djs2bNiAzMzMaFdlQhB+tL+pqQl2ux1OpxN5eXlYvHgxAODkyZOabN/hcIz5XkFBAe6///6wyyst LYXT6cTChQuxaNEiz2vhaG1tRXFxMSRJwooVK7yC71ZQUIAVK1YAAM6ePYumpqawytVbT09PtKsw YQgffvdZMy0tDSkpKVi0aBFUVcWhQ4ciUv7ChQvhcrlw9epVdHR0BL1+bW0tnE4nACA3NxdZWVkw m82oq6tDa2tryPU6ceIE4uPj4XK5sG7dunGXXbNmDa5evQpgaH/SzUH48JeXlwMAHnvsMQDwhOfK lSsROYulpqbC6XSG1I8FgNOnT8NgMGDmzJme7kVubi5kWcaJEydCrtfRo0chSRIWLlzod+wgIyMD mzZtwq5du1BYWBhymRRZQoff3eTv6enxNPcBYOnSpZBlOSJnsUuXLsFgMCA+Ph7Tpk0Lev0jR44A GLpU5pafnw9gKMChUFUVV65cgcvlQnZ2dkDrFBYWIisrK+RBxkAG/eLi4kLaNvkm9IDf8Cb/8MG9 vLw8HDt2DOXl5SEPwgXq888/hyRJuOOOO4KeNFNbWwtVVaGq6oiQZmdnQ5ZlT+sl2AGu5uZmyLIM p9OJ22+/Pah1QyFJEhoaGlBdXY3r16+PuVxjY2PIo/1ufX19Aa0vwgQmocPvbvKPHhWfPXs2ZFmG 3W5HbW1tWNfgjUajz9c7OjrwwQcfeEbTH3rooaC3XV5e7vPHS5Zl5ObmorKyEmVlZUGHf/igmNVq DbpewTKZTKiqqkJlZeW4y8myDJPJBEVRQirHYrFgy5YtfsN/7do1HDhwIOy5FxOdsOGvra2F3W6H qqpeE2KGh6e8vDzkL0FqaqpnZllvb++I9y5cuABZliFJEiwWCx5//PGgtq2qqqdP7x6vGC4/Px+V lZU4cuRI0K2Xvr4+Txlj/XjpIZAz8ug5E8EK5IwuSvdC2PC7B8rS0tJ8nhkfeeQRVFZWoqKiAhs3 bgy5GdjS0uJzRpnBYICqqkhLS8N7770X9PZramo8YcnLy/N6Pycnx9NEDrb14v7yy7I87qVKrfT3 92PNmjVYu3btuD8ANTU12LJlS9jlZGZmjtu9ABCR7k60CRv+8vJyxMXFweFw4IknnvC5jMVigd1u R01NTcjTZXNzc33OKU9PT8fcuXNDblWUlZV5msHPPPOMz2XcZ8lgWy/u2Y4AYLPZwp7s5M/wH0c9 +9qqqoa1zycbIcPvbvK7p8N2dXX5XE6SJM9031DC397ejg0bNmgyzXY4VVVRVVXlCbf77Dx63rok STCZTDh8+HBQrZcZM2ZAVVXIsgybzRbQOh0dHZg2bZoQA2WThZDhLy8v93xJjUajz2YzMBTeqqoq nDp1yhOGYOnRbHY3+U0mE6xWqyegS5cu9WpluD9rMK0XWZZx6623oqurC7W1tWPun+F27NiB0tJS PPDAAxN6ii/9QLjwq6qK06dPw2QywW63Y+bMmWMOiKmqiocffthzzT/cufJacTf5jUYjVq1aha1b twKAz7N7Y2Mjzp8/j/379wfVelm8eDFKS0tx+vRpbNq0ye/y33zzDdLS0oK6bZaiS7hJPjU1NbDb 7bDb7Xj55Zfx2muvjbmsLMuea+bhzpXXirvJ73K5UFBQgNzcXJSUlKCkpMRny2TlypVwOp04e/Zs UNOH8/Pz0dPTA7vd7ney0NGjRz1XTpYsWRL0Z6LoEC78X375JWRZhsViQV5ent/BrCVLlkBV1bDn ymvF3eTv6elBTk4OUlJSkJmZOea1fPfkn/j4eFRVVQVcTmZmJhYsWABZllFUVITa2lqfyzU1NaGo qAgWi8WzT+nmIFSzf/i18UC/pNnZ2TAYDDAYDDh58mTU5667m/wWiyWgyTspKSmYO3cu6uvrg35O webNm7F69WrP/forVqzAo48+iuTkZFy7dg3V1dXYu3cvLBYL2tvbUVRUFM5H050syzh37lxAg5gO h0OzpyxNVEKFf/i1cfetr/6kpKTgnnvuQX19PQ4dOhTV8Kuqiq+++gqSJAV1hl22bBnOnz8f9HMK MjIy8Prrr2PLli2eG4WOHTvmGfx0/wi5r2po/egwrZlMJnz00UcBTSbq7u5GSUnJpA6/UM3+0tJS dHd3AxiawhuolStXoqWlBTU1NWM2f0dra2tDW1tbSPUcS1lZGS5fvoyWlpaAf7yAobkGly9fRnd3 d9C3Kufk5GDPnj2YP3++Z1qte2xBURRYrdaw7uZra2sL6pFZoe7XlpYWtLe3Q1EUz/0Q4/3nnuU4 mUmuQB5oNkmE8+TZYNd1L6/lde9I1t+Xjo4OXL582ROMGTNmhD0BKNj9FOp+DefRX5OVUOEnoh8I 1ewnoh8INeB3bvOLaP/0Y0wJ4aEZgZpinY7cY+W6bV80Dbt34cq7b+p6zAautWPW7r2Ynr9ctzIm IqHCP+hwQG1sxo1EnQroA0xzdNq2oAb6evU9ZgAGfd/aMekJFX43STbrsl0XQnvIBPmn1zEbIuZx Y5+fSFAMP5GgGH4iQTH8RIJi+IkExfATCYrhJxIUw08kKIafSFAMP5GgGH4iAHKCjjcPTFAMP5Gg GH4iQTH8RIJi+IkExfATCYrhJxIUw08kKIafSFAMP5GgGH4iQTH8RIJi+IkExfATCYrhJxIUw08k KIafSFAMP5GgGH4iQTH8RIIS8k906+nG9etQmhrh7OmJdlUmhRu276JdhUmL4deQJJtxw9aM03fd He2qTCqxVrPuZajdXbqXMdEw/BqTZDNirdGuBZF/7PMTCYrhJxIUw08kKIafSFAMP5GgGH4iQTH8 RIJi+IkExfATCYrhJxIUw08kKIafSFAMP5GgGH4iQTH8RIJi+IkExfATCYpP8tGYS1VwQ7wnQukm BpF5jJeIGH4NuVQFph/PQc6JUxh0OKJdnZtejNGIpt/tQMsrr/IHQAcMvw4MiUnRrsLkETc12jWY tNjnJxIUw08kKIafSFAMP5GgGH4iQTH8RIJi+IkExfATCYrhJxIUw08kKIafSFAMP5GgGH4iQTH8 RIJi+IkExfATCYrhJxIUw08kKIafSFAMP5GgGH4iQTH8RIJi+IkExfATCYrhJxIUw08kKIafSFAM P5GgGH4iQTH8RIIS8k90u1RFnw336bNZ0vGYCUyo8McYjZiaPQeDBqNuZUxJStZt2yKKjZuq+zEb vNau27YnMsnlcrmiXQkiijz2+YkExfATCUqoPr+zqxOugYGIlCWnpIa1vtqhbT80nPqoqgpct2tY G2+j66f15/dHio2FITEpomVGm1Dhb/rdDlx65dWINXcsy5fhzn/4FabnLw9oeaWpEY3vvA3b7j2a 1yXGCFif3YCZ65+HOfOugNb5S9lxfPveO7Afr9C8PsMNAljqcECWZQBDwT+Rmhax4zQI4EdFb2H2 P/4mQiVODEKFHxjq58RazREpS/miAn8+XoFvly/DgsOfeb7cvjTs3oWL65/TtX5t7+5A67s7MOuD f8dfPfn0uMtWPfEoug4exhRjBPaXzfsyXiSPE2wKYuOmRqasCYR9fh1JCWbEWs2wH69A1eLcMZf7 v717cHH9czBYzbp+4WOtZhisZtSv+yW+/fD3Yy5XtSIP9oOHYbCaISVEKIAUcQx/BMRazeg/U4OG 3bu83lOaGlG/7pcwROosB8BgNaNh7S+gNDV6vdewexfsxysid9alqGH4IyQmEWj+1XNerze+83bU DkLjO2+P+H9VVfHt+ucYfEEI1+f3xdWtYNCh7TZHB0iSzXB2Keis/ROSsuYBGApb2+49Ps/6Az76 wVrWJ9Zqhm33Hjh/u80zyt127D99rutSFQx2aVqdkGm9X4ChAb+Bvl7NtzvRCR/+AZuCjJd+g3s2 v6zZNpVLl/DHefO9AhcDoP+7Ns//X/+mxudZf8Cm4L7qKlhmzdKkPu1/PIM//80Kn2d0e309Uu7P AQB0nanyet+lKjD9eA7m7/8ExrQ0Terji2GcwVC3AZuCRY0NutTDNTVe821OdMKHHwAMScmaXuNN ykqC9dmn0b53j9eAWb/N5vl3T1vb6FXhUhVYlj7oCaQWpucvR1P2HPRf/F9I8sj6qN0/nNJ7G+sR M2oK/WAXkLr67wO+PKg3Y1qacNfj9cI+PwBn5zXNtznFkuCzK2GyWocVrPpeWYebWMa64cjZ1+/5 9+B1OxDnvUycjmf8YEVqkpYIGH4AU6ZN03yb3+37V8QkjnxtEEDy9/39SFOVHr/LmDLv9urbxxiB 7z49qFOtgifFxka7CpOG8M3+WKsZbX/Yi67KzzXbpuNiI1yqMqKJ7epWkLj0QRhvSdesnGDI5niM 0c7wSFxwH2wYObtQSjDDfuwzlCdJMCSFX3fjrHuRuHARbnloWdBdm1irGafnzw67DsM5W9vwk7Zr QnYlhA8/AAx0dUCxNWu6zdF96xsOYO6uwKftOrs6NauLa2p8QGf+Wx8uQD2A0edW97iFs9N7jCJY zuo22I9X4NIrryJx6YO47+PDQQXvRo+i6YM9tL7KczNh+L83OqxaGrApmPdfxwIaNJNkM5TqClRo /FCQKYn+P6PxlnSk/Hw1Oj8s9nllQKt9FGsd+oGxnziF/05PDvrMq+2xEvcJQQx/BBjvTIcpiOa+ JJthsPpfTg/z3t+HLz4s9uq26CHWasaATcHXq3+G3GPlupZF3jjgFwHOzjZUz5uPjjPV0a6KX7Is Y1FjA9Cnz4Sa0dz3Pvyl7LjuZdFIPPNDnxl+McOa2ZJsxpREBV/n5OKhzok/uGTOvAs/abuG82/8 Fq3b3va/QhBijPCa+xBjBJr/bVdAtz5r/YM0CHEvHwoffle3goS/XY07/m6Npttt+Od/glpfM+IH AFBw+dBBv7fTTgSGxCTMfeMt3LP5Zdjr60dMBgpHy398hO6S4hE/AFKCGV2ffgZnV+e4P4yubgWz Sw7AYLFoUhePaRpv7yYhfPgHHYDlr+cE/MCNQMkJifg6Jxexw/ruMUag7eDHfsPvUhXc0HgufSAD fr4YEpM0nW2YsuA+fPFhsdcVBQAYdIzf/Bp0ANOX5U34ltPNQvjwA4DrhlPzbRpTUrxekxLMUL4Y /6k4LlWBecGDWHDgE7hu3NCkLjFGI75avmxESyRapNhYrynEwFDz22m3+50HIWoTXQ8MPwBpikHz bTo6Ony+HtDYgsEY9jMARwtkkk8kDDocGHR4zyWIAQJqznOGn3aED39MItB59n/w7Ye/h2usufYh uLTtX7ym97pUBcY7ozPDL5BJPgDQWfsn2KqrYTBq/4MIAG37P/LaL26Sn7kNMUagae8HMCUmaFon p8OJW5cunTA3L0WK8OGXZDOUE4fRcPCwptuN8dHHHuwCkn7xhKblaM1WXe15lqAefO0XV7cCy08f GfcZh8BQt6nl1y9qXqdBAHElBxh+EUmyecTAnF4GAdz+s0L9CwqDwWiI7MMzMTT1+e5fbwpoWV3q ZVMAg//nCUw2nOQTIQM2BcmPrtR05HwyGLApSPn5au6XKGD4I2DApkC+away9/4h2lWZUAZsCqZm z8G89/dFuypCErLZ7+rWf9qqe1R/EED6s0/j3mHPyhuvPoMOAE59bjUb7AJijON/dqfD6VUnTesw ar/MeXfnmH39SBwnkQkVftP06bD89JGI/IEGgzkeiQvug/WBxWMOJBksFp/1icvI0Lw+iffnwpF5 94jXBvp6EZ8+8upDnM77yGCOR/y9WeOOrkuxsRE7ToDv/SAC/oluIkGxz08kKIafSFAMP5GgGH4i QTH8RIJi+IkExfATCYrhJxIUw08kKIafSFAMP5GgGH4iQTH8RIJi+IkExfATCYrhJxIUw08kKIaf SFAMP5GgGH4iQTH8RIJi+IkExfATCYrhJxIUw08kKIafSFAMP5GgGH4iQTH8RIJi+IkE9f/C8O9i 7MjppQAAAABJRU5ErkJggg== "
        preserveAspectRatio="none"
-       xlink:href="data:image/png;base64,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 "
-       id="image3522"
-       x="-263"
-       y="646.29077" />
+       height="69.529411"
+       width="90" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="PLACE YOUR PICTOGRAM HERE"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="BADGE"
      style="display:none"
@@ -232,42 +233,33 @@
            id="g870"
            clip-path="url(#clipPath873)"
            style="opacity:0.6;filter:url(#filter891)">
-          <path
+          <circle
              transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
-             d="m 264,552.36218 a 12,12 0 0 1 -12,12 12,12 0 0 1 -12,-12 12,12 0 0 1 12,-12 12,12 0 0 1 12,12 z"
-             sodipodi:ry="12"
-             sodipodi:rx="12"
-             sodipodi:cy="552.36218"
-             sodipodi:cx="252"
              id="path844"
-             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+             cx="252"
+             cy="552.36218"
+             r="12" />
         </g>
         <g
            id="g862">
-          <path
-             sodipodi:type="arc"
-             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+          <circle
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
              id="path4398"
-             sodipodi:cx="252"
-             sodipodi:cy="552.36218"
-             sodipodi:rx="12"
-             sodipodi:ry="12"
-             d="m 264,552.36218 a 12,12 0 0 1 -12,12 12,12 0 0 1 -12,-12 12,12 0 0 1 12,-12 12,12 0 0 1 12,12 z"
-             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
-          <path
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)"
+             cx="252"
+             cy="552.36218"
+             r="12" />
+          <circle
              transform="matrix(1.25,0,0,1.25,33,-100.45273)"
-             d="m 264,552.36218 a 12,12 0 0 1 -12,12 12,12 0 0 1 -12,-12 12,12 0 0 1 12,-12 12,12 0 0 1 12,12 z"
-             sodipodi:ry="12"
-             sodipodi:rx="12"
-             sodipodi:cy="552.36218"
-             sodipodi:cx="252"
              id="path4400"
-             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+             cx="252"
+             cy="552.36218"
+             r="12" />
           <path
              sodipodi:type="star"
-             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
              id="path4459"
              sodipodi:sides="5"
              sodipodi:cx="666.19574"