Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 16746)
+++ /trunk/resources/data/defaultpresets.xml	(revision 16747)
@@ -5200,4 +5200,5 @@
             <preset_link preset_name="Tower" text="Similar but different tags:" />
             <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
+            <preset_link preset_name="Telescope" text="Similar but different tags:" />
         </item> <!-- Mast -->
         <item name="Tower" icon="presets/tower/tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5229,4 +5230,5 @@
             <preset_link preset_name="Mast" text="Similar but different tags:" />
             <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
+            <preset_link preset_name="Telescope" text="Similar but different tags:" />
             <reference ref="link_contact_address" />
         </item> <!-- Tower -->
@@ -5249,6 +5251,29 @@
             <preset_link preset_name="Mast" text="Similar but different tags:" />
             <preset_link preset_name="Tower" text="Similar but different tags:" />
+            <preset_link preset_name="Telescope" text="Similar but different tags:" />
             <reference ref="link_contact_address" />
         </item> <!-- Big Communication Tower -->
+        <item name="Telescope" icon="presets/tower/telescope.svg" type="node,closedway" preset_name_label="true">
+            <link wiki="Tag:man_made=telescope" />
+            <space />
+            <key key="man_made" value="telescope" />
+            <combo key="telescope:type" text="Type" values_context="telescope" values_searchable="true">
+                <list_entry value="optical" icon="presets/tower/telescope_dome.svg" />
+                <list_entry value="radio" icon="presets/tower/telescope_dish.svg" />
+                <list_entry value="gamma" icon="presets/tower/telescope_dish.svg" />
+            </combo>
+            <optional>
+                <combo key="tower:construction" text="Type of construction" values="dish,dome" values_searchable="true" />
+                <text key="telescope:diameter" text="Telescope Diameter (meters)" />
+                <reference ref="name_ref_operator" />
+                <text key="height" text="Height (meters)" length="7" />
+                <text key="ele" text="Elevation (meters)" length="10" />
+                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="POI_access" />
+            </optional>
+            <preset_link preset_name="Mast" text="Similar but different tags:" />
+            <preset_link preset_name="Tower" text="Similar but different tags:" />
+            <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
+        </item> <!-- Telescope -->
         <item name="Flagpole" icon="presets/misc/flag.svg" type="node" preset_name_label="true">
             <link wiki="Tag:man_made=flagpole" />
Index: /trunk/resources/images/presets/tower/telescope_dish.svg
===================================================================
--- /trunk/resources/images/presets/tower/telescope_dish.svg	(revision 16747)
+++ /trunk/resources/images/presets/tower/telescope_dish.svg	(revision 16747)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   id="svg109"
+   version="1.1">
+  <metadata
+     id="metadata115">
+    <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>
+  <defs
+     id="defs113" />
+  <path
+     id="path4541"
+     d="M 4.0507812 0 C 1.5789894 2.539636 1.5789894 6.6576312 4.0507812 9.1972656 C 6.5225734 11.736904 10.528207 11.736904 13 9.1972656 C 12.343388 8.5209988 12.562756 8.7485174 12.095703 8.2675781 L 12.447266 1.8925781 A 1 1 0 0 0 13 1 A 1 1 0 0 0 12 0 A 1 1 0 0 0 11.103516 0.55859375 L 4.9648438 0.93945312 C 4.513421 0.47588035 4.6907678 0.6575524 4.0507812 0 z M 10.777344 1.5722656 L 8.1425781 4.2070312 C 7.8109554 3.8671766 6.6384106 2.6582437 5.8808594 1.8808594 L 10.777344 1.5722656 z M 11.429688 2.3339844 L 11.152344 7.296875 C 10.349853 6.4708947 9.1820827 5.2709305 8.8417969 4.921875 L 11.429688 2.3339844 z M 3.2832031 10.142578 L 1 14 L 10 14 L 10 12.228516 C 7.7228562 12.609275 5.0575401 11.916032 3.2832031 10.142578 z "
+     style="fill:#555555;stroke-width:1.26671076" />
+</svg>
Index: /trunk/resources/images/presets/tower/telescope_dome.svg
===================================================================
--- /trunk/resources/images/presets/tower/telescope_dome.svg	(revision 16747)
+++ /trunk/resources/images/presets/tower/telescope_dome.svg	(revision 16747)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   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"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   id="svg109"
+   version="1.1">
+  <metadata
+     id="metadata115">
+    <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>
+  <defs
+     id="defs113">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient831">
+      <stop
+         id="stop829"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <path
+     id="path837"
+     d="M 6 0 L 6 1 L 7 1 A 6 6 0 0 1 13 7 L 13 8 L 14 8 L 14 7 A 7 7 0 0 0 12.599609 2.8144531 L 14 1.4140625 L 12.585938 0 L 11.185547 1.4003906 A 7 7 0 0 0 7 0 L 6 0 z M 6 2 A 5.9999999 6 0 0 0 0 8 L 12 8 A 5.9999999 6 0 0 0 6 2 z M 0 9 L 0 14 L 12 14 L 12 9 L 0 9 z "
+     style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:3.77295542;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+</svg>
Index: /trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/resources/styles/standard/elemstyles.mapcss	(revision 16746)
+++ /trunk/resources/styles/standard/elemstyles.mapcss	(revision 16747)
@@ -1608,4 +1608,5 @@
 
 area[man_made=water_tower],
+area[man_made=telescope],
 area[man_made=mast],
 area[man_made=tower],
@@ -1615,4 +1616,12 @@
 node[man_made=water_tower] {
     icon-image: "presets/tower/water_tower.svg";
+    set icon_z17;
+}
+node[man_made=telescope] {
+    icon-image: "presets/tower/telescope_dish.svg";
+    set icon_z17;
+}
+node[man_made=telescope][telescope:type=optical] {
+    icon-image: "presets/tower/telescope_dome.svg";
     set icon_z17;
 }