Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15187)
+++ /trunk/data/defaultpresets.xml	(revision 15188)
@@ -1949,7 +1949,14 @@
             <link wiki="Tag:railway=switch" />
             <key key="railway" value="switch" />
+            <combo key="railway:switch" text="Type" values="abt,default,double_slip,single_slip,three_way,wye" />
             <text key="ref" text="Reference" />
             <text key="operator" text="Operator" />
         </item> <!-- Railway Switch -->
+        <item name="Railway crossing" icon="presets/transport/railway/railway_crossing.svg" type="node" preset_name_label="true">
+            <link wiki="Tag:railway=railway_crossing" />
+            <key key="railway" value="railway_crossing" />
+            <text key="ref" text="Reference" />
+            <text key="operator" text="Operator" />
+        </item> <!-- Railway crossing -->
         <item name="Railway Signal" icon="presets/transport/railway/signal.svg" type="node" preset_name_label="true">
             <link wiki="Tag:railway=signal" />
@@ -5841,4 +5848,11 @@
     </group> <!-- Cash -->
     <group name="Home decoration" icon="presets/shop/interior_decoration.svg">
+        <item name="Doors" icon="presets/shop/doors.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=doors" />
+            <space />
+            <key key="shop" value="doors" />
+            <reference ref="name_brand_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Doors -->
         <item name="Furniture" icon="presets/shop/furniture.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=furniture" />
@@ -6148,4 +6162,11 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Variety Store -->
+        <item name="Party supplies" icon="presets/shop/party.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=party" />
+            <space />
+            <key key="shop" value="party" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Party supplies -->
         <item name="Charity" icon="presets/shop/charity.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=charity" />
