Refactor code structure for improved readability and maintainability

www/floorplan/fullsized_floorplan.svg

@@ -38,9 +38,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.01"
-     inkscape:cx="29850"
-     inkscape:cy="41850"
+     inkscape:zoom="0.014142136"
+     inkscape:cx="52149.125"
+     inkscape:cy="22874.904"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -3526,6 +3526,38 @@
    inkscape:label="binary_sensor.frigate_cam03_person_occupancy"
    transform="rotate(20.586101)"
    sodipodi:arc-type="slice" />
+<g
+   style="display:inline;overflow:visible;fill:#8270a2;fill-opacity:1;stroke:none"
+   id="camera.frigate_cam15"
+   transform="matrix(0.58407329,-0.00406597,0.00406597,0.58407329,768.10459,-17600.35)"
+   inkscape:label="camera.frigate_cam15">
+  <svg
+     id="svg5025-0-6"
+     version="1.1"
+     height="24"
+     width="24"
+     style="fill:#8270a2;fill-opacity:1;stroke:none">
+    <path
+       id="path5023-1-4"
+       d="M 17,10.5 V 7 A 1,1 0 0 0 16,6 H 4 A 1,1 0 0 0 3,7 v 10 a 1,1 0 0 0 1,1 h 12 a 1,1 0 0 0 1,-1 v -3.5 l 4,4 v -11 z"
+       inkscape:connector-curvature="0"
+       style="fill:#8270a2;fill-opacity:1;stroke:none" />
+  </svg>
+</g>
+<path
+   style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+   id="binary_sensor.frigate_cam15_person_occupancy"
+   sodipodi:type="arc"
+   sodipodi:cx="9500.0059"
+   sodipodi:cy="14828.762"
+   sodipodi:rx="9.9992313"
+   sodipodi:ry="10"
+   sodipodi:start="1.5707178"
+   sodipodi:end="3.1397678"
+   d="m 9500.0066,14838.762 a 9.9992313,10 0 0 1 -10,-9.982 l 9.9993,-0.02 z"
+   inkscape:label="binary_sensor.frigate_cam15_person_occupancy"
+   transform="rotate(-144.81275)"
+   sodipodi:arc-type="slice" />
 <path
    style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
    id="binary_sensor.frigate_cam06_person_occupancy"
@@ -3825,7 +3857,7 @@
    d="m 720.0222,-17679.003 a 4.5,4.5 0 0 1 4.99225,3.941 4.5,4.5 0 0 1 -3.93422,4.997 4.5,4.5 0 0 1 -5.00204,-3.928 4.5,4.5 0 0 1 3.92178,-5.007"
    inkscape:label="light.storage_room"
    sodipodi:arc-type="arc" />
-&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;       inkscape:label=&quot;light.front_porch_overhead&quot; /&gt;&#10;  <rect
+&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;       inkscape:label=&quot;light.front_porch_overhead&quot; /&gt;&#10;  <rect
    id="rect12-8-8-9-3-20-4-5-3"
    width="43.5"
    height="4.5"
@@ -4155,9 +4187,9 @@
      style="fill-rule:evenodd" />
 </g>
 <g
-   id="media_player.master_bedroom_clock"
+   id="media_player.bedroom_hub"
    transform="matrix(0,-0.03802678,0.03802678,0,306.02087,-17394.397)"
-   inkscape:label="media_player.master_bedroom_clock">
+   inkscape:label="media_player.bedroom_hub">
   <path
      d="m 235.81,50.402 c -23.977,0 -43.398,19.422 -43.398,43.227 v 372.57 c 0,23.875 19.414,43.398 43.398,43.398 h 228.38 c 23.988,0 43.398,-19.516 43.398,-43.398 V 93.629 c 0,-23.812 -19.422,-43.227 -43.398,-43.227 z m 114.1,34.648 c 22.637,0 41.125,18.359 41.125,40.949 0,22.594 -18.488,41.125 -41.125,41.125 -22.633,0 -40.949,-18.547 -40.949,-41.125 0,-22.578 18.316,-40.949 40.949,-40.949 z m 0,194.77 c 53.941,0 97.824,43.734 97.824,97.477 0,53.801 -43.883,97.477 -97.824,97.477 -53.879,0 -97.648,-43.672 -97.648,-97.477 0,-53.742 43.77,-97.477 97.648,-97.477 z"
      id="path70-9-99-1"
