imagery: add default site for socket settings

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

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 3ec9a0a7088c6c2bb512eefe86649c211ae369df..8c98e5ddbd4b60a274cf2d6a11dc721632bccbce 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


@@ -34,13 +34,13 @@ property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
 property :extension, String, :default => "png"
 property :resample, String, :default => "average"
 property :imagemode, String
 property :extension, String, :default => "png"

-property :max_zoom, Fixnum, :default => 23
+property :max_zoom, Fixnum, :default => 18

 property :url_aliases, [String, Array], :default => []
 property :revision, Fixnum, :default => 1
 property :overlay, [TrueClass, FalseClass], :default => false
 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
 
 action :create do

-

   file "create layer yaml definition" do
     owner "root"
     group "root"
   file "create layer yaml definition" do
     owner "root"
     group "root"


@@ -51,8 +51,10 @@ 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,

-                      :url => "http://#{site}/layer/#{layer}/{z}/{x}/{y}.png",
+                      :title => title || layer,
+                      :url => "http://{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png",

                       :attribution => copyright,
                       :attribution => copyright,

+                      :default => default_layer,

                       :maxZoom => max_zoom)
   end
 
                       :maxZoom => max_zoom)
   end