Index: /trunk/images/presets/shop/door.svg
===================================================================
--- /trunk/images/presets/shop/door.svg	(revision 15188)
+++ /trunk/images/presets/shop/door.svg	(revision 15188)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="16"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   version="1.0"
+   sodipodi:docname="door6.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="6.2762801"
+     inkscape:cy="-0.27184213"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     showguides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4160" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-8,-8.000001)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#e8bce8;fill-opacity:1;stroke:#ac39ac;stroke-width:1.42018926;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.7100946,23.000001 V 9.7100956 H 18.289906 V 23.000001"
+       id="path8372"
+       sodipodi:nodetypes="cccc" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ac39ac;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9673934;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4174"
+       width="2.7213643"
+       height="1.0746562"
+       x="15"
+       y="15.923315"
+       rx="0.00067477679"
+       ry="4.978418e-008" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/party.svg
===================================================================
--- /trunk/images/presets/shop/party.svg	(revision 15188)
+++ /trunk/images/presets/shop/party.svg	(revision 15188)
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="687.5"
+   id="svg1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="party.svg"
+   sodipodi:version="0.32"
+   width="687.5"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <metadata
+     id="metadata3">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title />
+        <dc:description />
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li />
+            <rdf:li>festive</rdf:li>
+            <rdf:li>party</rdf:li>
+            <rdf:li>recreation</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org">
+            <dc:title>Jean-Victor Balin (balin_j@epita.fr)</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jean-Victor Balin (balin_j@epita.fr)</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Jean-Victor Balin (balin_j@epita.fr)</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient12909">
+      <stop
+         id="stop12910"
+         offset="0.00000000"
+         style="stop-color:#f5db94;stop-opacity:1.0000000;" />
+      <stop
+         id="stop12911"
+         offset="1.0000000"
+         style="stop-color:#be7900;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12906">
+      <stop
+         id="stop12907"
+         offset="0.00000000"
+         style="stop-color:#67e869;stop-opacity:1.0000000;" />
+      <stop
+         id="stop12908"
+         offset="1.0000000"
+         style="stop-color:#1a4c00;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10342">
+      <stop
+         id="stop10343"
+         offset="0.00000000"
+         style="stop-color:#67e869;stop-opacity:1.0000000;" />
+      <stop
+         id="stop10344"
+         offset="1.0000000"
+         style="stop-color:#1a4c00;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9715">
+      <stop
+         id="stop9716"
+         offset="0.00000000"
+         style="stop-color:#67ff69;stop-opacity:1.0000000;" />
+      <stop
+         id="stop9717"
+         offset="1.0000000"
+         style="stop-color:#1a7600;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9088">
+      <stop
+         id="stop9089"
+         offset="0.00000000"
+         style="stop-color:#c5ab00;stop-opacity:1.0000000;" />
+      <stop
+         id="stop9090"
+         offset="1.0000000"
+         style="stop-color:#746b00;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8463">
+      <stop
+         id="stop8464"
+         offset="0.00000000"
+         style="stop-color:#ffe59e;stop-opacity:1.0000000;" />
+      <stop
+         id="stop8465"
+         offset="1.0000000"
+         style="stop-color:#db8e00;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4088">
+      <stop
+         id="stop4089"
+         offset="0.00000000"
+         style="stop-color:#a00000;stop-opacity:1.0000000;" />
+      <stop
+         id="stop4090"
+         offset="1.0000000"
+         style="stop-color:#510000;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3462">
+      <stop
+         id="stop3463"
+         offset="0.00000000"
+         style="stop-color:#ff5f5f;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3464"
+         offset="1.0000000"
+         style="stop-color:#890000;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       cx="238.37162"
+       cy="215.97427"
+       fx="244.37827"
+       fy="210.71845"
+       id="radialGradient3465"
+       inkscape:collect="always"
+       r="222.30843"
+       xlink:href="#linearGradient3462"
+       gradientTransform="scale(0.92542244,1.0805876)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4087"
+       inkscape:collect="always"
+       x1="319.30365"
+       x2="319.65744"
+       xlink:href="#linearGradient4088"
+       y1="506.98996"
+       y2="492.15268"
+       gradientTransform="scale(0.97022246,1.0306915)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="238.37162"
+       cy="215.97427"
+       fx="244.37827"
+       fy="210.71845"
+       id="radialGradient9718"
+       inkscape:collect="always"
+       r="222.30843"
+       xlink:href="#linearGradient9715"
+       gradientTransform="scale(0.92542244,1.0805876)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient10341"
+       inkscape:collect="always"
+       x1="146.36213"
+       x2="134.98328"
+       xlink:href="#linearGradient10342"
+       y1="519.61125"
+       y2="478.0835"
+       gradientTransform="scale(0.96062594,1.0409879)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     id="base"
+     inkscape:cx="237.97439"
+     inkscape:cy="486.04135"
+     inkscape:grid-bbox="false"
+     inkscape:grid-points="false"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="987"
+     inkscape:window-width="1680"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:zoom="0.30404535"
+     pagecolor="#ffffff"
+     showgrid="false"
+     inkscape:current-layer="svg1"
+     units="px"
+     inkscape:window-maximized="1"
+     showguides="false" />
+  <rect
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.11514652;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+     id="rect4179"
+     width="686.38483"
+     height="686.38483"
+     x="0.55757326"
+     y="0.55760437" />
+  <g
+     id="g11034"
+     transform="translate(162.45405,268.39124)">
+    <path
+       d="m 270.41041,326.46525 c -15.69626,33.09767 13.93913,62.90464 35.91665,84.01144 21.65726,20.68541 22.63385,51.05096 17.18343,78.44573 -4.07195,34.22013 -1.18807,73.44199 26.19689,97.99113 22.5108,20.78411 46.01128,54.20099 26.95798,84.77566 -2.20285,3.72121 -4.93534,7.1374 -8.14372,10.04188"
+       id="path10369"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:11.76399994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 118.73761,505.50611 c 5.92049,4.54502 8.14503,12.2066 8.89909,19.32712 0.59266,3.15428 0.11828,6.3348 0.17203,9.50269 0.0171,2.33202 1.32763,5.51901 4.18802,4.91107 2.01504,-0.53308 3.73287,-1.87874 5.42656,-3.07035 4.31033,-3.43035 7.4337,-8.72955 12.99766,-10.30624 4.61463,-0.89638 9.69879,-0.94788 13.53927,-4.03253 2.61724,-1.86527 1.95447,-6.0387 -1.15411,-6.96164 -3.20591,-1.42832 -6.8713,-1.91376 -9.60161,-4.3005 -7.01748,-4.78095 -11.38862,-12.43053 -14.36168,-20.20229 -1.61518,-2.8469 -5.89123,-2.06182 -7.50768,0.38923 -3.78415,4.41667 -4.98908,10.98521 -10.40744,13.95351 -0.68805,0.36425 -1.42644,0.6359 -2.19011,0.78993 z"
+       id="path9092"
+       style="fill:url(#linearGradient10341);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="matrix(0.710507,0,0,0.710507,163.3868,-43.44494)"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       id="path9093"
+       style="fill:url(#radialGradient9718);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="matrix(0.598546,-0.416502,0.414663,0.595902,-137.1147,141.6126)"
+       cx="315.09225"
+       cy="321.40948"
+       rx="155.64345"
+       ry="181.74011" />
+  </g>
+  <g
+     id="g13540"
+     transform="translate(162.45405,268.39124)">
+    <path
+       d="m 302.33609,531.99524 c -3.80669,44.12102 -27.5241,91.41466 -4.53752,133.95036 30.05164,45.86764 97.20361,51.31306 120.33411,103.76106 19.35629,33.49601 16.2321,72.75129 12.64291,109.64194 -2.51541,28.90739 2.17293,60.27497 23.71764,81.49211 12.74109,17.14391 24.17359,37.40155 22.26754,59.54359"
+       id="path2211"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:16.55719085;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="matrix(0.710507,0,0,0.710507,163.3868,-43.44494)"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 292.88809,498.92725 c 2.26367,7.11233 -0.28649,14.67176 -3.73462,20.94718 -1.31519,2.92763 -3.52121,5.26733 -5.28653,7.89832 -1.31795,1.92395 -2.06257,5.28846 0.63256,6.42323 1.95847,0.71339 4.13712,0.59001 6.20797,0.57932 5.49737,-0.35376 11.0879,-2.91949 16.55551,-1.03567 4.29981,1.90001 8.50244,4.76169 13.41669,4.42334 3.2137,-0.0362 5.05345,-3.84038 3.02901,-6.3735 -1.81567,-3.00355 -4.54705,-5.49561 -5.4249,-9.0142 -3.02936,-7.93256 -2.24804,-16.70824 -0.24935,-24.78565 0.30031,-3.25936 -3.658,-5.05733 -6.38481,-3.96873 -5.62884,1.4639 -10.36968,6.1673 -16.51264,5.50891 -0.77282,-0.094 -1.53407,-0.29278 -2.24889,-0.60255 z"
+       id="path1553"
+       style="fill:url(#linearGradient4087);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="matrix(0.710507,0,0,0.710507,163.3868,-43.44494)"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       id="path930"
+       style="fill:url(#radialGradient3465);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000003pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="matrix(0.729199,0,0,0.725978,155.025,-51.69274)"
+       cx="315.09225"
+       cy="321.40948"
+       rx="155.64345"
+       ry="181.74011" />
+  </g>
+  <path
+     style="fill:#ff0000;stroke:none;stroke-width:1.67627048px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M -7.638125,168.27547 163.46306,150.51041 105.43175,372.5547 Z"
+     id="path868-9"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#00ff00;stroke:none;stroke-width:1.67627048px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 330.93561,111.18855 161.01515,-60.588075 0.0958,229.514465 z"
+     id="path868-9-3"
+     inkscape:connector-curvature="0"
+     inkscape:transform-center-x="-16.217088"
+     inkscape:transform-center-y="-24.345894" />
+  <path
+     style="fill:#0000ff;stroke:none;stroke-width:1.67627048px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+     d="M 163.46306,150.51041 330.93561,111.18855 301.48624,338.80269 Z"
+     id="path868-9-0"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#ff8f00;stroke:none;stroke-width:1.67627048px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+     d="M 491.95076,50.600475 647.70905,-22.467444 665.8309,206.3293 Z"
+     id="path868-9-3-6"
+     inkscape:connector-curvature="0"
+     inkscape:transform-center-x="-16.634109"
+     inkscape:transform-center-y="-31.880049" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:32.76599884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M -62.483289,162.3022 C 407.61782,185.34554 1203.244,-325.65214 1212.1819,-337.60013"
+     id="path864"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+</svg>
Index: /trunk/images/presets/transport/railway/railway_crossing.svg
===================================================================
--- /trunk/images/presets/transport/railway/railway_crossing.svg	(revision 15188)
+++ /trunk/images/presets/transport/railway/railway_crossing.svg	(revision 15188)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="11"
+   viewBox="0 0 9 11"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="crossing5.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="48.59375"
+     inkscape:cx="1.6973267"
+     inkscape:cy="5.2839111"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1042.3622)">
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1.68350756;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect824-0"
+       width="9"
+       height="10.999966"
+       x="0"
+       y="1042.3622" />
+    <path
+       style="fill:#000000;stroke:#000000;stroke-width:0.99995613;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.5,1043.8622 6,8"
+       id="path841"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#000000;stroke:#000000;stroke-width:0.99995613;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.5,1051.8622 6,-8"
+       id="path841-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/switch.svg
===================================================================
--- /trunk/images/presets/transport/railway/switch.svg	(revision 15187)
+++ /trunk/images/presets/transport/railway/switch.svg	(revision 15188)
@@ -10,21 +10,13 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="15"
-   height="16"
-   viewBox="0 0 15 16"
-   id="svg4264"
+   width="9"
+   height="11"
+   viewBox="0 0 9 11"
+   id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="rail_railway_switch.svg">
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="switch9.svg">
   <defs
