From: Tom Hughes <tom@compton.nu>
Date: Sat, 13 Mar 2010 15:58:42 +0000 (+0000)
Subject: Allow pubs to be given names.
X-Git-Tag: 0.5~521
X-Git-Url: https://git.openstreetmap.org/potlatch2.git/commitdiff_plain/10c093ee7766f8d9aae4e3e97d34decd1b4a4825

Allow pubs to be given names.
---

diff --git a/resources/map_features.xml b/resources/map_features.xml
index 4d6fbde6..0efaa867 100644
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -28,7 +28,7 @@
   <!-- Roads -->
   
   <inputSet id="majorRoad">
-    <inputSet ref="roadNames"/>
+    <inputSet ref="names"/>
     <inputSet ref="roadRefs"/>
     <inputSet ref="roadRestrictions"/>
     <inputSet ref="roadPhysical"/>
@@ -37,14 +37,14 @@
   </inputSet>
   
   <inputSet id="minorRoad">
-    <inputSet ref="roadNames"/>
+    <inputSet ref="names"/>
     <inputSet ref="roadRestrictions"/>
     <inputSet ref="roadPhysical"/>
     <inputSet ref="cycle"/>
     <inputSet ref="bus-route"/>
   </inputSet>
   
-  <inputSet id="roadNames">
+  <inputSet id="names">
     <input type="freetext" presence="always"
         name="Name" category="Naming" priority="highest"
         key="name" description="The most common name"/>
@@ -186,7 +186,7 @@
   </inputSet>
   
   <inputSet id="route">
-    <inputSet ref="roadNames"/>
+    <inputSet ref="names"/>
     <inputSet ref="roadRefs"/>
   </inputSet>
   
@@ -591,6 +591,7 @@
     </icon>
     <point />
     <tag k="amenity" v="pub"/>
+    <inputSet ref="names" />
   </feature>
 
   <!-- cycle stuff -->
@@ -669,4 +670,3 @@
   
   
 </mapFeatures>
-