imagery: add html titles

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index 99dcb972a14626d54fa5956f0817dd0425286837..921cbe2d2ae63081ffd4507913cb3ff5ca136b28 100644 (file)
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -20,6 +20,7 @@
 include_recipe "imagery"
 
 imagery_site "agri.openstreetmap.org" do
+  title "OpenStreetMap - The Australian Geographic Reference Image"
   # aliases [ "agri.openstreetmap.org.au" ]
   bbox [[-44.74673, 111.5332], [-9.75237, 154.6875]]
 end

diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index 28dd8e94a66a9a6875b48f772c76d922a83458d2..ff6ef74ee797f1e834851fc608226d054340bbec 100644 (file)
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -20,6 +20,7 @@
 include_recipe "imagery"
 
 imagery_site "hampshire.aerial.openstreetmap.org.uk" do
+  title "OpenStreetMap - Hampshire Hub Aerial"
   # aliases
   bbox [[50.564, -1.9899], [51.3606, -0.712738]]
 end

diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index 16ca43184d8028e7152042532e9c28c36c039ce1..439231cbebc6c07a7c3a8f7fd4e13b0976598b0f 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -42,6 +42,7 @@ cookbook_file "/srv/imagery/common/osstvw_make_diffs" do
 end
 
 imagery_site "os.openstreetmap.org" do
+  title "OpenStreetMap - Ordnance Survey OpenData - Street View"
   aliases ["os.openstreetmap.org.uk"]
   bbox [[49.85, -10.5], [58.75, 1.9]]
 end

diff --git a/cookbooks/imagery/recipes/gb_surrey_aerial.rb b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
index 1495c2060492385a2b2e16bc263c393f3517e144..d2e286d6be63510c8adf07add651c46f11fad4f3 100644 (file)
--- a/cookbooks/imagery/recipes/gb_surrey_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
@@ -20,6 +20,7 @@
 include_recipe "imagery"
 
 imagery_site "surrey.aerial.openstreetmap.org.uk" do
+  title "OpenStreetMap - Surrey Air Survey - 2009"
   # aliases
   bbox [[51.0595, -0.873413], [51.466, 0.0617981]]
 end
@@ -29,5 +30,7 @@ imagery_layer "gb_surrey_aerial" do
   root_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"
+  text "Surrey Air Survey - 2008/2009"
+  copyright "ODC Open Database License (ODbL) - Surrey Heath Borough Council"
   url_aliases ["/sas"]
 end

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 6478faa52b1549266ed642757cb94bca69ddc6ae..a2c94b95399173f69dabd7b99ece160f82b50587 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -22,6 +22,7 @@ require "yaml"
 default_action :create
 
 property :name, String
+property :title, String, :required => true
 property :aliases, [String, Array], :default => []
 property :bbox, Array, :required => true
 
@@ -51,7 +52,7 @@ action :create do
     user "root"
     group "root"
     mode 0644
-    variables :title => name
+    variables :title => title
   end
 
   cookbook_file "/srv/#{name}/imagery.css" do