Imagery - add url alias support

diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index 5a76a0f1ef0233ad011bdfa90626552a2625ce52..ae74a43e56ee1bb2feb8cb1c70d04bdc458fd726 100644 (file)
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -30,12 +30,14 @@ imagery_layer "gb_hampshire_aerial_rgb" do
   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
+  url_aliases [ "/hampshire-rgb" ]
 end
 
 imagery_layer "gb_hampshire_aerial_fcir" do
   site "hampshire.aerial.openstreetmap.org.uk"
-  text "Hampshire Aerial - Summer 2013 (FCIR)"
+  text "Hampshire Aerial - Summer 2013 (False Colour IR)"
   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
+  url_aliases [ "/hampshire-fcir" ]
 end

diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index 326a01d0bd59e4fd9a75f5909b2a36111cf7bc84..5d634018010a13dc024b8138ce47be9c66f77567 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -39,6 +39,7 @@ imagery_layer "gb_os_sv_2010_04" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2010-04" ]
 end
 
 imagery_layer "gb_os_sv_2010_11" do
@@ -50,6 +51,7 @@ imagery_layer "gb_os_sv_2010_11" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2010-11" ]
 end
 
 imagery_layer "gb_os_sv_2011_05" do
@@ -61,6 +63,7 @@ imagery_layer "gb_os_sv_2011_05" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2011-05" ]
 end
 
 imagery_layer "gb_os_sv_2011_11" do
@@ -72,6 +75,7 @@ imagery_layer "gb_os_sv_2011_11" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2011-11" ]
 end
 
 imagery_layer "gb_os_sv_2012_05" do
@@ -83,6 +87,7 @@ imagery_layer "gb_os_sv_2012_05" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2012-05" ]
 end
 
 imagery_layer "gb_os_sv_2012_11" do
@@ -94,6 +99,7 @@ imagery_layer "gb_os_sv_2012_11" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2012-11" ]
 end
 
 imagery_layer "gb_os_sv_2013_05" do
@@ -105,6 +111,7 @@ imagery_layer "gb_os_sv_2013_05" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2013-05" ]
 end
 
 imagery_layer "gb_os_sv_2013_11" do
@@ -116,6 +123,7 @@ imagery_layer "gb_os_sv_2013_11" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2013-11" ]
 end
 
 imagery_layer "gb_os_sv_2014_04" do
@@ -127,6 +135,7 @@ imagery_layer "gb_os_sv_2014_04" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2014-04" ]
 end
 
 imagery_layer "gb_os_sv_2014_10" do
@@ -138,6 +147,7 @@ imagery_layer "gb_os_sv_2014_10" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2014-10" ]
 end
 
 imagery_layer "gb_os_sv_2015_05" do
@@ -149,6 +159,7 @@ imagery_layer "gb_os_sv_2015_05" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2015-05" ]
 end
 
 imagery_layer "gb_os_sv_2015_11" do
@@ -161,4 +172,5 @@ imagery_layer "gb_os_sv_2015_11" do
   extension "png"
   palette "/srv/imagery/common/ossv-palette.txt"
   extent "5000 5000 660000 1225000"
+  url_aliases [ "/sv-2015-11", "/sv" ]
 end

diff --git a/cookbooks/imagery/recipes/gb_surrey_aerial.rb b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
index c3ad9e69f8e9aaf883e2db15b35a3e1ae754e76a..3fecb590563a7000f1a105202ce857b20778c753 100644 (file)
--- a/cookbooks/imagery/recipes/gb_surrey_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
@@ -28,4 +28,5 @@ imagery_layer "gb_surrey_aerial" do
   root_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"
+  url_aliases [ "/sas" ]
 end

diff --git a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
index 721867f34c7025d79e30859a11ee286f60fed28b..1c58bd4e3e8aa8c096c84234e8a7942d38b15236 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
@@ -11,3 +11,6 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {
 <% if @root_layer -%>
 rewrite "^/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" "/layer/<%= @layer %>/$1/$2/$3.$4" last;
 <% end -%>
+<% @url_aliases.each do |url| -%>
+rewrite "^<%= url %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" "/layer/<%= @layer %>/$1/$2/$3.$4" last;
+<% end -%>