From 2c41c25d25b3725b8bf7fb508e18911764014d2c Mon Sep 17 00:00:00 2001
From: Sergey Vartanov <me@enzet.ru>
Date: Sun, 3 Oct 2021 09:52:01 +0300
Subject: [PATCH] Issue #90: reuse icons for amenity=parking.

With additional tags parking=lane and parking=street_side.
---
 map_machine/icons/icons.svg    | 233 ++++++++++++++++++++++++++++++++-
 map_machine/scheme/default.yml |   4 +
 2 files changed, 233 insertions(+), 4 deletions(-)

diff --git a/map_machine/icons/icons.svg b/map_machine/icons/icons.svg
index c7a01ab..24ba96d 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="372.29283"
-     inkscape:cx="599.95084"
-     inkscape:zoom="2"
+     inkscape:cy="144.88613"
+     inkscape:cx="493.11988"
+     inkscape:zoom="1"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -22918,5 +22918,230 @@
       <title
          id="title7510">small letter x 5 px</title>
     </path>
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.09999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7520"
+       width="11"
+       height="5"
+       x="402"
+       y="-463"
+       rx="0"
+       ry="0"
+       transform="scale(1,-1)" />
+    <path
+       style="opacity:0.2;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 402.5,452.5 5,-2 5,2"
+       id="path7530"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.2;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 403.5,452 0,6"
+       id="path7532"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.2;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 411.5,452 0,6"
+       id="path7534"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.2;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 404,454.5 9.5,0 0,2 1,0"
+       id="path7536"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <rect
+       style="opacity:1;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;fill:none"
+       id="rect7580"
+       width="3"
+       height="2"
+       x="406"
+       y="453.5" />
+    <path
+       style="opacity:0.2;fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 406.5,454.5 0,4"
+       id="path7582"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.09999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 407.49023 466 A 0.50005 0.50005 0 0 0 407.31445 466.03516 L 402.31445 468.03516 A 0.50050477 0.50050477 0 0 0 402.68555 468.96484 L 403 468.83984 L 403 474 L 402.5 474 C 402.223 474 402 474.223 402 474.5 L 402 478.5 C 402 478.777 402.223 479 402.5 479 L 412.5 479 C 412.777 479 413 478.777 413 478.5 L 413 474.5 C 413 474.223 412.777 474 412.5 474 L 412 474 L 412 471 L 413 471 L 413 472.5 A 0.50005 0.50005 0 0 0 413.5 473 L 414.5 473 A 0.50005 0.50005 0 1 0 414.5 472 L 414 472 L 414 470.5 A 0.50005 0.50005 0 0 0 413.5 470 L 412 470 L 412 468.83984 L 412.31445 468.96484 A 0.50050477 0.50050477 0 0 0 412.68555 468.03516 L 407.68555 466.03516 A 0.50005 0.50005 0 0 0 407.49023 466 z M 407.5 467.03906 L 411 468.43945 L 411 470 L 409 470 L 409 469.5 L 406 469.5 L 406 470 L 404 470 L 404 468.43945 L 407.5 467.03906 z M 404 471 L 406 471 L 406 471.5 L 406 474 L 404 474 L 404 471 z M 409 471 L 411 471 L 411 474 L 407 474 L 407 471.5 L 409 471.5 L 409 471 z "
+       id="rect7630" />
+    <rect
+       transform="scale(1,-1)"
+       ry="0"
+       rx="0"
+       y="-463"
+       x="418"
+       height="5"
+       width="11"
+       id="rect7658"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.09999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       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 423,453 1,4 3,0 1,-4 z"
+       id="path7660"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 440.5,455.5 3,0 c 0.5,0 1,0.5 1,1 l 0,1"
+       id="path7664"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 443.5,457.5 2,0"
+       id="path7666"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7668"
+       width="2"
+       height="10"
+       x="439"
+       y="453" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7670"
+       width="4"
+       height="1"
+       x="438"
+       y="462" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7672"
+       width="4"
+       height="1"
+       x="438"
+       y="453" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 438.5,453.5 0,3 1,1 1,0 1,-1 0,-3 z"
+       id="path7674"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 439.5,450.5 c -2,0 -3,1 -3,3 l 0,3 c 0,1.5 -2,2.5 -2,4"
+       id="path7676"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+    <path
+       sodipodi:nodetypes="cssc"
+       inkscape:connector-curvature="0"
+       id="path7678"
+       d="m 455.5,454.5 3,0 c 0.5,0 1,0.5 1,1 l 0,1.5"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7680"
+       d="m 458,457.5 3,0"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       y="452"
+       x="454"
+       height="11"
+       width="2"
+       id="rect7682"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       ry="1"
+       rx="1" />
+    <rect
+       y="462"
+       x="453"
+       height="1"
+       width="4"
+       id="rect7685"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cssc"
+       inkscape:connector-curvature="0"
+       id="path7691"
+       d="m 454.5,450.5 c -1.5,0 -2,1 -2,2 l 0,2 c 0,2 -2,2 -2,4"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 489.5,457.5 0,-1 a 2,2 0 0 1 2,-2 2,2 0 0 1 2,2 l 0,1"
+       id="path7713"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 470.5,452.5 4,0 c 0.5,0 1,0.5 1,1 l 0,0.5"
+       id="path7716"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 474,454.5 3,0"
+       id="path7718"
+       inkscape:connector-curvature="0" />
+    <rect
+       rx="0.9375"
+       ry="1"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7720"
+       width="2"
+       height="12"
+       x="469"
+       y="451" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7722"
+       width="4"
+       height="1"
+       x="468"
+       y="462" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 469.5,449.5 c -1.5,0 -2,1 -2,2 l 0,3 c 0,2 -2,2 -2,4"
+       id="path7724"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 473.5,456.5 1,6 3,0 1,-6 z"
+       id="path7726"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 474,459 0.5,3.5 3,0 0.5,-3.5 z"
+       id="path7728"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7730"
+       d="m 489,457.5 1,5 3,0 1,-5 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 488.5,457.5 6,0"
+       id="path7732"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cssc"
+       inkscape:connector-curvature="0"
+       id="path7735"
+       d="m 485.5,452.5 2,0 c 0.5,0 1,0.5 1,1 l 0,0.5"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       y="451"
+       x="484"
+       height="12"
+       width="2"
+       id="rect7739"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       ry="1"
+       rx="0.9375" />
+    <rect
+       y="462"
+       x="483"
+       height="1"
+       width="4"
+       id="rect7741"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cssc"
+       inkscape:connector-curvature="0"
+       id="path7743"
+       d="m 484.5,449.5 c -1.5,0 -2,1 -2,2 l 0,3 c 0,2 -1,2 -1,4"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/map_machine/scheme/default.yml b/map_machine/scheme/default.yml
index e223200..ce9596f 100644
--- a/map_machine/scheme/default.yml
+++ b/map_machine/scheme/default.yml
@@ -1150,6 +1150,10 @@ node_icons:
       shapes: [binoculars_on_pole]
     - tags: {amenity: parking_space}
       shapes: [p_small]
+    - tags: {amenity: parking, parking: lane}
+      shapes: [p_small]
+    - tags: {amenity: parking, parking: street_side}
+      shapes: [p_small]
     - tags: {amenity: post_box}
       shapes: [envelope]
     - tags: {amenity: recycling}