Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16853)
+++ trunk/resources/data/defaultpresets.xml	(revision 16861)
@@ -266,7 +266,11 @@
         <reference ref="oh" />
     </chunk>
-    <chunk id="name_wikipedia">
+    <chunk id="wikipedia_wikidata">
+        <text key="wikipedia" text="Wikipedia" />
+        <text key="wikidata" text="Wikidata" />
+    </chunk>
+    <chunk id="name_wikipedia_wikidata">
         <text key="name" text="Name" />
-        <text key="wikipedia" text="Wikipedia" />
+        <reference ref="wikipedia_wikidata" />
     </chunk>
     <chunk id="population_postcode_website">
@@ -448,8 +452,4 @@
         <text key="width" text="Width (meters)" />
     </chunk>
-    <chunk id="waterway_wikipedia">
-        <reference ref="waterway" />
-        <text key="wikipedia" text="Wikipedia" />
-    </chunk>
     <chunk id="water_access">
         <optional text="Water access rules:">
@@ -473,5 +473,5 @@
             <text key="iata" text="IATA" />
             <text key="icao" text="ICAO" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia_wikidata" />
         </optional>
     </chunk>
@@ -1465,5 +1465,5 @@
                 <text key="name" text="Name" />
                 <text key="ele" text="Elevation (meters)" length="10" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="wikipedia_wikidata" />
             </optional>
         </item> <!-- Mountain Pass -->
@@ -1865,5 +1865,6 @@
             <text key="name" text="Name" />
             <optional>
-                <reference ref="waterway_wikipedia" />
+                <reference ref="waterway" />
+                <reference ref="wikipedia_wikidata" />
                 <check key="lock" text="Lock" disable_off="true" />
             </optional>
@@ -1876,5 +1877,6 @@
             <text key="name" text="Name" />
             <optional>
-                <reference ref="waterway_wikipedia" />
+                <reference ref="waterway" />
+                <reference ref="wikipedia_wikidata" />
             </optional>
             <reference ref="water_access" />
@@ -1890,5 +1892,5 @@
                 <check key="seasonal" text="Seasonal" disable_off="true" />
                 <text key="width" text="Width (meters)" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="wikipedia_wikidata" />
             </optional>
         </item> <!-- Tidal channel -->
@@ -1903,5 +1905,5 @@
                 <combo key="usage" text="Usage" values="transportation,transmission,irrigation,headrace,tailrace,spillway" values_context="usage" />
                 <text key="width" text="Width (meters)" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="wikipedia_wikidata" />
                 <check key="lock" text="Lock" disable_off="true" />
             </optional>
@@ -1939,5 +1941,5 @@
             <space />
             <key key="waterway" value="waterfall" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <text key="height" text="Height (meters)" length="7" />
         </item> <!-- Waterfall -->
@@ -1952,5 +1954,5 @@
             <space />
             <key key="waterway" value="dam" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
         </item> <!-- Dam -->
         <item name="Levee" icon="presets/misc/dyke.svg" type="way" preset_name_label="true">
@@ -2028,5 +2030,5 @@
             <check key="tidal" text="In the tidal range" disable_off="true" />
             <text key="ele" text="Elevation (meters)" length="10" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia_wikidata" />
             <reference ref="water_access" />
         </item> <!-- Water -->
@@ -2068,5 +2070,5 @@
             <space />
             <key key="natural" value="beach" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <optional>
                 <reference ref="supervised" />
@@ -3062,5 +3064,5 @@
                 <text key="iata" text="IATA" />
                 <text key="icao" text="ICAO" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="wikipedia_wikidata" />
             </optional>
         </item> <!-- Helipad -->
@@ -3587,5 +3589,5 @@
             <reference ref="name_oh_wheelchair" />
             <combo key="zoo" text="Type" values="aviary,birds,butterfly,enclosure,falconry,petting_zoo,reptile,safari_park,wildlife_park" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia_wikidata" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Zoo -->
@@ -3871,5 +3873,5 @@
             <key key="tourism" value="museum" />
             <reference ref="name_operator_oh_wheelchair" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia_wikidata" />
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Building" />
@@ -6272,5 +6274,5 @@
             <key key="historic" value="castle" />
             <combo key="castle_type" text="Type" values="stately,defensive,fortress,manor,palace" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <check key="ruins" text="Ruins" />
             <reference ref="link_contact_address_payment" />
@@ -6280,5 +6282,5 @@
             <space />
             <key key="historic" value="fort" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <check key="ruins" text="Ruins" />
             <reference ref="link_contact_address_payment" />
@@ -6408,5 +6410,5 @@
                 <combo key="material" text="Material" values="concrete,granite,metal,plastic,steel,stone,wood" />
                 <text key="start_date" text="Start date" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="wikipedia_wikidata" />
             </optional>
         </item> <!-- Memorial -->
@@ -7668,5 +7670,5 @@
                 <reference ref="name_operator" />
                 <reference ref="oh" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="wikipedia_wikidata" />
                 <text key="start_date" text="Start date" />
             </optional>
@@ -7685,5 +7687,5 @@
             <space />
             <key key="place" value="continent" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
         </item> <!-- Continent -->
         <item name="Country" icon="presets/place/capital.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
@@ -7691,5 +7693,5 @@
             <space />
             <key key="place" value="country" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
         </item> <!-- Country -->
         <item name="State" icon="presets/place/capital.svg" name_context="place" type="node,closedway,multipolygon,relation" preset_name_label="true">
