Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 18574)
+++ /trunk/resources/data/defaultpresets.xml	(revision 18575)
@@ -393,5 +393,5 @@
     </chunk>
     <chunk id="power_loc">
-        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" />
+        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof,surface" values_context="power" />
     </chunk>
     <chunk id="power_line_extra">
@@ -727,4 +727,5 @@
                     <check key="toll" text="Toll" />
                     <check key="motorroad" text="Motorroad" default="on" />
+                    <check key="dual_carriageway" text="Divided highway" />
                 </checkgroup>
                 <reference ref="lit_common_no_times"/>
@@ -771,4 +772,5 @@
                 <checkgroup columns="4">
                     <check key="motorroad" text="Motorroad" />
+                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
                     <check key="narrow" text="Narrow" disable_off="true" />
                     <check key="trolley_wire" text="Overhead trolley wires" />
@@ -804,5 +806,6 @@
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
-                <checkgroup columns="2">
+                <checkgroup columns="3">
+                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
                     <check key="narrow" text="Narrow" disable_off="true" />
                     <check key="trolley_wire" text="Overhead trolley wires" />
@@ -836,5 +839,6 @@
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
-                <checkgroup columns="2">
+                <checkgroup columns="3">
+                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
                     <check key="narrow" text="Narrow" disable_off="true" />
                     <check key="trolley_wire" text="Overhead trolley wires" />
@@ -867,5 +871,6 @@
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
-                <checkgroup columns="3">
+                <checkgroup columns="4">
+                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
                     <check key="narrow" text="Narrow" disable_off="true" />
                     <check key="trolley_wire" text="Overhead trolley wires" />
@@ -894,5 +899,6 @@
                 <combo key="bus_bay" text="Bus bay" values="both,left,right" />
                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
-                <checkgroup columns="2">
+                <checkgroup columns="3">
+                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
                     <check key="narrow" text="Narrow" disable_off="true" />
                     <check key="trolley_wire" text="Overhead trolley wires" />
@@ -1012,4 +1018,5 @@
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <check key="trolley_wire" text="Overhead trolley wires" />
+                <check key="dual_carriageway" text="Divided highway" disable_off="true" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -2182,5 +2189,5 @@
             <key key="substance" value="water" />
             <key key="usage" value="penstock" />
-            <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
+            <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
             <optional>
                 <reference ref="name_operator" />
@@ -5676,5 +5683,5 @@
             <link wiki="Key:building" />
             <space />
-            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,roof,ruins,school,service,shed,silo,sports_centre,stable,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <optional>
                 <reference ref="name_operator" />
@@ -5820,5 +5827,5 @@
                 <reference ref="name_ref_operator" />
                 <text key="manufacturer" text="Manufacturer" />
-                <combo key="location" text="Location" values="outdoor,indoor,underground,underwater" values_context="pump" />
+                <combo key="location" text="Location" values="outdoor,indoor,surface,underground,underwater" values_context="pump" />
             </optional>
             <preset_link preset_name="Windpump" text="Similar but different tags:" />
@@ -6177,5 +6184,5 @@
             <reference ref="name_ref_operator" />
             <reference ref="substance" />
-            <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
+            <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
             <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
             <text key="pressure" text="Pressure (bar)" />
@@ -6210,5 +6217,5 @@
                 <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
                 <reference ref="color" />
-                <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
+                <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
             </optional>
         </item> <!-- Marker -->
@@ -6907,5 +6914,5 @@
             <optional>
                 <reference ref="cables_circuits" />
-                <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="power cable" />
+                <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="power cable" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
                 <check key="communication" text="Used for data communications" value_on="line" disable_off="true" />
Index: /trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- /trunk/resources/data/validator/ignoretags.cfg	(revision 18574)
+++ /trunk/resources/data/validator/ignoretags.cfg	(revision 18575)
@@ -767,5 +767,9 @@
 ; See #21964/#21907 for WIP patch for leisure=sports_hall
 K:leisure=sports_hall
+; A generic advertising device. Needs an icon for a preset.
+K:man_made=advertising
 K:man_made=courtyard
+; This seems to be very similar to man_made=street_lamp, but also covers floodlights, signal lamps, and any other lamp type.
+K:man_made=lamp
 K:man_made=gantry
 K:man_made=tunnel