Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 11264)
+++ /trunk/data/defaultpresets.xml	(revision 11265)
@@ -3630,4 +3630,17 @@
             <preset_link preset_name="Building" />
         </item> <!-- Guest House/Bed & Breakfast -->
+        <item name="Apartment" icon="presets/accommodation/apartment.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=apartment" />
+            <space />
+            <key key="tourism" value="apartment" />
+            <reference ref="name_operator" />
+            <combo key="number_of_apartments" text="Number of apartments" values="1,2,3,4,5,6,7,8,9,10" />
+            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="wheelchair" />
+            <space />
+            <reference ref="internet_smoking" />
+            <space />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Apartment -->
         <item name="Chalet" icon="presets/accommodation/chalet.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
Index: /trunk/images/presets/accommodation/apartment.svg
===================================================================
--- /trunk/images/presets/accommodation/apartment.svg	(revision 11265)
+++ /trunk/images/presets/accommodation/apartment.svg	(revision 11265)
@@ -0,0 +1,131 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="14.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="31.678384"
+     inkscape:cx="16.134079"
+     inkscape:cy="7.3826676"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     showgrid="true"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <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)">
+    <rect
+       x="8"
+       y="8.000001"
+       width="16"
+       height="16"
+       rx="2"
+       ry="2"
+       id="shield"
+       style="fill:#ffffff;stroke:none" />
+    <g
+       id="g4264"
+       transform="matrix(1.3960228,0,0,1.4671449,9.0011285,4.4882701)"
+       style="fill:#cd9369;fill-opacity:1;stroke:#c67036;stroke-opacity:1">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path8372"
+         d="m 2.478544,11.578874 0,-8.0822 5.0753842,0 0,8.0822"
+         style="fill:#cd9369;fill-opacity:1;stroke:#c67036;stroke-width:1.03557968;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="4.0554256"
+         x="2.8336146"
+         height="7.4207835"
+         width="4.292532"
+         id="rect8376"
+         style="opacity:0.2;fill:#cd9369;fill-opacity:1;stroke:#c67036;stroke-width:1.10825205;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <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:#ae6230;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;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"
+       height="1"
+       x="17"
+       y="15.000001"
+       rx="0.00049591064"
+       ry="4.6325681e-008" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4152"
+       d="M 9.59893,15.000001 C 9.224597,15.000001 9,15.224302 9,15.747664 l 0,7.252337 1.272728,0 0,-1.794396 c 0,0 10.331534,0.07478 11.454537,0 l 0,1.794396 1.272735,0 0,-2.392519 0,-3.887853 c 0,-0.29908 -0.149722,-0.747664 -0.673802,-0.747664 -0.449201,0 -0.598933,0.448598 -0.598933,0.747664 l 0,3.289715 -11.454537,0 0,-4.26168 c 0,-0.523366 -0.299479,-0.747663 -0.673798,-0.747663 z m 2.919783,0.971964 c -0.823528,0 -1.497319,0.672899 -1.497319,1.495323 0,0.822439 0.673791,1.495331 1.497319,1.495331 0.823534,0 1.497325,-0.672892 1.497325,-1.495331 0,-0.822424 -0.673791,-1.495323 -1.497325,-1.495323 z m 1.946526,1.046732 0,1.943922 6.513356,0 c 0,-0.971961 -1.048135,-1.943922 -2.021373,-1.943922 z"
+       style="fill:#0083c3;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  </g>
+</svg>
Index: /trunk/images/presets/accommodation/chalet.svg
===================================================================
--- /trunk/images/presets/accommodation/chalet.svg	(revision 11264)
+++ /trunk/images/presets/accommodation/chalet.svg	(revision 11265)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
@@ -10,14 +10,55 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg831"
+   width="16"
+   height="16"
+   id="svg2"
    sodipodi:version="0.32"
-   width="66.032692pt"
-   height="65.311539pt"
-   sodipodi:docname="chalet.svg"
    inkscape:version="0.91 r13725"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   version="1.0"
+   sodipodi:docname="22.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="31.678384"
+     inkscape:cx="8.8662849"
+     inkscape:cy="11.66826"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     showgrid="true"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4160" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata2216">
+     id="metadata7">
     <rdf:RDF>
       <cc:Work
@@ -41,66 +82,47 @@
     </rdf:RDF>
   </metadata>
-  <defs
-     id="defs833" />
-  <sodipodi:namedview
-     id="base"
-     inkscape:zoom="4.3131439"
-     inkscape:cx="19.414108"
-     inkscape:cy="29.615847"
-     inkscape:window-width="1680"
-     inkscape:window-height="988"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:current-layer="svg831"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4138"
-       originx="-15.444941"
-       originy="-24.440363" />
-  </sodipodi:namedview>
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
-     id="rect4140"
-     width="82.540863"
-     height="81.639427"
-     x="3.6975297e-007"
-     y="0" />
   <g
