Use nice labels in layer switcher

[chef.git] / cookbooks / imagery / resources / layer.rb

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 13b9b794c6cad45635f802f01fec06df89b781a2..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 :text, String
+property :title, String
 property :copyright, String, :default => "Copyright"
 property :projection, String, :default => "EPSG:3857"
 property :palette, String
@@ -37,15 +37,34 @@ property :extension, String, :default => "png"
 property :max_zoom, Fixnum, :default => 23
 property :url_aliases, [String, Array], :default => []
 property :revision, Fixnum, :default => 1
+property :overlay, [TrueClass, FalseClass], :default => false
+property :default_layer, [TrueClass, FalseClass], :default => false
 
 action :create do
-  file "/srv/imagery/layers/#{site}/#{layer}.yml" do
+  file "create layer yaml definition" do
     owner "root"
     group "root"
     mode 0644
+    if new_resource.overlay
+      path "/srv/imagery/overlays/#{site}/#{layer}.yml"
+    else
+      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)
+                      :attribution => copyright,
+                      :default => default_layer,
+                      :maxZoom => max_zoom)
+  end
+
+  file "remove old layer yaml" do
+    if new_resource.overlay
+      path "/srv/imagery/layers/#{site}/#{layer}.yml" # remove layer if overlay
+    else
+      path "/srv/imagery/overlays/#{site}/#{layer}.yml" # remove overlay if layer
+    end
+    action :delete
   end
 
   template "/srv/imagery/mapserver/layer-#{layer}.map" do