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

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

diff --git a/config/potlatch/autocomplete.txt b/config/potlatch/autocomplete.txt
index 9e60ea3725da82d7f0ecb4fa5f3589b43510bf9e..39a43a844791622dd59e5c6e4481663f72a72fb2 100644 (file)
--- a/config/potlatch/autocomplete.txt
+++ b/config/potlatch/autocomplete.txt
@@ -87,9 +87,9 @@ is_in/way             -
 note/point             -
 note/POI               -
 note/way               -
 note/point             -
 note/POI               -
 note/way               -

-source/point   survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap
-source/POI             survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap
-source/way             survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap
+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                -
 postal_code/point      -
 postal_code/POI                -
 postal_code/way                -


@@ -122,3 +122,6 @@ wikipedia/point                     -
 website/POI                            -
 website/way                            -
 website/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