From cc3497871e61ab679624b47f54348b0694741357 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sun, 31 Jan 2016 15:28:33 +0000 Subject: [PATCH] Imagery - Add OSSV palette file --- .../imagery/files/default/ossv-palette.txt | 256 ++++++++++++++++++ cookbooks/imagery/recipes/gb_os_sv.rb | 31 ++- cookbooks/imagery/resources/layer.rb | 1 - 3 files changed, 275 insertions(+), 13 deletions(-) create mode 100644 cookbooks/imagery/files/default/ossv-palette.txt diff --git a/cookbooks/imagery/files/default/ossv-palette.txt b/cookbooks/imagery/files/default/ossv-palette.txt new file mode 100644 index 000000000..191fb60e9 --- /dev/null +++ b/cookbooks/imagery/files/default/ossv-palette.txt @@ -0,0 +1,256 @@ +255,246,238 +98,65,74 +213,230,131 +90,82,82 +255,148,131 +255,90,98 +238,246,246 +57,24,24 +222,98,98 +115,74,65 +8,16,8 +230,238,238 +0,8,0 +230,213,164 +230,238,230 +32,32,16 +139,180,189 +238,230,90 +255,255,148 +32,32,32 +222,246,164 +16,8,8 +189,180,74 +213,246,148 +8,0,0 +90,82,90 +222,197,180 +238,246,238 +246,255,246 +115,49,49 +205,230,164 +246,238,98 +213,156,98 +246,255,213 +180,164,131 +246,106,106 +230,213,213 +24,24,24 +230,238,246 +255,213,131 +65,65,57 +41,41,41 +238,255,246 +205,180,123 +156,74,65 +222,222,131 +197,139,131 +213,238,156 +172,180,172 +213,180,172 +197,230,131 +74,74,74 +205,213,197 +205,238,131 +213,238,164 +213,189,131 +106,98,98 +246,205,123 +189,131,115 +205,238,139 +106,98,106 +82,90,82 +230,255,255 +16,16,8 +156,57,41 +156,156,156 +255,246,222 +238,255,205 +205,255,139 +246,255,238 +180,106,65 +106,106,98 +180,172,98 +115,106,98 +180,213,255 +139,57,57 +98,106,98 +246,238,222 +180,106,106 +115,106,49 +164,205,164 +16,16,16 +8,16,16 +164,180,189 +49,49,49 +205,197,156 +106,106,115 +222,246,172 +65,65,65 +246,222,139 +238,230,230 +238,255,255 +238,205,131 +148,106,106 +197,230,123 +189,189,172 +213,205,98 +74,74,24 +213,106,106 +197,197,180 +238,238,222 +205,246,131 +246,222,164 +172,197,123 +8,8,8 +8,8,0 +180,180,180 +230,230,205 +123,8,8 +8,8,16 +246,255,230 +255,180,172 +0,8,8 +172,172,164 +74,32,32 +205,222,238 +106,115,123 +131,131,49 +246,246,246 +172,156,115 +246,222,148 +255,230,164 +246,246,238 +246,246,255 +139,131,115 +246,246,230 +205,205,205 +255,222,139 +246,238,246 +255,222,131 +172,172,172 +82,82,82 +74,82,98 +82,82,74 +180,180,164 +123,164,238 +16,8,16 +148,164,115 +255,238,189 +82,82,90 +98,98,98 +255,238,123 +98,98,90 +255,238,172 +98,90,90 +246,222,189 +197,197,197 +106,106,106 +98,106,106 +222,222,222 +98,98,106 +106,0,0 +123,123,115 +90,139,246 +164,164,164 +246,115,115 +222,222,205 +255,115,115 +255,106,115 +74,74,90 +156,156,164 +0,0,0 +0,0,8 +255,246,205 +115,115,106 +238,238,238 +246,238,230 +213,213,197 +255,255,189 +255,230,148 +106,115,98 +90,90,90 +90,90,82 +189,189,189 +90,90,98 +255,246,98 +255,255,246 +238,238,230 +57,57,57 +238,246,255 +222,115,115 +139,139,139 +230,246,246 +222,238,255 +246,156,148 +90,98,98 +8,0,8 +255,230,180 +180,82,74 +74,131,246 +255,246,230 +238,230,238 +197,238,131 +164,197,246 +197,230,148 +197,238,139 +189,230,139 +82,90,90 +255,238,197 +255,123,123 +230,230,230 +230,230,238 +246,98,98 +246,213,131 +246,213,139 +238,213,139 +230,246,180 +230,222,222 +255,213,139 +230,246,255 +246,205,131 +255,255,238 +255,255,230 +246,255,255 +255,246,246 +255,255,255 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 +0,0,0 diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb index 31ff87a72..0817029e7 100644 --- a/cookbooks/imagery/recipes/gb_os_sv.rb +++ b/cookbooks/imagery/recipes/gb_os_sv.rb @@ -19,6 +19,13 @@ include_recipe "imagery" +cookbook_file "/srv/imagery/common/ossv-palette.txt" do + source "ossv-palette.txt" + owner "root" + group "root" + mode "0644" +end + imagery_site "os.openstreetmap.org" do aliases ["os.openstreetmap.org.uk"] @@ -29,7 +36,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2010" # FIXME: Correct Copyright? background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end @@ -40,7 +47,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2010" # FIXME: Correct Copyright? background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end @@ -51,7 +58,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2011" # FIXME: Correct Copyright? background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end @@ -62,7 +69,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2011" # FIXME: Correct Copyright? background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end @@ -73,7 +80,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2012" background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end @@ -84,7 +91,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2012" background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end @@ -95,7 +102,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2013" background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end @@ -106,7 +113,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2013" background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end @@ -117,7 +124,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2014" background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end @@ -128,7 +135,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2014" background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end @@ -139,7 +146,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2015" background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end @@ -150,7 +157,7 @@ imagery_site "os.openstreetmap.org" do copyright "Contains Ordnance Survey data © Crown copyright and database right 2015" background_colour "230 246 255" # OSSV Water Blue extension "png" - palette "ossv-palette.txt" + palette "/srv/imagery/common/ossv-palette.txt" extent "5000 5000 660000 1225000" end end diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb index 648ac06d6..8d9ffac14 100644 --- a/cookbooks/imagery/resources/layer.rb +++ b/cookbooks/imagery/resources/layer.rb @@ -76,7 +76,6 @@ action :create do variables new_resource.to_hash notifies :reload, "service[nginx]", :delayed end - end action :delete do -- 2.39.5