Add icon for vending with an upside-down bottle

enzet · enzet · commit d8d09415b54e · 2026-03-16T10:04:17.000+04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,8 @@ Add icons:
   - `building_door`,
   - `building_drop_door`,
   - `street_cabinet_bolt`,
-  - `street_cabinet_drop`.
+  - `street_cabinet_drop`,
+  - `vending_bottle_upside_down`.
 
 Redraw icons:
   - `dumbbell`,
diff --git a/data/config.json b/data/config.json
@@ -4419,10 +4419,7 @@
         },
         "vending_bottle_upside_down": {
             "keywords": ["sell", "automat"],
-            "name": "vending machine with upside down bottle",
-            "shapes": [{"id": "vending_bottle_upside_down", "version": "v0"}],
-            "sketch": true,
-            "todo": "check name and version"
+            "name": "vending machine with an upside-down bottle"
         },
         "vending_candles": {
             "keywords": ["sell", "automat"],
diff --git a/data/icons.svg b/data/icons.svg
@@ -581,9 +581,9 @@
      showgrid="true"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:cy="309.92609"
-     inkscape:cx="134.41619"
-     inkscape:zoom="3.771867"
+     inkscape:cy="386.32911"
+     inkscape:cx="219.59186"
+     inkscape:zoom="1.8352228"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      borderopacity="1.0"
@@ -28117,8 +28117,8 @@
        sodipodi:nodetypes="ssssssssssssssssssssssssscssccsscc"
        inkscape:connector-curvature="0"
        d="m 51.5,241 c -0.277,0 -0.5,0.223 -0.5,0.5 v 13 c 0,0.277 0.223,0.5 0.5,0.5 h 9 c 0.277,0 0.5,-0.223 0.5,-0.5 v -13 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 1,2 h 5 c 0.277,0 0.5,0.223 0.5,0.5 v 8 c 0,0.277 -0.223,0.5 -0.5,0.5 h -5 c -0.277,0 -0.5,-0.223 -0.5,-0.5 v -8 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 7,0 c 0.277,0 0.5,0.223 0.5,0.5 v 1 c 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 v -1 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m -4.5,7.5 0,-1 c 0,-1 1,-1 1,-2 v -3 A 0.5,0.5 45 0 0 55.5,244 h -2 a 0.5,0.5 135 0 0 -0.5,0.5 v 3 c 0,1 1,1 1,2 v 1 a 0.5,0.5 45 0 0 0.5,0.5 0.5,0.5 135 0 0 0.5,-0.5 z"
-       style="fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
-       id="vending_bottle_upside_down_v0"
+       style="fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+       id="vending_bottle_upside_down"
        inkscape:path-effect="#path-effect935"
        inkscape:original-d="m 51.5,241 c -0.277,0 -0.5,0.223 -0.5,0.5 v 13 c 0,0.277 0.223,0.5 0.5,0.5 h 9 c 0.277,0 0.5,-0.223 0.5,-0.5 v -13 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 1,2 h 5 c 0.277,0 0.5,0.223 0.5,0.5 v 8 c 0,0.277 -0.223,0.5 -0.5,0.5 h -5 c -0.277,0 -0.5,-0.223 -0.5,-0.5 v -8 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 7,0 c 0.277,0 0.5,0.223 0.5,0.5 v 1 c 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 v -1 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m -4.5,8 0,-1.5 c 0,-1 1,-1 1,-2 l 0,-3.5 h -3 l 0,3.5 c 0,1 1,1 1,2 l 0,1.5 z"
        transform="translate(64,32)" /><circle
diff --git a/doc/grid_black.svg b/doc/grid_black.svg
diff --git a/doc/grid_white.svg b/doc/grid_white.svg
diff --git a/icons/vending_bottle_upside_down.svg b/icons/vending_bottle_upside_down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M 3.5,1.0 C 3.223,1.0 3.0,1.223 3.0,1.5 L 3.0,14.5 C 3.0,14.777 3.223,15.0 3.5,15.0 L 12.5,15.0 C 12.777,15.0 13.0,14.777 13.0,14.5 L 13.0,1.5 C 13.0,1.223 12.777,1.0 12.5,1.0 L 3.5,1.0 M 4.5,3.0 L 9.5,3.0 C 9.777,3.0 10.0,3.223 10.0,3.5 L 10.0,11.5 C 10.0,11.777 9.777,12.0 9.5,12.0 L 4.5,12.0 C 4.223,12.0 4.0,11.777 4.0,11.5 L 4.0,3.5 C 4.0,3.223 4.223,3.0 4.5,3.0 M 11.5,3.0 C 11.777,3.0 12.0,3.223 12.0,3.5 L 12.0,4.5 C 12.0,4.777 11.777,5.0 11.5,5.0 C 11.223,5.0 11.0,4.777 11.0,4.5 L 11.0,3.5 C 11.0,3.223 11.223,3.0 11.5,3.0 M 7.0,10.5 L 7.0,9.5 C 7.0,8.5 8.0,8.5 8.0,7.5 L 8.0,4.5 A 0.5,0.5 45.0 0,0 7.5,4.0 L 5.5,4.0 A 0.5,0.5 135.0 0,0 5.0,4.5 L 5.0,7.5 C 5.0,8.5 6.0,8.5 6.0,9.5 L 6.0,10.5 A 0.5,0.5 45.0 0,0 6.5,11.0 A 0.5,0.5 135.0 0,0 7.0,10.5" fill="#000" /></svg>
diff --git a/shapes.json b/shapes.json
@@ -484,6 +484,7 @@
     "vanity_mirror": "M -6.0,-2.5 C -6.0,-0.5358 -4.951,1.2816 -3.25,2.2637 C -2.5485,2.6687 -1.7789,2.9037 -0.998,2.9746 C -0.9989,2.983 -1.0,2.9915 -1.0,3.0 L -1.0,5.0 L -4.5,5.0 C -4.7761,5.0 -5.0,5.2239 -5.0,5.5 C -5.0,5.7761 -4.7761,6.0 -4.5,6.0 L 3.5,6.0 C 3.7761,6.0 4.0,5.7761 4.0,5.5 C 4.0,5.2239 3.7761,5.0 3.5,5.0 L 0.0,5.0 L 0.0,3.0 C -0.0005,2.9915 -0.001,2.9831 -0.002,2.9746 C 0.7788,2.9037 1.5484,2.6687 2.2499,2.2637 C 3.9509,1.2816 4.9999,-0.5358 4.9999,-2.5 L 4.9999,-3.5 C 4.9999,-3.7761 4.7761,-4.0 4.5,-4.0 C 4.2238,-4.0 4.0,-3.7761 4.0,-3.5 L 4.0,-2.5 C 4.0,-0.8915 3.143,0.5922 1.75,1.3965 C 0.357,2.2007 -1.357,2.2007 -2.75,1.3965 C -4.143,0.5922 -5.0,-0.8915 -5.0,-2.5 L -5.0,-3.5 C -5.0,-3.7761 -5.2239,-4.0 -5.5,-4.0 C -5.7762,-4.0 -6.0,-3.7761 -6.0,-3.5 L -6.0,-2.5 M -0.5,-6.0 C -2.433,-6.0 -4.0,-4.433 -4.0,-2.5 C -4.0,-0.567 -2.433,1.0 -0.5,1.0 C 1.433,1.0 3.0,-0.567 3.0,-2.5 C 3.0,-4.433 1.433,-6.0 -0.5,-6.0 M -0.5,-5.0 C -0.2239,-5.0 0.0,-4.7761 0.0,-4.5 C 0.0,-4.2239 -0.2239,-4.0 -0.5,-4.0 C -1.3343,-4.0 -2.0,-3.3344 -2.0,-2.5 C -2.0,-2.2239 -2.2239,-2.0 -2.5,-2.0 C -2.7761,-2.0 -3.0,-2.2239 -3.0,-2.5 C -3.0,-3.8748 -1.8748,-5.0 -0.5,-5.0",
     "vending_angle": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.777 -5.0,-6.5 L -5.0,6.5 C -5.0,6.777 -4.777,7.0 -4.5,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.777 5.0,6.5 L 5.0,-6.5 C 5.0,-6.777 4.777,-7.0 4.5,-7.0 L -4.5,-7.0 M -3.5,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.777 2.0,-4.5 L 2.0,3.5 C 2.0,3.777 1.777,4.0 1.5,4.0 L -3.5,4.0 C -3.777,4.0 -4.0,3.777 -4.0,3.5 L -4.0,-4.5 C -4.0,-4.777 -3.777,-5.0 -3.5,-5.0 M 3.5,-5.0 C 3.777,-5.0 4.0,-4.777 4.0,-4.5 L 4.0,-3.5 C 4.0,-3.223 3.777,-3.0 3.5,-3.0 C 3.223,-3.0 3.0,-3.223 3.0,-3.5 L 3.0,-4.5 C 3.0,-4.777 3.223,-5.0 3.5,-5.0 M -2.5,-4.0 A 0.5,0.5 0.0 0,0 -3.0,-3.5 L -3.0,1.0 C -3.0,1.7137 -2.6181,2.3756 -2.0,2.7324 C -1.3819,3.0893 -0.6181,3.0893 0.0,2.7324 C 0.6181,2.3756 1.0,1.7137 1.0,1.0 L 1.0,-1.5 A 0.5,0.5 0.0 0,0 0.0,-1.5 C 0.0,-0.6667 -0.3535,-0.3535 -0.8535,0.1465 A 0.5,0.5 0.0 0,0 -0.8535,0.8535 A 0.5,0.5 0.0 0,0 -0.1465,0.8535 C -0.0985,0.8055 -0.05,0.7275 0.0,0.6758 L 0.0,1.0 C 0.0,1.3581 -0.1899,1.6862 -0.5,1.8652 C -0.8101,2.0443 -1.1899,2.0443 -1.5,1.8652 C -1.8101,1.6862 -2.0,1.3581 -2.0,1.0 L -2.0,-3.5 A 0.5,0.5 0.0 0,0 -2.5,-4.0",
     "vending_bottle": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.777 -5.0,-6.5 L -5.0,6.5 C -5.0,6.777 -4.777,7.0 -4.5,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.777 5.0,6.5 L 5.0,-6.5 C 5.0,-6.777 4.777,-7.0 4.5,-7.0 L -4.5,-7.0 M -3.5,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.777 2.0,-4.5 L 2.0,3.5 C 2.0,3.777 1.777,4.0 1.5,4.0 L -3.5,4.0 C -3.777,4.0 -4.0,3.777 -4.0,3.5 L -4.0,-4.5 C -4.0,-4.777 -3.777,-5.0 -3.5,-5.0 M 3.5,-5.0 C 3.777,-5.0 4.0,-4.777 4.0,-4.5 L 4.0,-3.5 C 4.0,-3.223 3.777,-3.0 3.5,-3.0 C 3.223,-3.0 3.0,-3.223 3.0,-3.5 L 3.0,-4.5 C 3.0,-4.777 3.223,-5.0 3.5,-5.0 M -2.0,-3.5 L -2.0,-2.5 C -2.0,-1.5 -3.0,-1.5 -3.0,-0.5 L -3.0,2.5 A 0.5,0.5 45.0 0,0 -2.5,3.0 L -0.5,3.0 A 0.5,0.5 135.0 0,0 0.0,2.5 L 0.0,-0.5 C 0.0,-1.5 -1.0,-1.5 -1.0,-2.5 L -1.0,-3.5 A 0.5,0.5 45.0 0,0 -1.5,-4.0 A 0.5,0.5 135.0 0,0 -2.0,-3.5",
+    "vending_bottle_upside_down": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.777 -5.0,-6.5 L -5.0,6.5 C -5.0,6.777 -4.777,7.0 -4.5,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.777 5.0,6.5 L 5.0,-6.5 C 5.0,-6.777 4.777,-7.0 4.5,-7.0 L -4.5,-7.0 M -3.5,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.777 2.0,-4.5 L 2.0,3.5 C 2.0,3.777 1.777,4.0 1.5,4.0 L -3.5,4.0 C -3.777,4.0 -4.0,3.777 -4.0,3.5 L -4.0,-4.5 C -4.0,-4.777 -3.777,-5.0 -3.5,-5.0 M 3.5,-5.0 C 3.777,-5.0 4.0,-4.777 4.0,-4.5 L 4.0,-3.5 C 4.0,-3.223 3.777,-3.0 3.5,-3.0 C 3.223,-3.0 3.0,-3.223 3.0,-3.5 L 3.0,-4.5 C 3.0,-4.777 3.223,-5.0 3.5,-5.0 M -1.0,2.5 L -1.0,1.5 C -1.0,0.5 0.0,0.5 0.0,-0.5 L 0.0,-3.5 A 0.5,0.5 45.0 0,0 -0.5,-4.0 L -2.5,-4.0 A 0.5,0.5 135.0 0,0 -3.0,-3.5 L -3.0,-0.5 C -3.0,0.5 -2.0,0.5 -2.0,1.5 L -2.0,2.5 A 0.5,0.5 45.0 0,0 -1.5,3.0 A 0.5,0.5 135.0 0,0 -1.0,2.5",
     "vending_candles": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.777 -5.0,-6.5 L -5.0,6.5 C -5.0,6.777 -4.777,7.0 -4.5,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.777 5.0,6.5 L 5.0,-6.5 C 5.0,-6.777 4.777,-7.0 4.5,-7.0 L -4.5,-7.0 M -3.5,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.777 2.0,-4.5 L 2.0,3.5 C 2.0,3.777 1.777,4.0 1.5,4.0 L -3.5,4.0 C -3.777,4.0 -4.0,3.777 -4.0,3.5 L -4.0,-4.5 C -4.0,-4.777 -3.777,-5.0 -3.5,-5.0 M 3.5,-5.0 C 3.777,-5.0 4.0,-4.777 4.0,-4.5 L 4.0,-3.5 C 4.0,-3.223 3.777,-3.0 3.5,-3.0 C 3.223,-3.0 3.0,-3.223 3.0,-3.5 L 3.0,-4.5 C 3.0,-4.777 3.223,-5.0 3.5,-5.0 M -1.0,-3.5 A 0.5,0.5 0.0 0,0 -1.4336,-3.25 L -1.8652,-2.5 C -2.1062,-2.0826 -2.0118,-1.5442 -1.6426,-1.2344 C -1.2734,-0.9246 -0.7266,-0.9246 -0.3574,-1.2344 C 0.0118,-1.5442 0.1062,-2.0826 -0.1348,-2.5 L -0.5664,-3.25 A 0.5,0.5 0.0 0,0 -1.0,-3.5 M -1.5,0.0 C -1.777,0.0 -2.0,0.223 -2.0,0.5 L -2.0,2.5 C -2.0,2.777 -1.777,3.0 -1.5,3.0 L -0.5,3.0 C -0.223,3.0 0.0,2.777 0.0,2.5 L 0.0,0.5 C 0.0,0.223 -0.223,0.0 -0.5,0.0 L -1.5,0.0",
     "vending_chemist": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.777 -5.0,-6.5 L -5.0,6.5 C -5.0,6.777 -4.777,7.0 -4.5,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.777 5.0,6.5 L 5.0,-6.5 C 5.0,-6.777 4.777,-7.0 4.5,-7.0 L -4.5,-7.0 M -3.5,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.777 2.0,-4.5 L 2.0,3.5 C 2.0,3.777 1.777,4.0 1.5,4.0 L -3.5,4.0 C -3.777,4.0 -4.0,3.777 -4.0,3.5 L -4.0,-4.5 C -4.0,-4.777 -3.777,-5.0 -3.5,-5.0 M 3.5,-5.0 C 3.777,-5.0 4.0,-4.777 4.0,-4.5 L 4.0,-2.5 C 4.0,-2.223 3.777,-2.0 3.5,-2.0 C 3.223,-2.0 3.0,-2.223 3.0,-2.5 L 3.0,-4.5 C 3.0,-4.777 3.223,-5.0 3.5,-5.0 M -2.0,-2.5 L -2.0,-2.0 L -2.5,-2.0 A 0.5,0.5 135.0 0,0 -3.0,-1.5 L -3.0,-0.5 A 0.5,0.5 45.0 0,0 -2.5,0.0 L -2.0,0.0 L -2.0,0.5 A 0.5,0.5 45.0 0,0 -1.5,1.0 L -0.5,1.0 A 0.5,0.5 135.0 0,0 0.0,0.5 L 0.0,0.0 L 0.5,0.0 A 0.5,0.5 135.0 0,0 1.0,-0.5 L 1.0,-1.5 A 0.5,0.5 45.0 0,0 0.5,-2.0 L 0.0,-2.0 L 0.0,-2.5 A 0.5,0.5 45.0 0,0 -0.5,-3.0 L -1.5,-3.0 A 0.5,0.5 135.0 0,0 -2.0,-2.5",
     "vending_drop": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.777 -5.0,-6.5 L -5.0,6.5 C -5.0,6.777 -4.777,7.0 -4.5,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.777 5.0,6.5 L 5.0,-6.5 C 5.0,-6.777 4.777,-7.0 4.5,-7.0 L -4.5,-7.0 M -3.5,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.777 2.0,-4.5 L 2.0,3.5 C 2.0,3.777 1.777,4.0 1.5,4.0 L -3.5,4.0 C -3.777,4.0 -4.0,3.777 -4.0,3.5 L -4.0,-4.5 C -4.0,-4.777 -3.777,-5.0 -3.5,-5.0 M 3.5,-5.0 C 3.777,-5.0 4.0,-4.777 4.0,-4.5 L 4.0,-3.5 C 4.0,-3.223 3.777,-3.0 3.5,-3.0 C 3.223,-3.0 3.0,-3.223 3.0,-3.5 L 3.0,-4.5 C 3.0,-4.777 3.223,-5.0 3.5,-5.0 M -1.0,-3.0 C -1.2292,-2.9996 -1.4288,-2.8435 -1.4844,-2.6211 C -1.7154,-1.6972 -2.026,-1.2983 -2.3438,-0.8535 C -2.6615,-0.4087 -3.0,0.1389 -3.0,1.0 C -3.0,1.5833 -2.8464,2.1107 -2.4785,2.4785 C -2.1107,2.8464 -1.5833,3.0 -1.0,3.0 C -0.4167,3.0 0.1107,2.8464 0.4785,2.4785 C 0.8464,2.1107 1.0,1.5833 1.0,1.0 C 1.0,0.1389 0.6615,-0.4087 0.3438,-0.8535 C 0.026,-1.2984 -0.2847,-1.6972 -0.5156,-2.6211 C -0.5712,-2.8435 -0.7708,-2.9996 -1.0,-3.0",