-     id="g825"
-     transform="matrix(0.680918,0,0,0.658159,-80.582191,-28.356326)">
-    <g
-       id="g815"
-       transform="matrix(0.268353,0,0,0.275569,94.8544,31.97102)">
-      <path
-         style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         d="m 147.599,86.2593 -15.334,13.418 21.085,23.0017 15.335,-11.501 13.418,11.501 21.086,-19.168 21.085,19.168 36.421,0 c 11.501,11.501 26.835,32.587 51.756,32.587 24.919,0 54.971,-13.533 55.589,-51.755 2.412,-36.3837 -26.837,-53.6723 -53.673,-53.6723 -26.836,1.9168 -44.088,19.1686 -53.672,36.4206 l -113.096,0 z m 210.856,16.2927 c 0,12.168 -6.441,22.044 -14.377,22.044 -7.935,0 -14.376,-9.876 -14.376,-22.044 0,-12.1677 6.441,-22.0437 14.376,-22.0437 7.936,0 14.377,9.876 14.377,22.0437 z"
-         id="path808"
-         sodipodi:nodetypes="cccccccccccccccccc"
-         inkscape:connector-curvature="0" />
-      <path
-         style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.774998pt"
-         d="m 357.772,94.7983 c -4.75,5.111 -4.749,7.4347 3.166,12.5467 l 36.41,-4.183 c 3.694,-2.323 4.222,-7.4347 -3.166,-11.1517 l -36.41,2.788 z"
-         id="path809"
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0" />
-      <path
-         style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.981394pt"
-         d="m 389.251,76.8318 8.868,29.3682 16.667,-6.6617 -8.834,-27.2582 -16.701,4.5517 z m -9.995,-10.3533 14.623,58.7975 89.458,-24.987 -14.383,-58.8024 -89.698,24.9919 z"
-         id="path814"
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0" />
-    </g>
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-8,-8.000001)">
+    <rect
+       x="8"
+       y="8.000001"
+       width="16"
+       height="16"
+       rx="2"
+       ry="2"
+       id="shield"
+       style="fill:#ffffff;stroke:none" />
     <path
-       style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.57346001pt"
-       d="m 179.113,80.5082 -60.267,36.8048 6.027,9.2 7.232,-3.451 0,43.706 94.018,0 0,-43.706 6.845,3.336 6.027,-9.201 -59.882,-36.6888 z m -26.517,41.4048 -0.262,13.861 54.241,0 0.262,-13.861 -54.241,0 z"
-       id="path824"
-       sodipodi:nodetypes="ccccccccccccccc"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       id="path4152"
+       d="M 9.59893,15.000001 C 9.224597,15.000001 9,15.224302 9,15.747664 l 0,7.252337 1.272728,0 0,-1.794396 c 0,0 10.331534,0.07478 11.454537,0 l 0,1.794396 1.272735,0 0,-2.392519 0,-3.887853 c 0,-0.29908 -0.149722,-0.747664 -0.673802,-0.747664 -0.449201,0 -0.598933,0.448598 -0.598933,0.747664 l 0,3.289715 -11.454537,0 0,-4.26168 c 0,-0.523366 -0.299479,-0.747663 -0.673798,-0.747663 z m 2.919783,0.971964 c -0.823528,0 -1.497319,0.672899 -1.497319,1.495323 0,0.822439 0.673791,1.495331 1.497319,1.495331 0.823534,0 1.497325,-0.672892 1.497325,-1.495331 0,-0.822424 -0.673791,-1.495323 -1.497325,-1.495323 z m 1.946526,1.046732 0,1.943922 6.513356,0 c 0,-0.971961 -1.048135,-1.943922 -2.021373,-1.943922 z"
+       style="fill:#0085c8;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+       style="fill:#a36b47;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 15,15.000001 7,0 -0.02232,-3.973214 L 23,11.000001 l 0,-1 -4.446429,-2 -4.553571,2 0,1 0.999093,-0.02524 z"
+       id="path4182"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <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:#c1987d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;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="rect4184"
+       width="2"
+       height="3"
+       x="19"
+       y="12.000001"
+       rx="2"
+       ry="4.6325681e-008" />
+    <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:#c79e83;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;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="rect4186"
+       width="2"
+       height="2"
+       x="16"
+       y="11.000001"
+       rx="2"
+       ry="4.6325681e-008" />
   </g>
 </svg>
