Use nice labels in layer switcher

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index 4eb10ea807874e42c39e228c6f4af72b6201b830..e3cc9fce8f542895bd1ec2f6a2c64618b244ef1a 100644 (file)
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -29,7 +29,7 @@ imagery_layer "au_ga_agri" do
   site "agri.openstreetmap.org"
   root_layer true
   default_layer true
   site "agri.openstreetmap.org"
   root_layer true
   default_layer true

-  text "AGRI: The Australian Geographic Reference Image"
+  title "AGRI: The Australian Geographic Reference Image"

   copyright "Commonwealth of Australia (Geoscience Australia) - Creative Commons Attribution 4.0 International Licence"
   background_colour "0 0 0" # Black
   projection "EPSG:3857"
   copyright "Commonwealth of Australia (Geoscience Australia) - Creative Commons Attribution 4.0 International Licence"
   background_colour "0 0 0" # Black
   projection "EPSG:3857"

diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index 9cee51ec57616b0941dd904cbbe8f1b38c7092cc..99f381d5167a7a3eaa07ef1d0d6b3b63d80c7452 100644 (file)
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -29,7 +29,7 @@ imagery_layer "gb_hampshire_aerial_rgb" do
   site "hampshire.aerial.openstreetmap.org.uk"
   root_layer true
   default_layer true
   site "hampshire.aerial.openstreetmap.org.uk"
   root_layer true
   default_layer true

-  text "Hampshire Aerial - Summer 2013"
+  title "Hampshire Aerial - Summer 2013"

   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"


@@ -38,7 +38,7 @@ end
 
 imagery_layer "gb_hampshire_aerial_fcir" do
   site "hampshire.aerial.openstreetmap.org.uk"
 
 imagery_layer "gb_hampshire_aerial_fcir" do
   site "hampshire.aerial.openstreetmap.org.uk"

-  text "Hampshire Aerial - Summer 2013 (False Colour IR)"
+  title "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"
   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"

diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index 1bbd084f82f03ae6f4795b7efbf2e9114b8179ca..8f75c2dbcef16f112e112e2c37c4c01c0bfc0114 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -49,6 +49,7 @@ end
 
 imagery_layer "gb_os_sv_2010_04" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2010_04" do
   site "os.openstreetmap.org"

+  title "April 2010"

   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2010-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2010" # FIXME: Correct Copyright?
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2010-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2010" # FIXME: Correct Copyright?


@@ -59,6 +60,7 @@ end
 
 imagery_layer "gb_os_sv_2010_11" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2010_11" do
   site "os.openstreetmap.org"

+  title "November 2010"

   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2010-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2010" # FIXME: Correct Copyright?
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2010-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2010" # FIXME: Correct Copyright?


@@ -69,6 +71,7 @@ end
 
 imagery_layer "gb_os_sv_2011_05" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2011_05" do
   site "os.openstreetmap.org"

+  title "May 2011"

   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2011-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011" # FIXME: Correct Copyright?
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2011-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011" # FIXME: Correct Copyright?


@@ -79,6 +82,7 @@ end
 
 imagery_layer "gb_os_sv_2011_11" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2011_11" do
   site "os.openstreetmap.org"

+  title "November 2011"

   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2011-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011" # FIXME: Correct Copyright?
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2011-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011" # FIXME: Correct Copyright?


@@ -89,6 +93,7 @@ end
 
 imagery_layer "gb_os_sv_2012_05" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2012_05" do
   site "os.openstreetmap.org"

+  title "May 2012"

   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2012-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2012-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"


@@ -99,6 +104,7 @@ end
 
 imagery_layer "gb_os_sv_2012_11" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2012_11" do
   site "os.openstreetmap.org"

+  title "November 2012"

   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2012-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2012-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2012"


@@ -109,6 +115,7 @@ end
 
 imagery_layer "gb_os_sv_2013_05" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2013_05" do
   site "os.openstreetmap.org"

+  title "May 2013"

   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2013-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"


@@ -119,6 +126,7 @@ end
 
 imagery_layer "gb_os_sv_2013_11" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2013_11" do
   site "os.openstreetmap.org"

+  title "November 2013"

   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2013-11-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2013"


@@ -129,6 +137,7 @@ end
 
 imagery_layer "gb_os_sv_2014_04" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2014_04" do
   site "os.openstreetmap.org"

+  title "April 2014"

   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2014-04-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"


@@ -139,6 +148,7 @@ end
 
 imagery_layer "gb_os_sv_2014_10" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2014_10" do
   site "os.openstreetmap.org"

+  title "October 2014"

   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2014-10-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2014"


