Merge remote-tracking branch 'upstream/pull/2125'

[rails.git] / config / potlatch / autocomplete.txt

diff --git a/config/potlatch/autocomplete.txt b/config/potlatch/autocomplete.txt
index 1b24d917c851ca472aff441de44baaa07c49f510..39a43a844791622dd59e5c6e4481663f72a72fb2 100644 (file)
--- a/config/potlatch/autocomplete.txt
+++ b/config/potlatch/autocomplete.txt
@@ -52,7 +52,7 @@ embankment/way        yes
 building/way   yes
 lanes/way              -
 layer/way              -
-surface/way            paved,unpaved,gravel,dirt,grass
+surface/way            paved,unpaved,gravel,dirt,grass,cobblestone,concrete,asphalt,sand
 width/way              -
 depth/way              -
 operator/way   -
@@ -87,9 +87,9 @@ is_in/way             -
 note/point             -
 note/POI               -
 note/way               -
-source/point   survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7
-source/POI             survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7
-source/way             survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7
+source/point   survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap,GeoEye,digitalglobe
+source/POI             survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap,GeoEye,digitalglobe
+source/way             survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap,GeoEye,digitalglobe
 postal_code/point      -
 postal_code/POI                -
 postal_code/way                -
@@ -116,3 +116,12 @@ addr:postcode/way          -
 addr:city/way                  -
 addr:country/way               -
 addr:interpolation/way even,odd,all,alphabetic
+wikipedia/POI                  -
+wikipedia/way                  -
+wikipedia/point                        -
+website/POI                            -
+website/way                            -
+website/point                  -
+earthquake_damage/POI  no,moderate,severe,collapsed
+earthquake_damage/way  no,moderate,severe,collapsed
+earthquake_damage/point        no,moderate,severe,collapsed