Index: /trunk/images/presets/accommodation/guest_house.svg
===================================================================
--- /trunk/images/presets/accommodation/guest_house.svg	(revision 11264)
+++ /trunk/images/presets/accommodation/guest_house.svg	(revision 11265)
@@ -16,8 +16,16 @@
    inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="guest_house.svg"
+   sodipodi:docname="04.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
-     id="defs4" />
+     id="defs4">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
   <sodipodi:namedview
      id="base"
@@ -30,7 +38,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="-6.2994363"
-     inkscape:cy="4.3181102"
+     inkscape:zoom="22.4"
+     inkscape:cx="7.4241071"
+     inkscape:cy="5.6013608"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -41,10 +49,14 @@
      inkscape:window-x="-8"
      inkscape:window-y="-8"
-     showgrid="false"
+     showgrid="true"
      inkscape:window-maximized="1"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
-     fit-margin-bottom="0" />
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4160" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -76,12 +88,14 @@
      transform="translate(-8,-8.000001)">
     <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
-       id="rect4140"
+       x="8"
+       y="8.000001"
        width="16"
        height="16"
-       x="8"
-       y="8.000001" />
+       rx="2"
+       ry="2"
+       id="shield"
+       style="fill:#ffffff;stroke:none" />
     <path
-       style="font-size:12px;fill:#b3b3b3;fill-rule:evenodd;stroke:#000000;stroke-width:0.03181237"
+       style="font-size:12px;fill:#c3c3c3;fill-rule:evenodd;stroke:#000000;stroke-width:0.03181237;fill-opacity:1"
        d="m 16.249466,8.6436365 -5.563218,5.7098325 1.112637,0 0,8.564744 3.337938,0 0,-4.352519 2.30158,0 7e-6,4.352519 3.261638,0 0,-8.564744 1.112644,0 -5.563226,-5.7098325 0,0 0,0 z"
        id="path645"
@@ -89,41 +103,8 @@
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 9.3392857,15.160715 9.25,22.125"
-       id="path2157"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 9.4285715,19.535715 22.821428,19.625"
-       id="path2159"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 22.910714,21.857143 23,17.303572"
-       id="path2161"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.14999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2163"
-       width="7.0535712"
-       height="1.25"
-       x="14.696428"
-       y="16.991074"
-       ry="0.625" />
-    <ellipse
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.47860229;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2167"
-       cx="12.53125"
-       cy="15.741072"
-       rx="0.97409177"
-       ry="0.86248463" />
-    <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2169"
-       width="2.7232141"
-       height="0.22321428"
-       x="10.544642"
-       y="17.973215"
-       ry="0.11160714" />
+       inkscape:connector-curvature="0"
+       id="path4152"
+       d="M 9.59893,15.000001 C 9.224597,15.000001 9,15.224302 9,15.747664 l 0,7.252337 1.272728,0 0,-1.794396 c 0,0 10.331534,0.07478 11.454537,0 l 0,1.794396 1.272735,0 0,-2.392519 0,-3.887853 c 0,-0.29908 -0.149722,-0.747664 -0.673802,-0.747664 -0.449201,0 -0.598933,0.448598 -0.598933,0.747664 l 0,3.289715 -11.454537,0 0,-4.26168 c 0,-0.523366 -0.299479,-0.747663 -0.673798,-0.747663 z m 2.919783,0.971964 c -0.823528,0 -1.497319,0.672899 -1.497319,1.495323 0,0.822439 0.673791,1.495331 1.497319,1.495331 0.823534,0 1.497325,-0.672892 1.497325,-1.495331 0,-0.822424 -0.673791,-1.495323 -1.497325,-1.495323 z m 1.946526,1.046732 0,1.943922 6.513356,0 c 0,-0.971961 -1.048135,-1.943922 -2.021373,-1.943922 z"
+       style="fill:#007ebc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   </g>
 </svg>
