From 784aaadad50c8c89c16f00adc9dbda82ae5362ba Mon Sep 17 00:00:00 2001
From: Sergey Vartanov <me@enzet.ru>
Date: Fri, 5 Nov 2021 22:11:16 +0300
Subject: [PATCH] Fix waste shapes.

---
 doc/grid.png                | Bin 163027 -> 163051 bytes
 map_machine/icons/icons.svg |  89 ++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/doc/grid.png b/doc/grid.png
index d7e542ef04d133a228c94abc36e7f7128c2419e5..3d8eaed9fb136eda60ba4b892810c110066aa945 100644
GIT binary patch
delta 10430
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
SJrf3f$=`b<`&QaG;C}!;=HhAq

delta 10406
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
Ik_K=77pFc92><{9

diff --git a/map_machine/icons/icons.svg b/map_machine/icons/icons.svg
index 1b93fcd..7a31c70 100644
--- a/map_machine/icons/icons.svg
+++ b/map_machine/icons/icons.svg
@@ -145,12 +145,12 @@
      inkscape:object-paths="true"
      inkscape:guide-bbox="true"
      showguides="false"
-     showgrid="true"
+     showgrid="false"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:cy="560.38213"
-     inkscape:cx="209.65716"
-     inkscape:zoom="11.313708"
+     inkscape:cy="375.82727"
+     inkscape:cx="157.68482"
+     inkscape:zoom="5.656854"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -561,6 +561,10 @@
      inkscape:label="main"
      id="layer1"
      style="display:inline">
+    <path
+       style="font-variation-settings:normal;opacity:0.2;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 165,357 h 6 l -1,8 h -4 z"
+       id="path4644" />
     <circle
        style="opacity:0.2;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path25711"
@@ -1225,12 +1229,6 @@
       <title
          id="title5984">greek cross</title>
     </path>
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-       d="m 148,360 2,6 4,0 2,-6 z"
-       id="path3056"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
     <path
        style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 186.07071,365 -1,1 -3.07071,0 0,-1 -1.0289,0.11169 -0.90039,-8.11169 8,0 -1,8 z"
@@ -9826,15 +9824,6 @@
        width="2"
        id="rect5632"
        style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-       d="m 151.5,373 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,0.5 -2.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,0.5 3.5,0 1,0 3.5,0 0,-0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2.5,0 0,-0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m -3.5,3 2,6 4,0 2,-6 z"
-       id="waste_basket"
-       inkscape:label="#path5634"
-       inkscape:connector-curvature="0">
-      <title
-         id="title5978">waste basket</title>
-    </path>
     <rect
        style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5643"
@@ -16340,12 +16329,6 @@
        inkscape:label="#path22634"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ssccccssssccccsssccsccscscscsccscccscccscc" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
-       id="path22645"
-       d="m 168,366 -2,0 0,-1 -1.0289,0.11169 L 164.07071,357 168,357 Z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
     <rect
        rx="0.5"
        ry="0.5"
@@ -16373,30 +16356,6 @@
        width="2"
        id="rect22653"
        style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <circle
-       r="1"
-       cy="365"
-       cx="165.96484"
-       id="circle22655"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-       d="m 168,366 2,0 0,-1 1.0289,0.11169 L 171.92929,357 168,357 Z"
-       id="path22665"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
-    <circle
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="circle22667"
-       cx="-170.03516"
-       cy="365"
-       r="1"
-       transform="scale(-1,1)" />
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-       d="M 167.5 370 C 167.223 370 167 370.223 167 370.5 L 167 371 L 164.5 371 C 164.223 371 164 371.223 164 371.5 L 164 372 L 167.5 372 L 171.5 372 L 172 372 L 172 371.5 C 172 371.223 171.777 371 171.5 371 L 169 371 L 169 370.5 C 169 370.223 168.777 370 168.5 370 L 167.5 370 z M 164.07031 373 L 164.9668 381.07031 A 1 1 0 0 0 164.9707 381.11133 A 1 1 0 0 0 165.96484 382 A 1 1 0 0 0 166 382 L 168 382 L 170 382 A 1 1 0 0 0 170.03516 382 A 1 1 0 0 0 171.0332 381.07031 L 171.92969 373 L 168 373 L 164.07031 373 z "
-       id="waste_disposal"
-       inkscape:label="#path22669" />
     <rect
        style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect22684"
@@ -23970,5 +23929,37 @@
        id="path50685"
        style="font-variation-settings:normal;opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
        d="M 420 182 L 419 183 L 419 185 L 418 185 L 418 186 L 419 186 L 419 187 L 418 187 L 418 188 L 419 188 L 419 190 L 421 190 L 421 188 L 422 188 L 422 190 L 424 190 L 424 188 L 425 188 L 425 190 L 427 190 L 427 188 L 428 188 L 428 187 L 427 187 L 427 186 L 428 186 L 428 185 L 427 185 L 427 183 L 426 182 L 425 183 L 425 185 L 424 185 L 424 183 L 423 182 L 422 183 L 422 185 L 421 185 L 421 183 L 420 182 z M 421 186 L 422 186 L 422 187 L 421 187 L 421 186 z M 424 186 L 425 186 L 425 187 L 424 187 L 424 186 z " />
+    <rect
+       ry="0"
+       rx="0"
+       y="355.5"
+       x="163"
+       height="1.5"
+       width="10"
+       id="rect5210"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="waste_disposal"
+       style="color:#000000;opacity:1;fill:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+       d="m 167.5,370 c -0.277,0 -0.5,0.223 -0.5,0.5 v 0.5 h -2.5 c -0.277,0 -0.5,0.223 -0.5,0.5 v 0.5 h 3.5 1 3.5 v -0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 H 169 v -0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m -3.5,3 c 8e-5,0.0411 0.003,0.083 0.008,0.125 l 1,8 c 0.063,0.49999 0.48824,0.87497 0.99219,0.875 h 4 c 0.50395,-3e-5 0.92915,-0.37501 0.99219,-0.875 l 1,-8 c 0.005,-0.042 0.008,-0.0839 0.008,-0.125 z" />
+    <path
+       style="font-variation-settings:normal;opacity:0.2;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 149,360 h 6 l -1,5 h -4 z"
+       id="path9090"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       ry="0"
+       rx="0"
+       y="358.5"
+       x="147"
+       height="1.5"
+       width="10"
+       id="rect9092"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="waste_basket"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 151.5,373 c -0.277,0 -0.5,0.223 -0.5,0.5 v 0.5 h -2.5 c -0.277,0 -0.5,0.223 -0.5,0.5 v 0.5 h 3.5 1 3.5 v -0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 H 153 v -0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m -3.49414,3 c -0.002,0.0654 0.003,0.13081 0.0137,0.19531 l 1,5 c 0.0932,0.46768 0.5036,0.80452 0.98047,0.80469 h 4 c 0.47687,-1.7e-4 0.88729,-0.33701 0.98047,-0.80469 l 1,-5 C 155.99337,376.131 155.99991,376.06559 156,376 Z"
+       sodipodi:nodetypes="sscssccccsscsssccccccccc" />
   </g>
 </svg>