@@ -149,6 +159,7 @@ end
 
 imagery_layer "gb_os_sv_2015_05" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2015_05" do
   site "os.openstreetmap.org"

+  title "May 2015"

   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2015-05-combined.vrt"
   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"


@@ -159,6 +170,7 @@ end
 
 imagery_layer "gb_os_sv_2015_11" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2015_11" do
   site "os.openstreetmap.org"

+  title "November 2015"

   root_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2015-11-combined.vrt"
   root_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2015-11-combined.vrt"


@@ -170,6 +182,7 @@ end
 
 imagery_layer "gb_os_sv_2016_04" do
   site "os.openstreetmap.org"
 
 imagery_layer "gb_os_sv_2016_04" do
   site "os.openstreetmap.org"

+  title "April 2016"

   root_layer true
   default_layer true
   projection "EPSG:27700"
   root_layer true
   default_layer true
   projection "EPSG:27700"

diff --git a/cookbooks/imagery/recipes/gb_surrey_aerial.rb b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
index 487e87595512f8f695e237e5eba3e83f6b0fcda6..1608dd93c20c628e327a4cae64b6b79fc7a65d97 100644 (file)
--- a/cookbooks/imagery/recipes/gb_surrey_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
@@ -31,7 +31,7 @@ imagery_layer "gb_surrey_aerial" do
   default_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"
   default_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"

-  text "Surrey Air Survey - 2008/2009"
+  title "Surrey Air Survey - 2008/2009"

   copyright "ODC Open Database License (ODbL) - Surrey Heath Borough Council"
   url_aliases ["/sas"]
 end
   copyright "ODC Open Database License (ODbL) - Surrey Heath Borough Council"
   url_aliases ["/sas"]
 end

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 96a57ea93a3995af846f18c209c56f8f0ece0c82..d66440b93d0d6423649d247b610df6e74b62562e 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -25,7 +25,7 @@ property :layer, String, :name_property => true
 property :site, String, :required => true
 property :source, String, :required => true
 property :root_layer, [TrueClass, FalseClass], :default => false
 property :site, String, :required => true
 property :source, String, :required => true
 property :root_layer, [TrueClass, FalseClass], :default => false

-property :text, String
+property :title, String

 property :copyright, String, :default => "Copyright"
 property :projection, String, :default => "EPSG:3857"
 property :palette, String
 property :copyright, String, :default => "Copyright"
 property :projection, String, :default => "EPSG:3857"
 property :palette, String


@@ -51,6 +51,7 @@ action :create do
       path "/srv/imagery/layers/#{site}/#{layer}.yml"
     end
     content YAML.dump(:name => layer,
       path "/srv/imagery/layers/#{site}/#{layer}.yml"
     end
     content YAML.dump(:name => layer,

+                      :title => title || layer,

                       :url => "http://#{site}/layer/#{layer}/{z}/{x}/{y}.png",
                       :attribution => copyright,
                       :default => default_layer,
                       :url => "http://#{site}/layer/#{layer}/{z}/{x}/{y}.png",
                       :attribution => copyright,
                       :default => default_layer,

diff --git a/cookbooks/imagery/templates/default/imagery.js.erb b/cookbooks/imagery/templates/default/imagery.js.erb
index d3ad6545839b138d06af574c744021b0484f2882..58e9b0fea89a195ace8b1d179ffcc90af75add0b 100644 (file)
--- a/cookbooks/imagery/templates/default/imagery.js.erb
+++ b/cookbooks/imagery/templates/default/imagery.js.erb
@@ -19,7 +19,7 @@ function createMap(divName) {
   });
 
   // Add <%= layer[:name] %> to layer switcher
   });
 
   // Add <%= layer[:name] %> to layer switcher

-  layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:name].to_json %>);
+  layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>);

 
   <% if layer[:default] -%>
   // Add <%= layer[:name] %> to map
 
   <% if layer[:default] -%>
   // Add <%= layer[:name] %> to map


@@ -31,7 +31,7 @@ function createMap(divName) {
   layers.addOverlay(L.tileLayer(<%= layer[:url].to_json %>, {
     attribution: <%= layer[:attribution].to_json %>,
     maxZoom: <%= layer[:maxZoom].to_json %>
   layers.addOverlay(L.tileLayer(<%= layer[:url].to_json %>, {
     attribution: <%= layer[:attribution].to_json %>,
     maxZoom: <%= layer[:maxZoom].to_json %>

-  }), <%= layer[:name].to_json %>);
+  }), <%= layer[:title].to_json %>);

 
   <% end -%>
   // Add the layer switch to the mao
 
   <% end -%>
   // Add the layer switch to the mao