Home Information - Your home, your data, organized.
Python
Working on addiong SVG Icons. WIP
Anthony Cassandra3a09cf971a14
diff --git a/src/hi/apps/control/views.py b/src/hi/apps/control/views.pyindex e9dcc763..3c25a50c 100644--- a/src/hi/apps/control/views.py+++ b/src/hi/apps/control/views.py@@ -70,7 +70,7 @@ class ControllerView( View, ControlViewMixin, ControllerMixin ):controller = controller,value = control_value,)-+return self.controller_data_response(request = request,controller = controller,diff --git a/src/hi/apps/entity/enums.py b/src/hi/apps/entity/enums.pyindex fc645488..4e987253 100644--- a/src/hi/apps/entity/enums.py+++ b/src/hi/apps/entity/enums.py@@ -9,18 +9,18 @@ class EntityType(LabeledEnum):- SVG filename is by convention:"""- AIR_CONDITIONER = ( 'Air Conditioner', '' ) # Controls areaAPPLIANCE = ( 'Appliance', '' )AREA = ( 'Area', '' )- AUDIO_AMPLIFIER = ( 'Audio Amplifier', '' ) # Controls Speaker- AUDIO_PLAYER = ( 'Audio Player', '' )+ AUDIO_RECEIVER = ( 'Audio Receiver', '' ) # Controls SpeakerAUTOMOBILE = ( 'Automobile', '' )BAROMETER = ( 'Barometer', '' )CAMERA = ( 'Camera', '' )+ CLOTHES_DRYER = ( 'Clothes Dryer', '' )+ CLOTHES_WASHER = ( 'Clothes Washer', '' )COMPUTER = ( 'Computer', '' )CONSUMABLE = ( 'Consumable', '' )CONTROL_WIRE = ( 'Control Wire', '' )- DISPLAY = ( 'Display', '' )+ COOKTOP = ( 'Cooktop', '' )DOOR = ( 'Door', '' )DOOR_LOCK = ( 'Door Lock', '' ) # Controls doorsELECTRICAL_OUTLET = ( 'Electrical Outlet', '' )@@ -29,9 +29,11 @@ class EntityType(LabeledEnum):ELECTRIC_WIRE = ( 'Electric Wire', '' )FURNITURE = ( 'Furniture', '' )HEALTHCHECK = ( 'Healthcheck', '' )- HEATER = ( 'Heater', '' ) # Controls area+ HVAC_AC_UNIT = ( 'HVAC A/C Unit', '' ) # Controls areaHVAC_AIR_HANDLER = ( 'HVAC Air Handler', '' ) # Controls areaHVAC_CONDENSER = ( 'HVAC Condenser', '' ) # Controls area+ HVAC_HEAT_PUMP = ( 'HVAC Heat Pump', '' ) # Controls area+ HVAC_FURNACE = ( 'HVAC Furnace', '' ) # Controls areaHVAC_MIN_SPLIT = ( 'HVAC Mini-split', '' ) # Controls areaHUMIDIFIER = ( 'Humidifier', '' ) # Controls areaHYGROMETER = ( 'Hygrometer', '' )@@ -41,6 +43,9 @@ class EntityType(LabeledEnum):NETWORK_SWITCH = ( 'Network Switch', '' )OPEN_CLOSE_SENSOR = ( 'Open/Close Sensor', '' )OTHER = ( 'Other', '' ) # Will use generic visual element+ OVEN = ( 'Oven', '' )+ POOL_EQUIPMENT = ( 'Pool Equipment', '' )+ REFRIGERATOR = ( 'Refrigerator', '' )PRESENCE_SENSOR = ( 'Presence Sensor', '' )SEWER_LINE = ( 'Sewer Line', '' )SHOWER = ( 'Shower', '' )@@ -53,12 +58,15 @@ class EntityType(LabeledEnum):SPRINKLER_WIRE = ( 'Sprinkler Wire', '' )TELECOM_BOX = ( 'Telecom Box', '' )TELECOM_WIRE = ( 'Telecom Wire', '' )+ TELEVISION = ( 'Television', '' )THERMOMETER = ( 'Thermometer', '' )THERMOSTAT = ( 'Thermostat', '' )TIME_SOURCE = ( 'Time Source', '' )TOILET = ( 'Toilet', '' )TOOL = ( 'Tool', '' )VIDEO_PLAYER = ( 'Video Player', '' )+ VALVE = ( 'Valve', '' )+ WALL = ( 'Wall', '' )WALL_SWITCH = ( 'Wall Switch', '' )WATER_HEATER = ( 'Water Heater', '' )WATER_LINE = ( 'Water Line', '' )diff --git a/src/hi/apps/entity/templates/entity/svg/type.audio_receiver.svg b/src/hi/apps/entity/templates/entity/svg/type.audio_receiver.svgnew file mode 100644index 00000000..cf008a23--- /dev/null+++ b/src/hi/apps/entity/templates/entity/svg/type.audio_receiver.svg@@ -0,0 +1,149 @@+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>+<path fill="#080808"+ d="M 19.68,47.62+ C 19.59,49.39 18.51,50.39 16.75,50.40+ 16.75,50.40 7.39,50.40 7.39,50.40+ 6.40,50.39 5.63,50.11 5.01,49.30+ 4.81,49.03 4.66,48.67 4.58,48.35+ 4.54,48.14 4.56,47.82 4.37,47.69+ 4.20,47.58 3.72,47.62 3.51,47.62+ 2.63,47.61 1.91,47.10 1.70,46.23+ 1.56,45.65 1.61,44.79 1.61,44.18+ 1.61,44.18 1.61,40.59 1.61,40.59+ 1.61,40.59 1.61,20.70 1.61,20.70+ 1.61,20.70 1.61,17.63 1.61,17.63+ 1.61,17.05 1.56,16.33 1.79,15.80+ 2.17,14.94 2.95,14.70 3.80,14.70+ 3.80,14.70 48.71,14.70 48.71,14.70+ 48.71,14.70 60.12,14.70 60.12,14.70+ 61.65,14.70 62.32,15.48 62.32,16.97+ 62.32,16.97 62.32,40.45 62.32,40.45+ 62.32,40.45 62.32,44.69 62.32,44.69+ 62.32,45.35 62.37,46.25 61.98,46.81+ 61.39,47.65 60.79,47.60 59.90,47.62+ 58.95,47.63 59.63,48.16 58.91,49.22+ 58.33,50.08 57.46,50.39 56.47,50.40+ 56.47,50.40 47.10,50.40 47.10,50.40+ 46.08,50.39 45.29,50.09 44.67,49.23+ 44.48,48.95 44.37,48.67 44.30,48.35+ 44.26,48.17 44.26,47.86 44.13,47.73+ 43.99,47.59 43.71,47.62 43.52,47.62+ 43.52,47.62 19.68,47.62 19.68,47.62 Z" />++<path stroke="#f0f0f0"+ d="M 60.12,16.82+ C 60.12,16.82 3.80,16.82 3.80,16.82+ 3.80,16.82 3.80,35.11 3.80,35.11+ 3.80,35.11 60.12,35.11 60.12,35.11+ 60.12,35.11 60.12,16.82 60.12,16.82 Z+ M 53.76,19.76+ C 53.76,19.76 54.35,19.76 54.35,19.76+ 55.86,19.78 57.41,20.44 58.43,21.58+ 60.24,23.60 60.35,26.88 58.57,28.96+ 58.11,29.50 57.53,29.97 56.91,30.30+ 55.93,30.81 55.07,30.95 53.98,30.94+ 53.43,30.93 52.89,30.80 52.37,30.62+ 49.22,29.53 47.82,25.96 49.17,22.97+ 49.80,21.59 51.08,20.48 52.52,20.02+ 52.92,19.89 53.34,19.84 53.76,19.76 Z+ M 14.63,20.74+ C 14.63,20.74 17.55,20.70 17.55,20.70+ 17.55,20.70 23.19,20.70 23.19,20.70+ 23.19,20.70 40.45,20.70 40.45,20.70+ 40.45,20.70 46.37,20.70 46.37,20.70+ 47.56,20.70 48.13,21.16 48.13,22.38+ 48.13,22.38 48.13,28.31 48.13,28.31+ 48.13,29.41 47.65,29.99 46.52,29.99+ 46.52,29.99 21.14,29.99 21.14,29.99+ 21.14,29.99 15.14,29.99 15.14,29.99+ 13.92,29.99 13.46,29.42 13.46,28.23+ 13.46,28.23 13.46,22.31 13.46,22.31+ 13.47,21.47 13.81,20.96 14.63,20.74 Z+ M 54.20,21.90+ C 52.68,22.06 51.60,22.64 51.01,24.14+ 50.81,24.67 50.83,25.05 50.83,25.60+ 50.85,27.32 52.43,28.78 54.13,28.82+ 57.21,28.89 58.94,25.19 56.76,22.97+ 56.42,22.63 56.17,22.42 55.73,22.23+ 55.24,22.01 54.74,21.90 54.20,21.90 Z+ M 6.22,22.33+ C 6.22,22.33 10.61,22.33 10.61,22.33+ 11.24,22.32 11.76,22.48 12.20,22.97+ 12.77,23.60 12.65,24.31 12.65,25.09+ 12.65,26.39 12.93,27.79 11.34,28.29+ 11.04,28.38 10.84,28.38 10.53,28.38+ 10.53,28.38 7.31,28.38 7.31,28.38+ 6.54,28.38 5.92,28.45 5.29,27.89+ 4.54,27.23 4.68,26.56 4.68,25.67+ 4.68,24.51 4.44,23.24 5.63,22.55+ 5.83,22.44 5.99,22.40 6.22,22.33 Z+ M 46.01,27.87+ C 46.01,27.87 46.01,23.48 46.01,23.48+ 46.01,22.85 45.98,22.82 45.35,22.82+ 45.35,22.82 22.53,22.82 22.53,22.82+ 22.53,22.82 17.26,22.82 17.26,22.82+ 17.26,22.82 16.09,22.82 16.09,22.82+ 15.95,22.82 15.75,22.81 15.65,22.94+ 15.56,23.05 15.58,23.33 15.58,23.48+ 15.58,23.48 15.58,27.87 15.58,27.87+ 15.58,27.87 46.01,27.87 46.01,27.87 Z+ M 10.53,24.43+ C 10.53,24.43 6.80,24.43 6.80,24.43+ 6.80,24.43 6.80,26.26 6.80,26.26+ 6.80,26.26 10.53,26.26 10.53,26.26+ 10.53,26.26 10.53,24.43 10.53,24.43 Z+ M 8.34,30.91+ C 8.50,30.88 8.60,30.86 8.78,30.87+ 10.11,30.99 10.04,33.09 8.56,32.98+ 7.53,32.90 7.16,31.41 8.34,30.91 Z+ M 16.60,30.91+ C 17.02,30.83 17.43,30.86 17.73,31.18+ 18.22,31.71 18.03,32.70 17.33,32.94+ 16.03,33.38 15.21,31.50 16.60,30.91 Z+ M 20.55,30.91+ C 20.96,30.83 21.38,30.86 21.68,31.18+ 22.17,31.70 21.99,32.70 21.28,32.94+ 19.97,33.38 19.18,31.50 20.55,30.91 Z+ M 24.50,30.91+ C 24.89,30.83 25.28,30.83 25.58,31.11+ 26.17,31.65 26.00,32.70 25.23,32.94+ 23.87,33.37 23.18,31.47 24.50,30.91 Z+ M 28.45,30.92+ C 28.83,30.83 29.23,30.83 29.53,31.11+ 30.12,31.65 29.95,32.70 29.18,32.94+ 27.85,33.36 27.14,31.52 28.45,30.92 Z+ M 32.48,30.91+ C 32.89,30.83 33.24,30.85 33.56,31.17+ 34.09,31.72 33.87,32.71 33.13,32.94+ 31.73,33.38 31.15,31.38 32.48,30.91 Z+ M 36.43,30.91+ C 36.84,30.83 37.19,30.85 37.51,31.17+ 38.05,31.72 37.83,32.71 37.08,32.94+ 35.70,33.38 35.10,31.37 36.43,30.91 Z+ M 40.37,30.91+ C 40.54,30.88 40.64,30.86 40.81,30.87+ 42.13,30.99 42.07,33.09 40.59,32.98+ 39.54,32.90 39.21,31.40 40.37,30.91 Z+ M 44.32,30.91+ C 44.49,30.88 44.59,30.86 44.76,30.87+ 46.09,30.99 46.02,33.09 44.54,32.98+ 43.51,32.90 43.14,31.41 44.32,30.91 Z+ M 60.12,37.23+ C 60.12,37.23 3.80,37.23 3.80,37.23+ 3.80,37.23 3.80,45.49 3.80,45.49+ 3.80,45.49 60.12,45.49 60.12,45.49+ 60.12,45.49 60.12,37.23 60.12,37.23 Z+ M 17.48,47.62+ C 17.48,47.62 6.66,47.62 6.66,47.62+ 6.68,47.80 6.69,47.95 6.83,48.09+ 7.12,48.37 8.28,48.27 8.70,48.27+ 8.70,48.27 15.21,48.27 15.21,48.27+ 15.67,48.27 17.01,48.37 17.31,48.09+ 17.47,47.95 17.47,47.81 17.48,47.62 Z+ M 57.20,47.62+ C 57.20,47.62 46.37,47.62 46.37,47.62+ 46.39,47.80 46.40,47.95 46.55,48.09+ 46.84,48.37 48.00,48.27 48.42,48.27+ 48.42,48.27 54.93,48.27 54.93,48.27+ 55.38,48.27 56.72,48.37 57.03,48.09+ 57.18,47.95 57.18,47.81 57.20,47.62 Z" />diff --git a/src/hi/apps/entity/templates/entity/svg/type.automobile.svg b/src/hi/apps/entity/templates/entity/svg/type.automobile.svgnew file mode 100644index 00000000..baaf9379--- /dev/null+++ b/src/hi/apps/entity/templates/entity/svg/type.automobile.svg@@ -0,0 +1,91 @@+<rect class="hi-entity-bg" x="0" y="0" width="200" height="300" fill="none"/>+ <path class="hi-entity-automobile-tires"+ fill="#040408" stroke="040408" stroke-width="1"+ d="M 23.53,49.33+ C 24.35,42.77 35.75,44.00 35.06,49.56+ 35.06,49.56 35.06,77.78 35.29,78.00+ 34.36,85.91 22.20,83.64 23.06,78.00+ 23.06,78.00 23.53,49.33 23.53,49.33 Z+ M 161.18,48.89+ C 161.37,43.50 174.70,46.09 174.59,49.11+ 174.59,49.11 174.59,78.67 174.59,78.44+ 174.64,82.67 161.01,84.40 160.94,78.00+ 160.94,77.78 161.18,48.89 161.18,48.89 Z+ M 22.59,219.56+ C 23.02,211.98 41.16,211.06 40.94,219.78+ 40.94,219.78 41.12,254.29 40.00,253.78+ 40.26,262.48 22.75,259.12 22.59,253.78+ 22.59,253.78 22.35,219.33 22.59,219.56 Z+ M 155.06,220.22+ C 155.38,211.97 171.78,214.18 171.53,220.67+ 171.53,220.67 171.53,251.56 171.76,251.56+ 172.45,256.39 155.85,260.50 155.06,252.00+ 155.06,252.00 155.06,220.22 155.06,220.22 Z" />+ <path class="mirrors"+ fill="#040408" stroke="040408" stroke-width="1"+ d="M 9.41,116.89+ C 9.41,116.89 29.88,115.56 29.88,115.56+ 38.97,114.79 35.70,127.06 29.88,127.56+ 29.88,127.56 9.88,128.89 9.88,128.89+ 1.56,128.79 2.68,116.81 9.41,116.89 Z+ M 169.18,115.78+ C 169.18,115.78 185.41,117.56 185.41,117.56+ 191.12,117.91 189.18,127.82 184.94,127.56+ 184.94,127.56 168.00,128.44 168.00,128.44+ 160.55,125.36 163.98,113.63 169.18,115.78 Z" />+ <path class="hi-entity-automobile-body"+ fill="#808080" stroke="#707070" stroke-width="1"+ d="M 35.53,23.78+ C 36.47,17.78 37.88,16.67 42.59,14.44+ 57.67,6.73 113.96,0.88 154.12,14.67+ 160.71,15.78 160.47,19.11 162.59,26.00+ 164.96,42.80 167.35,68.60 167.06,80.22+ 167.53,100.00 163.29,124.44 164.00,140.00+ 164.71,154.00 160.94,266.89 159.76,280.00+ 160.71,285.78 157.65,288.22 151.76,288.67+ 128.24,294.44 68.71,293.78 43.76,290.00+ 35.29,288.00 37.18,287.33 35.29,280.67+ 32.71,267.78 33.41,167.56 34.82,140.89+ 35.06,117.33 30.12,97.33 30.12,79.11+ 29.41,57.78 33.70,39.81 35.53,23.78 Z" />+ <path class="hi-entity-automobile-lights"+ fill="#f0f0d0" stroke="#808080" stroke-width="1"+ d="M 50.12,12.22+ C 55.42,10.26 71.63,7.25 79.76,7.11+ 83.92,7.04 82.35,18.89 76.47,20.22+ 72.00,23.33 54.87,26.39 51.53,24.44+ 46.59,22.44 47.41,12.01 50.12,12.22 Z+ M 115.29,8.00+ C 121.88,7.56 136.94,9.33 143.76,12.00+ 146.56,12.39 152.24,21.78 144.94,23.56+ 138.35,26.00 122.12,23.78 118.12,21.33+ 112.71,20.00 108.24,7.58 115.29,8.00 Z" />+ <path class="hi-entity-automobile-windows"+ fill="#c0c0f0" stroke="#a0a0f0" stroke-width="1" fill-opactity="0.75"+ d="M 51.53,97.56+ C 64.24,88.67 129.88,87.33 143.29,97.56+ 143.29,97.56 129.41,134.44 129.88,134.22+ 121.18,131.56 81.65,128.44 65.41,134.44+ 65.65,134.44 51.53,97.33 51.53,97.56 Z+ M 43.29,125.33+ C 43.29,125.33 57.18,142.44 57.18,142.44+ 57.18,142.44 55.76,194.00 56.00,194.00+ 56.24,194.00 43.06,217.11 43.06,217.11+ 43.06,217.11 43.29,125.33 43.29,125.33 Z+ M 152.47,126.44+ C 152.47,126.44 153.41,221.33 153.41,221.33+ 153.41,221.33 142.12,192.67 142.12,192.67+ 142.12,192.67 140.00,143.11 140.24,142.89+ 140.47,142.67 152.47,126.44 152.47,126.44 Z+ M 61.88,230.22+ C 73.41,234.67 115.53,235.11 132.71,232.67+ 132.71,232.67 142.12,274.67 142.12,274.67+ 124.47,277.33 68.71,278.00 55.29,274.22+ 55.29,274.22 61.65,230.22 61.88,230.22 Z" />+ <path class="hi-entity-automobile-lines"+ fill="none" stroke="#a0a0a0" stroke-width="2"+ d="M 47.64,34.91+ C 47.64,34.91 51.27,85.09 51.27,85.09M 148.00,35.45+ C 148.00,35.45 143.64,85.09 143.64,85.09M 50.18,228.55+ C 50.18,228.36 36.36,255.09 36.36,255.09M 142.55,224.73+ C 142.55,224.73 160.55,250.36 160.55,250.36" />diff --git a/src/hi/apps/entity/templates/entity/svg/type.barometer.svg b/src/hi/apps/entity/templates/entity/svg/type.barometer.svgnew file mode 100644index 00000000..f8f89ce9--- /dev/null+++ b/src/hi/apps/entity/templates/entity/svg/type.barometer.svg@@ -0,0 +1,120 @@+<rect class="hi-entity-bg" x="0" y="0" width="44" height="64" fill="none" />+<path fill="none" stroke="#a01010" stroke-width="2"+ d="M 21.71,0.20+ C 24.72,0.27 27.40,1.60 28.39,4.55+ 28.89,6.06 28.75,8.32 28.75,9.96+ 28.75,9.96 28.75,19.63 28.75,19.63+ 28.75,23.16 29.68,21.60 31.07,23.90+ 31.90,25.27 31.42,26.29 32.15,27.20+ 32.50,27.63 35.41,29.40 37.70,32.14+ 41.01,36.09 41.97,40.28 41.95,45.23+ 41.93,47.68 41.29,50.10 40.27,52.34+ 34.85,64.16 18.56,67.69 8.51,59.11+ 6.27,57.20 4.65,54.97 3.44,52.34+ 2.33,49.92 1.76,47.59 1.76,44.94+ 1.75,40.12 2.80,35.98 6.00,32.14+ 6.55,31.48 8.12,29.80 8.82,29.39+ 9.93,28.75 10.53,29.33 10.22,30.16+ 10.22,30.16 6.36,34.70 6.36,34.70+ 3.59,38.85 2.62,44.45 4.12,49.21+ 8.22,62.30 25.38,66.87 35.15,56.60+ 36.81,54.86 38.18,52.84 39.07,50.63+ 39.95,48.45 40.35,46.14 40.26,43.80+ 39.86,33.69 31.43,26.34 21.12,26.45+ 18.73,26.48 16.87,27.06 14.67,27.93+ 14.02,28.11 12.88,28.64 12.33,27.93+ 11.50,27.02 12.28,24.24 13.03,23.35+ 13.03,23.35 14.66,21.80 14.66,21.80+ 15.03,21.22 14.96,20.29 14.96,19.63+ 14.96,19.63 14.96,9.96 14.96,9.96+ 14.96,8.22 14.79,5.87 15.42,4.27+ 16.47,1.60 18.92,0.36 21.71,0.20 Z+ M 30.21,26.45+ C 29.97,25.66 29.81,24.92 29.21,24.29+ 28.70,23.75 27.95,23.49 27.58,22.93+ 27.21,22.37 27.28,21.42 27.28,20.76+ 27.27,17.52 27.55,8.26 26.95,5.69+ 26.39,3.29 23.96,1.55 21.41,1.80+ 18.53,2.09 17.04,3.91 16.60,6.54+ 16.60,6.54 16.43,20.76 16.43,20.76+ 16.43,21.42 16.49,22.37 16.13,22.93+ 15.76,23.49 15.01,23.75 14.50,24.29+ 13.90,24.92 13.74,25.66 13.49,26.45+ 17.10,25.51 18.28,24.70 22.29,24.75+ 25.52,24.78 27.28,25.69 30.21,26.45 Z+ M 21.75,6.31+ C 21.82,6.32 22.16,6.20 22.42,6.68+ 22.70,7.20 22.59,11.10 22.59,11.95+ 22.58,12.37 22.61,14.53 21.57,13.89+ 21.02,13.55 21.12,12.23 21.12,11.66+ 21.12,10.84 21.01,7.18 21.29,6.68+ 21.49,6.31 21.66,6.37 21.75,6.31 Z+ M 21.57,16.55+ C 22.81,16.39 22.48,17.64 22.75,18.49+ 23.12,19.68 24.53,21.81 22.26,22.34+ 21.73,22.46 21.13,22.34 20.72,21.98+ 19.42,20.83 20.74,19.44 21.03,18.20+ 21.24,17.36 20.99,17.29 21.57,16.55 Z+ M 19.65,30.56+ C 21.91,30.28 24.54,30.42 26.69,31.16+ 39.41,35.52 39.29,53.54 26.40,57.53+ 25.26,57.88 22.58,58.34 21.41,58.26+ 19.11,58.10 16.35,57.46 14.37,56.29+ 9.35,53.30 7.56,48.99 7.63,43.52+ 7.66,40.94 8.56,38.21 10.15,36.12+ 12.60,32.92 15.69,31.27 19.65,30.56 Z+ M 19.36,32.23+ C 17.56,32.57 16.17,33.12 14.67,34.15+ 6.53,39.69 7.50,52.15 17.01,55.73+ 18.52,56.30 19.79,56.59 21.41,56.60+ 24.85,56.64 27.92,55.72 30.50,53.42+ 35.40,49.04 36.00,41.34 31.62,36.41+ 30.54,35.19 29.05,34.01 27.57,33.27+ 25.02,32.00 22.16,31.96 19.36,32.23 Z+ M 20.64,34.36+ C 21.31,34.17 22.11,33.99 22.81,34.36+ 23.38,34.56 23.61,35.14 23.05,35.55+ 22.35,36.06 19.44,35.98 20.64,34.36 Z+ M 16.71,35.48+ C 18.90,35.28 17.66,37.07 16.43,37.51+ 15.33,37.90 14.90,37.17 15.28,36.50+ 15.59,35.93 16.15,35.73 16.71,35.48 Z+ M 26.05,35.56+ C 27.73,35.06 29.21,36.92 28.27,37.51+ 27.64,37.91 25.29,36.96 26.05,35.56 Z+ M 17.31,47.22+ C 18.12,46.65 18.92,46.05 19.48,45.23+ 20.05,44.40 20.01,43.68 20.66,43.12+ 21.37,42.51 22.49,42.72 23.17,41.51+ 23.46,40.99 23.61,37.60 25.05,38.45+ 25.70,38.83 25.09,39.95 25.52,40.57+ 26.15,41.48 27.61,40.34 27.94,41.33+ 28.44,42.81 25.35,42.78 24.67,43.14+ 23.51,43.75 23.81,44.64 23.04,45.42+ 22.52,45.96 21.74,46.12 21.12,46.53+ 20.43,46.98 19.40,48.03 18.77,48.64+ 19.40,48.69 21.23,49.13 20.06,50.06+ 19.38,50.59 16.95,50.40 16.30,49.85+ 15.57,49.23 15.49,48.10 15.56,47.22+ 15.61,46.66 15.97,45.35 16.84,45.84+ 17.30,46.10 17.27,46.78 17.31,47.22 Z+ M 13.22,39.30+ C 14.82,39.65 13.55,41.96 12.86,42.17+ 12.19,42.38 11.92,41.77 11.95,41.23+ 12.00,40.34 12.44,39.69 13.22,39.30 Z+ M 30.27,39.30+ C 31.92,39.63 32.21,42.22 31.06,42.21+ 30.26,42.20 29.01,40.09 30.27,39.30 Z+ M 11.90,44.71+ C 13.54,44.52 13.53,47.10 13.02,47.48+ 12.03,48.20 10.90,45.99 11.90,44.71 Z+ M 31.17,44.71+ C 32.92,44.51 32.12,47.10 31.52,47.48+ 30.97,47.83 30.48,47.47 30.39,46.89+ 30.26,46.06 30.59,45.27 31.17,44.71 Z+ M 13.98,49.80+ C 15.57,49.41 15.93,51.10 15.36,51.44+ 14.84,51.74 13.33,51.01 13.98,49.80 Z+ M 28.81,49.80+ C 30.65,49.40 29.98,51.05 29.04,51.44+ 28.21,51.78 27.49,50.96 28.81,49.80 Z" />diff --git a/src/hi/apps/entity/templates/entity/svg/type.camera.svg b/src/hi/apps/entity/templates/entity/svg/type.camera.svgnew file mode 100644index 00000000..1725937a--- /dev/null+++ b/src/hi/apps/entity/templates/entity/svg/type.camera.svg@@ -0,0 +1,5 @@+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>+<path d="M 49.50,42.86+ C 49.50,44.44 49.63,45.66 49.15,47.20 48.06,50.63 44.87,52.70 41.39,52.71 41.39,52.71 9.92,52.71 9.92,52.71 6.64,52.70 3.66,50.90 2.39,47.78 2.04,46.93 1.81,46.01 1.81,45.08 1.81,45.08 1.81,30.50 1.81,30.50 1.81,30.50 1.81,18.44 1.81,18.44 1.82,14.42 5.38,10.82 9.35,10.81 9.35,10.81 41.97,10.81 41.97,10.81 45.28,10.82 48.32,13.32 49.22,16.51 49.65,18.01 49.50,20.04 49.50,21.62 49.50,21.62 53.13,19.77 53.13,19.77 53.99,19.33 55.48,18.50 56.37,18.31 56.79,18.22 57.45,18.24 57.90,18.24 59.53,18.26 61.14,19.46 61.82,20.95 62.16,21.70 62.28,22.54 62.28,23.36 62.28,23.36 62.28,40.45 62.28,40.45 62.28,41.15 62.19,41.92 61.91,42.57 61.71,43.07 61.37,43.61 61.01,44.01 60.74,44.32 60.34,44.63 59.99,44.84 58.12,45.99 56.54,45.56 54.65,44.84 54.65,44.84 52.27,43.93 52.27,43.93 52.27,43.93 49.50,42.86 49.50,42.86 Z+ M 55.80,25.77+ C 55.80,25.77 53.51,26.91 53.51,26.91 53.51,26.91 49.79,28.79 49.79,28.79 48.58,29.40 47.55,30.13 46.16,30.12 44.34,30.10 43.11,28.51 43.11,26.74 43.11,26.74 43.11,19.31 43.11,19.31 43.11,18.43 42.91,17.65 41.97,17.36 41.69,17.27 41.39,17.28 41.11,17.28 41.11,17.28 20.98,17.28 20.98,17.28 20.98,17.28 10.11,17.28 10.11,17.28 8.74,17.29 8.20,17.96 8.20,19.31 8.20,19.31 8.20,39.96 8.20,39.96 8.20,39.96 8.20,43.34 8.20,43.34 8.20,44.39 8.05,45.74 9.35,46.09 9.58,46.15 9.87,46.14 10.11,46.14 10.11,46.14 35.48,46.14 35.48,46.14 35.48,46.14 41.30,46.14 41.30,46.14 42.68,46.13 43.11,45.42 43.11,44.11 43.11,44.11 43.11,38.32 43.11,38.32 43.11,36.56 44.34,34.97 46.16,34.94 47.34,34.93 48.42,35.47 49.50,35.89 49.50,35.89 53.22,37.30 53.22,37.30 53.22,37.30 55.80,38.23 55.80,38.23 55.80,38.23 55.80,25.77 55.80,25.77 Z" />diff --git a/src/hi/apps/entity/templates/entity/svg/type.clothes_dryer.svg b/src/hi/apps/entity/templates/entity/svg/type.clothes_dryer.svgnew file mode 100644index 00000000..e213c8f5--- /dev/null+++ b/src/hi/apps/entity/templates/entity/svg/type.clothes_dryer.svg@@ -0,0 +1,155 @@+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>+ <path fill="#fcfcfc" stroke="black" stroke-width="1"+ d="M 6.96,0.01+ C 6.96,0.01 11.60,0.01 11.60,0.01+ 11.60,0.01 20.56,0.01 20.56,0.01+ 20.56,0.01 48.00,0.01 48.00,0.01+ 48.00,0.01 56.40,0.01 56.40,0.01+ 58.64,0.00 60.08,1.76 60.08,3.92+ 60.08,3.92 60.08,50.08 60.08,50.08+ 60.08,50.08 60.08,60.08 60.08,60.08+ 60.08,62.24 58.64,64.00 56.40,64.00+ 56.40,64.00 16.08,64.00 16.08,64.00+ 16.08,64.00 7.60,64.00 7.60,64.00+ 5.36,64.00 3.92,62.24 3.92,60.08+ 3.92,60.08 3.92,14.40 3.92,14.40+ 3.92,14.40 3.92,3.84 3.92,3.84+ 3.92,1.92 5.07,0.46 6.96,0.01 Z" />+ <path fill="none" stroke="black" stroke-width="1"+ d="M 6.96,0.01+ C 6.96,0.01 11.60,0.01 11.60,0.01+ 11.60,0.01 20.56,0.01 20.56,0.01+ 20.56,0.01 48.00,0.01 48.00,0.01+ 48.00,0.01 56.40,0.01 56.40,0.01+ 58.64,0.00 60.08,1.76 60.08,3.92+ 60.08,3.92 60.08,50.08 60.08,50.08+ 60.08,50.08 60.08,60.08 60.08,60.08+ 60.08,62.24 58.64,64.00 56.40,64.00+ 56.40,64.00 16.08,64.00 16.08,64.00+ 16.08,64.00 7.60,64.00 7.60,64.00+ 5.36,64.00 3.92,62.24 3.92,60.08+ 3.92,60.08 3.92,14.40 3.92,14.40+ 3.92,14.40 3.92,3.84 3.92,3.84+ 3.92,1.92 5.07,0.46 6.96,0.01 Z+ M 58.00,11.20+ C 58.00,11.20 58.00,4.00 58.00,4.00+ 58.00,2.56 57.21,2.00 55.84,2.00+ 55.84,2.00 21.28,2.00 21.28,2.00+ 21.28,2.00 8.00,2.00 8.00,2.00+ 6.70,2.02 6.00,2.70 6.00,4.00+ 6.00,4.00 6.00,11.20 6.00,11.20+ 6.00,11.20 58.00,11.20 58.00,11.20 Z+ M 10.40,3.80+ C 11.31,3.68 12.28,3.93 12.95,4.57+ 14.04,5.62 14.14,7.49 13.17,8.64+ 12.88,8.99 12.57,9.22 12.16,9.42+ 11.61,9.69 11.31,9.69 10.72,9.68+ 8.31,9.65 7.11,6.85 8.46,4.96+ 8.96,4.27 9.58,3.95 10.40,3.80 Z+ M 17.28,4.12+ C 17.28,4.12 20.80,4.08 20.80,4.08+ 21.15,4.08 21.47,4.11 21.74,4.35+ 22.22,4.78 22.17,5.56 21.67,5.95+ 21.37,6.18 21.08,6.16 20.72,6.16+ 20.72,6.16 18.32,6.16 18.32,6.16+ 17.96,6.16 17.36,6.20 17.04,6.06+ 16.34,5.75 16.12,4.49 17.28,4.12 Z+ M 25.12,4.12+ C 25.12,4.12 28.64,4.08 28.64,4.08+ 28.99,4.08 29.31,4.11 29.59,4.35+ 30.07,4.77 30.02,5.58 29.52,5.96+ 29.22,6.18 28.91,6.16 28.56,6.16+ 28.56,6.16 25.52,6.16 25.52,6.16+ 25.14,6.15 24.86,6.11 24.58,5.82+ 24.09,5.30 24.28,4.39 25.12,4.12 Z+ M 10.64,5.87+ C 9.50,6.33 10.02,7.83 11.04,7.60+ 12.12,7.35 11.94,5.71 10.64,5.87 Z+ M 17.12,7.18+ C 17.12,7.18 20.80,7.12 20.80,7.12+ 21.12,7.12 21.40,7.11 21.68,7.32+ 22.18,7.70 22.22,8.51 21.74,8.93+ 21.43,9.20 20.95,9.20 20.56,9.20+ 20.56,9.20 18.32,9.20 18.32,9.20+ 17.93,9.20 17.40,9.23 17.04,9.07+ 16.29,8.72 16.23,7.59 17.12,7.18 Z+ M 25.04,7.17+ C 25.04,7.17 28.72,7.12 28.72,7.12+ 30.14,7.14 30.10,8.38 29.65,8.86+ 29.33,9.20 28.83,9.20 28.40,9.20+ 28.40,9.20 26.16,9.20 26.16,9.20+ 25.77,9.20 25.24,9.23 24.88,9.07+ 24.15,8.73 24.06,7.55 25.04,7.17 Z+ M 58.00,13.28+ C 58.00,13.28 6.00,13.28 6.00,13.28+ 6.00,13.28 6.00,50.72 6.00,50.72+ 6.00,50.72 6.00,60.00 6.00,60.00+ 6.00,61.44 6.79,62.00 8.16,62.00+ 8.16,62.00 46.40,62.00 46.40,62.00+ 46.40,62.00 55.84,62.00 55.84,62.00+ 57.21,62.00 58.00,61.44 58.00,60.00+ 58.00,60.00 58.00,13.28 58.00,13.28 Z+ M 30.96,19.62+ C 30.96,19.62 31.60,19.62 31.60,19.62+ 36.80,19.59 41.46,21.48 44.94,25.44+ 45.99,26.64 46.75,27.87 47.46,29.28+ 48.29,30.94 49.11,33.66 49.12,35.52+ 49.12,35.52 49.20,36.88 49.20,36.88+ 49.20,36.88 49.12,38.00 49.12,38.00+ 49.11,39.41 48.56,41.55 48.08,42.88+ 46.34,47.60 42.23,51.55 37.44,53.09+ 35.04,53.86 33.44,53.95 30.96,53.92+ 29.55,53.90 27.65,53.45 26.32,52.99+ 24.03,52.20 21.93,50.92 20.16,49.27+ 14.95,44.42 13.41,36.50 16.19,30.00+ 17.98,25.82 21.50,22.36 25.76,20.75+ 27.16,20.23 28.60,19.88 30.08,19.70+ 30.08,19.70 30.96,19.62 30.96,19.62 Z+ M 46.80,33.92+ C 46.70,32.67 46.02,31.04 45.46,29.92+ 43.55,26.10 39.96,23.24 35.84,22.15+ 34.18,21.71 33.04,21.68 31.36,21.68+ 30.14,21.68 28.44,22.04 27.28,22.43+ 20.82,24.57 16.80,30.45 16.88,37.20+ 16.90,38.93 17.43,41.23 18.14,42.80+ 19.02,44.72 20.19,46.49 21.76,47.91+ 27.16,52.78 35.19,53.27 41.04,48.89+ 42.63,47.70 43.80,46.39 44.85,44.72+ 45.95,42.97 46.69,40.93 46.96,38.88+ 46.96,38.88 44.32,38.88 44.32,38.88+ 44.14,40.22 43.67,41.44 43.06,42.64+ 42.52,43.71 41.72,44.75 40.88,45.60+ 37.47,49.02 32.23,50.24 27.68,48.53+ 25.74,47.80 24.01,46.59 22.64,45.04+ 21.76,44.05 20.99,42.91 20.50,41.68+ 20.01,40.47 19.54,38.91 19.52,37.60+ 19.50,36.18 19.48,35.33 19.81,33.92+ 20.66,30.32 23.27,27.02 26.64,25.46+ 28.33,24.68 30.29,24.22 32.16,24.24+ 32.16,24.24 32.96,24.31 32.96,24.31+ 37.04,24.60 40.79,26.92 42.82,30.48+ 43.36,31.42 44.01,32.84 44.16,33.92+ 44.16,33.92 46.80,33.92 46.80,33.92 Z+ M 42.08,33.92+ C 42.08,33.92 41.41,32.16 41.41,32.16+ 40.36,29.95 38.47,28.17 36.24,27.19+ 30.70,24.74 24.17,27.56 22.14,33.28+ 21.79,34.24 21.53,35.62 21.52,36.64+ 21.51,37.76 21.75,39.10 22.11,40.16+ 22.45,41.19 22.96,42.18 23.62,43.04+ 25.26,45.19 27.56,46.64 30.24,47.09+ 31.09,47.23 31.94,47.21 32.80,47.20+ 34.50,47.18 36.61,46.33 38.00,45.37+ 39.06,44.63 39.98,43.71 40.69,42.64+ 41.44,41.52 41.99,40.21 42.24,38.88+ 42.24,38.88 37.68,38.88 37.68,38.88+ 36.75,38.88 36.40,38.53 36.40,37.60+ 36.40,37.60 36.40,35.28 36.40,35.28+ 36.40,34.68 36.48,34.26 37.12,34.02+ 37.51,33.88 38.35,33.92 38.80,33.92+ 38.80,33.92 42.08,33.92 42.08,33.92 Z+ M 46.88,36.00+ C 46.88,36.00 38.56,36.00 38.56,36.00+ 38.56,36.00 38.56,36.88 38.56,36.88+ 38.56,36.88 46.88,36.88 46.88,36.88+ 46.88,36.88 46.88,36.00 46.88,36.00 Z" />diff --git a/src/hi/apps/entity/templates/entity/svg/type.clothes_washer.svg b/src/hi/apps/entity/templates/entity/svg/type.clothes_washer.svgnew file mode 100644index 00000000..3cf7ea33--- /dev/null+++ b/src/hi/apps/entity/templates/entity/svg/type.clothes_washer.svg@@ -0,0 +1,118 @@+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>+ <path fill="#fcfcfc" stroke="black" stroke-width="1"+ d="M 11.36,1.61+ C 11.36,1.61 16.00,1.61 16.00,1.61+ 16.00,1.61 24.96,1.61 24.96,1.61+ 24.96,1.61 52.00,1.61 52.00,1.61+ 56.23,1.61 59.83,5.00 59.84,9.28+ 59.84,9.28 59.84,38.64 59.84,38.64+ 59.84,38.64 59.84,54.88 59.84,54.88+ 59.83,55.61 59.62,56.59 59.36,57.28+ 58.22,60.39 55.30,62.39 52.00,62.40+ 52.00,62.40 12.00,62.40 12.00,62.40+ 7.77,62.39 4.17,59.00 4.16,54.72+ 4.16,54.72 4.16,14.80 4.16,14.80+ 4.16,14.80 4.16,10.72 4.16,10.72+ 4.16,9.39 4.09,8.52 4.47,7.20+ 4.87,5.80 5.72,4.50 6.80,3.53+ 7.27,3.11 7.99,2.65 8.56,2.38+ 9.66,1.86 10.20,1.80 11.36,1.61 Z" />+ <path fill="none" stroke="black" stroke-width="1"+ d="M 11.36,1.61+ C 11.36,1.61 16.00,1.61 16.00,1.61+ 16.00,1.61 24.96,1.61 24.96,1.61+ 24.96,1.61 52.00,1.61 52.00,1.61+ 56.23,1.61 59.83,5.00 59.84,9.28+ 59.84,9.28 59.84,38.64 59.84,38.64+ 59.84,38.64 59.84,54.88 59.84,54.88+ 59.83,55.61 59.62,56.59 59.36,57.28+ 58.22,60.39 55.30,62.39 52.00,62.40+ 52.00,62.40 12.00,62.40 12.00,62.40+ 7.77,62.39 4.17,59.00 4.16,54.72+ 4.16,54.72 4.16,14.80 4.16,14.80+ 4.16,14.80 4.16,10.72 4.16,10.72+ 4.16,9.39 4.09,8.52 4.47,7.20+ 4.87,5.80 5.72,4.50 6.80,3.53+ 7.27,3.11 7.99,2.65 8.56,2.38+ 9.66,1.86 10.20,1.80 11.36,1.61 Z+ M 56.80,12.80+ C 56.80,10.25 57.20,7.63 55.04,5.78+ 54.67,5.47 54.28,5.26 53.84,5.06+ 53.26,4.80 52.79,4.72 52.16,4.72+ 52.16,4.72 19.28,4.72 19.28,4.72+ 19.28,4.72 14.24,4.72 14.24,4.72+ 14.24,4.72 11.84,4.72 11.84,4.72+ 9.80,4.72 8.03,6.15 7.44,8.08+ 7.29,8.57 7.20,9.56 7.20,10.08+ 7.20,10.08 7.20,12.80 7.20,12.80+ 7.20,12.80 56.80,12.80 56.80,12.80 Z+ M 14.08,6.76+ C 15.03,6.63 15.85,6.87 16.42,7.68+ 17.35,9.01 16.54,10.88 14.96,11.16+ 12.67,11.58 11.38,8.71 13.12,7.22+ 13.43,6.95 13.69,6.85 14.08,6.76 Z+ M 21.04,6.76+ C 21.47,6.69 21.91,6.70 22.32,6.84+ 24.68,7.68 24.02,11.35 21.44,11.19+ 19.45,11.07 18.57,8.66 20.01,7.29+ 20.33,6.99 20.62,6.87 21.04,6.76 Z+ M 56.80,15.92+ C 56.80,15.92 7.20,15.92 7.20,15.92+ 7.20,15.92 7.20,49.36 7.20,49.36+ 7.20,49.36 7.20,52.80 7.20,52.80+ 7.20,54.98 7.17,56.76 9.04,58.28+ 9.38,58.56 9.77,58.76 10.16,58.94+ 10.74,59.20 11.21,59.28 11.84,59.28+ 11.84,59.28 46.32,59.28 46.32,59.28+ 46.32,59.28 52.16,59.28 52.16,59.28+ 54.19,59.28 55.97,57.85 56.56,55.92+ 56.71,55.43 56.80,54.44 56.80,53.92+ 56.80,53.92 56.80,15.92 56.80,15.92 Z+ M 30.48,19.06+ C 30.48,19.06 33.04,19.06 33.04,19.06+ 35.05,19.04 37.42,19.69 39.28,20.43+ 41.32,21.25 43.19,22.50 44.80,23.99+ 50.55,29.33 52.33,37.75 49.25,44.96+ 48.20,47.41 46.64,49.52 44.72,51.36+ 43.29,52.72 41.33,53.96 39.52,54.74+ 37.87,55.45 35.23,56.22 33.44,56.24+ 33.44,56.24 31.92,56.32 31.92,56.32+ 31.92,56.32 31.20,56.24 31.20,56.24+ 31.20,56.24 30.40,56.24 30.40,56.24+ 27.69,55.97 25.08,55.16 22.72,53.81+ 16.83,50.43 13.36,44.02 13.44,37.28+ 13.44,37.28 13.52,36.48 13.52,36.48+ 13.52,36.48 13.52,35.84 13.52,35.84+ 13.75,33.55 14.42,31.26 15.46,29.20+ 16.44,27.25 17.90,25.32 19.52,23.85+ 21.81,21.79 24.46,20.37 27.44,19.59+ 27.44,19.59 30.48,19.06 30.48,19.06 Z+ M 16.56,38.16+ C 16.56,38.16 17.36,37.47 17.36,37.47+ 17.88,37.03 18.70,36.39 19.28,36.03+ 22.35,34.12 25.43,33.46 28.80,35.07+ 31.98,36.58 34.37,39.88 38.16,39.92+ 40.90,39.95 43.64,38.28 45.52,36.40+ 46.00,35.92 46.35,35.58 46.78,35.04+ 47.02,34.75 47.22,34.56 47.17,34.16+ 47.17,34.16 46.75,32.64 46.75,32.64+ 46.25,31.17 45.54,29.82 44.64,28.56+ 43.69,27.23 42.45,25.99 41.12,25.04+ 35.43,20.98 27.89,21.09 22.40,25.48+ 21.01,26.59 19.83,27.94 18.88,29.44+ 17.58,31.52 16.56,34.48 16.56,36.96+ 16.56,36.96 16.56,38.16 16.56,38.16 Z+ M 47.60,38.72+ C 47.60,38.72 46.72,39.47 46.72,39.47+ 46.01,40.06 45.27,40.61 44.48,41.08+ 41.29,43.01 37.52,43.65 34.08,41.98+ 32.22,41.08 31.09,40.16 29.44,38.98+ 28.25,38.13 26.80,37.22 25.28,37.20+ 22.82,37.17 20.50,38.63 18.80,40.32+ 18.80,40.32 17.62,41.52 17.62,41.52+ 17.47,41.70 17.27,41.91 17.27,42.16+ 17.26,42.42 17.77,43.70 17.91,44.00+ 18.66,45.70 19.94,47.51 21.28,48.80+ 27.38,54.63 36.99,54.60 43.04,48.71+ 44.41,47.38 45.63,45.52 46.39,43.76+ 46.99,42.36 47.57,40.24 47.60,38.72 Z" />diff --git a/src/hi/apps/entity/templates/entity/svg/type.computer.svg b/src/hi/apps/entity/templates/entity/svg/type.computer.svgnew file mode 100644index 00000000..8e90a9ba--- /dev/null+++ b/src/hi/apps/entity/templates/entity/svg/type.computer.svg@@ -0,0 +1,205 @@+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>+ <path class="hi-entity-computer-body"+ fill="#404040" stroke="black" stroke-width="1"+ d="M 0.00,64.00+ C 0.00,64.00 0.00,59.34 0.00,59.34+ 0.00,58.59 0.18,58.17 0.33,57.46+ 0.33,57.46 1.19,53.77 1.19,53.77+ 1.19,53.77 3.16,45.36 3.16,45.36+ 3.16,45.36 3.84,42.43 3.84,42.43+ 3.84,42.43 4.20,41.11 4.20,41.11+ 4.21,40.91 4.08,40.68 4.02,40.49+ 3.90,40.13 3.90,39.95 3.90,39.58+ 3.90,39.58 3.90,16.35 3.90,16.35+ 3.90,16.35 3.90,5.22 3.90,5.22+ 3.90,3.46 5.07,2.58 6.75,2.57+ 6.75,2.57 47.72,2.57 47.72,2.57+ 47.72,2.57 57.25,2.57 57.25,2.57+ 58.93,2.58 60.10,3.46 60.10,5.22+ 60.10,5.22 60.10,39.58 60.10,39.58+ 60.10,39.95 60.10,40.13 59.98,40.49+ 59.92,40.68 59.79,40.91 59.80,41.11+ 59.80,41.11 60.16,42.43 60.16,42.43+ 60.16,42.43 60.86,45.43 60.86,45.43+ 60.86,45.43 62.92,54.26 62.92,54.26+ 62.92,54.26 63.64,57.39 63.64,57.39+ 63.81,58.09 64.00,58.61 64.00,59.34+ 64.00,59.34 64.00,64.00 64.00,64.00+ 64.00,64.00 0.00,64.00 0.00,64.00 Z" />+ <path class="hi-entity-computer-surface"+ fill="#a0a0a0" stroke="black" stroke-width="1"+ d="M 6.44,5.15+ C 6.75,5.02 7.24,5.08 7.58,5.08+ 7.58,5.08 9.88,5.08 9.88,5.08+ 9.88,5.08 17.88,5.08 17.88,5.08+ 17.88,5.08 45.91,5.08 45.91,5.08+ 45.91,5.08 54.96,5.08 54.96,5.08+ 54.96,5.08 56.83,5.08 56.83,5.08+ 57.00,5.08 57.43,5.05 57.56,5.15+ 57.70,5.26 57.67,5.54 57.67,5.70+ 57.67,5.70 57.67,31.79 57.67,31.79+ 57.67,31.79 57.67,37.84 57.67,37.84+ 57.67,37.84 57.67,39.23 57.67,39.23+ 57.67,39.37 57.68,39.56 57.56,39.65+ 57.45,39.74 57.18,39.72 57.04,39.72+ 57.04,39.72 18.16,39.72 18.16,39.72+ 18.16,39.72 9.11,39.72 9.11,39.72+ 9.11,39.72 6.96,39.72 6.96,39.72+ 6.82,39.72 6.55,39.74 6.44,39.65+ 6.30,39.54 6.33,39.26 6.33,39.10+ 6.33,39.10 6.33,20.17 6.33,20.17+ 6.33,20.17 6.33,9.18 6.33,9.18+ 6.33,9.18 6.33,6.33 6.33,6.33+ 6.33,5.99 6.25,5.42 6.44,5.15 Z+ M 2.85,57.60+ C 2.85,57.60 3.50,54.82 3.50,54.82+ 3.50,54.82 5.23,47.37 5.23,47.37+ 5.23,47.37 5.62,45.77 5.62,45.77+ 5.62,45.77 6.18,43.41 6.18,43.41+ 6.18,43.41 6.48,42.34 6.48,42.34+ 6.48,42.34 7.03,42.23 7.03,42.23+ 7.03,42.23 10.64,42.23 10.64,42.23+ 10.64,42.23 10.37,43.76 10.37,43.76+ 10.37,43.76 9.39,49.04 9.39,49.04+ 9.28,49.69 8.87,51.13 9.14,51.69+ 9.34,52.09 9.71,52.38 10.16,52.41+ 10.16,52.41 10.57,52.41 10.57,52.41+ 10.57,52.41 11.34,52.45 11.34,52.45+ 11.34,52.45 52.66,52.45 52.66,52.45+ 52.66,52.45 53.43,52.42 53.43,52.42+ 53.43,52.42 53.84,52.42 53.84,52.42+ 54.28,52.39 54.67,52.08 54.86,51.69+ 55.12,51.13 54.72,49.69 54.61,49.04+ 54.61,49.04 53.74,44.38 53.74,44.38+ 53.74,44.38 53.36,42.23 53.36,42.23+ 53.36,42.23 56.97,42.23 56.97,42.23+ 56.97,42.23 57.52,42.34 57.52,42.34+ 57.52,42.34 57.82,43.41 57.82,43.41+ 57.82,43.41 58.38,45.77 58.38,45.77+ 58.38,45.77 58.77,47.37 58.77,47.37+ 58.77,47.37 60.50,54.82 60.50,54.82+ 60.50,54.82 61.15,57.60 61.15,57.60+ 60.70,57.73 59.39,57.67 58.85,57.67+ 58.85,57.67 54.40,57.67 54.40,57.67+ 54.40,57.67 39.79,57.67 39.79,57.67+ 39.65,57.67 39.40,57.69 39.28,57.60+ 39.14,57.50 38.80,56.50 38.72,56.28+ 38.33,55.25 38.10,54.57 37.01,54.07+ 36.13,53.67 34.91,53.77 33.95,53.77+ 33.95,53.77 28.45,53.77 28.45,53.77+ 27.32,53.79 26.21,54.25 25.67,55.30+ 25.67,55.30 25.02,56.97 25.02,56.97+ 24.96,57.13 24.84,57.51 24.72,57.60+ 24.60,57.69 24.35,57.67 24.21,57.67+ 24.21,57.67 9.60,57.67 9.60,57.67+ 9.60,57.67 5.15,57.67 5.15,57.67+ 4.61,57.67 3.30,57.73 2.85,57.60 Z" />+ <path class="hi-entity-computer-latch"+ fill="#c0c0c0" stroke="black" stroke-width="1"+ d="M 27.41,57.60+ C 27.52,57.33 27.78,56.49 27.99,56.36+ 28.14,56.26 28.41,56.28 28.59,56.28+ 28.59,56.28 35.41,56.28 35.41,56.28+ 35.59,56.28 35.86,56.26 36.02,56.36+ 36.22,56.49 36.49,57.34 36.59,57.60+ 36.12,57.73 34.22,57.67 33.60,57.67+ 33.60,57.67 29.50,57.67 29.50,57.67+ 28.97,57.67 27.86,57.73 27.41,57.60 Z" />+ <path class="hi-entity-computer-screen"+ fill="#c0c0e0" stroke="black" stroke-width="1"+ d="M 9.95,7.76+ C 9.95,7.76 13.77,7.72 13.77,7.72+ 13.77,7.72 21.29,7.72 21.29,7.72+ 21.29,7.72 44.66,7.72 44.66,7.72+ 44.66,7.72 53.43,7.72 53.43,7.72+ 53.67,7.72 53.88,7.72 54.12,7.79+ 54.94,8.02 55.02,8.73 55.03,9.46+ 55.03,9.46 55.03,30.68 55.03,30.68+ 55.03,30.68 55.03,34.43 55.03,34.43+ 55.03,34.98 55.08,35.90 54.87,36.38+ 54.61,36.98 54.07,37.08 53.50,37.08+ 53.50,37.08 19.34,37.08 19.34,37.08+ 19.34,37.08 10.50,37.08 10.50,37.08+ 9.27,37.08 8.98,36.48 8.97,35.34+ 8.97,35.34 8.97,14.40 8.97,14.40+ 8.97,14.40 8.97,9.32 8.97,9.32+ 8.98,8.56 9.16,8.00 9.95,7.76 Z" />+ <path class="hi-entity-computer-keys"+ fill="#fcfcfc" stroke="black" stroke-width="1"+ d="M 13.15,42.23+ C 13.15,42.23 18.71,42.23 18.71,42.23+ 18.71,42.23 18.43,44.80 18.43,44.80+ 18.43,44.80 12.73,44.80 12.73,44.80+ 12.73,44.80 13.15,42.23 13.15,42.23 Z+ M 20.94,44.80+ C 20.94,44.80 21.11,42.99 21.11,42.99+ 21.11,42.99 21.23,42.34 21.23,42.34+ 21.23,42.34 21.77,42.23 21.77,42.23+ 21.77,42.23 26.71,42.23 26.71,42.23+ 26.71,42.23 26.71,43.34 26.71,43.34+ 26.71,43.34 26.64,44.80 26.64,44.80+ 26.64,44.80 20.94,44.80 20.94,44.80 Z+ M 29.22,42.23+ C 29.22,42.23 34.78,42.23 34.78,42.23+ 34.78,42.23 34.85,44.80 34.85,44.80+ 34.85,44.80 29.15,44.80 29.15,44.80+ 29.15,44.80 29.22,42.23 29.22,42.23 Z+ M 37.29,42.23+ C 37.29,42.23 42.23,42.23 42.23,42.23+ 42.23,42.23 42.77,42.34 42.77,42.34+ 42.77,42.34 42.89,42.99 42.89,42.99+ 42.89,42.99 43.06,44.80 43.06,44.80+ 43.06,44.80 37.36,44.80 37.36,44.80+ 37.36,44.80 37.29,43.41 37.29,43.41+ 37.29,43.41 37.29,42.23 37.29,42.23 Z+ M 45.29,42.23+ C 45.29,42.23 50.85,42.23 50.85,42.23+ 50.85,42.23 51.27,44.87 51.27,44.87+ 51.27,44.87 49.25,44.80 49.25,44.80+ 49.25,44.80 45.57,44.80 45.57,44.80+ 45.57,44.80 45.29,42.23 45.29,42.23 Z+ M 12.24,47.23+ C 13.29,47.37 15.21,47.30 16.35,47.30+ 16.84,47.30 17.72,47.25 18.16,47.37+ 18.16,47.37 17.91,49.25 17.91,49.25+ 17.91,49.25 17.76,49.88 17.76,49.88+ 17.76,49.88 17.25,49.95 17.25,49.95+ 17.25,49.95 11.76,49.95 11.76,49.95+ 11.76,49.95 12.24,47.23 12.24,47.23 Z+ M 45.84,47.37+ C 46.28,47.25 47.16,47.30 47.65,47.30+ 48.79,47.30 50.71,47.37 51.76,47.23+ 51.76,47.23 52.24,49.95 52.24,49.95+ 52.24,49.95 46.75,49.95 46.75,49.95+ 46.75,49.95 46.24,49.88 46.24,49.88+ 46.24,49.88 46.09,49.25 46.09,49.25+ 46.09,49.25 45.84,47.37 45.84,47.37 Z+ M 20.31,49.88+ C 20.31,49.88 20.53,48.07 20.53,48.07+ 20.55,47.91 20.58,47.47 20.70,47.38+ 20.81,47.29 21.08,47.30 21.22,47.30+ 21.22,47.30 25.95,47.30 25.95,47.30+ 26.71,47.31 26.51,47.41 26.50,48.07+ 26.50,48.07 26.50,49.11 26.50,49.11+ 26.50,49.11 26.43,49.95 26.43,49.95+ 26.43,49.95 22.40,49.95 22.40,49.95+ 22.40,49.95 20.31,49.88 20.31,49.88 Z+ M 28.94,49.95+ C 28.94,49.95 29.01,48.14 29.01,48.14+ 29.01,47.97 28.98,47.54 29.08,47.42+ 29.19,47.28 29.47,47.30 29.63,47.30+ 29.63,47.30 33.67,47.30 33.67,47.30+ 33.91,47.30 34.78,47.24 34.92,47.42+ 35.01,47.53 34.99,47.79 34.99,47.93+ 34.99,47.93 35.06,49.95 35.06,49.95+ 35.06,49.95 28.94,49.95 28.94,49.95 Z+ M 37.57,49.95+ C 37.57,49.95 37.50,49.11 37.50,49.11+ 37.50,49.11 37.50,48.07 37.50,48.07+ 37.50,48.07 37.50,47.42 37.50,47.42+ 37.50,47.42 38.05,47.30 38.05,47.30+ 38.05,47.30 42.78,47.30 42.78,47.30+ 42.78,47.30 43.34,47.42 43.34,47.42+ 43.34,47.42 43.48,48.21 43.48,48.21+ 43.48,48.21 43.69,49.95 43.69,49.95+ 43.69,49.95 37.57,49.95 37.57,49.95 Z" />diff --git a/src/hi/apps/entity/templates/entity/svg/type.consumable.svg b/src/hi/apps/entity/templates/entity/svg/type.consumable.svgnew file mode 100644index 00000000..c44a96c9--- /dev/null+++ b/src/hi/apps/entity/templates/entity/svg/type.consumable.svg@@ -0,0 +1,1669 @@+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>+ <path class="hi-entity-consumables-background"+ fill="#fefefe" stroke="black" stroke-width="0"+ d="M 27.00,22.86+ C 27.00,22.86 27.00,12.94 27.00,12.94+ 27.00,12.49 27.03,11.96 27.23,11.56+ 27.67,10.69 28.88,10.20 29.76,9.89+ 31.98,9.10 35.58,8.65 37.95,8.63+ 37.95,8.63 39.16,8.54 39.16,8.54+ 39.16,8.54 41.66,8.54 41.66,8.54+ 41.66,8.54 43.13,8.63 43.13,8.63+ 43.13,8.63 44.16,8.70 44.16,8.70+ 46.21,8.84 48.21,9.13 50.20,9.65+ 50.20,9.65 51.49,10.05 51.49,10.05+ 51.49,10.05 55.20,11.10 55.20,11.10+ 56.54,11.53 58.19,12.11 59.43,12.74+ 59.77,12.92 60.63,13.36 60.83,13.64+ 61.05,13.96 60.88,15.35 60.83,15.78+ 60.83,15.78 60.71,17.85 60.71,17.85+ 60.71,17.85 60.47,20.87 60.47,20.87+ 60.47,20.87 60.13,25.70 60.13,25.70+ 60.13,25.70 59.94,28.98 59.94,28.98+ 59.94,28.98 59.52,34.42 59.52,34.42+ 59.52,34.42 59.09,40.63 59.09,40.63+ 59.09,40.63 58.92,42.95 58.92,42.95+ 58.92,42.95 58.92,43.82 58.92,43.82+ 58.92,43.82 58.50,48.99 58.50,48.99+ 58.45,49.47 58.53,50.60 58.18,50.93+ 57.75,51.34 57.24,50.85 56.93,50.54+ 56.15,49.79 54.66,48.50 53.65,48.13+ 53.65,48.52 53.68,48.88 53.52,49.25+ 53.00,50.44 50.94,51.06 49.77,51.35+ 46.39,52.20 42.55,52.40 39.07,52.36+ 39.07,52.36 37.95,52.27 37.95,52.27+ 37.95,52.27 37.35,52.27 37.35,52.27+ 37.35,52.27 36.49,52.19 36.49,52.19+ 36.49,52.19 33.98,51.94 33.98,51.94+ 32.65,51.75 30.64,51.38 29.41,50.89+ 28.87,50.67 28.11,50.32 27.69,49.92+ 27.22,49.49 27.22,49.16 26.96,48.99+ 26.80,48.89 26.50,48.91 26.31,48.91+ 26.31,48.91 7.68,48.91 7.68,48.91+ 5.80,48.88 4.66,47.53 4.66,45.71+ 4.66,45.71 4.59,41.32 4.59,41.32+ 4.59,41.32 4.89,38.90 4.89,38.90+ 4.89,38.90 5.60,33.73 5.60,33.73+ 5.74,32.68 5.74,31.72 6.73,31.06+ 7.23,30.73 7.95,30.62 8.54,30.62+ 8.54,30.62 13.02,30.62 13.02,30.62+ 13.02,30.62 11.59,25.70 11.59,25.70+ 11.44,25.26 11.00,24.21 11.28,23.82+ 11.50,23.51 11.84,23.52 12.16,23.66+ 12.16,23.66 12.94,24.06 12.94,24.06+ 13.55,24.33 14.60,24.48 15.27,24.49+ 16.68,24.52 19.59,23.90 21.05,23.58+ 22.24,23.32 24.79,22.86 25.96,22.86+ 25.96,22.86 27.00,22.86 27.00,22.86 Z" />+ <path class="hi-entity-consumables-lines"+ fill="none" stroke="black" stroke-width="1"+ d="M 23.46,23.29+ C 23.56,23.02 24.23,23.04 24.50,23.02+ 24.50,23.02 26.31,22.86 26.31,22.86+ 26.51,22.86 26.79,22.87 26.95,22.72+ 27.11,22.55 27.08,22.21 27.08,21.99+ 27.08,21.99 27.08,12.51 27.08,12.51+ 27.09,10.86 28.46,10.37 29.79,9.91+ 29.79,9.91 30.53,9.65 30.53,9.65+ 32.26,9.19 34.44,8.84 36.23,8.71+ 36.23,8.71 36.92,8.71 36.92,8.71+ 36.92,8.71 37.95,8.63 37.95,8.63+ 37.95,8.63 40.71,8.54 40.71,8.54+ 40.71,8.54 42.01,8.63 42.01,8.63+ 43.50,8.63 45.01,8.75 46.49,8.95+ 46.72,8.98 47.75,9.09 47.89,9.19+ 47.98,9.25 47.94,9.27 47.96,9.32+ 49.05,9.14 50.75,9.91 51.84,10.16+ 52.22,10.25 53.15,10.42 53.39,10.70+ 53.39,10.70 53.74,10.61 53.74,10.61+ 53.74,10.61 53.65,10.78 53.65,10.78+ 54.14,10.71 54.57,10.91 55.03,11.06+ 55.26,11.13 55.47,11.15 55.55,11.39+ 56.02,11.34 56.40,11.52 56.84,11.67+ 56.84,11.67 59.34,12.71 59.34,12.71+ 59.72,12.88 60.33,13.19 60.55,13.54+ 60.55,13.54 60.72,13.46 60.72,13.46+ 60.81,13.62 60.90,13.79 60.93,13.97+ 60.93,13.97 60.73,16.73 60.73,16.73+ 60.73,16.73 60.73,17.60 60.73,17.60+ 60.73,17.60 60.54,19.92 60.54,19.92+ 60.54,19.92 60.29,23.37 60.29,23.37+ 60.29,23.37 60.13,25.44 60.13,25.44+ 60.13,25.44 60.02,27.43 60.02,27.43+ 60.02,27.43 59.78,30.36 59.78,30.36+ 59.78,30.36 59.51,34.85 59.51,34.85+ 59.51,34.85 59.26,37.78 59.26,37.78+ 59.26,37.78 59.16,39.85 59.16,39.85+ 59.16,39.85 59.00,41.49 59.00,41.49+ 59.00,41.49 58.64,47.18 58.64,47.18+ 58.64,47.18 58.48,48.82 58.48,48.82+ 58.47,49.15 58.44,50.38 58.34,50.63+ 58.14,51.15 57.39,51.28 57.10,50.46+ 56.70,50.41 56.15,49.90 56.06,49.51+ 55.50,49.37 55.24,49.06 54.77,48.75+ 54.42,48.52 54.12,48.41 53.91,48.04+ 53.91,48.04 53.74,48.04 53.74,48.04+ 53.60,48.59 53.69,48.98 53.37,49.49+ 52.67,50.62 50.33,51.24 49.08,51.51+ 46.99,51.96 44.14,52.27 42.01,52.27+ 42.01,52.27 39.94,52.36 39.94,52.36+ 39.94,52.36 39.07,52.27 39.07,52.27+ 39.07,52.27 37.87,52.27 37.87,52.27+ 36.73,52.27 33.22,51.87 32.11,51.60+ 31.67,51.49 30.64,51.39 30.36,51.06+ 30.08,51.10 30.02,51.12 29.84,50.89+ 29.22,50.95 28.05,50.27 27.61,49.84+ 26.95,49.19 27.38,48.91 26.31,48.91+ 26.31,48.91 7.85,48.91 7.85,48.91+ 6.75,48.89 5.71,48.51 5.13,47.53+ 4.95,47.22 4.88,47.11 4.92,46.75+ 4.74,46.58 4.78,46.55 4.83,46.32+ 4.54,46.06 4.66,45.31 4.66,44.94+ 4.66,44.94 4.66,42.01 4.66,42.01+ 4.66,42.01 4.60,41.06 4.60,41.06+ 4.60,41.06 4.85,39.33 4.85,39.33+ 4.85,39.33 5.58,33.98 5.58,33.98+ 5.72,32.93 5.71,31.81 6.67,31.11+ 7.49,30.51 9.24,30.71 10.26,30.71+ 10.26,30.71 12.25,30.71 12.25,30.71+ 12.60,30.71 12.73,30.67 13.02,30.88+ 12.98,29.88 12.22,28.48 12.33,27.69+ 12.33,27.69 12.25,27.43 12.25,27.43+ 11.95,27.20 11.90,26.74 11.80,26.39+ 11.67,25.94 11.16,24.47 11.20,24.06+ 11.22,23.86 11.28,23.80 11.39,23.63+ 11.39,23.63 11.56,23.81 11.56,23.81+ 11.56,23.81 11.56,23.55 11.56,23.55+ 12.25,23.59 12.40,23.84 13.02,24.10+ 13.66,24.36 14.32,24.49 15.01,24.50+ 17.28,24.51 18.73,24.04 20.91,23.65+ 21.73,23.50 22.63,23.15 23.46,23.29 Z+ M 33.29,9.14+ C 33.29,9.14 33.21,9.14 33.21,9.14+ 33.21,9.14 33.29,9.23 33.29,9.23+ 33.29,9.23 33.29,9.14 33.29,9.14 Z+ M 33.38,9.23+ C 33.38,9.23 33.29,9.23 33.29,9.23+ 33.29,9.23 33.38,9.32 33.38,9.32+ 33.38,9.32 33.38,9.23 33.38,9.23 Z+ M 47.18,9.23+ C 47.18,9.23 47.09,9.23 47.09,9.23+ 47.09,9.23 47.18,9.32 47.18,9.32+ 47.18,9.32 47.18,9.23 47.18,9.23 Z+ M 42.26,9.66+ C 42.26,9.66 42.18,9.66 42.18,9.66+ 42.18,9.66 42.26,9.75 42.26,9.75+ 42.26,9.75 42.26,9.66 42.26,9.66 Z+ M 49.94,9.66+ C 49.94,9.66 49.85,9.66 49.85,9.66+ 49.85,9.66 49.94,9.75 49.94,9.75+ 49.94,9.75 49.94,9.66 49.94,9.66 Z+ M 46.40,10.01+ C 45.69,10.13 45.20,9.97 44.51,9.93+ 44.51,9.93 42.61,9.83 42.61,9.83+ 42.61,9.83 41.14,9.75 41.14,9.75+ 39.35,9.74 37.58,9.82 35.80,9.99+ 35.80,9.99 33.98,10.16 33.98,10.16+ 33.98,10.16 32.60,10.42 32.60,10.42+ 31.45,10.62 30.30,10.90 29.24,11.40+ 28.92,11.55 28.26,11.86 28.35,12.32+ 28.42,12.64 29.06,12.93 29.33,13.20+ 29.33,13.20 31.83,13.86 31.83,13.86+ 33.89,14.25 35.94,14.57 38.04,14.58+ 38.04,14.58 39.50,14.66 39.50,14.66+ 39.50,14.66 41.40,14.66 41.40,14.66+ 41.40,14.66 42.87,14.58 42.87,14.58+ 42.87,14.58 44.77,14.48 44.77,14.48+ 45.50,14.40 46.97,14.13 47.61,14.23+ 48.00,13.94 48.61,13.92 49.08,13.84+ 49.70,13.73 51.03,13.29 51.58,12.98+ 51.79,12.86 52.20,12.64 52.33,12.44+ 52.68,11.91 51.51,11.38 51.15,11.22+ 50.44,10.91 49.17,10.64 48.39,10.47+ 47.89,10.36 46.79,10.13 46.32,10.18+ 46.32,10.18 46.40,10.01 46.40,10.01 Z+ M 44.42,9.75+ C 44.42,9.75 44.33,9.75 44.33,9.75+ 44.33,9.75 44.42,9.83 44.42,9.83+ 44.42,9.83 44.42,9.75 44.42,9.75 Z+ M 45.80,9.75+ C 45.80,9.75 45.71,9.75 45.71,9.75+ 45.71,9.75 45.80,9.83 45.80,9.83+ 45.80,9.83 45.80,9.75 45.80,9.75 Z+ M 30.36,10.01+ C 30.36,10.01 30.27,10.01 30.27,10.01+ 30.27,10.01 30.36,10.09 30.36,10.09+ 30.36,10.09 30.36,10.01 30.36,10.01 Z+ M 29.84,10.09+ C 29.84,10.09 29.76,10.09 29.76,10.09+ 29.76,10.09 29.84,10.18 29.84,10.18+ 29.84,10.18 29.84,10.09 29.84,10.09 Z+ M 50.80,10.09+ C 50.80,10.09 50.72,10.09 50.72,10.09+ 50.72,10.09 50.80,10.18 50.80,10.18+ 50.80,10.18 50.80,10.09 50.80,10.09 Z+ M 29.15,10.26+ C 29.15,10.26 29.07,10.26 29.07,10.26+ 29.07,10.26 29.15,10.35 29.15,10.35+ 29.15,10.35 29.15,10.26 29.15,10.26 Z+ M 48.56,10.35+ C 48.56,10.35 48.47,10.35 48.47,10.35+ 48.47,10.35 48.56,10.44 48.56,10.44+ 48.56,10.44 48.56,10.35 48.56,10.35 Z+ M 49.25,10.35+ C 49.25,10.35 49.16,10.35 49.16,10.35+ 49.16,10.35 49.25,10.44 49.25,10.44+ 49.25,10.44 49.25,10.35 49.25,10.35 Z+ M 28.55,10.52+ C 28.55,10.52 28.46,10.52 28.46,10.52+ 28.46,10.52 28.55,10.61 28.55,10.61+ 28.55,10.61 28.55,10.52 28.55,10.52 Z+ M 29.15,10.52+ C 29.15,10.52 29.07,10.52 29.07,10.52+ 29.07,10.52 29.15,10.61 29.15,10.61+ 29.15,10.61 29.15,10.52 29.15,10.52 Z+ M 31.22,10.52+ C 31.22,10.52 31.14,10.52 31.14,10.52+ 31.14,10.52 31.22,10.61 31.22,10.61+ 31.22,10.61 31.22,10.52 31.22,10.52 Z+ M 35.19,12.16+ C 35.11,11.42 35.80,11.16 36.40,10.97+ 37.81,10.54 39.00,10.52 40.45,10.52+ 40.86,10.52 41.82,10.40 42.09,10.70+ 42.87,10.51 44.46,10.88 45.11,11.35+ 45.66,11.76 45.83,12.43 45.30,12.93+ 44.83,13.40 44.15,13.50 43.53,13.64+ 42.57,13.84 42.30,13.88 41.32,13.89+ 41.32,13.89 40.19,13.96 40.19,13.96+ 40.19,13.96 39.07,13.89 39.07,13.89+ 39.07,13.89 37.78,13.76 37.78,13.76+ 37.57,13.73 37.42,13.75 37.35,13.54+ 36.97,13.62 36.09,13.55 35.97,13.11+ 35.97,13.11 35.54,13.11 35.54,13.11+ 35.54,13.11 35.02,12.08 35.02,12.08+ 35.02,12.08 35.19,12.16 35.19,12.16 Z+ M 39.59,10.61+ C 39.59,10.61 39.50,10.61 39.50,10.61+ 39.50,10.61 39.59,10.70 39.59,10.70+ 39.59,10.70 39.59,10.61 39.59,10.61 Z+ M 28.29,10.70+ C 28.29,10.70 28.20,10.70 28.20,10.70+ 28.20,10.70 28.29,10.78 28.29,10.78+ 28.29,10.78 28.29,10.70 28.29,10.70 Z+ M 28.46,10.78+ C 28.46,10.78 28.38,10.78 28.38,10.78+ 28.38,10.78 28.46,10.87 28.46,10.87+ 28.46,10.87 28.46,10.78 28.46,10.78 Z+ M 50.37,10.78+ C 50.37,10.78 50.29,10.78 50.29,10.78+ 50.29,10.78 50.37,10.87 50.37,10.87+ 50.37,10.87 50.37,10.78 50.37,10.78 Z+ M 53.56,10.78+ C 53.56,10.78 53.48,10.78 53.48,10.78+ 53.48,10.78 53.56,10.87 53.56,10.87+ 53.56,10.87 53.56,10.78 53.56,10.78 Z+ M 28.12,10.87+ C 28.12,10.87 28.03,10.87 28.03,10.87+ 28.03,10.87 28.12,10.95 28.12,10.95+ 28.12,10.95 28.12,10.87 28.12,10.87 Z+ M 29.67,11.04+ C 29.67,11.04 29.58,11.04 29.58,11.04+ 29.58,11.04 29.67,11.13 29.67,11.13+ 29.67,11.13 29.67,11.04 29.67,11.04 Z+ M 51.23,11.04+ C 51.23,11.04 51.15,11.04 51.15,11.04+ 51.15,11.04 51.23,11.13 51.23,11.13+ 51.23,11.13 51.23,11.04 51.23,11.04 Z+ M 27.77,11.13+ C 27.77,11.13 27.69,11.13 27.69,11.13+ 27.69,11.13 27.77,11.21 27.77,11.21+ 27.77,11.21 27.77,11.13 27.77,11.13 Z+ M 35.97,11.21+ C 35.97,11.21 35.88,11.21 35.88,11.21+ 35.88,11.21 35.97,11.30 35.97,11.30+ 35.97,11.30 35.97,11.21 35.97,11.21 Z+ M 55.12,11.21+ C 55.12,11.21 55.03,11.21 55.03,11.21+ 55.03,11.21 55.12,11.30 55.12,11.30+ 55.12,11.30 55.12,11.21 55.12,11.21 Z+ M 35.80,11.30+ C 35.80,11.30 35.71,11.30 35.71,11.30+ 35.71,11.30 35.80,11.39 35.80,11.39+ 35.80,11.39 35.80,11.30 35.80,11.30 Z+ M 36.05,11.30+ C 36.05,11.30 35.97,11.30 35.97,11.30+ 35.97,11.30 36.05,11.39 36.05,11.39+ 36.05,11.39 36.05,11.30 36.05,11.30 Z+ M 51.92,11.30+ C 51.92,11.30 51.84,11.30 51.84,11.30+ 51.84,11.30 51.92,11.39 51.92,11.39+ 51.92,11.39 51.92,11.30 51.92,11.30 Z+ M 55.37,11.30+ C 55.37,11.30 55.29,11.30 55.29,11.30+ 55.29,11.30 55.37,11.39 55.37,11.39+ 55.37,11.39 55.37,11.30 55.37,11.30 Z+ M 28.89,11.39+ C 28.89,11.39 28.81,11.39 28.81,11.39+ 28.81,11.39 28.89,11.47 28.89,11.47+ 28.89,11.47 28.89,11.39 28.89,11.39 Z+ M 55.03,11.39+ C 55.03,11.39 54.94,11.39 54.94,11.39+ 54.94,11.39 55.03,11.47 55.03,11.47+ 55.03,11.47 55.03,11.39 55.03,11.39 Z+ M 51.92,11.47+ C 51.92,11.47 51.84,11.47 51.84,11.47+ 51.84,11.47 51.92,11.56 51.92,11.56+ 51.92,11.56 51.92,11.47 51.92,11.47 Z+ M 28.72,11.56+ C 28.72,11.56 28.64,11.56 28.64,11.56+ 28.64,11.56 28.72,11.64 28.72,11.64+ 28.72,11.64 28.72,11.56 28.72,11.56 Z+ M 44.08,12.33+ C 43.76,11.83 42.81,11.86 42.26,11.79+ 42.26,11.79 40.37,11.65 40.37,11.65+ 40.37,11.65 39.07,11.73 39.07,11.73+ 37.96,11.73 37.06,12.09 36.66,12.08+ 36.78,12.38 36.95,12.39 37.26,12.46+ 37.57,12.54 38.70,12.71 38.99,12.70+ 39.61,12.67 39.50,12.72 40.02,12.75+ 40.02,12.75 41.40,12.75 41.40,12.75+ 42.30,12.70 43.20,12.50 44.08,12.33 Z+ M 45.37,11.64+ C 45.37,11.64 45.28,11.64 45.28,11.64+ 45.28,11.64 45.37,11.73 45.37,11.73+ 45.37,11.73 45.37,11.64 45.37,11.64 Z+ M 43.64,11.73+ C 43.64,11.73 43.56,11.73 43.56,11.73+ 43.56,11.73 43.64,11.82 43.64,11.82+ 43.64,11.82 43.64,11.73 43.64,11.73 Z+ M 43.73,11.82+ C 43.73,11.82 43.64,11.82 43.64,11.82+ 43.64,11.82 43.73,11.90 43.73,11.90+ 43.73,11.90 43.73,11.82 43.73,11.82 Z+ M 53.99,11.82+ C 53.99,11.82 53.91,11.82 53.91,11.82+ 53.91,11.82 53.99,11.90 53.99,11.90+ 53.99,11.90 53.99,11.82 53.99,11.82 Z+ M 59.77,14.32+ C 58.25,13.44 57.03,12.96 55.37,12.42+ 54.83,12.24 54.21,12.00 53.65,11.90+ 53.65,11.90 53.65,36.83 53.65,36.83+ 53.65,36.83 53.65,45.97 53.65,45.97+ 53.65,46.76 53.64,46.58 54.68,47.28+ 54.68,47.28 56.58,48.65 56.58,48.65+ 56.58,48.65 56.41,48.56 56.41,48.56+ 56.51,48.71 56.52,48.77 56.67,48.65+ 56.67,48.65 57.27,49.08 57.27,49.08+ 57.27,49.08 57.37,47.87 57.37,47.87+ 57.37,47.87 57.55,45.28 57.55,45.28+ 57.55,45.28 57.88,40.45 57.88,40.45+ 57.88,40.45 58.13,37.18 58.13,37.18+ 58.13,37.18 58.31,34.33 58.31,34.33+ 58.31,34.33 58.40,33.47 58.40,33.47+ 58.40,33.47 58.48,32.52 58.48,32.52+ 58.48,32.52 58.48,31.74 58.48,31.74+ 58.48,31.74 58.72,28.98 58.72,28.98+ 58.72,28.98 58.83,26.91 58.83,26.91+ 58.83,26.91 59.16,22.68 59.16,22.68+ 59.16,22.68 59.35,19.41 59.35,19.41+ 59.35,19.41 59.52,17.08 59.52,17.08+ 59.52,17.08 59.77,14.32 59.77,14.32 Z+ M 57.19,11.90+ C 57.19,11.90 57.10,11.90 57.10,11.90+ 57.10,11.90 57.19,11.99 57.19,11.99+ 57.19,11.99 57.19,11.90 57.19,11.90 Z+ M 57.44,11.99+ C 57.44,11.99 57.36,11.99 57.36,11.99+ 57.36,11.99 57.44,12.08 57.44,12.08+ 57.44,12.08 57.44,11.99 57.44,11.99 Z+ M 54.68,12.08+ C 54.68,12.08 54.60,12.08 54.60,12.08+ 54.60,12.08 54.68,12.16 54.68,12.16+ 54.68,12.16 54.68,12.08 54.68,12.08 Z+ M 57.79,12.08+ C 57.79,12.08 57.70,12.08 57.70,12.08+ 57.70,12.08 57.79,12.16 57.79,12.16+ 57.79,12.16 57.79,12.08 57.79,12.08 Z+ M 44.33,12.16+ C 44.33,12.16 44.25,12.16 44.25,12.16+ 44.25,12.16 44.33,12.25 44.33,12.25+ 44.33,12.25 44.33,12.16 44.33,12.16 Z+ M 53.48,12.16+ C 53.48,12.16 53.39,12.16 53.39,12.16+ 53.39,12.16 53.48,12.25 53.48,12.25+ 53.48,12.25 53.48,12.16 53.48,12.16 Z+ M 45.46,12.25+ C 45.46,12.25 45.37,12.25 45.37,12.25+ 45.37,12.25 45.46,12.33 45.46,12.33+ 45.46,12.33 45.46,12.25 45.46,12.25 Z+ M 36.83,12.42+ C 36.83,12.42 36.74,12.42 36.74,12.42+ 36.74,12.42 36.83,12.51 36.83,12.51+ 36.83,12.51 36.83,12.42 36.83,12.42 Z+ M 52.53,12.42+ C 52.53,12.42 52.44,12.42 52.44,12.42+ 52.44,12.42 52.53,12.51 52.53,12.51+ 52.53,12.51 52.53,12.42 52.53,12.42 Z+ M 56.06,12.42+ C 56.06,12.42 55.98,12.42 55.98,12.42+ 55.98,12.42 56.06,12.51 56.06,12.51+ 56.06,12.51 56.06,12.42 56.06,12.42 Z+ M 58.22,12.42+ C 58.22,12.42 58.13,12.42 58.13,12.42+ 58.13,12.42 58.22,12.51 58.22,12.51+ 58.22,12.51 58.22,12.42 58.22,12.42 Z+ M 58.48,12.42+ C 58.48,12.42 58.39,12.42 58.39,12.42+ 58.39,12.42 58.48,12.51 58.48,12.51+ 58.48,12.51 58.48,12.42 58.48,12.42 Z+ M 56.32,12.51+ C 56.32,12.51 56.24,12.51 56.24,12.51+ 56.24,12.51 56.32,12.59 56.32,12.59+ 56.32,12.59 56.32,12.51 56.32,12.51 Z+ M 35.36,12.59+ C 35.36,12.59 35.28,12.59 35.28,12.59+ 35.28,12.59 35.36,12.68 35.36,12.68+ 35.36,12.68 35.36,12.59 35.36,12.59 Z+ M 45.11,12.59+ C 45.11,12.59 45.02,12.59 45.02,12.59+ 45.02,12.59 45.11,12.68 45.11,12.68+ 45.11,12.68 45.11,12.59 45.11,12.59 Z+ M 52.36,12.59+ C 52.36,12.59 52.27,12.59 52.27,12.59+ 52.27,12.59 52.36,12.68 52.36,12.68+ 52.36,12.68 52.36,12.59 52.36,12.59 Z+ M 58.91,12.59+ C 58.91,12.59 58.82,12.59 58.82,12.59+ 58.82,12.59 58.91,12.68 58.91,12.68+ 58.91,12.68 58.91,12.59 58.91,12.59 Z+ M 56.50,12.68+ C 56.50,12.68 56.41,12.68 56.41,12.68+ 56.41,12.68 56.50,12.77 56.50,12.77+ 56.50,12.77 56.50,12.68 56.50,12.68 Z+ M 59.08,12.68+ C 59.08,12.68 59.00,12.68 59.00,12.68+ 59.00,12.68 59.08,12.77 59.08,12.77+ 59.08,12.77 59.08,12.68 59.08,12.68 Z+ M 42.95,12.77+ C 42.95,12.77 42.87,12.77 42.87,12.77+ 42.87,12.77 42.95,12.85 42.95,12.85+ 42.95,12.85 42.95,12.77 42.95,12.77 Z+ M 56.75,12.77+ C 56.75,12.77 56.67,12.77 56.67,12.77+ 56.67,12.77 56.75,12.85 56.75,12.85+ 56.75,12.85 56.75,12.77 56.75,12.77 Z+ M 59.26,12.77+ C 59.26,12.77 59.17,12.77 59.17,12.77+ 59.17,12.77 59.26,12.85 59.26,12.85+ 59.26,12.85 59.26,12.77 59.26,12.77 Z+ M 58.22,12.85+ C 58.22,12.85 58.13,12.85 58.13,12.85+ 58.13,12.85 58.22,12.94 58.22,12.94+ 58.22,12.94 58.22,12.85 58.22,12.85 Z+ M 59.51,12.85+ C 59.51,12.85 59.43,12.85 59.43,12.85+ 59.43,12.85 59.51,12.94 59.51,12.94+ 59.51,12.94 59.51,12.85 59.51,12.85 Z+ M 57.88,13.11+ C 57.88,13.11 57.79,13.11 57.79,13.11+ 57.79,13.11 57.88,13.20 57.88,13.20+ 57.88,13.20 57.88,13.11 57.88,13.11 Z+ M 51.23,13.20+ C 51.23,13.20 51.15,13.20 51.15,13.20+ 51.15,13.20 51.23,13.28 51.23,13.28+ 51.23,13.28 51.23,13.20 51.23,13.20 Z+ M 58.13,13.20+ C 58.13,13.20 58.05,13.20 58.05,13.20+ 58.05,13.20 58.13,13.28 58.13,13.28+ 58.13,13.28 58.13,13.20 58.13,13.20 Z+ M 44.42,13.28+ C 44.42,13.28 44.33,13.28 44.33,13.28+ 44.33,13.28 44.42,13.37 44.42,13.37+ 44.42,13.37 44.42,13.28 44.42,13.28 Z+ M 58.22,13.28+ C 58.22,13.28 58.13,13.28 58.13,13.28+ 58.13,13.28 58.22,13.37 58.22,13.37+ 58.22,13.37 58.22,13.28 58.22,13.28 Z+ M 60.46,13.37+ C 60.46,13.37 60.38,13.37 60.38,13.37+ 60.38,13.37 60.46,13.46 60.46,13.46+ 60.46,13.46 60.46,13.37 60.46,13.37 Z+ M 29.67,13.46+ C 29.67,13.46 29.58,13.46 29.58,13.46+ 29.58,13.46 29.67,13.54 29.67,13.54+ 29.67,13.54 29.67,13.46 29.67,13.46 Z+ M 29.93,13.46+ C 29.93,13.46 29.84,13.46 29.84,13.46+ 29.84,13.46 29.93,13.54 29.93,13.54+ 29.93,13.54 29.93,13.46 29.93,13.46 Z+ M 60.38,13.46+ C 60.38,13.46 60.29,13.46 60.29,13.46+ 60.29,13.46 60.38,13.54 60.38,13.54+ 60.38,13.54 60.38,13.46 60.38,13.46 Z+ M 50.63,13.54+ C 50.63,13.54 50.54,13.54 50.54,13.54+ 50.54,13.54 50.63,13.63 50.63,13.63+ 50.63,13.63 50.63,13.54 50.63,13.54 Z+ M 60.29,13.54+ C 60.29,13.54 60.20,13.54 60.20,13.54+ 60.20,13.54 60.29,13.63 60.29,13.63+ 60.29,13.63 60.29,13.54 60.29,13.54 Z+ M 60.55,13.54+ C 60.55,13.54 60.46,13.54 60.46,13.54+ 60.46,13.54 60.55,13.63 60.55,13.63+ 60.55,13.63 60.55,13.54 60.55,13.54 Z+ M 50.89,13.63+ C 50.89,13.63 50.80,13.63 50.80,13.63+ 50.80,13.63 50.89,13.71 50.89,13.71+ 50.89,13.71 50.89,13.63 50.89,13.63 Z+ M 58.82,13.63+ C 58.82,13.63 58.74,13.63 58.74,13.63+ 58.74,13.63 58.82,13.71 58.82,13.71+ 58.82,13.71 58.82,13.63 58.82,13.63 Z+ M 60.64,13.63+ C 60.64,13.63 60.55,13.63 60.55,13.63+ 60.55,13.63 60.64,13.71 60.64,13.71+ 60.64,13.71 60.64,13.63 60.64,13.63 Z+ M 28.38,13.71+ C 28.38,13.71 28.29,13.71 28.29,13.71+ 28.29,13.71 28.38,13.80 28.38,13.80+ 28.38,13.80 28.38,13.71 28.38,13.71 Z+ M 60.12,13.71+ C 60.12,13.71 60.03,13.71 60.03,13.71+ 60.03,13.71 60.12,13.80 60.12,13.80+ 60.12,13.80 60.12,13.71 60.12,13.71 Z+ M 33.04,15.18+ C 32.42,15.26 31.99,15.11 31.40,14.95+ 31.40,14.95 29.67,14.47 29.67,14.47+ 29.67,14.47 28.29,13.89 28.29,13.89+ 28.29,13.89 28.20,13.97 28.20,13.97+ 28.20,13.97 28.29,19.67 28.29,19.67+ 28.29,19.67 28.20,22.86 28.20,22.86+ 28.20,22.86 30.53,23.42 30.53,23.42+ 30.87,23.53 31.27,23.67 31.35,24.07+ 31.40,24.31 31.15,25.16 31.09,25.44+ 31.09,25.44 30.33,28.81 30.33,28.81+ 30.33,28.81 30.04,30.02 30.04,30.02+ 30.01,30.18 29.93,30.44 30.04,30.59+ 30.15,30.79 30.74,30.71 30.96,30.71+ 30.96,30.71 34.33,30.71 34.33,30.71+ 35.37,30.71 36.26,31.16 36.66,32.17+ 36.85,32.63 36.89,33.24 36.95,33.73+ 37.04,34.35 37.20,34.99 37.09,35.62+ 37.31,35.92 37.31,36.29 37.35,36.66+ 37.35,36.66 37.57,38.21 37.57,38.21+ 37.57,38.21 37.94,41.06 37.94,41.06+ 37.96,41.45 37.84,41.59 37.85,41.92+ 37.85,41.92 37.85,45.97 37.85,45.97+ 37.86,46.64 37.44,47.94 36.74,48.13+ 36.74,48.13 36.14,48.47 36.14,48.47+ 36.14,48.47 35.79,48.73 35.79,48.73+ 35.79,48.73 34.67,48.91 34.67,48.91+ 34.67,48.91 28.46,48.91 28.46,48.91+ 28.90,49.46 29.69,49.73 30.36,49.93+ 31.42,50.24 32.46,50.49 33.55,50.64+ 35.07,50.85 36.59,51.06 38.12,51.06+ 38.12,51.06 39.59,51.15 39.59,51.15+ 39.59,51.15 41.23,51.15 41.23,51.15+ 41.23,51.15 42.95,51.06 42.95,51.06+ 42.95,51.06 43.90,50.98 43.90,50.98+ 43.90,50.98 46.30,50.85 46.30,50.85+ 46.68,50.82 46.69,50.63 47.53,50.72+ 47.61,50.55 47.78,50.58 47.96,50.54+ 47.96,50.54 49.08,50.28 49.08,50.28+ 49.87,50.11 50.86,49.84 51.58,49.46+ 51.85,49.32 52.25,49.09 52.39,48.81+ 52.50,48.57 52.44,48.07 52.44,47.78+ 52.44,47.78 52.44,13.89 52.44,13.89+ 52.44,13.89 51.15,14.43 51.15,14.43+ 51.15,14.43 50.46,14.61 50.46,14.61+ 50.46,14.61 48.04,15.23 48.04,15.23+ 48.04,15.23 46.92,15.39 46.92,15.39+ 46.72,15.40 46.57,15.33 46.49,15.53+ 46.49,15.53 45.71,15.44 45.71,15.44+ 45.71,15.44 45.80,15.61 45.80,15.61+ 45.80,15.61 42.52,15.78 42.52,15.78+ 42.52,15.78 41.32,15.87 41.32,15.87+ 41.32,15.87 39.42,15.87 39.42,15.87+ 39.42,15.87 38.12,15.78 38.12,15.78+ 38.12,15.78 34.85,15.54 34.85,15.54+ 34.85,15.54 33.04,15.18 33.04,15.18 Z+ M 28.81,13.89+ C 28.81,13.89 28.72,13.89 28.72,13.89+ 28.72,13.89 28.81,13.97 28.81,13.97+ 28.81,13.97 28.81,13.89 28.81,13.89 Z+ M 52.10,13.89+ C 52.10,13.89 52.01,13.89 52.01,13.89+ 52.01,13.89 52.10,13.97 52.10,13.97+ 52.10,13.97 52.10,13.89 52.10,13.89 Z+ M 52.61,13.89+ C 52.61,13.89 52.53,13.89 52.53,13.89+ 52.53,13.89 52.61,13.97 52.61,13.97+ 52.61,13.97 52.61,13.89 52.61,13.89 Z+ M 28.89,13.97+ C 28.89,13.97 28.81,13.97 28.81,13.97+ 28.81,13.97 28.89,14.06 28.89,14.06+ 28.89,14.06 28.89,13.97 28.89,13.97 Z+ M 31.91,13.97+ C 31.91,13.97 31.83,13.97 31.83,13.97+ 31.83,13.97 31.91,14.06 31.91,14.06+ 31.91,14.06 31.91,13.97 31.91,13.97 Z+ M 51.92,13.97+ C 51.92,13.97 51.84,13.97 51.84,13.97+ 51.84,13.97 51.92,14.06 51.92,14.06+ 51.92,14.06 51.92,13.97 51.92,13.97 Z+ M 59.43,13.97+ C 59.43,13.97 59.34,13.97 59.34,13.97+ 59.34,13.97 59.43,14.06 59.43,14.06+ 59.43,14.06 59.43,13.97 59.43,13.97 Z+ M 28.98,14.06+ C 28.98,14.06 28.89,14.06 28.89,14.06+ 28.89,14.06 28.98,14.15 28.98,14.15+ 28.98,14.15 28.98,14.06 28.98,14.06 Z+ M 32.60,14.06+ C 32.60,14.06 32.52,14.06 32.52,14.06+ 32.52,14.06 32.60,14.15 32.60,14.15+ 32.60,14.15 32.60,14.06 32.60,14.06 Z+ M 51.67,14.06+ C 51.67,14.06 51.58,14.06 51.58,14.06+ 51.58,14.06 51.67,14.15 51.67,14.15+ 51.67,14.15 51.67,14.06 51.67,14.06 Z+ M 29.15,14.15+ C 29.15,14.15 29.07,14.15 29.07,14.15+ 29.07,14.15 29.15,14.23 29.15,14.23+ 29.15,14.23 29.15,14.15 29.15,14.15 Z+ M 32.95,14.15+ C 32.95,14.15 32.86,14.15 32.86,14.15+ 32.86,14.15 32.95,14.23 32.95,14.23+ 32.95,14.23 32.95,14.15 32.95,14.15 Z+ M 29.58,14.23+ C 29.58,14.23 29.50,14.23 29.50,14.23+ 29.50,14.23 29.58,14.32 29.58,14.32+ 29.58,14.32 29.58,14.23 29.58,14.23 Z+ M 48.56,14.23+ C 48.56,14.23 48.47,14.23 48.47,14.23+ 48.47,14.23 48.56,14.32 48.56,14.32+ 48.56,14.32 48.56,14.23 48.56,14.23 Z+ M 51.32,14.23+ C 51.32,14.23 51.23,14.23 51.23,14.23+ 51.23,14.23 51.32,14.32 51.32,14.32+ 51.32,14.32 51.32,14.23 51.32,14.23 Z+ M 59.95,14.32+ C 59.95,14.32 59.86,14.32 59.86,14.32+ 59.86,14.32 59.95,14.40 59.95,14.40+ 59.95,14.40 59.95,14.32 59.95,14.32 Z+ M 59.86,14.40+ C 59.86,14.40 59.77,14.40 59.77,14.40+ 59.77,14.40 59.86,14.49 59.86,14.49+ 59.86,14.49 59.86,14.40 59.86,14.40 Z+ M 31.22,14.49+ C 31.22,14.49 31.14,14.49 31.14,14.49+ 31.14,14.49 31.22,14.58 31.22,14.58+ 31.22,14.58 31.22,14.49 31.22,14.49 Z+ M 49.94,14.66+ C 49.94,14.66 49.85,14.66 49.85,14.66+ 49.85,14.66 49.94,14.75 49.94,14.75+ 49.94,14.75 49.94,14.66 49.94,14.66 Z+ M 59.86,15.09+ C 59.86,15.09 59.77,15.09 59.77,15.09+ 59.77,15.09 59.86,15.18 59.86,15.18+ 59.86,15.18 59.86,15.09 59.86,15.09 Z+ M 33.73,15.18+ C 33.73,15.18 33.64,15.18 33.64,15.18+ 33.64,15.18 33.73,15.27 33.73,15.27+ 33.73,15.27 33.73,15.18 33.73,15.18 Z+ M 49.60,19.67+ C 49.97,19.58 50.22,19.51 50.37,19.92+ 50.37,19.92 50.54,19.84 50.54,19.84+ 50.54,19.84 50.63,23.46 50.63,23.46+ 50.63,23.46 50.63,29.58 50.63,29.58+ 50.63,29.58 50.63,32.00 50.63,32.00+ 50.63,32.41 50.71,32.77 50.46,33.12+ 50.60,33.30 50.44,33.36 50.29,33.47+ 50.47,33.74 49.84,33.70 49.70,33.62+ 49.36,33.42 49.42,32.86 49.42,32.52+ 49.42,32.52 49.42,24.06 49.42,24.06+ 49.42,24.06 49.42,19.84 49.42,19.84+ 49.42,19.84 49.68,19.92 49.68,19.92+ 49.68,19.92 49.60,19.67 49.60,19.67 Z+ M 49.60,20.53+ C 49.60,20.53 49.51,20.53 49.51,20.53+ 49.51,20.53 49.60,20.61 49.60,20.61+ 49.60,20.61 49.60,20.53 49.60,20.53 Z+ M 26.82,22.94+ C 26.82,22.94 26.74,22.94 26.74,22.94+ 26.74,22.94 26.82,23.03 26.82,23.03+ 26.82,23.03 26.82,22.94 26.82,22.94 Z+ M 28.55,23.03+ C 28.55,23.03 28.46,23.03 28.46,23.03+ 28.46,23.03 28.55,23.12 28.55,23.12+ 28.55,23.12 28.55,23.03 28.55,23.03 Z+ M 26.48,23.29+ C 26.48,23.29 26.39,23.29 26.39,23.29+ 26.39,23.29 26.48,23.37 26.48,23.37+ 26.48,23.37 26.48,23.29 26.48,23.29 Z+ M 29.93,23.29+ C 29.93,23.29 29.84,23.29 29.84,23.29+ 29.84,23.29 29.93,23.37 29.93,23.37+ 29.93,23.37 29.93,23.29 29.93,23.29 Z+ M 11.90,23.63+ C 11.90,23.63 11.82,23.63 11.82,23.63+ 11.82,23.63 11.90,23.72 11.90,23.72+ 11.90,23.72 11.90,23.63 11.90,23.63 Z+ M 20.87,23.72+ C 20.87,23.72 20.79,23.72 20.79,23.72+ 20.79,23.72 20.87,23.81 20.87,23.81+ 20.87,23.81 20.87,23.72 20.87,23.72 Z+ M 31.22,23.72+ C 31.22,23.72 31.14,23.72 31.14,23.72+ 31.14,23.72 31.22,23.81 31.22,23.81+ 31.22,23.81 31.22,23.72 31.22,23.72 Z+ M 12.25,23.81+ C 12.25,23.81 12.16,23.81 12.16,23.81+ 12.16,23.81 12.25,23.89 12.25,23.89+ 12.25,23.89 12.25,23.81 12.25,23.81 Z+ M 11.99,23.89+ C 11.99,23.89 11.90,23.89 11.90,23.89+ 11.90,23.89 11.99,23.98 11.99,23.98+ 11.99,23.98 11.99,23.89 11.99,23.89 Z+ M 12.42,23.89+ C 12.42,23.89 12.33,23.89 12.33,23.89+ 12.33,23.89 12.42,23.98 12.42,23.98+ 12.42,23.98 12.42,23.89 12.42,23.89 Z+ M 31.31,23.89+ C 31.31,23.89 31.22,23.89 31.22,23.89+ 31.22,23.89 31.31,23.98 31.31,23.98+ 31.31,23.98 31.31,23.89 31.31,23.89 Z+ M 30.10,24.50+ C 28.19,23.86 25.60,24.00 23.63,24.33+ 23.63,24.33 22.17,24.56 22.17,24.56+ 21.46,24.70 21.13,24.89 20.36,24.84+ 19.95,25.17 19.31,25.18 18.80,25.25+ 18.80,25.25 18.11,25.41 18.11,25.41+ 17.49,25.52 15.67,25.74 15.09,25.69+ 15.09,25.69 13.54,25.52 13.54,25.52+ 13.15,25.43 13.02,25.24 12.68,25.52+ 12.68,25.52 13.20,26.74 13.20,26.74+ 13.20,26.74 13.11,27.00 13.11,27.00+ 13.43,27.37 13.68,28.54 13.84,29.07+ 13.84,29.07 15.18,33.53 15.18,33.53+ 15.18,33.53 15.72,35.36 15.72,35.36+ 15.79,35.59 15.83,35.89 16.07,36.00+ 16.23,36.08 17.22,36.19 17.37,35.85+ 17.44,35.68 17.26,34.44 17.23,34.16+ 17.23,34.16 16.93,31.83 16.93,31.83+ 16.93,31.83 16.88,30.96 16.88,30.96+ 16.80,30.39 16.60,29.83 16.64,29.24+ 16.68,28.63 17.39,28.33 17.72,28.98+ 17.85,29.24 18.00,30.83 18.04,31.22+ 18.04,31.22 18.29,33.21 18.29,33.21+ 18.29,33.21 18.63,36.05 18.63,36.05+ 18.63,36.05 20.72,36.05 20.72,36.05+ 20.72,36.05 20.72,33.30 20.72,33.30+ 20.86,32.87 21.34,32.64 21.68,32.99+ 21.93,33.25 21.91,33.65 21.91,33.98+ 21.91,33.98 21.91,36.14 21.91,36.14+ 22.66,36.04 22.54,36.06 23.29,36.05+ 24.05,36.05 23.92,35.96 24.08,34.85+ 24.08,34.85 24.36,32.43 24.36,32.43+ 24.41,32.09 24.43,31.68 24.70,31.43+ 25.13,31.04 25.60,31.53 25.60,32.00+ 25.60,32.00 25.38,33.81 25.38,33.81+ 25.38,33.81 25.10,35.97 25.10,35.97+ 25.10,35.97 27.34,36.14 27.34,36.14+ 27.34,36.14 27.34,36.05 27.34,36.05+ 27.34,36.05 27.51,35.97 27.51,35.97+ 27.51,35.97 27.83,34.33 27.83,34.33+ 27.83,34.33 28.46,31.65 28.46,31.65+ 28.46,31.65 28.76,30.43 28.76,30.43+ 28.76,30.43 28.89,30.36 28.89,30.36+ 28.89,30.36 28.89,29.93 28.89,29.93+ 28.89,29.93 29.50,27.34 29.50,27.34+ 29.50,27.34 29.50,27.51 29.50,27.51+ 29.50,27.51 29.58,27.51 29.58,27.51+ 29.54,27.00 29.70,25.85 30.02,25.44+ 30.02,25.44 30.10,24.50 30.10,24.50 Z+ M 22.34,24.15+ C 22.34,24.15 22.25,24.15 22.25,24.15+ 22.25,24.15 22.34,24.24 22.34,24.24+ 22.34,24.24 22.34,24.15 22.34,24.15 Z+ M 23.03,24.15+ C 23.03,24.15 22.94,24.15 22.94,24.15+ 22.94,24.15 23.03,24.24 23.03,24.24+ 23.03,24.24 23.03,24.15 23.03,24.15 Z+ M 23.72,24.15+ C 23.72,24.15 23.63,24.15 23.63,24.15+ 23.63,24.15 23.72,24.24 23.72,24.24+ 23.72,24.24 23.72,24.15 23.72,24.15 Z+ M 29.24,24.15+ C 29.24,24.15 29.15,24.15 29.15,24.15+ 29.15,24.15 29.24,24.24 29.24,24.24+ 29.24,24.24 29.24,24.15 29.24,24.15 Z+ M 13.37,24.41+ C 13.37,24.41 13.28,24.41 13.28,24.41+ 13.28,24.41 13.37,24.50 13.37,24.50+ 13.37,24.50 13.37,24.41 13.37,24.41 Z+ M 30.27,24.41+ C 30.27,24.41 30.19,24.41 30.19,24.41+ 30.19,24.41 30.27,24.50 30.27,24.50+ 30.27,24.50 30.27,24.41 30.27,24.41 Z+ M 30.27,24.67+ C 30.27,24.67 30.19,24.67 30.19,24.67+ 30.19,24.67 30.27,24.75 30.27,24.75+ 30.27,24.75 30.27,24.67 30.27,24.67 Z+ M 20.18,24.84+ C 20.18,24.84 20.10,24.84 20.10,24.84+ 20.10,24.84 20.18,24.93 20.18,24.93+ 20.18,24.93 20.18,24.84 20.18,24.84 Z+ M 11.73,24.93+ C 11.73,24.93 11.64,24.93 11.64,24.93+ 11.64,24.93 11.73,25.01 11.73,25.01+ 11.73,25.01 11.73,24.93 11.73,24.93 Z+ M 18.89,24.93+ C 18.89,24.93 18.80,24.93 18.80,24.93+ 18.80,24.93 18.89,25.01 18.89,25.01+ 18.89,25.01 18.89,24.93 18.89,24.93 Z+ M 19.49,24.93+ C 19.49,24.93 19.41,24.93 19.41,24.93+ 19.41,24.93 19.49,25.01 19.49,25.01+ 19.49,25.01 19.49,24.93 19.49,24.93 Z+ M 19.84,24.93+ C 19.84,24.93 19.75,24.93 19.75,24.93+ 19.75,24.93 19.84,25.01 19.84,25.01+ 19.84,25.01 19.84,24.93 19.84,24.93 Z+ M 13.28,25.27+ C 13.28,25.27 13.20,25.27 13.20,25.27+ 13.20,25.27 13.28,25.36 13.28,25.36+ 13.28,25.36 13.28,25.27 13.28,25.27 Z+ M 11.73,25.36+ C 11.73,25.36 11.64,25.36 11.64,25.36+ 11.64,25.36 11.73,25.44 11.73,25.44+ 11.73,25.44 11.73,25.36 11.73,25.36 Z+ M 12.94,26.13+ C 12.94,26.13 12.85,26.13 12.85,26.13+ 12.85,26.13 12.94,26.22 12.94,26.22+ 12.94,26.22 12.94,26.13 12.94,26.13 Z+ M 12.33,26.82+ C 12.33,26.82 12.25,26.82 12.25,26.82+ 12.25,26.82 12.33,26.91 12.33,26.91+ 12.33,26.91 12.33,26.82 12.33,26.82 Z+ M 12.59,26.82+ C 12.59,26.82 12.51,26.82 12.51,26.82+ 12.51,26.82 12.59,26.91 12.59,26.91+ 12.59,26.91 12.59,26.82 12.59,26.82 Z+ M 12.51,27.69+ C 12.51,27.69 12.42,27.69 12.42,27.69+ 12.42,27.69 12.51,27.77 12.51,27.77+ 12.51,27.77 12.51,27.69 12.51,27.69 Z+ M 13.54,28.20+ C 13.54,28.20 13.46,28.20 13.46,28.20+ 13.46,28.20 13.54,28.29 13.54,28.29+ 13.54,28.29 13.54,28.20 13.54,28.20 Z+ M 17.42,28.64+ C 17.42,28.64 17.34,28.64 17.34,28.64+ 17.34,28.64 17.42,28.72 17.42,28.72+ 17.42,28.72 17.42,28.64 17.42,28.64 Z+ M 16.99,28.81+ C 16.99,28.81 16.91,28.81 16.91,28.81+ 16.91,28.81 16.99,28.89 16.99,28.89+ 16.99,28.89 16.99,28.81 16.99,28.81 Z+ M 17.60,28.81+ C 17.60,28.81 17.51,28.81 17.51,28.81+ 17.51,28.81 17.60,28.89 17.60,28.89+ 17.60,28.89 17.60,28.81 17.60,28.81 Z+ M 12.77,28.89+ C 12.77,28.89 12.68,28.89 12.68,28.89+ 12.68,28.89 12.77,28.98 12.77,28.98+ 12.77,28.98 12.77,28.89 12.77,28.89 Z+ M 13.02,29.50+ C 13.02,29.50 12.94,29.50 12.94,29.50+ 12.94,29.50 13.02,29.58 13.02,29.58+ 13.02,29.58 13.02,29.50 13.02,29.50 Z+ M 13.89,29.50+ C 13.89,29.50 13.80,29.50 13.80,29.50+ 13.80,29.50 13.89,29.58 13.89,29.58+ 13.89,29.58 13.89,29.50 13.89,29.50 Z+ M 30.02,29.93+ C 30.02,29.93 29.93,29.93 29.93,29.93+ 29.93,29.93 30.02,30.02 30.02,30.02+ 30.02,30.02 30.02,29.93 30.02,29.93 Z+ M 14.15,30.27+ C 14.15,30.27 14.06,30.27 14.06,30.27+ 14.06,30.27 14.15,30.36 14.15,30.36+ 14.15,30.36 14.15,30.27 14.15,30.27 Z+ M 30.02,30.71+ C 30.02,30.71 29.93,30.71 29.93,30.71+ 29.93,30.71 30.02,30.79 30.02,30.79+ 30.02,30.79 30.02,30.71 30.02,30.71 Z+ M 12.85,30.88+ C 12.85,30.88 12.77,30.88 12.77,30.88+ 12.77,30.88 12.85,30.96 12.85,30.96+ 12.85,30.96 12.85,30.88 12.85,30.88 Z+ M 14.15,30.88+ C 14.15,30.88 14.06,30.88 14.06,30.88+ 14.06,30.88 14.15,30.96 14.15,30.96+ 14.15,30.96 14.15,30.88 14.15,30.88 Z+ M 7.07,30.96+ C 7.07,30.96 6.99,30.96 6.99,30.96+ 6.99,30.96 7.07,31.05 7.07,31.05+ 7.07,31.05 7.07,30.96 7.07,30.96 Z+ M 35.54,30.96+ C 35.54,30.96 35.45,30.96 35.45,30.96+ 35.45,30.96 35.54,31.05 35.54,31.05+ 35.54,31.05 35.54,30.96 35.54,30.96 Z+ M 35.88,31.22+ C 35.88,31.22 35.80,31.22 35.80,31.22+ 35.80,31.22 35.88,31.31 35.88,31.31+ 35.88,31.31 35.88,31.22 35.88,31.22 Z+ M 6.64,31.31+ C 6.64,31.31 6.56,31.31 6.56,31.31+ 6.56,31.31 6.64,31.40 6.64,31.40+ 6.64,31.40 6.64,31.31 6.64,31.31 Z+ M 6.99,31.31+ C 6.99,31.31 6.90,31.31 6.90,31.31+ 6.90,31.31 6.99,31.40 6.99,31.40+ 6.99,31.40 6.99,31.31 6.99,31.31 Z+ M 25.10,31.31+ C 25.10,31.31 25.01,31.31 25.01,31.31+ 25.01,31.31 25.10,31.40 25.10,31.40+ 25.10,31.40 25.10,31.31 25.10,31.31 Z+ M 14.49,31.40+ C 14.49,31.40 14.40,31.40 14.40,31.40+ 14.40,31.40 14.49,31.48 14.49,31.48+ 14.49,31.48 14.49,31.40 14.49,31.40 Z+ M 24.84,31.40+ C 24.84,31.40 24.75,31.40 24.75,31.40+ 24.75,31.40 24.84,31.48 24.84,31.48+ 24.84,31.48 24.84,31.40 24.84,31.40 Z+ M 25.27,31.40+ C 25.27,31.40 25.19,31.40 25.19,31.40+ 25.19,31.40 25.27,31.48 25.27,31.48+ 25.27,31.48 25.27,31.40 25.27,31.40 Z+ M 36.14,31.40+ C 36.14,31.40 36.05,31.40 36.05,31.40+ 36.05,31.40 36.14,31.48 36.14,31.48+ 36.14,31.48 36.14,31.40 36.14,31.40 Z+ M 35.88,31.48+ C 35.88,31.48 35.80,31.48 35.80,31.48+ 35.80,31.48 35.88,31.57 35.88,31.57+ 35.88,31.57 35.88,31.48 35.88,31.48 Z+ M 36.23,31.48+ C 36.23,31.48 36.14,31.48 36.14,31.48+ 36.14,31.48 36.23,31.57 36.23,31.57+ 36.23,31.57 36.23,31.48 36.23,31.48 Z+ M 6.38,31.57+ C 6.38,31.57 6.30,31.57 6.30,31.57+ 6.30,31.57 6.38,31.65 6.38,31.65+ 6.38,31.65 6.38,31.57 6.38,31.57 Z+ M 24.67,31.57+ C 24.67,31.57 24.58,31.57 24.58,31.57+ 24.58,31.57 24.67,31.65 24.67,31.65+ 24.67,31.65 24.67,31.57 24.67,31.57 Z+ M 25.44,31.57+ C 25.44,31.57 25.36,31.57 25.36,31.57+ 25.36,31.57 25.44,31.65 25.44,31.65+ 25.44,31.65 25.44,31.57 25.44,31.57 Z+ M 36.14,31.57+ C 36.14,31.57 36.05,31.57 36.05,31.57+ 36.05,31.57 36.14,31.65 36.14,31.65+ 36.14,31.65 36.14,31.57 36.14,31.57 Z+ M 6.30,31.65+ C 6.30,31.65 6.21,31.65 6.21,31.65+ 6.21,31.65 6.30,31.74 6.30,31.74+ 6.30,31.74 6.30,31.65 6.30,31.65 Z+ M 25.53,31.65+ C 25.53,31.65 25.53,32.09 25.53,32.09+ 25.53,32.09 25.53,31.65 25.53,31.65 Z+ M 7.25,31.83+ C 7.25,31.83 7.16,31.83 7.16,31.83+ 7.16,31.83 7.25,31.91 7.25,31.91+ 7.25,31.91 7.25,31.83 7.25,31.83 Z+ M 7.59,31.83+ C 7.59,31.83 7.50,31.83 7.50,31.83+ 7.50,31.83 7.59,31.91 7.59,31.91+ 7.59,31.91 7.59,31.83 7.59,31.83 Z+ M 13.37,31.83+ C 12.80,31.97 12.07,31.91 11.47,31.91+ 11.47,31.91 8.28,31.91 8.28,31.91+ 8.03,31.91 7.74,31.90 7.51,32.00+ 6.81,32.31 6.85,33.42 6.76,34.07+ 6.76,34.07 6.19,38.30 6.19,38.30+ 6.19,38.30 5.82,41.06 5.82,41.06+ 5.79,42.06 6.38,42.26 7.25,42.26+ 7.25,42.26 35.28,42.26 35.28,42.26+ 35.52,42.26 35.83,42.28 36.05,42.19+ 37.00,41.82 36.70,40.46 36.59,39.67+ 36.59,39.67 35.86,34.33 35.86,34.33+ 35.86,34.33 35.54,32.26 35.54,32.26+ 35.05,32.00 34.98,31.92 34.42,31.91+ 34.42,31.91 31.40,31.91 31.40,31.91+ 30.82,31.91 30.23,31.96 29.67,31.83+ 29.67,31.83 28.55,36.05 28.55,36.05+ 29.16,36.00 30.25,36.00 30.79,36.23+ 30.79,36.23 30.62,36.40 30.62,36.40+ 31.08,36.74 30.59,37.13 30.19,37.24+ 29.46,37.35 28.75,37.17 28.03,37.24+ 28.03,37.24 27.26,37.24 27.26,37.24+ 27.26,37.24 16.91,37.24 16.91,37.24+ 16.91,37.24 14.23,37.24 14.23,37.24+ 13.82,37.26 13.37,37.34 13.02,37.09+ 12.42,36.95 12.58,36.69 12.59,36.23+ 13.57,35.92 14.03,36.13 14.39,36.03+ 14.61,35.96 14.62,35.85 14.59,35.65+ 14.59,35.65 14.06,33.90 14.06,33.90+ 13.82,33.11 13.78,32.62 13.37,31.83 Z+ M 35.19,31.91+ C 35.19,31.91 35.11,31.91 35.11,31.91+ 35.11,31.91 35.19,32.00 35.19,32.00+ 35.19,32.00 35.19,31.91 35.19,31.91 Z+ M 36.49,31.91+ C 36.49,31.91 36.40,31.91 36.40,31.91+ 36.40,31.91 36.49,32.00 36.49,32.00+ 36.49,32.00 36.49,31.91 36.49,31.91 Z+ M 7.25,32.00+ C 7.25,32.00 7.16,32.00 7.16,32.00+ 7.16,32.00 7.25,32.09 7.25,32.09+ 7.25,32.09 7.25,32.00 7.25,32.00 Z+ M 35.36,32.00+ C 35.36,32.00 35.28,32.00 35.28,32.00+ 35.28,32.00 35.36,32.09 35.36,32.09+ 35.36,32.09 35.36,32.00 35.36,32.00 Z+ M 6.30,32.09+ C 6.30,32.09 6.21,32.09 6.21,32.09+ 6.21,32.09 6.30,32.17 6.30,32.17+ 6.30,32.17 6.30,32.09 6.30,32.09 Z+ M 7.16,32.17+ C 7.16,32.17 7.07,32.17 7.07,32.17+ 7.07,32.17 7.16,32.26 7.16,32.26+ 7.16,32.26 7.16,32.17 7.16,32.17 Z+ M 13.71,32.26+ C 13.71,32.26 13.63,32.26 13.63,32.26+ 13.63,32.26 13.71,32.35 13.71,32.35+ 13.71,32.35 13.71,32.26 13.71,32.26 Z+ M 36.49,32.26+ C 36.49,32.26 36.40,32.26 36.40,32.26+ 36.40,32.26 36.49,32.35 36.49,32.35+ 36.49,32.35 36.49,32.26 36.49,32.26 Z+ M 6.90,32.35+ C 6.90,32.35 6.81,32.35 6.81,32.35+ 6.81,32.35 6.90,32.43 6.90,32.43+ 6.90,32.43 6.90,32.35 6.90,32.35 Z+ M 17.16,32.35+ C 17.16,32.35 17.08,32.35 17.08,32.35+ 17.08,32.35 17.16,32.43 17.16,32.43+ 17.16,32.43 17.16,32.35 17.16,32.35 Z+ M 35.62,32.35+ C 35.62,32.35 35.54,32.35 35.54,32.35+ 35.54,32.35 35.62,32.43 35.62,32.43+ 35.62,32.43 35.62,32.35 35.62,32.35 Z+ M 6.81,32.95+ C 6.81,32.95 6.73,32.95 6.73,32.95+ 6.73,32.95 6.81,33.04 6.81,33.04+ 6.81,33.04 6.81,32.95 6.81,32.95 Z+ M 21.65,32.95+ C 21.65,32.95 21.56,32.95 21.56,32.95+ 21.56,32.95 21.65,33.04 21.65,33.04+ 21.65,33.04 21.65,32.95 21.65,32.95 Z+ M 49.68,33.04+ C 49.68,33.04 49.60,33.04 49.60,33.04+ 49.60,33.04 49.68,33.12 49.68,33.12+ 49.68,33.12 49.68,33.04 49.68,33.04 Z+ M 49.77,33.21+ C 49.77,33.21 49.68,33.21 49.68,33.21+ 49.68,33.21 49.77,33.29 49.77,33.29+ 49.77,33.29 49.77,33.21 49.77,33.21 Z+ M 49.60,33.29+ C 49.60,33.29 49.51,33.29 49.51,33.29+ 49.51,33.29 49.60,33.38 49.60,33.38+ 49.60,33.38 49.60,33.29 49.60,33.29 Z+ M 49.68,33.38+ C 49.68,33.38 49.60,33.38 49.60,33.38+ 49.60,33.38 49.68,33.47 49.68,33.47+ 49.68,33.47 49.68,33.38 49.68,33.38 Z+ M 14.92,33.47+ C 14.92,33.47 14.84,33.47 14.84,33.47+ 14.84,33.47 14.92,33.55 14.92,33.55+ 14.92,33.55 14.92,33.47 14.92,33.47 Z+ M 50.20,33.55+ C 50.20,33.55 50.11,33.55 50.11,33.55+ 50.11,33.55 50.20,33.64 50.20,33.64+ 50.20,33.64 50.20,33.55 50.20,33.55 Z+ M 28.12,33.64+ C 28.12,33.64 28.03,33.64 28.03,33.64+ 28.03,33.64 28.12,33.73 28.12,33.73+ 28.12,33.73 28.12,33.64 28.12,33.64 Z+ M 14.15,33.73+ C 14.15,33.73 14.06,33.73 14.06,33.73+ 14.06,33.73 14.15,33.81 14.15,33.81+ 14.15,33.81 14.15,33.73 14.15,33.73 Z+ M 14.49,33.73+ C 14.49,33.73 14.40,33.73 14.40,33.73+ 14.40,33.73 14.49,33.81 14.49,33.81+ 14.49,33.81 14.49,33.73 14.49,33.73 Z+ M 28.20,33.73+ C 28.20,33.73 28.12,33.73 28.12,33.73+ 28.12,33.73 28.20,33.81 28.20,33.81+ 28.20,33.81 28.20,33.73 28.20,33.73 Z+ M 25.27,34.33+ C 25.27,34.33 25.19,34.33 25.19,34.33+ 25.19,34.33 25.27,34.42 25.27,34.42+ 25.27,34.42 25.27,34.33 25.27,34.33 Z+ M 15.61,35.11+ C 15.61,35.11 15.53,35.11 15.53,35.11+ 15.53,35.11 15.61,35.19 15.61,35.19+ 15.61,35.19 15.61,35.11 15.61,35.11 Z+ M 18.46,35.11+ C 18.46,35.11 18.37,35.11 18.37,35.11+ 18.37,35.11 18.46,35.19 18.46,35.19+ 18.46,35.19 18.46,35.11 18.46,35.11 Z+ M 58.48,35.11+ C 58.48,35.11 58.39,35.11 58.39,35.11+ 58.39,35.11 58.48,35.19 58.48,35.19+ 58.48,35.19 58.48,35.11 58.48,35.11 Z+ M 15.61,35.54+ C 15.61,35.54 15.53,35.54 15.53,35.54+ 15.53,35.54 15.61,35.62 15.61,35.62+ 15.61,35.62 15.61,35.54 15.61,35.54 Z+ M 28.64,35.71+ C 28.64,35.71 28.55,35.71 28.55,35.71+ 28.55,35.71 28.64,35.80 28.64,35.80+ 28.64,35.80 28.64,35.71 28.64,35.71 Z+ M 59.26,35.71+ C 59.26,35.71 59.17,35.71 59.17,35.71+ 59.17,35.71 59.26,35.80 59.26,35.80+ 59.26,35.80 59.26,35.71 59.26,35.71 Z+ M 24.32,35.88+ C 24.32,35.88 24.24,35.88 24.24,35.88+ 24.24,35.88 24.32,35.97 24.32,35.97+ 24.32,35.97 24.32,35.88 24.32,35.88 Z+ M 8.54,35.88+ C 9.20,36.25 9.10,36.76 8.99,37.43+ 8.99,37.43 8.71,39.59 8.71,39.59+ 8.71,39.59 12.25,39.59 12.25,39.59+ 12.70,39.60 13.25,39.68 13.17,40.28+ 13.11,40.76 12.73,40.79 12.33,40.80+ 12.33,40.80 8.63,40.80 8.63,40.80+ 8.27,40.80 7.81,40.83 7.57,40.52+ 7.33,40.21 7.46,39.76 7.50,39.42+ 7.50,39.42 7.81,37.09 7.81,37.09+ 7.89,36.52 7.84,36.28 8.37,35.97+ 8.37,35.97 8.28,36.14 8.28,36.14+ 8.28,36.14 8.54,35.88 8.54,35.88 Z+ M 8.71,36.05+ C 8.71,36.05 8.63,36.05 8.63,36.05+ 8.63,36.05 8.71,36.14 8.71,36.14+ 8.71,36.14 8.71,36.05 8.71,36.05 Z+ M 14.66,36.05+ C 14.66,36.05 14.58,36.05 14.58,36.05+ 14.58,36.05 14.66,36.14 14.66,36.14+ 14.66,36.14 14.66,36.05 14.66,36.05 Z+ M 17.42,36.05+ C 17.42,36.05 17.34,36.05 17.34,36.05+ 17.34,36.05 17.42,36.14 17.42,36.14+ 17.42,36.14 17.42,36.05 17.42,36.05 Z+ M 25.10,36.05+ C 25.10,36.05 25.01,36.05 25.01,36.05+ 25.01,36.05 25.10,36.14 25.10,36.14+ 25.10,36.14 25.10,36.05 25.10,36.05 Z+ M 27.60,36.05+ C 27.60,36.05 27.51,36.05 27.51,36.05+ 27.51,36.05 27.60,36.14 27.60,36.14+ 27.60,36.14 27.60,36.05 27.60,36.05 Z+ M 23.72,36.14+ C 23.72,36.14 23.63,36.14 23.63,36.14+ 23.63,36.14 23.72,36.23 23.72,36.23+ 23.72,36.23 23.72,36.14 23.72,36.14 Z+ M 25.53,36.14+ C 25.53,36.14 25.44,36.14 25.44,36.14+ 25.44,36.14 25.53,36.23 25.53,36.23+ 25.53,36.23 25.53,36.14 25.53,36.14 Z+ M 28.64,36.14+ C 28.64,36.14 28.55,36.14 28.55,36.14+ 28.55,36.14 28.64,36.23 28.64,36.23+ 28.64,36.23 28.64,36.14 28.64,36.14 Z+ M 23.98,36.23+ C 23.98,36.23 23.89,36.23 23.89,36.23+ 23.89,36.23 23.98,36.31 23.98,36.31+ 23.98,36.31 23.98,36.23 23.98,36.23 Z+ M 24.15,36.23+ C 24.15,36.23 24.06,36.23 24.06,36.23+ 24.06,36.23 24.15,36.31 24.15,36.31+ 24.15,36.31 24.15,36.23 24.15,36.23 Z+ M 8.11,36.31+ C 8.11,36.31 8.02,36.31 8.02,36.31+ 8.02,36.31 8.11,36.40 8.11,36.40+ 8.11,36.40 8.11,36.31 8.11,36.31 Z+ M 13.20,36.31+ C 13.20,36.31 13.11,36.31 13.11,36.31+ 13.11,36.31 13.20,36.40 13.20,36.40+ 13.20,36.40 13.20,36.31 13.20,36.31 Z+ M 27.69,36.31+ C 27.69,36.31 27.60,36.31 27.60,36.31+ 27.60,36.31 27.69,36.40 27.69,36.40+ 27.69,36.40 27.69,36.31 27.69,36.31 Z+ M 12.94,36.40+ C 12.94,36.40 12.85,36.40 12.85,36.40+ 12.85,36.40 12.94,36.49 12.94,36.49+ 12.94,36.49 12.94,36.40 12.94,36.40 Z+ M 20.44,36.40+ C 20.44,36.40 20.36,36.40 20.36,36.40+ 20.36,36.40 20.44,36.49 20.44,36.49+ 20.44,36.49 20.44,36.40 20.44,36.40 Z+ M 12.68,36.57+ C 12.68,36.57 12.59,36.57 12.59,36.57+ 12.59,36.57 12.68,36.66 12.68,36.66+ 12.68,36.66 12.68,36.57 12.68,36.57 Z+ M 30.79,36.57+ C 30.79,36.57 30.71,36.57 30.71,36.57+ 30.71,36.57 30.79,36.66 30.79,36.66+ 30.79,36.66 30.79,36.57 30.79,36.57 Z+ M 12.68,36.83+ C 12.68,36.83 12.59,36.83 12.59,36.83+ 12.59,36.83 12.68,36.92 12.68,36.92+ 12.68,36.92 12.68,36.83 12.68,36.83 Z+ M 8.88,37.43+ C 8.88,37.43 8.80,37.43 8.80,37.43+ 8.80,37.43 8.88,37.52 8.88,37.52+ 8.88,37.52 8.88,37.43 8.88,37.43 Z+ M 5.26,37.78+ C 5.26,37.78 5.18,37.78 5.18,37.78+ 5.18,37.78 5.26,37.87 5.26,37.87+ 5.26,37.87 5.26,37.78 5.26,37.78 Z+ M 8.63,38.47+ C 8.63,38.47 8.54,38.47 8.54,38.47+ 8.54,38.47 8.63,38.56 8.63,38.56+ 8.63,38.56 8.63,38.47 8.63,38.47 Z+ M 36.57,38.47+ C 36.57,38.47 36.49,38.47 36.49,38.47+ 36.49,38.47 36.57,38.56 36.57,38.56+ 36.57,38.56 36.57,38.47 36.57,38.47 Z+ M 7.76,38.73+ C 7.76,38.73 7.68,38.73 7.68,38.73+ 7.68,38.73 7.76,38.81 7.76,38.81+ 7.76,38.81 7.76,38.73 7.76,38.73 Z+ M 49.51,42.26+ C 49.44,41.98 49.43,41.87 49.42,41.57+ 49.42,41.57 49.42,40.37 49.42,40.37+ 49.42,40.37 49.42,39.50 49.42,39.50+ 49.44,38.63 50.15,38.61 50.45,39.01+ 50.74,39.40 50.64,40.79 50.63,41.32+ 50.63,41.59 50.67,41.91 50.37,42.01+ 50.37,42.01 50.46,42.26 50.46,42.26+ 50.02,42.47 49.88,42.51 49.60,42.09+ 49.60,42.09 49.60,42.26 49.60,42.26+ 49.60,42.26 49.51,42.26 49.51,42.26 Z+ M 50.03,38.81+ C 50.03,38.81 49.94,38.81 49.94,38.81+ 49.94,38.81 50.03,38.90 50.03,38.90+ 50.03,38.90 50.03,38.81 50.03,38.81 Z+ M 49.77,38.90+ C 49.77,38.90 49.68,38.90 49.68,38.90+ 49.68,38.90 49.77,38.99 49.77,38.99+ 49.77,38.99 49.77,38.90 49.77,38.90 Z+ M 49.60,39.07+ C 49.60,39.07 49.51,39.07 49.51,39.07+ 49.51,39.07 49.60,39.16 49.60,39.16+ 49.60,39.16 49.60,39.07 49.60,39.07 Z+ M 50.46,39.07+ C 50.46,39.07 50.37,39.07 50.37,39.07+ 50.37,39.07 50.46,39.16 50.46,39.16+ 50.46,39.16 50.46,39.07 50.46,39.07 Z+ M 49.94,39.16+ C 49.94,39.16 49.85,39.16 49.85,39.16+ 49.85,39.16 49.94,39.25 49.94,39.25+ 49.94,39.25 49.94,39.16 49.94,39.16 Z+ M 8.63,39.25+ C 8.63,39.25 8.54,39.25 8.54,39.25+ 8.54,39.25 8.63,39.33 8.63,39.33+ 8.63,39.33 8.63,39.25 8.63,39.25 Z+ M 12.77,39.68+ C 12.77,39.68 12.68,39.68 12.68,39.68+ 12.68,39.68 12.77,39.76 12.77,39.76+ 12.77,39.76 12.77,39.68 12.77,39.68 Z+ M 16.48,39.65+ C 16.87,39.56 18.27,39.52 18.58,39.73+ 18.96,39.99 18.89,40.48 18.52,40.70+ 18.33,40.81 18.07,40.80 17.85,40.80+ 17.56,40.80 16.63,40.83 16.40,40.73+ 16.00,40.55 15.87,39.99 16.48,39.65 Z+ M 16.47,39.76+ C 16.47,39.76 16.39,39.76 16.39,39.76+ 16.39,39.76 16.47,39.85 16.47,39.85+ 16.47,39.85 16.47,39.76 16.47,39.76 Z+ M 18.46,39.76+ C 18.46,39.76 18.37,39.76 18.37,39.76+ 18.37,39.76 18.46,39.85 18.46,39.85+ 18.46,39.85 18.46,39.76 18.46,39.76 Z+ M 12.77,39.85+ C 12.77,39.85 12.68,39.85 12.68,39.85+ 12.68,39.85 12.77,39.94 12.77,39.94+ 12.77,39.94 12.77,39.85 12.77,39.85 Z+ M 13.02,39.85+ C 13.02,39.85 12.94,39.85 12.94,39.85+ 12.94,39.85 13.02,39.94 13.02,39.94+ 13.02,39.94 13.02,39.85 13.02,39.85 Z+ M 16.65,39.85+ C 16.65,39.85 16.56,39.85 16.56,39.85+ 16.56,39.85 16.65,39.94 16.65,39.94+ 16.65,39.94 16.65,39.85 16.65,39.85 Z+ M 18.63,39.85+ C 18.63,39.85 18.54,39.85 18.54,39.85+ 18.54,39.85 18.63,39.94 18.63,39.94+ 18.63,39.94 18.63,39.85 18.63,39.85 Z+ M 37.61,39.94+ C 37.61,39.94 37.52,39.94 37.52,39.94+ 37.52,39.94 37.61,40.02 37.61,40.02+ 37.61,40.02 37.61,39.94 37.61,39.94 Z+ M 18.80,40.19+ C 18.80,40.19 18.72,40.19 18.72,40.19+ 18.72,40.19 18.80,40.28 18.80,40.28+ 18.80,40.28 18.80,40.19 18.80,40.19 Z+ M 13.11,40.28+ C 13.11,40.28 13.02,40.28 13.02,40.28+ 13.02,40.28 13.11,40.37 13.11,40.37+ 13.11,40.37 13.11,40.28 13.11,40.28 Z+ M 16.22,40.28+ C 16.22,40.28 16.13,40.28 16.13,40.28+ 16.13,40.28 16.22,40.37 16.22,40.37+ 16.22,40.37 16.22,40.28 16.22,40.28 Z+ M 13.02,40.54+ C 13.02,40.54 12.94,40.54 12.94,40.54+ 12.94,40.54 13.02,40.63 13.02,40.63+ 13.02,40.63 13.02,40.54 13.02,40.54 Z+ M 16.47,40.63+ C 16.47,40.63 16.39,40.63 16.39,40.63+ 16.39,40.63 16.47,40.71 16.47,40.71+ 16.47,40.71 16.47,40.63 16.47,40.63 Z+ M 18.46,40.63+ C 18.46,40.63 18.37,40.63 18.37,40.63+ 18.37,40.63 18.46,40.71 18.46,40.71+ 18.46,40.71 18.46,40.63 18.46,40.63 Z+ M 5.78,41.32+ C 5.78,41.32 5.69,41.32 5.69,41.32+ 5.69,41.32 5.78,41.40 5.78,41.40+ 5.78,41.40 5.78,41.32 5.78,41.32 Z+ M 36.74,41.83+ C 36.74,41.83 36.66,41.83 36.66,41.83+ 36.66,41.83 36.74,41.92 36.74,41.92+ 36.74,41.92 36.74,41.83 36.74,41.83 Z+ M 36.66,41.92+ C 36.66,41.92 36.57,41.92 36.57,41.92+ 36.57,41.92 36.66,42.01 36.66,42.01+ 36.66,42.01 36.66,41.92 36.66,41.92 Z+ M 36.57,42.01+ C 36.57,42.01 36.49,42.01 36.49,42.01+ 36.49,42.01 36.57,42.09 36.57,42.09+ 36.57,42.09 36.57,42.01 36.57,42.01 Z+ M 49.77,42.01+ C 49.77,42.01 49.68,42.01 49.68,42.01+ 49.68,42.01 49.77,42.09 49.77,42.09+ 49.77,42.09 49.77,42.01 49.77,42.01 Z+ M 49.85,42.18+ C 49.85,42.18 49.77,42.18 49.77,42.18+ 49.77,42.18 49.85,42.26 49.85,42.26+ 49.85,42.26 49.85,42.18 49.85,42.18 Z+ M 50.29,42.18+ C 50.29,42.18 50.20,42.18 50.20,42.18+ 50.20,42.18 50.29,42.26 50.29,42.26+ 50.29,42.26 50.29,42.18 50.29,42.18 Z+ M 6.47,42.26+ C 6.47,42.26 6.38,42.26 6.38,42.26+ 6.38,42.26 6.47,42.35 6.47,42.35+ 6.47,42.35 6.47,42.26 6.47,42.26 Z+ M 36.14,42.26+ C 36.14,42.26 36.05,42.26 36.05,42.26+ 36.05,42.26 36.14,42.35 36.14,42.35+ 36.14,42.35 36.14,42.26 36.14,42.26 Z+ M 6.81,42.35+ C 6.81,42.35 6.73,42.35 6.73,42.35+ 6.73,42.35 6.81,42.44 6.81,42.44+ 6.81,42.44 6.81,42.35 6.81,42.35 Z+ M 6.47,42.44+ C 6.47,42.44 6.38,42.44 6.38,42.44+ 6.38,42.44 6.47,42.52 6.47,42.52+ 6.47,42.52 6.47,42.44 6.47,42.44 Z+ M 36.31,42.87+ C 36.31,42.87 36.23,42.87 36.23,42.87+ 36.23,42.87 36.31,42.95 36.31,42.95+ 36.31,42.95 36.31,42.87 36.31,42.87 Z+ M 36.40,43.13+ C 36.40,43.13 36.31,43.13 36.31,43.13+ 36.31,43.13 36.40,43.21 36.40,43.21+ 36.40,43.21 36.40,43.13 36.40,43.13 Z+ M 36.57,43.21+ C 35.71,43.58 34.66,43.47 33.73,43.47+ 33.73,43.47 28.55,43.47 28.55,43.47+ 28.55,43.47 13.11,43.47 13.11,43.47+ 13.11,43.47 8.71,43.47 8.71,43.47+ 7.70,43.47 6.92,43.58 5.95,43.21+ 5.83,43.64 5.87,43.99 5.87,44.42+ 5.87,45.28 5.72,46.56 6.36,47.23+ 6.76,47.64 7.40,47.70 7.94,47.70+ 7.94,47.70 30.02,47.70 30.02,47.70+ 30.02,47.70 33.73,47.70 33.73,47.70+ 34.16,47.70 35.17,47.74 35.54,47.61+ 36.44,47.29 36.66,46.66 36.66,45.80+ 36.66,45.16 36.73,43.76 36.57,43.21 Z+ M 53.48,46.49+ C 53.48,46.49 53.39,46.49 53.39,46.49+ 53.39,46.49 53.48,46.58 53.48,46.58+ 53.48,46.58 53.48,46.49 53.48,46.49 Z+ M 53.39,46.58+ C 53.39,46.58 53.30,46.58 53.30,46.58+ 53.30,46.58 53.39,46.66 53.39,46.66+ 53.39,46.66 53.39,46.58 53.39,46.58 Z+ M 5.87,46.75+ C 5.87,46.75 5.78,46.75 5.78,46.75+ 5.78,46.75 5.87,46.84 5.87,46.84+ 5.87,46.84 5.87,46.75 5.87,46.75 Z+ M 36.66,46.84+ C 36.66,46.84 36.57,46.84 36.57,46.84+ 36.57,46.84 36.66,46.92 36.66,46.92+ 36.66,46.92 36.66,46.84 36.66,46.84 Z+ M 54.34,47.09+ C 54.34,47.09 54.25,47.09 54.25,47.09+ 54.25,47.09 54.34,47.18 54.34,47.18+ 54.34,47.18 54.34,47.09 54.34,47.09 Z+ M 6.21,47.18+ C 6.21,47.18 6.12,47.18 6.12,47.18+ 6.12,47.18 6.21,47.27 6.21,47.27+ 6.21,47.27 6.21,47.18 6.21,47.18 Z+ M 54.25,47.27+ C 54.25,47.27 54.17,47.27 54.17,47.27+ 54.17,47.27 54.25,47.35 54.25,47.35+ 54.25,47.35 54.25,47.27 54.25,47.27 Z+ M 36.74,47.35+ C 36.74,47.35 36.66,47.35 36.66,47.35+ 36.66,47.35 36.74,47.44 36.74,47.44+ 36.74,47.44 36.74,47.35 36.74,47.35 Z+ M 5.87,47.44+ C 5.87,47.44 5.78,47.44 5.78,47.44+ 5.78,47.44 5.87,47.53 5.87,47.53+ 5.87,47.53 5.87,47.44 5.87,47.44 Z+ M 6.12,47.44+ C 6.12,47.44 6.04,47.44 6.04,47.44+ 6.04,47.44 6.12,47.53 6.12,47.53+ 6.12,47.53 6.12,47.44 6.12,47.44 Z+ M 5.61,47.61+ C 5.61,47.61 5.52,47.61 5.52,47.61+ 5.52,47.61 5.61,47.70 5.61,47.70+ 5.61,47.70 5.61,47.61 5.61,47.61 Z+ M 5.43,47.70+ C 5.43,47.70 5.35,47.70 5.35,47.70+ 5.35,47.70 5.43,47.78 5.43,47.78+ 5.43,47.78 5.43,47.70 5.43,47.70 Z+ M 37.18,47.70+ C 37.18,47.70 37.09,47.70 37.09,47.70+ 37.09,47.70 37.18,47.78 37.18,47.78+ 37.18,47.78 37.18,47.70 37.18,47.70 Z+ M 5.52,47.78+ C 5.52,47.78 5.43,47.78 5.43,47.78+ 5.43,47.78 5.52,47.87 5.52,47.87+ 5.52,47.87 5.52,47.78 5.52,47.78 Z+ M 5.61,47.87+ C 5.61,47.87 5.52,47.87 5.52,47.87+ 5.52,47.87 5.61,47.96 5.61,47.96+ 5.61,47.96 5.61,47.87 5.61,47.87 Z+ M 37.00,47.87+ C 37.00,47.87 36.92,47.87 36.92,47.87+ 36.92,47.87 37.00,47.96 37.00,47.96+ 37.00,47.96 37.00,47.87 37.00,47.87 Z+ M 53.74,47.87+ C 53.74,47.87 53.65,47.87 53.65,47.87+ 53.65,47.87 53.74,47.96 53.74,47.96+ 53.74,47.96 53.74,47.87 53.74,47.87 Z+ M 55.46,47.87+ C 55.46,47.87 55.37,47.87 55.37,47.87+ 55.37,47.87 55.46,47.96 55.46,47.96+ 55.46,47.96 55.46,47.87 55.46,47.87 Z+ M 55.46,48.04+ C 55.46,48.04 55.37,48.04 55.37,48.04+ 55.37,48.04 55.46,48.13 55.46,48.13+ 55.46,48.13 55.46,48.04 55.46,48.04 Z+ M 6.12,48.30+ C 6.12,48.30 6.04,48.30 6.04,48.30+ 6.04,48.30 6.12,48.39 6.12,48.39+ 6.12,48.39 6.12,48.30 6.12,48.30 Z+ M 35.71,48.39+ C 35.71,48.39 35.62,48.39 35.62,48.39+ 35.62,48.39 35.71,48.47 35.71,48.47+ 35.71,48.47 35.71,48.39 35.71,48.39 Z+ M 7.07,48.47+ C 7.07,48.47 6.99,48.47 6.99,48.47+ 6.99,48.47 7.07,48.56 7.07,48.56+ 7.07,48.56 7.07,48.47 7.07,48.47 Z+ M 35.45,48.56+ C 35.45,48.56 35.36,48.56 35.36,48.56+ 35.36,48.56 35.45,48.65 35.45,48.65+ 35.45,48.65 35.45,48.56 35.45,48.56 Z+ M 56.15,48.73+ C 56.15,48.73 56.06,48.73 56.06,48.73+ 56.06,48.73 56.15,48.82 56.15,48.82+ 56.15,48.82 56.15,48.73 56.15,48.73 Z+ M 56.41,48.73+ C 56.41,48.73 56.32,48.73 56.32,48.73+ 56.32,48.73 56.41,48.82 56.41,48.82+ 56.41,48.82 56.41,48.73 56.41,48.73 Z+ M 57.44,48.82+ C 57.44,48.82 57.36,48.82 57.36,48.82+ 57.36,48.82 57.44,48.91 57.44,48.91+ 57.44,48.91 57.44,48.82 57.44,48.82 Z+ M 27.43,48.91+ C 27.43,48.91 27.34,48.91 27.34,48.91+ 27.34,48.91 27.43,48.99 27.43,48.99+ 27.43,48.99 27.43,48.91 27.43,48.91 Z+ M 52.53,48.91+ C 52.53,48.91 52.44,48.91 52.44,48.91+ 52.44,48.91 52.53,48.99 52.53,48.99+ 52.53,48.99 52.53,48.91 52.53,48.91 Z+ M 53.48,48.99+ C 53.48,48.99 53.39,48.99 53.39,48.99+ 53.39,48.99 53.48,49.08 53.48,49.08+ 53.48,49.08 53.48,48.99 53.48,48.99 Z+ M 55.46,48.99+ C 55.46,48.99 55.37,48.99 55.37,48.99+ 55.37,48.99 55.46,49.08 55.46,49.08+ 55.46,49.08 55.46,48.99 55.46,48.99 Z+ M 57.44,48.99+ C 57.44,48.99 57.36,48.99 57.36,48.99+ 57.36,48.99 57.44,49.08 57.44,49.08+ 57.44,49.08 57.44,48.99 57.44,48.99 Z+ M 27.60,49.08+ C 27.60,49.08 27.51,49.08 27.51,49.08+ 27.51,49.08 27.60,49.16 27.60,49.16+ 27.60,49.16 27.60,49.08 27.60,49.08 Z+ M 55.63,49.08+ C 55.63,49.08 55.55,49.08 55.55,49.08+ 55.55,49.08 55.63,49.16 55.63,49.16+ 55.63,49.16 55.63,49.08 55.63,49.08 Z+ M 55.72,49.16+ C 55.72,49.16 55.63,49.16 55.63,49.16+ 55.63,49.16 55.72,49.25 55.72,49.25+ 55.72,49.25 55.72,49.16 55.72,49.16 Z+ M 57.10,49.16+ C 57.10,49.16 57.01,49.16 57.01,49.16+ 57.01,49.16 57.10,49.25 57.10,49.25+ 57.10,49.25 57.10,49.16 57.10,49.16 Z+ M 55.81,49.25+ C 55.81,49.25 55.72,49.25 55.72,49.25+ 55.72,49.25 55.81,49.34 55.81,49.34+ 55.81,49.34 55.81,49.25 55.81,49.25 Z+ M 28.55,49.34+ C 28.55,49.34 28.46,49.34 28.46,49.34+ 28.46,49.34 28.55,49.42 28.55,49.42+ 28.55,49.42 28.55,49.34 28.55,49.34 Z+ M 52.01,49.34+ C 52.01,49.34 51.92,49.34 51.92,49.34+ 51.92,49.34 52.01,49.42 52.01,49.42+ 52.01,49.42 52.01,49.34 52.01,49.34 Z+ M 56.93,49.34+ C 56.93,49.34 56.84,49.34 56.84,49.34+ 56.84,49.34 56.93,49.42 56.93,49.42+ 56.93,49.42 56.93,49.34 56.93,49.34 Z+ M 27.51,49.51+ C 27.51,49.51 27.43,49.51 27.43,49.51+ 27.43,49.51 27.51,49.60 27.51,49.60+ 27.51,49.60 27.51,49.51 27.51,49.51 Z+ M 57.36,49.51+ C 57.36,49.51 57.27,49.51 57.27,49.51+ 57.27,49.51 57.36,49.60 57.36,49.60+ 57.36,49.60 57.36,49.51 57.36,49.51 Z+ M 56.58,49.60+ C 56.58,49.60 56.50,49.60 56.50,49.60+ 56.50,49.60 56.58,49.68 56.58,49.68+ 56.58,49.68 56.58,49.60 56.58,49.60 Z+ M 28.12,49.77+ C 28.12,49.77 28.03,49.77 28.03,49.77+ 28.03,49.77 28.12,49.85 28.12,49.85+ 28.12,49.85 28.12,49.77 28.12,49.77 Z+ M 29.58,49.77+ C 29.58,49.77 29.50,49.77 29.50,49.77+ 29.50,49.77 29.58,49.85 29.58,49.85+ 29.58,49.85 29.58,49.77 29.58,49.77 Z+ M 56.50,49.77+ C 56.50,49.77 56.41,49.77 56.41,49.77+ 56.41,49.77 56.50,49.85 56.50,49.85+ 56.50,49.85 56.50,49.77 56.50,49.77 Z+ M 56.75,49.77+ C 56.75,49.77 56.67,49.77 56.67,49.77+ 56.67,49.77 56.75,49.85 56.75,49.85+ 56.75,49.85 56.75,49.77 56.75,49.77 Z+ M 27.86,49.85+ C 27.86,49.85 27.77,49.85 27.77,49.85+ 27.77,49.85 27.86,49.94 27.86,49.94+ 27.86,49.94 27.86,49.85 27.86,49.85 Z+ M 29.93,49.94+ C 29.93,49.94 29.84,49.94 29.84,49.94+ 29.84,49.94 29.93,50.03 29.93,50.03+ 29.93,50.03 29.93,49.94 29.93,49.94 Z+ M 28.20,50.03+ C 28.20,50.03 28.12,50.03 28.12,50.03+ 28.12,50.03 28.20,50.11 28.20,50.11+ 28.20,50.11 28.20,50.03 28.20,50.03 Z+ M 50.63,50.11+ C 50.63,50.11 50.54,50.11 50.54,50.11+ 50.54,50.11 50.63,50.20 50.63,50.20+ 50.63,50.20 50.63,50.11 50.63,50.11 Z+ M 56.75,50.11+ C 56.75,50.11 56.67,50.11 56.67,50.11+ 56.67,50.11 56.75,50.20 56.75,50.20+ 56.75,50.20 56.75,50.11 56.75,50.11 Z+ M 28.38,50.20+ C 28.38,50.20 28.29,50.20 28.29,50.20+ 28.29,50.20 28.38,50.29 28.38,50.29+ 28.38,50.29 28.38,50.20 28.38,50.20 Z+ M 28.46,50.29+ C 28.46,50.29 28.38,50.29 28.38,50.29+ 28.38,50.29 28.46,50.37 28.46,50.37+ 28.46,50.37 28.46,50.29 28.46,50.29 Z+ M 52.27,50.29+ C 52.27,50.29 52.18,50.29 52.18,50.29+ 52.18,50.29 52.27,50.37 52.27,50.37+ 52.27,50.37 52.27,50.29 52.27,50.29 Z+ M 57.36,50.37+ C 57.36,50.37 57.27,50.37 57.27,50.37+ 57.27,50.37 57.36,50.46 57.36,50.46+ 57.36,50.46 57.36,50.37 57.36,50.37 Z+ M 29.67,50.46+ C 29.67,50.46 29.58,50.46 29.58,50.46+ 29.58,50.46 29.67,50.54 29.67,50.54+ 29.67,50.54 29.67,50.46 29.67,50.46 Z+ M 58.31,50.54+ C 58.31,50.54 58.22,50.54 58.22,50.54+ 58.22,50.54 58.31,50.63 58.31,50.63+ 58.31,50.63 58.31,50.54 58.31,50.54 Z+ M 47.18,50.72+ C 47.18,50.72 47.09,50.72 47.09,50.72+ 47.09,50.72 47.18,50.80 47.18,50.80+ 47.18,50.80 47.18,50.72 47.18,50.72 Z+ M 47.78,50.72+ C 47.78,50.72 47.70,50.72 47.70,50.72+ 47.70,50.72 47.78,50.80 47.78,50.80+ 47.78,50.80 47.78,50.72 47.78,50.72 Z+ M 34.16,50.80+ C 34.16,50.80 33.73,50.89 33.73,50.89+ 33.73,50.89 34.16,50.80 34.16,50.80 Z+ M 46.32,50.72+ C 46.32,50.72 46.40,50.72 46.40,50.72+ 46.40,50.72 46.32,50.80 46.32,50.80+ 46.32,50.80 46.32,50.72 46.32,50.72 Z+ M 50.80,50.89+ C 50.80,50.89 50.72,50.89 50.72,50.89+ 50.72,50.89 50.80,50.98 50.80,50.98+ 50.80,50.98 50.80,50.89 50.80,50.89 Z+ M 48.56,51.23+ C 48.56,51.23 48.47,51.23 48.47,51.23+ 48.47,51.23 48.56,51.32 48.56,51.32+ 48.56,51.32 48.56,51.23 48.56,51.23 Z+ M 49.25,51.32+ C 49.25,51.32 49.16,51.32 49.16,51.32+ 49.16,51.32 49.25,51.41 49.25,51.41+ 49.25,51.41 49.25,51.32 49.25,51.32 Z+ M 36.14,51.92+ C 36.14,51.92 36.05,51.92 36.05,51.92+ 36.05,51.92 36.14,52.01 36.14,52.01+ 36.14,52.01 36.14,51.92 36.14,51.92 Z+ M 45.02,51.92+ C 45.02,51.92 44.94,51.92 44.94,51.92+ 44.94,51.92 45.02,52.01 45.02,52.01+ 45.02,52.01 45.02,51.92 45.02,51.92 Z" />diff --git a/src/hi/apps/entity/templates/entity/svg/type.cooktop.svg b/src/hi/apps/entity/templates/entity/svg/type.cooktop.svgnew file mode 100644index 00000000..e8755193--- /dev/null+++ b/src/hi/apps/entity/templates/entity/svg/type.cooktop.svg@@ -0,0 +1,164 @@+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>+ <path class="hi-entity-cooktop-background"+ fill="#c0c0d0" stroke="black" stroke-width="0"+ d="M 10.64,5.21+ C 10.64,5.21 15.60,5.21 15.60,5.21+ 15.60,5.21 25.20,5.21 25.20,5.21+ 25.20,5.21 43.60,5.21 43.60,5.21+ 43.60,5.21 52.88,5.21 52.88,5.21+ 53.43,5.21 53.96,5.35 54.48,5.52+ 56.95,6.36 58.80,8.72 58.80,11.36+ 58.80,11.36 58.80,38.00 58.80,38.00+ 58.80,38.00 58.80,52.80 58.80,52.80+ 58.76,55.99 55.80,58.80 52.64,58.80+ 52.64,58.80 26.00,58.80 26.00,58.80+ 26.00,58.80 11.20,58.80 11.20,58.80+ 8.08,58.76 5.20,55.83 5.20,52.72+ 5.20,52.72 5.20,16.96 5.20,16.96+ 5.20,16.96 5.20,13.20 5.20,13.20+ 5.20,13.20 5.20,11.28 5.20,11.28+ 5.20,9.69 6.05,7.97 7.20,6.89+ 7.59,6.53 8.09,6.18 8.56,5.94+ 9.30,5.56 9.82,5.39 10.64,5.21 Z" />+ <path class="hi-entity-cooktop-lines"+ fill="none" stroke="black" stroke-width="1"+ d="M 10.48,5.13+ C 10.48,5.13 15.52,5.13 15.52,5.13+ 15.52,5.13 25.20,5.13 25.20,5.13+ 25.20,5.13 43.76,5.13 43.76,5.13+ 43.76,5.13 53.04,5.13 53.04,5.13+ 56.06,5.16 58.88,8.13 58.88,11.12+ 58.88,11.12 58.88,36.56 58.88,36.56+ 58.88,36.56 58.88,52.96 58.88,52.96+ 58.87,56.02 55.92,58.88 52.88,58.88+ 52.88,58.88 27.44,58.88 27.44,58.88+ 27.44,58.88 11.04,58.88 11.04,58.88+ 7.98,58.87 5.12,55.92 5.12,52.88+ 5.12,52.88 5.12,16.88 5.12,16.88+ 5.12,16.88 5.12,12.64 5.12,12.64+ 5.12,11.73 5.05,10.81 5.27,9.92+ 5.59,8.64 6.18,7.72 7.12,6.80+ 7.50,6.43 7.93,6.12 8.40,5.86+ 9.09,5.49 9.71,5.30 10.48,5.13 Z+ M 11.60,7.69+ C 10.88,7.81 10.55,7.78 9.84,8.11+ 8.21,8.87 7.68,10.49 7.68,12.16+ 7.68,12.16 7.68,27.68 7.68,27.68+ 7.68,27.68 7.68,43.84 7.68,43.84+ 7.68,43.84 7.68,52.00 7.68,52.00+ 7.70,53.64 8.32,55.23 9.92,55.93+ 10.58,56.22 11.44,56.32 12.16,56.32+ 12.16,56.32 46.08,56.32 46.08,56.32+ 46.08,56.32 48.56,56.32 48.56,56.32+ 48.56,56.32 51.04,56.32 51.04,56.32+ 52.90,56.32 54.52,56.31 55.67,54.56+ 55.88,54.24 56.02,53.89 56.13,53.52+ 56.24,53.10 56.32,52.28 56.32,51.84+ 56.32,51.84 56.32,17.92 56.32,17.92+ 56.32,17.92 56.32,13.60 56.32,13.60+ 56.32,11.57 56.49,9.61 54.56,8.33+ 54.24,8.12 53.88,7.98 53.52,7.87+ 53.15,7.75 52.25,7.68 51.84,7.69+ 51.84,7.69 25.12,7.69 25.12,7.69+ 25.12,7.69 16.24,7.69 16.24,7.69+ 16.24,7.69 11.60,7.69 11.60,7.69 Z+ M 20.00,10.26+ C 20.00,10.26 21.60,10.26 21.60,10.26+ 23.25,10.24 25.07,11.00 26.23,12.17+ 27.38,13.31 28.16,15.18 28.16,16.80+ 28.16,16.80 28.16,17.92 28.16,17.92+ 28.14,20.01 26.86,22.16 25.12,23.27+ 23.59,24.25 22.22,24.34 20.48,24.32+ 19.89,24.31 19.20,24.16 18.64,23.97+ 16.25,23.18 14.69,21.34 14.20,18.88+ 14.05,18.14 14.07,17.40 14.08,16.64+ 14.09,15.77 14.43,14.62 14.82,13.84+ 15.89,11.70 17.71,10.65 20.00,10.26 Z+ M 41.04,10.26+ C 41.04,10.26 42.80,10.26 42.80,10.26+ 44.87,10.24 47.19,11.36 48.63,12.81+ 51.66,15.83 52.13,21.02 49.56,24.48+ 48.64,25.72 47.75,26.48 46.40,27.21+ 45.50,27.71 43.91,28.16 42.88,28.16+ 42.88,28.16 41.52,28.16 41.52,28.16+ 40.89,28.15 40.04,27.96 39.44,27.76+ 36.85,26.90 34.82,25.04 33.85,22.48+ 33.26,20.94 33.28,20.23 33.28,18.64+ 33.28,15.55 35.45,12.50 38.16,11.14+ 39.07,10.69 40.04,10.44 41.04,10.26 Z+ M 21.12,12.85+ C 19.92,12.91 19.03,13.04 18.09,13.89+ 16.23,15.58 16.23,18.98 18.09,20.67+ 18.93,21.43 20.02,21.71 21.12,21.71+ 22.22,21.71 23.31,21.43 24.15,20.67+ 26.01,18.98 26.01,15.58 24.15,13.89+ 23.21,13.04 22.32,12.91 21.12,12.85 Z+ M 42.24,12.85+ C 40.48,12.93 39.06,13.38 37.76,14.65+ 35.29,17.06 35.30,21.22 37.69,23.68+ 38.86,24.88 40.57,25.55 42.24,25.55+ 43.91,25.55 45.62,24.88 46.79,23.68+ 49.18,21.22 49.19,17.05 46.72,14.65+ 45.42,13.38 44.00,12.93 42.24,12.85 Z+ M 20.56,29.46+ C 20.56,29.46 22.40,29.46 22.40,29.46+ 24.42,29.45 26.74,30.60 28.15,32.01+ 31.26,35.11 31.65,40.46 28.90,43.92+ 28.02,45.02 27.23,45.69 26.00,46.37+ 25.05,46.89 23.48,47.35 22.40,47.36+ 22.40,47.36 21.04,47.36 21.04,47.36+ 20.41,47.35 19.56,47.16 18.96,46.96+ 16.37,46.10 14.34,44.24 13.37,41.68+ 12.78,40.14 12.80,39.43 12.80,37.84+ 12.80,37.02 12.99,36.22 13.25,35.44+ 14.39,32.07 17.12,30.04 20.56,29.46 Z+ M 21.76,32.05+ C 20.00,32.13 18.58,32.58 17.28,33.85+ 14.81,36.26 14.82,40.42 17.21,42.88+ 18.38,44.08 20.09,44.75 21.76,44.75+ 23.43,44.75 25.14,44.08 26.31,42.88+ 28.70,40.42 28.71,36.25 26.24,33.85+ 24.93,32.58 23.53,32.14 21.76,32.05 Z+ M 41.76,33.30+ C 41.76,33.30 43.36,33.30 43.36,33.30+ 45.01,33.28 46.83,34.04 47.99,35.21+ 49.14,36.35 49.92,38.22 49.92,39.84+ 49.92,39.84 49.92,40.96 49.92,40.96+ 49.90,43.05 48.62,45.20 46.88,46.31+ 45.35,47.29 43.98,47.38 42.24,47.36+ 41.65,47.35 40.96,47.20 40.40,47.01+ 38.01,46.22 36.45,44.38 35.96,41.92+ 35.81,41.18 35.83,40.44 35.84,39.68+ 35.85,38.81 36.19,37.66 36.58,36.88+ 37.65,34.74 39.47,33.69 41.76,33.30 Z+ M 42.88,35.89+ C 41.68,35.95 40.79,36.08 39.85,36.93+ 37.99,38.62 37.99,42.02 39.85,43.71+ 40.69,44.47 41.78,44.75 42.88,44.75+ 43.98,44.75 45.07,44.47 45.91,43.71+ 47.77,42.02 47.77,38.62 45.91,36.93+ 44.97,36.08 44.08,35.95 42.88,35.89 Z+ M 20.56,49.96+ C 21.44,49.82 22.21,49.95 22.75,50.72+ 23.46,51.74 22.94,53.43 21.68,53.72+ 20.86,53.91 19.99,53.67 19.49,52.96+ 19.25,52.62 19.20,52.32 19.20,51.92+ 19.19,50.94 19.58,50.26 20.56,49.96 Z+ M 26.96,49.96+ C 27.84,49.82 28.61,49.95 29.15,50.72+ 29.86,51.74 29.34,53.43 28.08,53.72+ 27.26,53.91 26.39,53.67 25.89,52.96+ 25.65,52.62 25.60,52.32 25.60,51.92+ 25.59,50.94 25.98,50.26 26.96,49.96 Z+ M 35.92,49.96+ C 36.80,49.82 37.57,49.95 38.11,50.72+ 38.82,51.74 38.30,53.43 37.04,53.72+ 36.22,53.91 35.35,53.67 34.85,52.96+ 34.61,52.62 34.56,52.32 34.56,51.92+ 34.55,50.94 34.94,50.26 35.92,49.96 Z+ M 42.32,49.96+ C 43.20,49.82 43.97,49.95 44.51,50.72+ 45.22,51.74 44.70,53.43 43.44,53.72+ 42.62,53.91 41.75,53.67 41.25,52.96+ 41.01,52.62 40.96,52.32 40.96,51.92+ 40.95,50.94 41.34,50.26 42.32,49.96 Z" />diff --git a/src/hi/apps/entity/templates/entity/svg/type.electric_panel.svg b/src/hi/apps/entity/templates/entity/svg/type.electric_panel.svgnew file mode 100644index 00000000..7e015228--- /dev/null+++ b/src/hi/apps/entity/templates/entity/svg/type.electric_panel.svg@@ -0,0 +1,119 @@+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>+<path fill="#808080"+ d="M 9.01,2.29+ C 9.01,2.29 13.06,2.22 13.06,2.22+ 13.06,2.22 20.51,2.22 20.51,2.22+ 20.51,2.22 43.76,2.22 43.76,2.22+ 43.76,2.22 52.38,2.22 52.38,2.22+ 53.86,2.22 54.20,2.38 54.20,3.91+ 54.20,3.91 54.20,47.58 54.20,47.58+ 54.20,47.58 54.20,57.48 54.20,57.48+ 54.20,58.24 54.42,60.17 53.78,60.63+ 53.41,60.90 52.82,60.87 52.38,60.87+ 52.38,60.87 18.55,60.87 18.55,60.87+ 18.55,60.87 9.93,60.87 9.93,60.87+ 8.48,60.86 8.23,60.59 8.23,59.18+ 8.23,59.18 8.23,15.90 8.23,15.90+ 8.23,15.90 8.23,5.74 8.23,5.74+ 8.23,5.13 8.13,3.19 8.38,2.75+ 8.55,2.45 8.72,2.41 9.01,2.29 Z" />++<path fill="#d0d0d0"+ d="M 52.38,4.17+ C 52.38,4.17 10.06,4.17 10.06,4.17+ 10.06,4.17 10.06,58.92 10.06,58.92+ 10.06,58.92 52.38,58.92 52.38,58.92+ 52.38,58.92 52.38,4.17 52.38,4.17 Z+ M 12.68,6.22+ C 13.39,6.04 15.12,6.13 15.93,6.13+ 15.93,6.13 21.94,6.13 21.94,6.13+ 21.94,6.13 41.67,6.13 41.67,6.13+ 41.67,6.13 48.98,6.13 48.98,6.13+ 50.24,6.14 50.28,6.56 50.29,7.69+ 50.29,7.69 50.29,45.49 50.29,45.49+ 50.29,45.49 50.29,55.53 50.29,55.53+ 50.28,56.87 50.02,56.96 48.72,56.96+ 48.72,56.96 20.64,56.96 20.64,56.96+ 20.64,56.96 13.45,56.96 13.45,56.96+ 12.19,56.94 12.15,56.52 12.15,55.40+ 12.15,55.40 12.15,18.25 12.15,18.25+ 12.15,18.25 12.15,9.38 12.15,9.38+ 12.15,8.82 12.05,6.95 12.30,6.55+ 12.43,6.33 12.49,6.34 12.68,6.22 Z+ M 48.46,7.95+ C 48.46,7.95 13.98,7.95 13.98,7.95+ 13.98,7.95 13.98,55.14 13.98,55.14+ 13.98,55.14 48.46,55.14 48.46,55.14+ 48.46,55.14 48.46,7.95 48.46,7.95 Z+ M 20.77,16.69+ C 21.39,16.48 22.08,16.55 22.73,16.55+ 22.73,16.55 26.12,16.55 26.12,16.55+ 26.12,16.55 37.49,16.55 37.49,16.55+ 37.49,16.55 40.75,16.55 40.75,16.55+ 41.17,16.56 41.56,16.53 41.89,16.86+ 42.23,17.20 42.19,17.67 42.19,18.12+ 42.19,18.12 42.19,22.81 42.19,22.81+ 42.19,23.34 42.27,24.32 41.96,24.75+ 41.62,25.21 41.13,25.16 40.62,25.16+ 40.62,25.16 25.08,25.16 25.08,25.16+ 25.08,25.16 21.68,25.16 21.68,25.16+ 21.27,25.15 20.88,25.18 20.56,24.86+ 20.20,24.48 20.25,23.94 20.24,23.46+ 20.24,23.46 20.24,18.12 20.24,18.12+ 20.25,17.41 20.18,17.15 20.77,16.69 Z+ M 40.36,18.38+ C 40.36,18.38 22.07,18.38 22.07,18.38+ 22.07,18.38 22.07,23.33 22.07,23.33+ 22.07,23.33 40.36,23.33 40.36,23.33+ 40.36,23.33 40.36,18.38 40.36,18.38 Z+ M 17.37,28.88+ C 18.43,28.70 19.41,28.78 20.18,29.63+ 21.48,31.07 20.94,33.73 18.94,34.21+ 15.85,34.96 14.17,31.39 16.21,29.49+ 16.58,29.14 16.90,29.02 17.37,28.88 Z+ M 28.60,41.32+ C 27.94,41.32 26.39,41.47 25.92,41.00+ 25.36,40.45 25.87,39.37 26.04,38.71+ 26.04,38.71 27.61,32.72 27.61,32.72+ 27.61,32.72 28.26,30.24 28.26,30.24+ 28.36,29.86 28.47,29.28 28.79,29.01+ 29.09,28.77 29.54,28.81 29.91,28.81+ 29.91,28.81 33.96,28.81 33.96,28.81+ 34.55,28.81 35.20,28.77 35.42,29.46+ 35.55,29.87 35.17,31.08 35.05,31.54+ 35.05,31.54 33.83,36.37 33.83,36.37+ 34.59,36.37 36.27,36.14 36.68,36.90+ 37.06,37.63 36.06,38.68 35.64,39.23+ 35.64,39.23 31.07,45.36 31.07,45.36+ 31.07,45.36 29.21,47.84 29.21,47.84+ 28.92,48.22 28.59,48.73 28.08,48.84+ 27.03,49.06 26.90,48.07 27.09,47.32+ 27.09,47.32 28.60,41.32 28.60,41.32 Z+ M 17.90,30.69+ C 16.74,31.19 17.31,32.60 18.28,32.41+ 19.29,32.21 19.33,30.58 17.90,30.69 Z+ M 33.31,30.63+ C 33.31,30.63 30.04,30.63 30.04,30.63+ 30.04,30.63 28.42,36.89 28.42,36.89+ 28.42,36.89 27.82,39.49 27.82,39.49+ 28.34,39.49 29.77,39.42 30.17,39.63+ 30.46,39.79 30.69,40.07 30.73,40.41+ 30.78,40.82 30.16,42.81 30.04,43.41+ 30.04,43.41 32.24,40.67 32.24,40.67+ 32.24,40.67 33.96,38.19 33.96,38.19+ 33.30,38.19 32.39,38.33 31.93,37.78+ 31.47,37.23 31.86,36.33 32.04,35.71+ 32.04,35.71 33.31,30.63 33.31,30.63 Z" />+ <path fill="#f01010"+ d="M 33.31,30.63+ C 33.31,30.63 30.04,30.63 30.04,30.63+ 30.04,30.63 28.42,36.89 28.42,36.89+ 28.42,36.89 27.82,39.49 27.82,39.49+ 28.34,39.49 29.77,39.42 30.17,39.63+ 30.46,39.79 30.69,40.07 30.73,40.41+ 30.78,40.82 30.16,42.81 30.04,43.41+ 30.04,43.41 32.24,40.67 32.24,40.67+ 32.24,40.67 33.96,38.19 33.96,38.19+ 33.30,38.19 32.39,38.33 31.93,37.78+ 31.47,37.23 31.86,36.33 32.04,35.71+ 32.04,35.71 33.31,30.63 33.31,30.63 Z" />diff --git a/src/hi/apps/entity/templates/entity/svg/type.light.svg b/src/hi/apps/entity/templates/entity/svg/type.light.svgnew file mode 100644index 00000000..6bc2cae6--- /dev/null+++ b/src/hi/apps/entity/templates/entity/svg/type.light.svg@@ -0,0 +1,8 @@+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>+<path class="hi-state-bg"+ d="M 32.00,4.07+ C 32.00,4.07 31.28,4.07 31.28,4.07 28.55,4.09 25.55,4.88 23.12,6.10 17.84,8.74 13.94,13.61 12.58,19.36 12.34,20.36 12.08,21.86 12.08,22.88 12.08,22.88 12.01,24.00 12.01,24.00 12.01,24.00 12.08,25.28 12.08,25.28 12.09,26.40 12.53,28.58 12.86,29.68 13.63,32.27 14.89,34.62 16.60,36.72 16.60,36.72 18.56,38.80 18.56,38.80 20.52,40.85 21.27,43.14 22.35,45.68 22.35,45.68 23.05,47.28 23.05,47.28 23.13,47.46 23.25,47.81 23.41,47.92 23.55,48.02 23.83,48.00 24.00,48.00 24.00,48.00 40.00,48.00 40.00,48.00 40.17,48.00 40.45,48.02 40.60,47.92 40.76,47.81 40.88,47.46 40.96,47.28 40.96,47.28 41.62,45.76 41.62,45.76 42.84,43.09 43.32,41.02 45.44,38.80 46.33,37.87 46.90,37.38 47.73,36.32 49.45,34.11 50.63,31.67 51.35,28.96 51.58,28.07 51.92,26.18 51.92,25.28 51.92,25.28 52.00,23.92 52.00,23.92 52.00,23.92 51.92,22.64 51.92,22.64 51.90,21.23 51.41,19.10 50.96,17.76 49.28,12.71 45.69,8.45 40.88,6.10 38.49,4.93 35.47,4.08 32.80,4.07 32.80,4.07 32.00,4.07 32.00,4.07 Z" />+<path d="M 21.44,52.00+ C 21.10,51.84 20.77,51.71 20.51,51.43 20.11,51.01 19.59,49.63 19.34,49.04 19.34,49.04 17.54,44.88 17.54,44.88 17.14,43.99 16.95,43.39 16.36,42.56 15.90,41.90 15.27,41.39 14.73,40.80 13.92,39.94 13.17,39.03 12.47,38.08 10.50,35.40 9.08,32.06 8.43,28.80 8.25,27.88 8.00,26.28 8.00,25.36 8.00,25.36 8.00,22.64 8.00,22.64 8.00,20.33 8.88,16.94 9.76,14.80 12.54,8.03 18.25,2.92 25.28,0.90 26.67,0.50 29.06,0.02 30.48,0.00 30.48,0.00 33.36,0.00 33.36,0.00 34.99,0.00 37.54,0.54 39.12,1.02 46.36,3.20 52.13,8.81 54.66,15.92 55.34,17.81 56.00,20.72 56.00,22.72 56.00,22.72 56.00,25.28 56.00,25.28 56.00,25.28 55.85,26.96 55.85,26.96 55.35,31.17 53.81,34.98 51.29,38.40 50.65,39.27 49.93,40.09 49.19,40.88 48.61,41.50 48.17,41.84 47.64,42.56 47.06,43.34 46.67,44.38 46.29,45.28 46.29,45.28 44.66,49.04 44.66,49.04 44.41,49.63 43.89,51.01 43.49,51.43 43.23,51.71 42.90,51.84 42.56,52.00 42.94,52.18 43.28,52.31 43.56,52.65 44.17,53.38 44.17,54.62 43.56,55.35 43.28,55.69 42.94,55.82 42.56,56.00 42.94,56.18 43.28,56.31 43.56,56.65 44.20,57.42 44.17,58.79 43.43,59.49 43.22,59.69 42.91,59.86 42.64,59.94 42.39,60.01 42.18,59.97 42.00,60.19 42.00,60.19 40.97,62.16 40.97,62.16 40.26,63.33 39.03,64.00 37.68,64.00 37.68,64.00 26.32,64.00 26.32,64.00 24.98,64.00 23.74,63.32 23.03,62.16 23.03,62.16 22.00,60.19 22.00,60.19 21.82,59.97 21.61,60.01 21.36,59.94 21.09,59.86 20.78,59.69 20.57,59.49 19.83,58.79 19.80,57.42 20.44,56.65 20.72,56.31 21.06,56.18 21.44,56.00 21.06,55.82 20.72,55.69 20.44,55.35 19.83,54.63 19.83,53.37 20.44,52.65 20.72,52.31 21.06,52.18 21.44,52.00 Z+ M 32.00,4.07+ C 32.00,4.07 31.28,4.07 31.28,4.07 28.55,4.09 25.55,4.88 23.12,6.10 17.84,8.74 13.94,13.61 12.58,19.36 12.34,20.36 12.08,21.86 12.08,22.88 12.08,22.88 12.01,24.00 12.01,24.00 12.01,24.00 12.08,25.28 12.08,25.28 12.09,26.40 12.53,28.58 12.86,29.68 13.63,32.27 14.89,34.62 16.60,36.72 16.60,36.72 18.56,38.80 18.56,38.80 20.52,40.85 21.27,43.14 22.35,45.68 22.35,45.68 23.05,47.28 23.05,47.28 23.13,47.46 23.25,47.81 23.41,47.92 23.55,48.02 23.83,48.00 24.00,48.00 24.00,48.00 40.00,48.00 40.00,48.00 40.17,48.00 40.45,48.02 40.60,47.92 40.76,47.81 40.88,47.46 40.96,47.28 40.96,47.28 41.62,45.76 41.62,45.76 42.84,43.09 43.32,41.02 45.44,38.80 46.33,37.87 46.90,37.38 47.73,36.32 49.45,34.11 50.63,31.67 51.35,28.96 51.58,28.07 51.92,26.18 51.92,25.28 51.92,25.28 52.00,23.92 52.00,23.92 52.00,23.92 51.92,22.64 51.92,22.64 51.90,21.23 51.41,19.10 50.96,17.76 49.28,12.71 45.69,8.45 40.88,6.10 38.49,4.93 35.47,4.08 32.80,4.07 32.80,4.07 32.00,4.07 32.00,4.07 Z" />diff --git a/src/hi/apps/location/svg_item_factory.py b/src/hi/apps/location/svg_item_factory.pyindex 615fd6df..b4fb9fb0 100644--- a/src/hi/apps/location/svg_item_factory.py+++ b/src/hi/apps/location/svg_item_factory.py@@ -3,7 +3,8 @@ from hi.apps.common.svg_models import SvgIconItem, SvgPathItem, SvgStatusStyle,from hi.apps.collection.models import Collectionfrom hi.apps.entity.enums import EntityTypefrom hi.apps.entity.models import Entity-from hi.apps.monitor.status_display_data import StatusStyle++from hi.hi_styles import EntityStyle, ItemStyle, StatusStylefrom .enums import SvgItemTypefrom .models import (@@ -28,7 +29,12 @@ class SvgItemFactory( Singleton ):svg_status_style : SvgStatusStyle = None ) -> SvgIconItem:if not svg_status_style:svg_status_style = StatusStyle.default()-++ if isinstance( item, Entity ):+ template_name = EntityStyle.get_svg_icon_template_name( entity_type = item.entity_type )+ else:+ template_name = ItemStyle.get_default_svg_icon_template_name()+return SvgIconItem(html_id = item.html_id,css_class = css_class,@@ -37,7 +43,7 @@ class SvgItemFactory( Singleton ):position_y = float( position.svg_y ),rotate = float( position.svg_rotate ),scale = float( position.svg_scale ),- template_name = 'entity/svg/type.other.svg',+ template_name = template_name,bounding_box = SvgViewBox( x = 0, y = 0, width = 32, height = 32 ),)@@ -46,23 +52,12 @@ class SvgItemFactory( Singleton ):path : LocationItemPathModel,css_class : str,svg_status_style : SvgStatusStyle = None ) -> SvgPathItem:- if isinstance( item, Entity ):- entity_type = item.entity_type- if entity_type == EntityType.WATER_LINE:- svg_status_style = StatusStyle.WaterLine- elif entity_type == EntityType.ELECTRIC_WIRE:- svg_status_style = StatusStyle.ElectricWire- elif entity_type == EntityType.TELECOM_WIRE:- svg_status_style = StatusStyle.TelecomWire- elif entity_type == EntityType.SEWER_LINE:- svg_status_style = StatusStyle.SewerLine- elif entity_type in [ EntityType.CONTROL_WIRE,- EntityType.SPRINKLER_WIRE ]:- svg_status_style = StatusStyle.ControlWire-if not svg_status_style:- svg_status_style = StatusStyle.default()-+ if isinstance( item, Entity ):+ svg_status_style = EntityStyle.PathEntityTypeToSvgStatusStyle.get( item.entity_type )+ if not svg_status_style:+ svg_status_style = EntityStyle.default()+return SvgPathItem(html_id = item.html_id,css_class = css_class,@@ -78,15 +73,10 @@ class SvgItemFactory( Singleton ):if isinstance( obj, Entity ):entity_type = obj.entity_type- if entity_type in [ EntityType.CONTROL_WIRE,- EntityType.ELECTRIC_WIRE,- EntityType.SEWER_LINE,- EntityType.SPRINKLER_WIRE,- EntityType.TELECOM_WIRE,- EntityType.WATER_LINE, ]:+ if entity_type in EntityStyle.EntityTypeOpenPaths:return SvgItemType.OPEN_PATH- if entity_type in [ EntityType.AREA ]:+ if entity_type in EntityStyle.EntityTypeClosedPaths:return SvgItemType.CLOSED_PATHreturn SvgItemType.ICONdiff --git a/src/hi/apps/location/templates/location/panes/svg_icon_item.html b/src/hi/apps/location/templates/location/panes/svg_icon_item.htmlindex 68cc6ae7..0d166d63 100644--- a/src/hi/apps/location/templates/location/panes/svg_icon_item.html+++ b/src/hi/apps/location/templates/location/panes/svg_icon_item.html@@ -1,5 +1,5 @@<g id="{{ svg_icon_item.html_id }}"- class="selectable draggable {{ svg_icon_item.css_class }}"+ class="hi-icon selectable draggable {{ svg_icon_item.css_class }}"status="{{ svg_icon_item.status_value }}"data-type="svg-icon"onmouseover="this.setAttribute('hover','true');"diff --git a/src/hi/apps/monitor/status_display_data.py b/src/hi/apps/monitor/status_display_data.pyindex bb9cc236..b0e275fb 100644--- a/src/hi/apps/monitor/status_display_data.py+++ b/src/hi/apps/monitor/status_display_data.py@@ -1,191 +1,10 @@import hi.apps.common.datetimeproxy as datetimeproxy-from hi.apps.common.svg_models import SvgStatusStylefrom hi.apps.entity.enums import EntityStateType, EntityStateValue-from .transient_models import EntityStateStatusData---class StatusStyle:-- DEFAULT_STATUS_VALUE = ''- DEFAULT_STROKE_COLOR = '#a0a0a0'- DEFAULT_STROKE_WIDTH = 4.0- DEFAULT_STROKE_DASHARRAY = []- DEFAULT_FILL_COLOR = 'white'- DEFAULT_FILL_OPACITY = 0.0+from hi.hi_styles import StatusStyle- # These should match those in main.css- STATUS_ACTIVE_COLOR = 'red'- STATUS_RECENT_COLOR = 'orange'- STATUS_PAST_COLOR = 'yellow'- STATUS_OK_COLOR = 'green'- STATUS_BAD_COLOR = 'red'- STATUS_IDLE_COLOR = '#888888'-- MovementActive = SvgStatusStyle(- status_value = 'active',- stroke_color = STATUS_ACTIVE_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_ACTIVE_COLOR,- fill_opacity = 0.5,- )- MovementRecent = SvgStatusStyle(- status_value = 'recent',- stroke_color = STATUS_RECENT_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_RECENT_COLOR,- fill_opacity = 0.5,- )- MovementPast = SvgStatusStyle(- status_value = 'past',- stroke_color = STATUS_PAST_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_PAST_COLOR,- fill_opacity = 0.5,- )- MovementIdle = SvgStatusStyle(- status_value = 'idle',- stroke_color = STATUS_OK_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_OK_COLOR,- fill_opacity = 0.15,- )- On = SvgStatusStyle(- status_value = 'on',- stroke_color = 'green',- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = 'green',- fill_opacity = 0.5,- )- Off = SvgStatusStyle(- status_value = 'off',- stroke_color = STATUS_IDLE_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_IDLE_COLOR,- fill_opacity = 0.5,- )- Open = SvgStatusStyle(- status_value = 'open',- stroke_color = STATUS_ACTIVE_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_ACTIVE_COLOR,- fill_opacity = 0.5,- )- OpenRecent = SvgStatusStyle(- status_value = 'recent',- stroke_color = STATUS_RECENT_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_RECENT_COLOR,- fill_opacity = 0.5,- )- OpenPast = SvgStatusStyle(- status_value = 'past',- stroke_color = STATUS_PAST_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_PAST_COLOR,- fill_opacity = 0.5,- )- Closed = SvgStatusStyle(- status_value = 'closed',- stroke_color = STATUS_IDLE_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_IDLE_COLOR,- fill_opacity = 0.5,- )- Connected = SvgStatusStyle(- status_value = 'connected',- stroke_color = STATUS_OK_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_OK_COLOR,- fill_opacity = 0.5,- )- Disconnected = SvgStatusStyle(- status_value = 'disconnected',- stroke_color = STATUS_BAD_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_BAD_COLOR,- fill_opacity = 0.5,- )- High = SvgStatusStyle(- status_value = 'high',- stroke_color = STATUS_OK_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_OK_COLOR,- fill_opacity = 0.5,- )- Low = SvgStatusStyle(- status_value = 'low',- stroke_color = STATUS_BAD_COLOR,- stroke_width = DEFAULT_STROKE_WIDTH,- stroke_dasharray = DEFAULT_STROKE_DASHARRAY,- fill_color = STATUS_BAD_COLOR,- fill_opacity = 0.5,- )- WaterLine = SvgStatusStyle(- status_value = '',- stroke_color = '#0000FF',- stroke_width = 3,- stroke_dasharray = [ 4, 2 ],- fill_color = None,- fill_opacity = 0.0,- )- ElectricWire = SvgStatusStyle(- status_value = '',- stroke_color = '#FF0000',- stroke_width = 3,- stroke_dasharray = [ 2, 2 ],- fill_color = None,- fill_opacity = 0.0,- )- SewerLine = SvgStatusStyle(- status_value = '',- stroke_color = '#008000',- stroke_width = 3,- stroke_dasharray = [ 8, 4, 2, 4 ],- fill_color = None,- fill_opacity = 0.0,- )- TelecomWire = SvgStatusStyle(- status_value = '',- stroke_color = '#FFA500',- stroke_width = 3,- stroke_dasharray = [ 6, 2 ],- fill_color = None,- fill_opacity = 0.0,- )- ControlWire = SvgStatusStyle(- status_value = '',- stroke_color = '#800080',- stroke_width = 3,- stroke_dasharray = [ 3, 6 ],- fill_color = None,- fill_opacity = 0.0,- )-- @classmethod- def default( cls, status_value : str = DEFAULT_STATUS_VALUE ):- return SvgStatusStyle(- status_value = status_value,- stroke_color = cls.DEFAULT_STROKE_COLOR,- stroke_width = cls.DEFAULT_STROKE_WIDTH,- stroke_dasharray = cls.DEFAULT_STROKE_DASHARRAY,- fill_color = cls.DEFAULT_FILL_COLOR,- fill_opacity = cls.DEFAULT_FILL_OPACITY,- )+from .transient_models import EntityStateStatusDataclass StatusDisplayData:diff --git a/src/hi/hi_styles.py b/src/hi/hi_styles.pynew file mode 100644index 00000000..1c68ea29--- /dev/null+++ b/src/hi/hi_styles.py@@ -0,0 +1,312 @@+from hi.apps.common.svg_models import SvgStatusStyle++from hi.apps.entity.enums import EntityType+++class ItemStyle:++ @classmethod+ def get_default_svg_icon_template_name( cls ):+ return 'entity/svg/type.other.svg'+++class EntityStyle:++ DEFAULT_STATUS_VALUE = ''+ DEFAULT_STROKE_COLOR = '#a0a0a0'+ DEFAULT_STROKE_WIDTH = 4.0+ DEFAULT_STROKE_DASHARRAY = []+ DEFAULT_FILL_COLOR = 'white'+ DEFAULT_FILL_OPACITY = 0.0++ Appliance = SvgStatusStyle(+ status_value = '',+ stroke_color = '#0606a0',+ stroke_width = 2,+ stroke_dasharray = [],+ fill_color = '#808080',+ fill_opacity = 1,+ )+ Area = SvgStatusStyle(+ status_value = '',+ stroke_color = '#0606a0',+ stroke_width = 2,+ stroke_dasharray = [],+ fill_color = '#8080ff',+ fill_opacity = 0.1,+ )+ ControlWire = SvgStatusStyle(+ status_value = '',+ stroke_color = '#800080',+ stroke_width = 3,+ stroke_dasharray = [ 3, 6 ],+ fill_color = None,+ fill_opacity = 0.0,+ )+ Door = SvgStatusStyle(+ status_value = '',+ stroke_color = '#4f3022',+ stroke_width = 2,+ stroke_dasharray = [],+ fill_color = '#5f3929',+ fill_opacity = 1,+ )+ ElectricWire = SvgStatusStyle(+ status_value = '',+ stroke_color = '#FF0000',+ stroke_width = 3,+ stroke_dasharray = [ 2, 2 ],+ fill_color = None,+ fill_opacity = 0.0,+ )+ Furniture = SvgStatusStyle(+ status_value = '',+ stroke_color = '#0606a0',+ stroke_width = 2,+ stroke_dasharray = [],+ fill_color = '#808080',+ fill_opacity = 1,+ )+ SewerLine = SvgStatusStyle(+ status_value = '',+ stroke_color = '#008000',+ stroke_width = 3,+ stroke_dasharray = [ 8, 4, 2, 4 ],+ fill_color = None,+ fill_opacity = 0.0,+ )+ TelecomWire = SvgStatusStyle(+ status_value = '',+ stroke_color = '#FFA500',+ stroke_width = 3,+ stroke_dasharray = [ 6, 2 ],+ fill_color = None,+ fill_opacity = 0.0,+ )+ Wall = SvgStatusStyle(+ status_value = '',+ stroke_color = '#0606a0',+ stroke_width = 2,+ stroke_dasharray = [],+ fill_color = '#808080',+ fill_opacity = 1,+ )+ WaterLine = SvgStatusStyle(+ status_value = '',+ stroke_color = '#0000FF',+ stroke_width = 3,+ stroke_dasharray = [ 4, 2 ],+ fill_color = None,+ fill_opacity = 0.0,+ )+ Window = SvgStatusStyle(+ status_value = '',+ stroke_color = '#0606a0',+ stroke_width = 2,+ stroke_dasharray = [],+ fill_color = '#808080',+ fill_opacity = 1,+ )++ EntityTypesWithIcons = {+ EntityType.AUDIO_RECEIVER,+ EntityType.AUTOMOBILE,+ EntityType.BAROMETER,+ EntityType.CAMERA,+ EntityType.CLOTHES_DRYER,+ EntityType.CLOTHES_WASHER,+ EntityType.COMPUTER,+ EntityType.CONSUMABLE,+ EntityType.COOKTOP,+ EntityType.ELECTRIC_PANEL,+ EntityType.LIGHT,+ }+ EntityTypeClosedPaths = {+ EntityType.APPLIANCE,+ EntityType.AREA,+ EntityType.DOOR,+ EntityType.FURNITURE,+ EntityType.WALL,+ EntityType.WINDOW,+ }+ EntityTypeOpenPaths = {+ EntityType.CONTROL_WIRE,+ EntityType.ELECTRIC_WIRE,+ EntityType.SEWER_LINE,+ EntityType.SPRINKLER_WIRE,+ EntityType.TELECOM_WIRE,+ EntityType.WATER_LINE,+ }+ PathEntityTypeToSvgStatusStyle = {+ EntityType.APPLIANCE: Appliance,+ EntityType.AREA: Area,+ EntityType.CONTROL_WIRE: ControlWire,+ EntityType.DOOR: Door,+ EntityType.ELECTRIC_WIRE: ElectricWire,+ EntityType.FURNITURE: Furniture,+ EntityType.SEWER_LINE: SewerLine,+ EntityType.SPRINKLER_WIRE: ControlWire,+ EntityType.TELECOM_WIRE: TelecomWire,+ EntityType.WALL: Wall,+ EntityType.WATER_LINE: WaterLine,+ EntityType.WINDOW: Window,+ }++ @classmethod+ def get_svg_icon_template_name( cls, entity_type : EntityType ):+ if entity_type in cls.EntityTypesWithIcons:+ return f'entity/svg/type.{entity_type}.svg'+ return ItemStyle.get_default_svg_icon_template_name()++ @classmethod+ def default( cls, status_value : str = DEFAULT_STATUS_VALUE ):+ return SvgStatusStyle(+ status_value = status_value,+ stroke_color = cls.DEFAULT_STROKE_COLOR,+ stroke_width = cls.DEFAULT_STROKE_WIDTH,+ stroke_dasharray = cls.DEFAULT_STROKE_DASHARRAY,+ fill_color = cls.DEFAULT_FILL_COLOR,+ fill_opacity = cls.DEFAULT_FILL_OPACITY,+ )+++class StatusStyle:++ DEFAULT_STATUS_VALUE = ''+ DEFAULT_STROKE_COLOR = '#a0a0a0'+ DEFAULT_STROKE_WIDTH = 4.0+ DEFAULT_STROKE_DASHARRAY = []+ DEFAULT_FILL_COLOR = 'white'+ DEFAULT_FILL_OPACITY = 0.0++ # These should match those in main.css+ STATUS_ACTIVE_COLOR = 'red'+ STATUS_RECENT_COLOR = 'orange'+ STATUS_PAST_COLOR = 'yellow'+ STATUS_OK_COLOR = 'green'+ STATUS_BAD_COLOR = 'red'+ STATUS_IDLE_COLOR = '#888888'++ MovementActive = SvgStatusStyle(+ status_value = 'active',+ stroke_color = STATUS_ACTIVE_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_ACTIVE_COLOR,+ fill_opacity = 0.5,+ )+ MovementRecent = SvgStatusStyle(+ status_value = 'recent',+ stroke_color = STATUS_RECENT_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_RECENT_COLOR,+ fill_opacity = 0.5,+ )+ MovementPast = SvgStatusStyle(+ status_value = 'past',+ stroke_color = STATUS_PAST_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_PAST_COLOR,+ fill_opacity = 0.5,+ )+ MovementIdle = SvgStatusStyle(+ status_value = 'idle',+ stroke_color = STATUS_OK_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_OK_COLOR,+ fill_opacity = 0.15,+ )+ On = SvgStatusStyle(+ status_value = 'on',+ stroke_color = 'green',+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = 'green',+ fill_opacity = 0.5,+ )+ Off = SvgStatusStyle(+ status_value = 'off',+ stroke_color = STATUS_IDLE_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_IDLE_COLOR,+ fill_opacity = 0.5,+ )+ Open = SvgStatusStyle(+ status_value = 'open',+ stroke_color = STATUS_ACTIVE_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_ACTIVE_COLOR,+ fill_opacity = 0.5,+ )+ OpenRecent = SvgStatusStyle(+ status_value = 'recent',+ stroke_color = STATUS_RECENT_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_RECENT_COLOR,+ fill_opacity = 0.5,+ )+ OpenPast = SvgStatusStyle(+ status_value = 'past',+ stroke_color = STATUS_PAST_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_PAST_COLOR,+ fill_opacity = 0.5,+ )+ Closed = SvgStatusStyle(+ status_value = 'closed',+ stroke_color = STATUS_IDLE_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_IDLE_COLOR,+ fill_opacity = 0.5,+ )+ Connected = SvgStatusStyle(+ status_value = 'connected',+ stroke_color = STATUS_OK_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_OK_COLOR,+ fill_opacity = 0.5,+ )+ Disconnected = SvgStatusStyle(+ status_value = 'disconnected',+ stroke_color = STATUS_BAD_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_BAD_COLOR,+ fill_opacity = 0.5,+ )+ High = SvgStatusStyle(+ status_value = 'high',+ stroke_color = STATUS_OK_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_OK_COLOR,+ fill_opacity = 0.5,+ )+ Low = SvgStatusStyle(+ status_value = 'low',+ stroke_color = STATUS_BAD_COLOR,+ stroke_width = DEFAULT_STROKE_WIDTH,+ stroke_dasharray = DEFAULT_STROKE_DASHARRAY,+ fill_color = STATUS_BAD_COLOR,+ fill_opacity = 0.5,+ )++ @classmethod+ def default( cls, status_value : str = DEFAULT_STATUS_VALUE ):+ return SvgStatusStyle(+ status_value = status_value,+ stroke_color = cls.DEFAULT_STROKE_COLOR,+ stroke_width = cls.DEFAULT_STROKE_WIDTH,+ stroke_dasharray = cls.DEFAULT_STROKE_DASHARRAY,+ fill_color = cls.DEFAULT_FILL_COLOR,+ fill_opacity = cls.DEFAULT_FILL_OPACITY,+ )diff --git a/src/hi/services/hass/hass_controller.py b/src/hi/services/hass/hass_controller.pyindex 20a54c24..1329f566 100644--- a/src/hi/services/hass/hass_controller.py+++ b/src/hi/services/hass/hass_controller.py@@ -26,10 +26,16 @@ class HassController( IntegrationController, HassMixin ):entity_id = entity_id,state = hass_state_value,)++ if response.status_code == 200:+ error_list = list()+ else:+ error_list = [ f'Bad HAss response. Status code = {response.status_code}' ]+logger.debug( f'HAss set state: {entity_id}={hass_state_value}, response={response}' )return IntegrationControlResult(new_value = control_value,- error_list = [],+ error_list = error_list,)except Exception as e:diff --git a/src/hi/services/hass/views.py b/src/hi/services/hass/views.pyindex 0392d62c..bd55958d 100644--- a/src/hi/services/hass/views.py+++ b/src/hi/services/hass/views.py@@ -1,5 +1,3 @@-import json-from django.core.exceptions import BadRequestfrom django.db import transaction@@ -55,17 +53,3 @@ class HassSyncView( HiModalView ):'processing_result': processing_result,}return self.modal_response( request, context )---class SyensorResponseDetailsView( HiModalView ):-- def get_template_name( self ) -> str:- return 'hass/modals/sensor_response_details.html'-- def get(self, request, *args, **kwargs):- details_str = kwargs.get( 'details_str' )-- # TODO: No current HAss SensorResponse instances add any viewable details.- details_dict = json.loads( details_str )- context = details_dict- return self.modal_response( request, context )diff --git a/src/hi/static/css/main.css b/src/hi/static/css/main.cssindex 15eae942..de221f1f 100644--- a/src/hi/static/css/main.css+++ b/src/hi/static/css/main.css@@ -30,6 +30,11 @@--status-highlighted-color: red;--status-hover-color: blue;++ --status-off-color: #aaaaaa;+ --status-on-color: yellow;+ --on-status-off-color: black;+ --on-status-on-color: black;/* These should match those in hi.apps.monitor.StatusStyle */--status-active-color: red;@@ -37,7 +42,7 @@--status-past-color: yellow;--status-ok-color: green;--status-bad-color: red;- --status-idle-color: #888888;+ --status-idle-color: #aaaaaa;--on-status-active-color: white;--on-status-recent-color: black;@@ -243,9 +248,9 @@ svg[action-state="scale"] {svg .highlighted {filter: drop-shadow(0 0 10px var(--status-highlighted-color));}-g[hover] {- outline: 2px solid var(--status-hover-color);- filter: drop-shadow(0 0 5px var(--status-hover-color));++g.hi-icon {+ pointer-events: all;}path.hi-path-closed[hover] {}@@ -257,7 +262,7 @@ path.hover-target {}path.hi-path-closed[hover] {stroke: var(--status-hover-color);- stroke-width: 5;+ stroke-width: 4;}path.hover-target[hover] + path.hi-path-open {stroke: var(--status-hover-color);@@ -277,14 +282,31 @@ g[status="past"] {outline: 2px solid var(--status-past-color);filter: drop-shadow(0 0 5px var(--status-past-color));}++g[status="off"] path.hi-state-bg {+ fill: var(--status-off-color);+}+div[status="off"] {+ color: var(--on-status-off-color);+ background-color: var(--status-off-color);+}g[status="on"] {- outline: 5px solid var(--status-ok-color);- filter: drop-shadow(0 0 5px var(--status-ok-color));+ filter: drop-shadow(0 0 5px var(--status-on-color));}-g[status="off"] {- outline: 5px solid var(--status-idle-color);- filter: drop-shadow(0 0 5px var(--status-idle-color));+g[status="on"] path.hi-state-bg {+ fill: var(--status-on-color);}+div[status="on"] {+ color: var(--on-status-on-color);+ background-color: var(--status-on-color);+}+++++++g[status="open"] {outline: 5px solid var(--status-active-color);filter: drop-shadow(0 0 5px var(--status-active-color));@@ -322,14 +344,6 @@ div[status="past"] {color: var(--on-status-past-color);background-color: var(--status-past-color);}-div[status="on"] {- color: var(--on-status-ok-color);- background-color: var(--status-ok-color);-}-div[status="off"] {- color: var(--on-status-idle-color);- background-color: var(--status-idle-color);-}div[status="open"] {color: var(--on-status-bad-color);background-color: var(--status-bad-color);@@ -355,6 +369,10 @@ div[status="low"] {background-color: var(--status-bad-color);}+g[hover] {+ filter: drop-shadow(0 0 10px var(--status-hover-color)) !important;+}+.switch {position: relative;display: inline-block;