Add shape names.

.gitignore

@@ -23,5 +23,4 @@ precommit.py
 temp
 venv
 
-compare.html
 taginfo

data/githooks/pre-push

@@ -15,6 +15,6 @@ data/githooks/pre-commit || { echo "FAIL"; exit 1; }
 # Unit tests with pytest.
 
 echo "Run tests with pytest..."
-pytest -v || { echo "FAIL"; exit 1; }
+pytest -vv || { echo "FAIL"; exit 1; }
 
 exit 0

map_machine/icons/config.json

@@ -354,7 +354,7 @@
     "turning_loop": {"name": "turning loop"},
     "turnstile": {"name": "turnstile"},
     "umbrella": {"is_part": true},
-    "urban_tree_pot": {"is_part": true},
+    "urban_tree_pot": {"is_part": true, "name": "tree pot"},
     "vanity_mirror": {"name": "vanity mirror"},
     "ventilation": {},
     "watches": {},
@@ -387,7 +387,9 @@
     "waste_disposal": {}
   },
   "electronic_device": {
-    "cctv": {"directed": "right"},
+    "cctv": {"directed": "right", "name": "wall CCTV camera"},
+    "cctv_dome_wall": {"directed": "right", "name": "wall dome CCTV camera"},
+    "cctv_dome_ceiling": {"directed": "right", "name": "ceiling dome CCTV camera"},
     "phone": {"name": "phone"},
     "photo_camera": {"emoji": "📷"},
     "telephone": {"emoji": "☎️"},

map_machine/icons/icons.svg

@@ -6,6 +6,9 @@
    id="svg2987"
    height="600px"
    width="800px"
+   inkscape:export-filename="/Users/enzet/program/map-machine/map_machine/icons/icons.png"
+   inkscape:export-xdpi="960"
+   inkscape:export-ydpi="960"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -148,9 +151,9 @@
      showgrid="true"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:cy="307.2379"
+     inkscape:cy="246.16155"
-     inkscape:cx="483.30749"
+     inkscape:cx="209.392"
-     inkscape:zoom="2.8284271"
+     inkscape:zoom="11.313709"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -561,6 +564,10 @@
      inkscape:label="main"
      id="layer1"
      style="display:inline">
+    <path
+       style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+       d="m 211.5,247 a 0.50005,0.50005 0 0 0 -0.35352,0.85352 l 1,1 A 0.50005,0.50005 0 0 0 212.5,249 h 7 a 0.50005,0.50005 0 0 0 0.35352,-0.14648 l 1,-1 A 0.50005,0.50005 0 0 0 220.5,247 Z"
+       id="tree_pot" />
     <path
        id="pac_man"
        style="color:#000000;opacity:1;fill:#000000;fill-opacity:0.886364;stroke:none;stroke-linecap:square;stroke-linejoin:round;-inkscape-stroke:none"
@@ -26445,5 +26452,22 @@
        y="459"
        rx="0.48895144"
        ry="0.5" />
+    <path
+       style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+       d="m 197.5,247 a 0.5,0.5 0 0 0 -0.5,0.5 0.5,0.5 0 0 0 0.5,0.5 h 4 a 0.5,0.5 0 0 0 0.5,-0.5 0.5,0.5 0 0 0 -0.5,-0.5 z"
+       id="horizontal_line_5px" />
+    <rect
+       ry="0.5"
+       rx="0.5"
+       y="225"
+       x="35"
+       height="14"
+       width="10"
+       id="rect26777"
+       style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.2"
+       d="m 211.5,231.5 1,1 h 7 l 1,-1 z"
+       id="path31024" />
   </g>
 </svg>