From: Ævar Arnfjörð Bjarmason Date: Sat, 16 Jan 2010 19:35:19 +0000 (+0000) Subject: Potlatch 1.3d: Impoved Haiti crisis support X-Git-Tag: live~6343^2~10 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/64a28f5de6c08479d6c8f0bc5d7bf14fb951bcc5?hp=431b49eff433fa8376c63e38b6029c11f62bc2a3;ds=inline Potlatch 1.3d: Impoved Haiti crisis support * Adding DigitalGlobe layer to presets * Now with 2 GeoEye layers: GravityStorm's and the NYPL extended coverage * Pressing B with GeoEye/DigitalGlobe (and NearMap) layers now adds the correct source=* tag to elements * Added GeoEye and digitalglobe to source=* tag autocompletion --- diff --git a/config/potlatch/autocomplete.txt b/config/potlatch/autocomplete.txt index 17671cf2f..39a43a844 100644 --- a/config/potlatch/autocomplete.txt +++ b/config/potlatch/autocomplete.txt @@ -87,9 +87,9 @@ is_in/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 - diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml index e0516127e..4c26fceda 100644 --- a/config/potlatch/locales/en.yml +++ b/config/potlatch/locales/en.yml @@ -124,7 +124,9 @@ en: option_external: "External launch:" option_fadebackground: Fade background option_layer_cycle_map: OSM - cycle map - option_layer_geoeye_haiti: "Haiti: GeoEye" + option_layer_geoeye_gravitystorm_haiti: "Haiti: GeoEye Jan 13" + option_layer_geoeye_nypl_haiti: "Haiti: GeoEye Jan 13+" + option_layer_digitalglobe_haiti: "Haiti: DigitalGlobe" option_layer_maplint: OSM - Maplint (errors) option_layer_mapnik: OSM - Mapnik option_layer_nearmap: "Australia: NearMap" diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf index 569be49e0..3d1ae7c9d 100644 Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