-     id="defs4266">
-    <pattern
-       y="0"
-       x="0"
-       height="6"
-       width="6"
-       patternUnits="userSpaceOnUse"
-       id="EMFhbasepattern" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
@@ -34,22 +26,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-11.517092"
-     inkscape:cy="4.0015607"
+     inkscape:zoom="48.59375"
+     inkscape:cx="1.6973267"
+     inkscape:cy="5.2839111"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      units="px"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false">
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16"
+     showguides="false">
     <inkscape:grid
        type="xygrid"
-       id="grid4137" />
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
   </sodipodi:namedview>
   <metadata
-     id="metadata4269">
+     id="metadata7">
     <rdf:RDF>
       <cc:Work
@@ -58,5 +56,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
@@ -74,60 +72,27 @@
   </metadata>
   <g
-     inkscape:label="Camada 1"
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1036.3621)">
+     transform="translate(0,-1042.3622)">
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1.68350756;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect824-0"
+       width="9"
+       height="10.999966"
+       x="0"
+       y="1042.3622" />
     <path
-       sodipodi:nodetypes="ccccc"
-       style="fill:#c87137;fill-opacity:1"
+       style="fill:#000000;stroke:#000000;stroke-width:0.99995613;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2.5,1051.8551 v -8"
+       id="path841-8"
        inkscape:connector-curvature="0"