@@ -4180,9 +4212,9 @@
      style="fill-rule:evenodd" />
 </g>
 <g
-   id="media_player.girls_room_hub"
+   id="media_player.girls_room_clock"
    transform="matrix(0.03802678,0,0,0.03802678,586.69139,-17442.661)"
-   inkscape:label="media_player.girls_room_hub">
+   inkscape:label="media_player.girls_room_clock">
   <path
      d="m 235.81,50.402 c -23.977,0 -43.398,19.422 -43.398,43.227 v 372.57 c 0,23.875 19.414,43.398 43.398,43.398 h 228.38 c 23.988,0 43.398,-19.516 43.398,-43.398 V 93.629 c 0,-23.812 -19.422,-43.227 -43.398,-43.227 z m 114.1,34.648 c 22.637,0 41.125,18.359 41.125,40.949 0,22.594 -18.488,41.125 -41.125,41.125 -22.633,0 -40.949,-18.547 -40.949,-41.125 0,-22.578 18.316,-40.949 40.949,-40.949 z m 0,194.77 c 53.941,0 97.824,43.734 97.824,97.477 0,53.801 -43.883,97.477 -97.824,97.477 -53.879,0 -97.648,-43.672 -97.648,-97.477 0,-53.742 43.77,-97.477 97.648,-97.477 z"
      id="path70-9-1"
@@ -4905,6 +4937,18 @@
    id="binary_sensor.great_room_person_occupancy"
    style="stroke-width:0.892033"
    inkscape:label="binary_sensor.great_room_person_occupancy" />
+<path
+   inkscape:connector-curvature="0"
+   d="m 844.11517,-17608.177 a 1.7840606,1.7840606 0 0 1 1.78106,1.713 1.7840606,1.7840606 0 0 1 -1.78106,1.711 1.7840606,1.7840606 0 0 1 -1.7816,-1.711 1.7840606,1.7840606 0 0 1 1.7816,-1.713 m -1.33634,4.281 h 2.67214 a 1.7840606,1.7840606 0 0 1 1.78105,1.713 v 5.138 h -1.33579 v 6.851 h -3.57087 v -6.851 h -1.33579 v -5.138 a 1.7840606,1.7840606 0 0 1 1.78106,-1.713 z"
+   id="binary_sensor.downstairs_person_occupancy"
+   style="stroke-width:0.892033"
+   inkscape:label="binary_sensor.downstairs_person_occupancy" />
+<path
+   inkscape:connector-curvature="0"
+   d="m 478.04226,-17659 a 1.7840606,1.7840606 0 0 1 1.78106,1.713 1.7840606,1.7840606 0 0 1 -1.78106,1.711 1.7840606,1.7840606 0 0 1 -1.7816,-1.711 1.7840606,1.7840606 0 0 1 1.7816,-1.713 m -1.33634,4.281 h 2.67214 a 1.7840606,1.7840606 0 0 1 1.78105,1.713 v 5.138 h -1.33579 v 6.851 h -3.57087 v -6.851 h -1.33579 v -5.138 a 1.7840606,1.7840606 0 0 1 1.78106,-1.713 z"
+   id="binary_sensor.upstairs_person_occupancy"
+   style="stroke-width:0.892033"
+   inkscape:label="binary_sensor.upstairs_person_occupancy" />
 <path
    inkscape:connector-curvature="0"
    d="m 705.78981,-17610.132 a 1.7840606,1.7840606 0 0 1 1.78106,1.713 1.7840606,1.7840606 0 0 1 -1.78106,1.711 1.7840606,1.7840606 0 0 1 -1.7816,-1.711 1.7840606,1.7840606 0 0 1 1.7816,-1.713 m -1.33634,4.281 h 2.67214 a 1.7840606,1.7840606 0 0 1 1.78105,1.713 v 5.138 h -1.33579 v 6.851 H 704 v -6.851 h -1.33579 v -5.138 a 1.7840606,1.7840606 0 0 1 1.78106,-1.713 z"