Index: /trunk/images_nodist/presets/accommodation/chalet.svg
===================================================================
--- /trunk/images_nodist/presets/accommodation/chalet.svg	(revision 11265)
+++ /trunk/images_nodist/presets/accommodation/chalet.svg	(revision 11265)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+
+<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"
+   id="svg831"
+   sodipodi:version="0.32"
+   width="66.032692pt"
+   height="65.311539pt"
+   sodipodi:docname="chalet.svg"
+   inkscape:version="0.91 r13725"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <metadata
+     id="metadata2216">
+    <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>
+  <defs
+     id="defs833" />
+  <sodipodi:namedview
+     id="base"
+     inkscape:zoom="4.3131439"
+     inkscape:cx="19.414108"
+     inkscape:cy="29.615847"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:current-layer="svg831"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4138"
+       originx="-15.444941"
+       originy="-24.440363" />
+  </sodipodi:namedview>
+  <rect
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+     id="rect4140"
+     width="82.540863"
+     height="81.639427"
+     x="3.6975297e-007"
+     y="0" />
+  <g
+     id="g825"
+     transform="matrix(0.680918,0,0,0.658159,-80.582191,-28.356326)">
+    <g
+       id="g815"
+       transform="matrix(0.268353,0,0,0.275569,94.8544,31.97102)">
+      <path
+         style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         d="m 147.599,86.2593 -15.334,13.418 21.085,23.0017 15.335,-11.501 13.418,11.501 21.086,-19.168 21.085,19.168 36.421,0 c 11.501,11.501 26.835,32.587 51.756,32.587 24.919,0 54.971,-13.533 55.589,-51.755 2.412,-36.3837 -26.837,-53.6723 -53.673,-53.6723 -26.836,1.9168 -44.088,19.1686 -53.672,36.4206 l -113.096,0 z m 210.856,16.2927 c 0,12.168 -6.441,22.044 -14.377,22.044 -7.935,0 -14.376,-9.876 -14.376,-22.044 0,-12.1677 6.441,-22.0437 14.376,-22.0437 7.936,0 14.377,9.876 14.377,22.0437 z"
+         id="path808"
+         sodipodi:nodetypes="cccccccccccccccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.774998pt"
+         d="m 357.772,94.7983 c -4.75,5.111 -4.749,7.4347 3.166,12.5467 l 36.41,-4.183 c 3.694,-2.323 4.222,-7.4347 -3.166,-11.1517 l -36.41,2.788 z"
+         id="path809"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.981394pt"
+         d="m 389.251,76.8318 8.868,29.3682 16.667,-6.6617 -8.834,-27.2582 -16.701,4.5517 z m -9.995,-10.3533 14.623,58.7975 89.458,-24.987 -14.383,-58.8024 -89.698,24.9919 z"
+         id="path814"
+         sodipodi:nodetypes="cccccccccc"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.57346001pt"
+       d="m 179.113,80.5082 -60.267,36.8048 6.027,9.2 7.232,-3.451 0,43.706 94.018,0 0,-43.706 6.845,3.336 6.027,-9.201 -59.882,-36.6888 z m -26.517,41.4048 -0.262,13.861 54.241,0 0.262,-13.861 -54.241,0 z"
+       id="path824"
+       sodipodi:nodetypes="ccccccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images_nodist/presets/accommodation/guest_house.svg
===================================================================
--- /trunk/images_nodist/presets/accommodation/guest_house.svg	(revision 11265)
+++ /trunk/images_nodist/presets/accommodation/guest_house.svg	(revision 11265)
@@ -0,0 +1,129 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="guest_house.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <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="11.2"
+     inkscape:cx="-6.2994363"
+     inkscape:cy="4.3181102"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     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" />
+  <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)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4140"
+       width="16"
+       height="16"
+       x="8"
+       y="8.000001" />
+    <path
+       style="font-size:12px;fill:#b3b3b3;fill-rule:evenodd;stroke:#000000;stroke-width:0.03181237"
+       d="m 16.249466,8.6436365 -5.563218,5.7098325 1.112637,0 0,8.564744 3.337938,0 0,-4.352519 2.30158,0 7e-6,4.352519 3.261638,0 0,-8.564744 1.112644,0 -5.563226,-5.7098325 0,0 0,0 z"
+       id="path645"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.3392857,15.160715 9.25,22.125"
+       id="path2157"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.4285715,19.535715 22.821428,19.625"
+       id="path2159"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 22.910714,21.857143 23,17.303572"
+       id="path2161"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.14999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2163"
+       width="7.0535712"
+       height="1.25"
+       x="14.696428"
+       y="16.991074"
+       ry="0.625" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.47860229;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2167"
+       cx="12.53125"
+       cy="15.741072"
+       rx="0.97409177"
+       ry="0.86248463" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2169"
+       width="2.7232141"
+       height="0.22321428"
+       x="10.544642"
+       y="17.973215"
+       ry="0.11160714" />
+  </g>
+</svg>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 11264)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 11265)
@@ -2983,4 +2983,5 @@
 area[tourism=motel],
 area[tourism=guest_house],
+area[tourism=apartment],
 area[tourism=hostel],
 area[tourism=chalet],
@@ -3001,4 +3002,8 @@
 node[tourism=guest_house] {
     icon-image: "presets/accommodation/guest_house.svg";
+    set icon_z17;
+}
+node[tourism=apartment] {
+    icon-image: "presets/accommodation/apartment.svg";
     set icon_z17;
 }