-       id="path3387-0-99-7-4-2-9-2-8-3-7-6-5"
-       d="m -1.0476837e-5,1039.3621 0,-2 15.000015476837,0 0,2 z"
-       class="st5" />
+       sodipodi:nodetypes="cc" />
     <path
-       sodipodi:nodetypes="ccccc"
-       style="fill:#c87137;fill-opacity:1"
+       style="fill:none;stroke:#000000;stroke-width:0.99995613;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2.5,1051.8552 c 1.1516408,-2.7975 1.5,-5.493 5,-7.993"
+       id="path841-8-3"
        inkscape:connector-curvature="0"
-       id="path3387-0-99-7-4-2-9-2-2-0-9-3-7-8"
-       d="m -4.7683722e-7,1043.3621 0,-2 14.00000147683722,0 0,2 z"
-       class="st5" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       style="fill:#c87137;fill-opacity:1"
-       inkscape:connector-curvature="0"
-       id="path3387-0-99-7-4-2-9-2-1-0-8-5-3-6"
-       d="m -4.7683722e-7,1047.3621 0,-2 13.00000147683722,0 0,2 z"
-       class="st5" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       style="fill:#c87137;fill-opacity:1"
-       inkscape:connector-curvature="0"
-       id="path3387-0-99-7-4-2-9-2-5-0-5-8-3-4"
-       d="m -4.7683722e-7,1051.3621 0,-2 12.00000147683722,0 0,2 z"
-       class="st5" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       style="fill:#000000;fill-opacity:1"
-       inkscape:connector-curvature="0"
-       id="path3387-0-99-9-7-8-7-2-8-3-9"
-       d="m 3.0000019,1052.3621 -1.000011,0 0,-16 1.000011,0 z"
-       class="st5" />
-    <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m 5.9868759,1036.3621 c -3.703746,7.0026 -3.986328,15.2305 -3.986328,15.2305 l 1,0.035 c 0,0 0.323914,-8.4499 4.117188,-15.2656 l -1.13086,0 z"
-       id="path4812-4"
-       inkscape:connector-curvature="0" />
-    <path
-       class="st5"
-       d="m 10.000001,1052.3621 -1.0000113,0 0,-16 1.0000113,0 z"
-       id="path4143"
-       inkscape:connector-curvature="0"
-       style="fill:#000000;fill-opacity:1"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4145"
-       d="m 12.986875,1036.3621 c -3.7037463,7.0026 -3.9863283,15.2305 -3.9863283,15.2305 l 1.0000003,0.035 c 0,0 0.323914,-8.4499 4.117188,-15.2656 l -1.13086,0 z"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
Index: /trunk/images_nodist/presets/transport/switch.svg
===================================================================
--- /trunk/images_nodist/presets/transport/switch.svg	(revision 15188)
+++ /trunk/images_nodist/presets/transport/switch.svg	(revision 15188)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="rail_railway_switch.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-11.517092"
+     inkscape:cy="4.0015607"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <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 />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-8-3-7-6-5"
+       d="m -1.0476837e-5,1039.3621 0,-2 15.000015476837,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-2-0-9-3-7-8"
+       d="m -4.7683722e-7,1043.3621 0,-2 14.00000147683722,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-1-0-8-5-3-6"
+       d="m -4.7683722e-7,1047.3621 0,-2 13.00000147683722,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-5-0-5-8-3-4"
+       d="m -4.7683722e-7,1051.3621 0,-2 12.00000147683722,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-9-7-8-7-2-8-3-9"
+       d="m 3.0000019,1052.3621 -1.000011,0 0,-16 1.000011,0 z"
+       class="st5" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 5.9868759,1036.3621 c -3.703746,7.0026 -3.986328,15.2305 -3.986328,15.2305 l 1,0.035 c 0,0 0.323914,-8.4499 4.117188,-15.2656 l -1.13086,0 z"
+       id="path4812-4"
+       inkscape:connector-curvature="0" />
+    <path
+       class="st5"
+       d="m 10.000001,1052.3621 -1.0000113,0 0,-16 1.0000113,0 z"
+       id="path4143"
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4145"
+       d="m 12.986875,1036.3621 c -3.7037463,7.0026 -3.9863283,15.2305 -3.9863283,15.2305 l 1.0000003,0.035 c 0,0 0.323914,-8.4499 4.117188,-15.2656 l -1.13086,0 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 15187)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 15188)
@@ -1956,4 +1956,5 @@
 area[shop=department_store],
 area[shop=deli],
+area[shop=doors],
 area[shop=electronics],
 area[shop=erotic],
@@ -1983,4 +1984,5 @@
 area[shop=medical_supply],
 area[shop=paint],
+area[shop=party],
 area[shop=pawnbroker],
 area[shop=seafood],
@@ -2131,4 +2133,8 @@
     set icon_z17;
 }
+node[shop=doors] {
+    icon-image: "presets/shop/doors.svg";
+    set icon_z17;
+}
 node[shop=electronics] {
     icon-image: "presets/shop/electronics.svg";
@@ -2237,4 +2243,8 @@
 node[shop=paint] {
     icon-image: "presets/shop/paint.svg";
+    set icon_z17;
+}
+node[shop=party] {
+    icon-image: "presets/shop/party.svg";
     set icon_z17;
 }
@@ -3642,4 +3652,8 @@
 node[railway=switch] {
     icon-image: "presets/transport/railway/switch.svg";
+    set icon_z17;
+}
+node[railway=railway_crossing] {
+    icon-image: "presets/transport/railway/railway_crossing.svg";
     set icon_z17;
 }