@@ -7697,5 +7699,5 @@
             <space />
             <key key="place" value="state" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
         </item> <!-- State -->
         <item name="Region" icon="presets/place/capital.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
@@ -7703,5 +7705,5 @@
             <space />
             <key key="place" value="region" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
         </item> <!-- Region -->
         <item name="County" icon="presets/place/capital.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
@@ -7709,5 +7711,5 @@
             <space />
             <key key="place" value="county" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <reference ref="population_postcode_website" />
         </item> <!-- County -->
@@ -7717,5 +7719,5 @@
             <space />
             <key key="place" value="city" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <reference ref="population_postcode_website" />
         </item> <!-- City -->
@@ -7724,5 +7726,5 @@
             <space />
             <key key="place" value="town" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <reference ref="population_postcode_website" />
         </item> <!-- Town -->
@@ -7731,5 +7733,5 @@
             <space />
             <key key="place" value="village" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <reference ref="population_postcode_website" />
         </item> <!-- Village -->
@@ -7738,5 +7740,5 @@
             <space />
             <key key="place" value="hamlet" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <reference ref="population_postcode_website" />
         </item> <!-- Hamlet -->
@@ -7745,5 +7747,5 @@
             <space />
             <key key="place" value="isolated_dwelling" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <reference ref="population_postcode_website" />
         </item> <!-- Isolated Dwelling -->
@@ -7753,5 +7755,5 @@
             <space />
             <key key="place" value="suburb" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <reference ref="population_postcode_website" />
         </item> <!-- Suburb -->
@@ -7760,5 +7762,5 @@
             <space />
             <key key="place" value="quarter" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <text key="population" text="Population" />
             <text key="website" text="Website" />
@@ -7768,5 +7770,5 @@
             <space />
             <key key="place" value="neighbourhood" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <text key="population" text="Population" />
             <text key="website" text="Website" />
@@ -7778,5 +7780,5 @@
             <label text="(please use isolated_dwelling for an isolated farm)" />
             <key key="place" value="farm" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <reference ref="population_postcode_website" />
         </item> <!-- Farm -->
@@ -7786,5 +7788,5 @@
             <space />
             <key key="place" value="locality" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
         </item> <!-- Locality -->
         <item name="Square" icon="presets/place/square.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -7792,5 +7794,5 @@
             <space />
             <key key="place" value="square" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
         </item> <!-- Square -->
     </group> <!-- Places -->
@@ -7801,5 +7803,5 @@
             <space />
             <key key="natural" value="peak" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <text key="ele" text="Elevation (meters)" length="10" />
         </item> <!-- Peak -->
@@ -7809,5 +7811,5 @@
             <space/>
             <key key="natural" value="saddle" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <text key="ele" text="Elevation (meters)" length="10" />
         </item> <!-- Saddle -->
@@ -7817,5 +7819,5 @@
             <space />
             <key key="natural" value="glacier" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <text key="ele" text="Elevation (meters)" length="10" />
         </item> <!-- Glacier -->
@@ -7825,5 +7827,5 @@
             <space />
             <key key="natural" value="volcano" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <text key="ele" text="Elevation (meters)" length="10" />
             <optional>
@@ -7837,5 +7839,5 @@
             <space />
             <key key="natural" value="ridge" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <text key="ele" text="Elevation (meters)" length="10" />
         </item> <!-- Ridge -->
@@ -7845,5 +7847,5 @@
             <space />
             <key key="natural" value="valley" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
         </item> <!-- Valley -->
         <item name="Cliff" icon="presets/misc/cliff.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
@@ -7860,5 +7862,5 @@
             <space />
             <key key="natural" value="cave_entrance" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <reference ref="oh_wheelchair" />
             <reference ref="POI_access" />
@@ -7870,5 +7872,5 @@
             <space />
             <key key="place" value="island" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
         </item> <!-- Island -->
         <item name="Islet" icon="presets/place/islet.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -7876,5 +7878,5 @@
             <space />
             <key key="place" value="islet" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
         </item> <!-- Islet -->
         <item name="Reef" icon="presets/landmark/reef.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -8015,5 +8017,5 @@
             <space />
             <key key="natural" value="rock" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <optional>
                 <check key="tourism" text="Tourism attraction" value_on="attraction" disable_off="true" />
@@ -8025,5 +8027,5 @@
             <space />
             <key key="natural" value="stone" />
-            <reference ref="name_wikipedia" />
+            <reference ref="name_wikipedia_wikidata" />
             <optional>
                 <text key="height" text="Height (meters)" length="7" />
@@ -8308,5 +8310,5 @@
             <label text="Use E.123 format, e.g. +49 11223 456 7890" />
             <space />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia_wikidata" />
             <text key="image" text="Image" />
             <preset_link preset_name="Contact (Schema with 'contact:*' Prefix)" text="Similar tags but different tagging schema:" text_context="Contact" />
@@ -8322,5 +8324,5 @@
             <label text="Use E.123 format, e.g. +49 11223 456 7890" />
             <space />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia_wikidata" />
             <text key="image" text="Image" />
             <preset_link preset_name="Contact (Common Schema)" text="Similar tags but different tagging schema:" text_context="Contact" />
@@ -8727,5 +8729,5 @@
                 <text key="ref:gnis" text="Reference GNIS (USA)" />
                 <text key="ref:gnbc" text="Reference GNBC (CA)" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="wikipedia_wikidata" />
             </optional>
             <roles>