diff --git a/flatland/utils/graphics_pil.py b/flatland/utils/graphics_pil.py
index 05fc67b0b6c77a02518ee43b8a5879e1119d3210..4b3875ba03d292a2561765b0db8c41ff3a097847 100644
--- a/flatland/utils/graphics_pil.py
+++ b/flatland/utils/graphics_pil.py
@@ -69,7 +69,7 @@ class PILGL(GraphicsLayer):
self.tColRail = (0, 0, 0) # black rails
self.tColGrid = (230,) * 3 # light grey for grid
- sColors = "ff0000#00ff00#0000ff#ffcc00#00FFFF#ff00ff#ff00FF#000000#808080" + \
+ sColors = "ff0000#ff00FF#0000ff#00ff00#00FFFF#FFFF00#808080#000000" + \
"#d50000#c51162#aa00ff#6200ea#304ffe#2962ff#0091ea#00b8d4#00bfa5#00c853" + \
"#64dd17#aeea00#ffd600#ffab00#ff6d00#ff3d00#5d4037#455a64"
diff --git a/notebooks/Scene_Editor.ipynb b/notebooks/Scene_Editor.ipynb
index 8f8408da58523af8b2ada8a44060cb77a097657c..c8c2f72e223d3949d64e69b477613cc6ff2e9095 100644
--- a/notebooks/Scene_Editor.ipynb
+++ b/notebooks/Scene_Editor.ipynb
@@ -9,9 +9,22 @@
},
{
"cell_type": "code",
- "execution_count": 1,
+ "execution_count": 7,
"metadata": {},
- "outputs": [],
+ "outputs": [
+ {
+ "data": {
+ "text/html": [
+ "<style>.container { width:95% !important; }</style>"
+ ],
+ "text/plain": [
+ "<IPython.core.display.HTML object>"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ }
+ ],
"source": [
"from IPython.core.display import display, HTML\n",
"display(HTML(\"<style>.container { width:95% !important; }</style>\"))"
@@ -19,7 +32,7 @@
},
{
"cell_type": "code",
- "execution_count": 2,
+ "execution_count": 8,
"metadata": {},
"outputs": [],
"source": [
@@ -49,7 +62,7 @@
},
{
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": 9,
"metadata": {
"scrolled": false
},
@@ -57,7 +70,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "56d4cd729b7a4edcb0a55e62476a3e94",
+ "model_id": "47399e4964f543e9b60f131967909abc",
"version_major": 2,
"version_minor": 0
},
diff --git a/svg/Bahnhof_#d50000_target.svg b/svg/Bahnhof_#d50000_target.svg
index a1dd4604bbe46279381438574b9e2618e97ea124..7c66ed1b55fc14f7adae1e23c9b17f94f9c6647b 100644
--- a/svg/Bahnhof_#d50000_target.svg
+++ b/svg/Bahnhof_#d50000_target.svg
@@ -19,7 +19,7 @@
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
id="metadata165"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata>
<defs
id="defs163"/>
<sodipodi:namedview
@@ -32,12 +32,12 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
- inkscape:window-height="1017"
+ inkscape:window-height="1137"
id="namedview161"
showgrid="false"
inkscape:zoom="3.5"
- inkscape:cx="120"
- inkscape:cy="111.85562"
+ inkscape:cx="104.17929"
+ inkscape:cy="134.71276"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
@@ -54,307 +54,100 @@
.st6{fill:none;}
</style>
<g
- id="g16">
- <path
- class="st0"
- d="M146.27,104.75c1.07,0,1.94,0.87,1.94,1.94s-0.87,1.94-1.94,1.94c-0.42,0-0.8-0.13-1.12-0.36v7.88h25.42v-4.08 v-7.44H69.53v11.52h25.08v-7.88c-0.32,0.22-0.7,0.36-1.12,0.36c-1.07,0-1.94-0.87-1.94-1.94s0.87-1.94,1.94-1.94h1.12h2.33h0.7 h1.63h1.12c1.07,0,1.94,0.87,1.94,1.94s-0.87,1.94-1.94,1.94c-0.42,0-0.8-0.13-1.12-0.36v7.88h6.9v-0.64h16.75h10.9v0.64h6.68 v-7.88c-0.32,0.22-0.7,0.36-1.12,0.36c-1.07,0-1.94-0.87-1.94-1.94s0.87-1.94,1.94-1.94h1.12h2.33h0.7h1.63H146.27z"
- id="path4"/>
+ id="g1514"
+ transform="matrix(1.1053282,0,0,1.2239689,-12.677639,-22.410895)"
+ style="stroke-width:0.85974407"><path
+ inkscape:connector-curvature="0"
+ id="rect957-7"
+ d="m 31.722221,50.310733 v 16.48909 h 18.113142 v -16.48909 z m 0,16.48909 H 14.571429 v 16.678786 h 17.150792 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395" />
<path
- class="st0"
- d="M89.76,124.67v12.52v1.38H76.18v-1.38v-12.52v-0.68h-6.66H20.73v65.53h48.79H92.1v-2.29h0.98v-1.05h1.52 v-33.72c-0.32,0.22-0.7,0.36-1.12,0.36c-1.07,0-1.94-0.87-1.94-1.94c0-1.07,0.87-1.94,1.94-1.94h-3.15v-2.71v-2.71h1.76v-0.47h0.98 v-1.05h1.52v-18h-4.85V124.67z M42.78,166.43v1.38v12.52v1.38H29.2v-1.38v-12.52v-1.38v-7.09h8.22h5.35V166.43z M42.78,135.58v1.38 v12.52v1.38H29.2v-1.38v-12.52v-1.38v-7.09h8.22h5.35V135.58z M62.28,166.43v1.38v12.52v1.38H48.71v-1.38v-12.52v-1.38v-7.09h8.22 h5.35V166.43z M62.28,135.58v1.38v12.52v1.38H48.71v-1.38v-12.52v-1.38v-7.09h8.22h5.35V135.58z M89.76,154.13v1.38v12.52v1.38 H76.18v-1.38v-12.52v-1.38v-7.09h8.22h5.35V154.13z"
- id="path6"/>
- <polygon
- class="st0"
- points="133.81,136.5 133.81,137.88 106.17,137.88 106.17,136.5 106.17,123.99 99.27,123.99 99.27,141.99 100.79,141.99 100.79,143.04 101.78,143.04 101.78,143.51 137.98,143.51 137.98,143.04 138.97,143.04 138.97,141.99 140.49,141.99 140.49,123.99 133.81,123.99 "
- id="polygon8"/>
+ inkscape:connector-curvature="0"
+ id="rect957-9-4"
+ d="m 66.986155,50.310733 v 16.48909 h 18.113142 v -16.48909 z m 0,16.48909 H 49.835363 v 16.678786 h 17.150792 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"/>
<path
- class="st0"
- d="M170.57,123.99h-6.66v0.68v12.52v1.38h-13.58v-1.38v-12.52v-0.68h-5.18v18h1.52v1.05h0.98v0.47h1.76v2.71v2.71 h-3.15c1.07,0,1.94,0.87,1.94,1.94c0,1.07-0.87,1.94-1.94,1.94c-0.42,0-0.8-0.13-1.12-0.36v33.72h1.52v1.05h0.98v2.29h22.91h48.79 v-65.53H170.57z M163.91,154.13v1.38v12.52v1.38h-13.58v-1.38v-12.52v-1.38v-7.09h8.22h5.35V154.13z M191.58,166.43v1.38v12.52 v1.38h-13.58v-1.38v-12.52v-1.38v-7.09h8.22h5.35V166.43z M191.58,135.58v1.38v12.52v1.38h-13.58v-1.38v-12.52v-1.38v-7.09h8.22 h5.35V135.58z M211.09,166.43v1.38v12.52v1.38h-13.58v-1.38v-12.52v-1.38v-7.09h8.22h5.35V166.43z M211.09,135.58v1.38v12.52v1.38 h-13.58v-1.38v-12.52v-1.38v-7.09h8.22h5.35V135.58z"
- id="path10"/>
+ id="rect957-7-1"
+ d="m 102.25009,50.310733 v 16.48909 h 18.11314 v -16.48909 z m 0,16.48909 H 85.099297 v 16.678784 h 17.150793 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/>
<path
- class="st0"
- d="M137.43,150.87c0-1.07,0.87-1.94,1.94-1.94h-38.99c1.07,0,1.94,0.87,1.94,1.94c0,1.07-0.87,1.94-1.94,1.94 c-0.42,0-0.8-0.13-1.12-0.36v33.72h1.52v1.05h0.98v2.29h18.67h17.54v-2.29h0.98v-1.05h1.52v-33.72c-0.32,0.22-0.7,0.36-1.12,0.36 C138.3,152.82,137.43,151.95,137.43,150.87z M135.51,189.46h-0.59h-14.47h-0.59h-15.02h-0.04h-0.55v-32.71h0.55h0.04h15.02h0.59 h14.47h0.59V189.46z"
- id="path12"/>
+ id="rect957-9-4-6"
+ d="m 137.51402,50.310733 v 16.48909 h 18.11315 v -16.48909 z m 0,16.48909 h -17.15079 v 16.678784 h 17.15079 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/>
<path
- class="st0"
- d="M176.97,96.4L120.29,62L64.55,96.38v3.45h112.42V96.4z M120.76,93.18c-5.68,0-10.28-4.6-10.28-10.28 c0-5.68,4.6-10.28,10.28-10.28c5.68,0,10.28,4.6,10.28,10.28C131.04,88.58,126.44,93.18,120.76,93.18z"
- id="path14"/>
-</g>
- <path
- class="st1"
- d="M135.6,34.49l-14.76,3.47v11.26l14.76-3.47V34.49z M132.01,42.11l-2.69,0.6v2.72l-2.19,0.63V43.2l-2.69,0.6 V41.6l2.69-0.6v-2.72l2.19-0.63v2.86l2.69-0.6V42.11z"
- id="path18"/>
- <g
- id="g76">
- <polygon
- class="st2"
- points="76.18,124.67 76.18,137.19 79.06,137.19 89.76,137.19 89.76,124.67 82.25,124.67 "
- id="polygon20"/>
- <polygon
- class="st2"
- points="76.18,116.2 76.18,123.29 82.6,123.29 89.76,123.29 89.76,116.2 84.41,116.2 "
- id="polygon22"/>
- <polygon
- class="st2"
- points="150.33,124.67 150.33,137.19 153.2,137.19 163.91,137.19 163.91,124.67 156.4,124.67 "
- id="polygon24"/>
- <polygon
- class="st2"
- points="150.33,116.2 150.33,123.29 156.75,123.29 163.91,123.29 163.91,116.2 158.56,116.2 "
- id="polygon26"/>
- <polygon
- class="st2"
- points="76.18,147.04 76.18,154.13 82.6,154.13 89.76,154.13 89.76,147.04 84.41,147.04 "
- id="polygon28"/>
- <polygon
- class="st2"
- points="76.18,155.51 76.18,168.04 79.06,168.04 89.76,168.04 89.76,155.51 82.25,155.51 "
- id="polygon30"/>
- <polygon
- class="st2"
- points="150.33,155.51 150.33,168.04 153.2,168.04 163.91,168.04 163.91,155.51 156.4,155.51 "
- id="polygon32"/>
- <polygon
- class="st2"
- points="150.33,147.04 150.33,154.13 156.75,154.13 163.91,154.13 163.91,147.04 158.56,147.04 "
- id="polygon34"/>
+ id="rect957-7-1-5"
+ d="m 172.77795,50.310733 v 16.48909 h 18.11314 v -16.48909 z m 0,16.48909 h -17.15078 v 16.678784 h 17.15078 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/>
<path
- class="st2"
- d="M120.45,158.37v6.38v22.81h14.47v-29.18h-11.87H120.45z M123.78,173.75v1.09h-1.86v-1.09H123.78z"
- id="path36"/>
+ id="rect957-9-4-6-8"
+ d="m 208.04189,50.310733 v 16.48909 h 18.11313 v -16.48909 z m 0,16.48909 h -17.1508 v 16.678784 h 17.1508 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/>
<path
- class="st2"
- d="M104.84,187.55h6.33h8.69V166.2v-7.83h-15.02V187.55z M116.53,173.75h0.26h1.6v1.09h-1.87v-0.44V173.75z"
- id="path38"/>
- <polygon
- class="st2"
- points="48.71,128.5 48.71,135.58 55.12,135.58 62.28,135.58 62.28,128.5 56.93,128.5 "
- id="polygon40"/>
- <polygon
- class="st2"
- points="48.71,136.97 48.71,149.49 51.58,149.49 62.28,149.49 62.28,136.97 54.77,136.97 "
- id="polygon42"/>
- <polygon
- class="st2"
- points="48.71,167.81 48.71,180.33 51.58,180.33 62.28,180.33 62.28,167.81 54.77,167.81 "
- id="polygon44"/>
- <polygon
- class="st2"
- points="48.71,159.34 48.71,166.43 55.12,166.43 62.28,166.43 62.28,159.34 56.93,159.34 "
- id="polygon46"/>
- <polygon
- class="st2"
- points="29.2,136.97 29.2,149.49 32.07,149.49 42.78,149.49 42.78,136.97 35.26,136.97 "
- id="polygon48"/>
- <polygon
- class="st2"
- points="29.2,128.5 29.2,135.58 35.62,135.58 42.78,135.58 42.78,128.5 37.42,128.5 "
- id="polygon50"/>
- <polygon
- class="st2"
- points="29.2,159.34 29.2,166.43 35.62,166.43 42.78,166.43 42.78,159.34 37.42,159.34 "
- id="polygon52"/>
- <polygon
- class="st2"
- points="29.2,167.81 29.2,180.33 32.07,180.33 42.78,180.33 42.78,167.81 35.26,167.81 "
- id="polygon54"/>
- <polygon
- class="st2"
- points="197.51,136.97 197.51,149.49 200.38,149.49 211.09,149.49 211.09,136.97 203.58,136.97 "
- id="polygon56"/>
- <polygon
- class="st2"
- points="197.51,159.34 197.51,166.43 203.93,166.43 211.09,166.43 211.09,159.34 205.74,159.34 "
- id="polygon58"/>
- <polygon
- class="st2"
- points="197.51,167.81 197.51,180.33 200.38,180.33 211.09,180.33 211.09,167.81 203.58,167.81 "
- id="polygon60"/>
- <polygon
- class="st2"
- points="178.01,136.97 178.01,149.49 180.88,149.49 191.58,149.49 191.58,136.97 184.07,136.97 "
- id="polygon62"/>
- <polygon
- class="st2"
- points="178.01,128.5 178.01,135.58 184.42,135.58 191.58,135.58 191.58,128.5 186.23,128.5 "
- id="polygon64"/>
- <polygon
- class="st2"
- points="178.01,159.34 178.01,166.43 184.42,166.43 191.58,166.43 191.58,159.34 186.23,159.34 "
- id="polygon66"/>
- <polygon
- class="st2"
- points="178.01,167.81 178.01,180.33 180.88,180.33 191.58,180.33 191.58,167.81 184.07,167.81 "
- id="polygon68"/>
- <polygon
- class="st2"
- points="133.81,122.59 133.81,116.15 133.81,115.51 122.91,115.51 106.17,115.51 106.17,116.15 106.17,122.59 119.23,122.59 "
- id="polygon70"/>
- <polygon
- class="st2"
- points="133.81,136.5 133.81,123.99 133.81,123.98 118.52,123.98 106.17,123.98 106.17,123.99 106.17,136.5 112.02,136.5 "
- id="polygon72"/>
- <polygon
- class="st2"
- points="205.74,128.5 197.51,128.5 197.51,135.58 203.93,135.58 211.09,135.58 211.09,128.5 "
- id="polygon74"/>
-</g>
- <g
- id="g136">
- <polygon
- class="st3"
- points="133.81,136.5 112.02,136.5 106.17,136.5 106.17,137.88 133.81,137.88 "
- id="polygon78"/>
- <polygon
- class="st3"
- points="76.18,137.19 76.18,138.58 89.76,138.58 89.76,137.19 79.06,137.19 "
- id="polygon80"/>
- <polygon
- class="st3"
- points="150.33,137.19 150.33,138.58 163.91,138.58 163.91,137.19 153.2,137.19 "
- id="polygon82"/>
- <polygon
- class="st3"
- points="76.18,168.04 76.18,169.42 89.76,169.42 89.76,168.04 79.06,168.04 "
- id="polygon84"/>
- <polygon
- class="st3"
- points="150.33,168.04 150.33,169.42 163.91,169.42 163.91,168.04 153.2,168.04 "
- id="polygon86"/>
+ inkscape:connector-curvature="0"
+ id="rect957-4"
+ d="M 31.722221,83.478607 V 99.969504 H 49.835363 V 83.478607 Z m 0,16.490897 H 14.571429 v 16.676986 h 17.150792 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"/>
<path
- class="st3"
- d="M120.45,156.75h-0.59h-15.02h-0.04h-0.55v32.71h0.55h0.04h15.02h0.59h14.47h0.59v-32.71h-0.59H120.45z M119.86,166.2v21.35h-8.69h-6.33v-29.18h15.02V166.2z M134.92,187.55h-14.47v-22.81v-6.38h2.6h11.87V187.55z"
- id="path88"/>
- <polygon
- class="st3"
- points="118.39,173.75 116.79,173.75 116.53,173.75 116.53,174.39 116.53,174.84 118.39,174.84 "
- id="polygon90"/>
- <rect
- x="121.92"
- y="173.75"
- class="st3"
- width="1.86"
- height="1.09"
- id="rect92"/>
- <polygon
- class="st3"
- points="178.01,180.33 178.01,181.72 191.58,181.72 191.58,180.33 180.88,180.33 "
- id="polygon94"/>
- <polygon
- class="st3"
- points="48.71,149.49 48.71,150.87 62.28,150.87 62.28,149.49 51.58,149.49 "
- id="polygon96"/>
- <polygon
- class="st3"
- points="48.71,180.33 48.71,181.72 62.28,181.72 62.28,180.33 51.58,180.33 "
- id="polygon98"/>
- <polygon
- class="st3"
- points="29.2,149.49 29.2,150.87 42.78,150.87 42.78,149.49 32.07,149.49 "
- id="polygon100"/>
- <polygon
- class="st3"
- points="29.2,180.33 29.2,181.72 42.78,181.72 42.78,180.33 32.07,180.33 "
- id="polygon102"/>
- <polygon
- class="st3"
- points="197.51,149.49 197.51,150.87 211.09,150.87 211.09,149.49 200.38,149.49 "
- id="polygon104"/>
- <polygon
- class="st3"
- points="197.51,180.33 197.51,181.72 211.09,181.72 211.09,180.33 200.38,180.33 "
- id="polygon106"/>
- <polygon
- class="st3"
- points="178.01,149.49 178.01,150.87 191.58,150.87 191.58,149.49 180.88,149.49 "
- id="polygon108"/>
- <polygon
- class="st3"
- points="133.81,123.98 133.81,122.59 119.23,122.59 106.17,122.59 106.17,123.98 118.52,123.98 "
- id="polygon110"/>
- <polygon
- class="st3"
- points="76.18,123.29 76.18,123.99 76.18,124.67 82.25,124.67 89.76,124.67 89.76,123.99 89.76,123.29 82.6,123.29 "
- id="polygon112"/>
- <polygon
- class="st3"
- points="150.33,123.29 150.33,123.99 150.33,124.67 156.4,124.67 163.91,124.67 163.91,123.99 163.91,123.29 156.75,123.29 "
- id="polygon114"/>
- <polygon
- class="st3"
- points="76.18,154.13 76.18,155.51 82.25,155.51 89.76,155.51 89.76,154.13 82.6,154.13 "
- id="polygon116"/>
- <polygon
- class="st3"
- points="150.33,154.13 150.33,155.51 156.4,155.51 163.91,155.51 163.91,154.13 156.75,154.13 "
- id="polygon118"/>
- <polygon
- class="st3"
- points="178.01,166.43 178.01,167.81 184.07,167.81 191.58,167.81 191.58,166.43 184.42,166.43 "
- id="polygon120"/>
- <polygon
- class="st3"
- points="48.71,135.58 48.71,136.97 54.77,136.97 62.28,136.97 62.28,135.58 55.12,135.58 "
- id="polygon122"/>
- <polygon
- class="st3"
- points="48.71,166.43 48.71,167.81 54.77,167.81 62.28,167.81 62.28,166.43 55.12,166.43 "
- id="polygon124"/>
- <polygon
- class="st3"
- points="29.2,135.58 29.2,136.97 35.26,136.97 42.78,136.97 42.78,135.58 35.62,135.58 "
- id="polygon126"/>
- <polygon
- class="st3"
- points="29.2,166.43 29.2,167.81 35.26,167.81 42.78,167.81 42.78,166.43 35.62,166.43 "
- id="polygon128"/>
- <polygon
- class="st3"
- points="203.93,135.58 197.51,135.58 197.51,136.97 203.58,136.97 211.09,136.97 211.09,135.58 "
- id="polygon130"/>
- <polygon
- class="st3"
- points="197.51,166.43 197.51,167.81 203.58,167.81 211.09,167.81 211.09,166.43 203.93,166.43 "
- id="polygon132"/>
- <polygon
- class="st3"
- points="178.01,135.58 178.01,136.97 184.07,136.97 191.58,136.97 191.58,135.58 184.42,135.58 "
- id="polygon134"/>
-</g>
- <path
- class="st2"
- d="M120.76,72.62c-5.68,0-10.28,4.6-10.28,10.28c0,5.68,4.6,10.28,10.28,10.28c5.68,0,10.28-4.6,10.28-10.28 C131.04,77.22,126.44,72.62,120.76,72.62z M120.76,92.04c-5.04,0-9.13-4.1-9.13-9.13c0-5.04,4.1-9.13,9.13-9.13 c5.04,0,9.13,4.1,9.13,9.13C129.89,87.94,125.8,92.04,120.76,92.04z"
- id="path138"/>
- <path
- class="st2"
- d="M120.76,74.82c-4.46,0-8.09,3.63-8.09,8.09c0,4.46,3.63,8.09,8.09,8.09c4.46,0,8.09-3.63,8.09-8.09 C128.85,78.44,125.22,74.82,120.76,74.82z M126.97,82.9c0,0.29-0.23,0.52-0.52,0.52h-5.69c-0.29,0-0.52-0.23-0.52-0.52v-6.2 c0-0.29,0.23-0.52,0.52-0.52c0.29,0,0.52,0.23,0.52,0.52v5.67h5.17C126.74,82.38,126.97,82.61,126.97,82.9z"
- id="path140"/>
- <g
- id="g146">
- <path
- class="st4"
- d="M120.76,73.77c-5.04,0-9.13,4.1-9.13,9.13c0,5.04,4.1,9.13,9.13,9.13c5.04,0,9.13-4.1,9.13-9.13 C129.89,77.87,125.8,73.77,120.76,73.77z M120.76,90.99c-4.46,0-8.09-3.63-8.09-8.09c0-4.46,3.63-8.09,8.09-8.09 c4.46,0,8.09,3.63,8.09,8.09C128.85,87.36,125.22,90.99,120.76,90.99z"
- id="path142"/>
+ inkscape:connector-curvature="0"
+ id="rect957-9-2"
+ d="M 66.986155,83.478607 V 99.969504 H 85.099297 V 83.478607 Z m 0,16.490897 H 49.835363 v 16.676986 h 17.150792 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"/>
<path
- class="st4"
- d="M126.45,82.38h-5.17V76.7c0-0.29-0.23-0.52-0.52-0.52c-0.29,0-0.52,0.23-0.52,0.52v6.2 c0,0.29,0.23,0.52,0.52,0.52h5.69c0.29,0,0.52-0.23,0.52-0.52C126.97,82.61,126.74,82.38,126.45,82.38z"
- id="path144"/>
-</g>
- <g
- id="g152">
- <path
- class="st5"
- d="M170.57,104.96h9.66V93.08l-59.4-36.22v-18.9h-1.51v19.17L61.3,93.08v11.87h8.23H170.57z M64.55,96.38 L120.29,62l56.68,34.39v3.44H64.55V96.38z"
- id="path148"/>
+ inkscape:connector-curvature="0"
+ id="rect957-7-7"
+ d="m 31.722221,116.64649 v 16.48909 h 18.113142 v -16.48909 z m 0,16.48909 H 14.571429 v 16.67878 h 17.150792 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"/>
<path
- class="st5"
- d="M163.91,123.99h6.66h48.79h2.54v-7.84h-51.33h-25.42v-7.88c0.32,0.22,0.7,0.36,1.12,0.36 c1.07,0,1.94-0.87,1.94-1.94s-0.87-1.94-1.94-1.94h-1.12h-1.63h-0.7h-2.33h-1.12c-1.07,0-1.94,0.87-1.94,1.94s0.87,1.94,1.94,1.94 c0.42,0,0.8-0.13,1.12-0.36v7.88h-6.68v6.45v1.38v0.01h6.68v18h-1.52v1.05h-0.98v0.47h-36.21v-0.47h-0.98v-1.05h-1.52v-18h6.9 v-0.01v-1.38v-6.45h-6.9v-7.88c0.32,0.22,0.7,0.36,1.12,0.36c1.07,0,1.94-0.87,1.94-1.94s-0.87-1.94-1.94-1.94h-1.12h-1.63h-0.7 h-2.33h-1.12c-1.07,0-1.94,0.87-1.94,1.94s0.87,1.94,1.94,1.94c0.42,0,0.8-0.13,1.12-0.36v7.88H69.53H18.19v7.84h2.54h48.79h6.66 v-0.7v-7.09h8.22h5.35v7.09v0.7h4.85v18h-1.52v1.05H92.1v0.47h-1.76v2.71v2.71h3.15c-1.07,0-1.94,0.87-1.94,1.94 c0,1.07,0.87,1.94,1.94,1.94c0.42,0,0.8-0.13,1.12-0.36v33.72h-1.52v1.05H92.1v2.29H69.53H20.73h-2.54v3.99H221.9v-3.99h-2.54 h-48.79h-22.91v-2.29h-0.98v-1.05h-1.52v-33.72c0.32,0.22,0.7,0.36,1.12,0.36c1.07,0,1.94-0.87,1.94-1.94 c0-1.07-0.87-1.94-1.94-1.94h3.15v-2.71v-2.71h-1.76v-0.47h-0.98v-1.05h-1.52v-18h5.18v-0.7v-7.09h8.22h5.35v7.09V123.99z M101.78,189.52v-2.29h-0.98v-1.05h-1.52v-33.72c0.32,0.22,0.7,0.36,1.12,0.36c1.07,0,1.94-0.87,1.94-1.94 c0-1.07-0.87-1.94-1.94-1.94h38.99c-1.07,0-1.94,0.87-1.94,1.94c0,1.07,0.87,1.94,1.94,1.94c0.42,0,0.8-0.13,1.12-0.36v33.72h-1.52 v1.05h-0.98v2.29h-17.54H101.78z"
- id="path150"/>
-</g>
- <polygon
- class="st2"
- points="129.32,37.65 127.12,38.28 127.12,41 124.43,41.6 124.43,43.8 127.12,43.2 127.12,46.06 129.32,45.43 129.32,42.71 132.01,42.11 132.01,39.92 129.32,40.52 "
- id="polygon154"/>
+ inkscape:connector-curvature="0"
+ id="rect957-9-4-7"
+ d="m 66.986155,116.64649 v 16.48909 h 18.113142 v -16.48909 z m 0,16.48909 H 49.835363 v 16.67878 h 17.150792 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"/>
+ <path
+ id="rect957-5-7"
+ d="m 102.25009,83.478607 v 16.490897 h 18.11314 V 83.478607 Z m 0,16.490897 H 85.099297 v 16.676986 h 17.150793 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/>
+ <path
+ id="rect957-9-6-8"
+ d="m 137.51402,83.478607 v 16.490897 h 18.11315 V 83.478607 Z m 0,16.490897 h -17.15079 v 16.676986 h 17.15079 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/>
+ <path
+ id="rect957-7-1-1"
+ d="m 102.25009,116.64649 v 16.48909 h 18.11314 v -16.48909 z m 0,16.48909 H 85.099297 v 16.67878 h 17.150793 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/>
+ <path
+ id="rect957-9-4-6-4"
+ d="m 137.51402,116.64649 v 16.48909 h 18.11315 v -16.48909 z m 0,16.48909 h -17.15079 v 16.67878 h 17.15079 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/>
+ <path
+ id="rect957-5-3-3"
+ d="m 172.77795,83.478607 v 16.490897 h 18.11314 V 83.478607 Z m 0,16.490897 h -17.15078 v 16.676986 h 17.15078 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/>
+ <path
+ id="rect957-9-6-3-3"
+ d="m 208.04189,83.478607 v 16.490897 h 18.11313 V 83.478607 Z m 0,16.490897 h -17.1508 v 16.676986 h 17.1508 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/>
+ <path
+ id="rect957-7-1-5-6"
+ d="m 172.77795,116.64649 v 16.48909 h 18.11314 v -16.48909 z m 0,16.48909 h -17.15078 v 16.67878 h 17.15078 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/>
+ <path
+ id="rect957-9-4-6-8-2"
+ d="m 208.04189,116.64649 v 16.48909 h 18.11313 v -16.48909 z m 0,16.48909 h -17.1508 v 16.67878 h 17.1508 z"
+ style="opacity:1;fill:#000000;fill-opacity:0.50196078;stroke-width:0.85974395"
+ inkscape:connector-curvature="0"/></g>
+
+
<g
id="g158">
<rect
@@ -363,11 +156,8 @@
height="240"
id="rect156"/>
</g>
- <rect
- style="fill:#000000;fill-opacity:1"
+ <path
+ style="fill:#ea0001;fill-opacity:1;stroke-width:0.99999994"
+ d="m 29.481468,177.7857 c -11.321115,0 -20.4346046,10.14868 -20.4346046,22.75573 v 0.70256 c 0,12.60705 9.1134896,22.75572 20.4346046,22.75572 H 206.84887 c 11.32112,0 20.43462,-10.14867 20.43462,-22.75572 v -0.70256 c 0,-12.60705 -9.1135,-22.75573 -20.43462,-22.75573 z m 1.901345,8.12876 c 3.446266,0 5.853226,1.47185 7.217789,4.41686 0.61754,1.34358 0.951474,3.00612 1.001276,4.98756 h -2.779884 c -0.159365,-1.81858 -0.578061,-3.2031 -1.255361,-4.1531 -0.906388,-1.27572 -2.309394,-1.9135 -4.211813,-1.9135 -1.374522,0 -2.47131,0.33251 -3.288056,0.99751 -1.085673,0.88215 -1.627878,2.19857 -1.627878,3.94928 0,1.425 0.38802,2.44177 1.164923,3.05249 0.776904,0.61071 2.36477,1.26211 4.765206,1.95426 1.474124,0.43428 2.609661,0.83488 3.406486,1.20132 0.806785,0.36644 1.495104,0.79429 2.062841,1.28285 1.743055,1.53358 2.614079,3.63761 2.614079,6.31118 0,2.80929 -0.81694,5.07677 -2.45043,6.80034 -1.414364,1.50643 -3.436263,2.25878 -6.065785,2.25878 -2.838688,0 -5.050562,-0.9158 -6.634251,-2.74795 -1.57373,-1.8457 -2.370218,-4.43769 -2.390139,-7.77626 h 2.794955 c 0.02987,1.92714 0.392337,3.43185 1.089559,4.51758 1.135475,1.77785 2.918427,2.66881 5.348744,2.66881 1.782895,0 3.128855,-0.50957 4.035243,-1.52744 0.906388,-1.01786 1.358719,-2.32066 1.358719,-3.90851 0,-0.99072 -0.174636,-1.80556 -0.523246,-2.44342 -0.348612,-0.63787 -0.934677,-1.20753 -1.761383,-1.70968 -0.637459,-0.39358 -1.978308,-0.91677 -4.02017,-1.56821 -1.972141,-0.62427 -3.218002,-1.04413 -3.735938,-1.26127 -0.517936,-0.23071 -1.044803,-0.57124 -1.58266,-1.01909 -1.504006,-1.235 -2.256636,-3.18119 -2.256636,-5.84119 0,-2.63287 0.693431,-4.70965 2.077914,-6.22965 1.384484,-1.53357 3.265382,-2.29955 5.645896,-2.29955 z m 72.313437,0 c 2.998,0 5.35892,1.26194 7.08203,3.78623 1.16534,1.73714 1.82082,3.67771 1.97022,5.82201 h -2.89827 c -0.32868,-1.96787 -1.04553,-3.50221 -2.1511,-4.6015 -1.09561,-1.11286 -2.45474,-1.66892 -4.07826,-1.66892 -2.60955,0 -4.57223,1.44463 -5.886987,4.33534 -0.996004,2.19857 -1.494339,4.83141 -1.494339,7.89856 0,3.25714 0.518786,5.97171 1.554632,8.14314 1.314758,2.72786 3.256964,4.09315 5.826694,4.09315 1.8526,0 3.32718,-0.73313 4.42278,-2.19883 1.10558,-1.47929 1.7764,-3.60495 2.01545,-6.37353 h 2.87027 c -0.18924,3.01286 -0.89289,5.54475 -2.10802,7.59403 -1.72312,2.87715 -4.17175,4.31615 -7.34905,4.31615 -3.36655,0 -5.966387,-1.62169 -7.799064,-4.86526 -1.553795,-2.76858 -2.331988,-6.32523 -2.331988,-10.66809 0,-4.66857 0.996679,-8.49524 2.988727,-11.48096 1.832676,-2.75501 4.288585,-4.13152 7.366275,-4.13152 z m 98.30774,0 c 3.44628,0 5.85108,1.47185 7.21563,4.41686 0.61756,1.34358 0.95148,3.00612 1.00128,4.98756 h -2.77988 c -0.15936,-1.81858 -0.5759,-3.2031 -1.25321,-4.1531 -0.90639,-1.27572 -2.31154,-1.9135 -4.21395,-1.9135 -1.37453,0 -2.47133,0.33251 -3.28807,0.99751 -1.08566,0.88215 -1.62787,2.19857 -1.62787,3.94928 0,1.425 0.38801,2.44177 1.16491,3.05249 0.77692,0.61071 2.36693,1.26211 4.76737,1.95426 1.47412,0.43428 2.60966,0.83488 3.40648,1.20132 0.80679,0.36644 1.49296,0.79429 2.0607,1.28285 1.74305,1.53358 2.61407,3.63761 2.61407,6.31118 0,2.80929 -0.81479,5.07677 -2.44827,6.80034 -1.41437,1.50643 -3.43627,2.25878 -6.0658,2.25878 -2.83868,0 -5.05055,-0.9158 -6.63425,-2.74795 -1.57372,-1.8457 -2.37022,-4.43769 -2.39012,-7.77626 h 2.79279 c 0.0298,1.92714 0.39449,3.43185 1.09171,4.51758 1.13548,1.77785 2.91842,2.66881 5.34875,2.66881 1.7829,0 3.1267,-0.50957 4.03308,-1.52744 0.9064,-1.01786 1.35873,-2.32066 1.35873,-3.90851 0,-0.99072 -0.17249,-1.80556 -0.52111,-2.44342 -0.3486,-0.63787 -0.93682,-1.20753 -1.76353,-1.70968 -0.63745,-0.39358 -1.9783,-0.91677 -4.02017,-1.56821 -1.97213,-0.62427 -3.21585,-1.04413 -3.73378,-1.26127 -0.51793,-0.23071 -1.04696,-0.57124 -1.58482,-1.01909 -1.50399,-1.235 -2.25448,-3.18119 -2.25448,-5.84119 0,-2.63287 0.69128,-4.70965 2.07576,-6.22965 1.38448,-1.53357 3.26754,-2.29955 5.64805,-2.29955 z m -158.069717,0.69058 h 8.785375 c 2.131507,0 3.683585,0.33251 4.659695,0.99751 0.896428,0.61072 1.605197,1.49928 2.123132,2.66643 0.527897,1.15357 0.790254,2.4179 0.790254,3.78862 0,1.45215 -0.287921,2.74132 -0.865618,3.86775 -0.567739,1.12643 -1.354003,1.9525 -2.359992,2.48179 0.816744,0.29857 1.448823,0.65832 1.897037,1.07904 1.533888,1.41144 2.299702,3.46898 2.299702,6.1697 0,3.54214 -1.069072,6.08524 -3.210539,7.6324 -1.005991,0.71927 -2.3315,1.07903 -3.974952,1.07903 H 43.934273 Z m 20.975084,0 h 8.785377 c 2.131506,0 3.685735,0.33251 4.661846,0.99751 0.896429,0.61072 1.603044,1.49928 2.120981,2.66643 0.527897,1.15357 0.792407,2.4179 0.792407,3.78862 0,1.45215 -0.287921,2.74132 -0.865619,3.86775 -0.567738,1.12643 -1.356155,1.9525 -2.362147,2.48179 0.816746,0.29857 1.448824,0.65832 1.897038,1.07904 1.533888,1.41144 2.301854,3.46898 2.301854,6.1697 0,3.54214 -1.071223,6.08524 -3.212689,7.6324 -1.005992,0.71927 -2.329349,1.07903 -3.972799,1.07903 H 64.909357 Z m 51.635323,0 h 14.35807 v 3.42175 h -11.47482 v 9.40442 h 10.09886 v 3.17477 h -10.09886 v 13.76133 h -2.88325 z m 17.5686,0 h 14.35806 v 3.42175 h -11.47266 v 9.40442 h 10.09887 v 3.17477 h -10.09887 v 13.76133 h -2.8854 z m 26.05683,0 h 14.35805 v 3.42175 h -11.47482 v 9.40442 h 10.10103 v 3.17477 h -10.10103 v 13.76133 h -2.88323 z m 17.57074,0 h 14.35806 v 3.42175 H 180.6241 v 9.40442 h 10.09887 v 3.17477 H 180.6241 v 13.76133 h -2.88325 z m -130.923337,3.42175 v 9.26054 h 5.198014 c 1.424325,0 2.477251,-0.12819 3.154552,-0.38604 0.677301,-0.27144 1.214393,-0.79464 1.612806,-1.5682 0.408373,-0.77358 0.611531,-1.67577 0.611531,-2.7072 0,-1.03142 -0.174636,-1.91198 -0.523247,-2.64484 -0.34861,-0.73285 -0.834576,-1.25605 -1.462076,-1.5682 -0.527896,-0.25787 -1.565486,-0.38606 -3.109334,-0.38606 z m 20.977238,0 v 9.26054 h 5.198013 c 1.424324,0 2.475099,-0.12819 3.1524,-0.38604 0.6773,-0.27144 1.214393,-0.79464 1.612806,-1.5682 0.408372,-0.77358 0.613683,-1.67577 0.613683,-2.7072 0,-1.03142 -0.174635,-1.91198 -0.523246,-2.64484 -0.34861,-0.73285 -0.836729,-1.25605 -1.464229,-1.5682 -0.527897,-0.25787 -1.563332,-0.38606 -3.107181,-0.38606 z M 46.817513,202.4645 v 10.48346 h 5.766479 c 1.992062,1e-5 3.332909,-0.23716 4.020171,-0.71216 1.175316,-0.81428 1.761382,-2.29417 1.761382,-4.43845 0,-2.41571 -0.791377,-4.02939 -2.375067,-4.84368 -0.617539,-0.32571 -1.912372,-0.48917 -3.884513,-0.48917 z m 20.977238,0 v 10.48346 h 5.766479 c 1.992062,1e-5 3.330757,-0.23716 4.018017,-0.71216 1.175317,-0.81428 1.763536,-2.29417 1.763536,-4.43845 0,-2.41571 -0.791377,-4.02939 -2.375067,-4.84368 -0.617538,-0.32571 -1.912372,-0.48917 -3.884514,-0.48917 z"
id="rect972"
- width="197.95059"
- height="37.642857"
- x="21.047144"
- y="197.5"
- ry="18.535713"/></svg>
+ inkscape:connector-curvature="0"/></svg>