rgeoserver 0.5.8.2 → 0.5.9

data/lib/rgeoserver/featuretype.rb

@@ -2,9 +2,22 @@
 module RGeoServer
   # A feature type is a vector based spatial resource or data set that originates from a data store. In some cases, like Shapefile, a feature type has a one-to-one relationship with its data store. In other cases, like PostGIS, the relationship of feature type to data store is many-to-one, with each feature type corresponding to a table in the database.
   class FeatureType < ResourceInfo
-    OBJ_ATTRIBUTES = {:catalog => "catalog", :name => "name", :workspace => "workspace", :data_store => "data_store", :enabled => "enabled", :metadata_links => "metadataLinks", :title => "title", :abstract => "abstract" }
-    OBJ_DEFAULT_ATTRIBUTES = {:catalog => nil, :workspace => nil, :data_store => nil, :name => nil, :enabled => "false", :metadata_links => [], :title => nil, :abtract => nil } 
-   
+    OBJ_ATTRIBUTES = {:catalog => "catalog", :name => "name", :workspace => "workspace", :data_store => "data_store", :enabled => "enabled", :metadata_links => "metadataLinks", :title => "title", :abstract => "abstract", :native_bounds => 'native_bounds', :latlon_bounds => "latlon_bounds", :projection_policy => 'projection_policy'}
+    OBJ_DEFAULT_ATTRIBUTES =
+      {
+      :catalog => nil,
+      :workspace => nil,
+      :data_store => nil,
+      :name => nil,
+      :enabled => "false",
+      :metadata_links => [],
+      :title => nil,
+      :abstract => nil,
+      :native_bounds => {'minx'=>nil, 'miny' =>nil, 'maxx'=>nil, 'maxy'=>nil, 'crs' =>nil},
+      :latlon_bounds => {'minx'=>nil, 'miny' =>nil, 'maxx'=>nil, 'maxy'=>nil, 'crs' =>nil},
+      :projection_policy => :force
+    }
+
     define_attribute_methods OBJ_ATTRIBUTES.keys
     update_attribute_accessors OBJ_ATTRIBUTES
 
@@ -29,7 +42,7 @@ module RGeoServer
     end
 
     def route
-      @@route % [@workspace.name , @data_store.name ]
+      @@route % [@workspace.name , @data_store.name]
     end
 
     def message
@@ -37,12 +50,42 @@ module RGeoServer
         xml.featureType {
           xml.name @name if new?
           xml.enabled @enabled if (enabled_changed? || new?)
-          unless new?
-            xml.title @title
-            xml.abstract @abtract if abstract_changed?
-            xml.store(:class => 'featureType') {
-              xml.name @data_store.name
-            } 
+          xml.title title
+          xml.abstract abstract
+
+          xml.store(:class => 'dataStore') {
+            xml.name @data_store.name
+          } if new? || data_store_changed?
+
+          xml.nativeBoundingBox {
+            xml.minx native_bounds['minx'] if native_bounds['minx']
+            xml.miny native_bounds['miny'] if native_bounds['miny']
+            xml.maxx native_bounds['maxx'] if native_bounds['maxx']
+            xml.maxy native_bounds['maxy'] if native_bounds['maxy']
+            xml.crs native_bounds['crs'] if native_bounds['crs']
+          } if valid_native_bounds?
+
+          xml.latLonBoundingBox {
+            xml.minx latlon_bounds['minx'] if latlon_bounds['minx']
+            xml.miny latlon_bounds['miny'] if latlon_bounds['miny']
+            xml.maxx latlon_bounds['maxx'] if latlon_bounds['maxx']
+            xml.maxy latlon_bounds['maxy'] if latlon_bounds['maxy']
+            xml.crs latlon_bounds['crs'] if latlon_bounds['crs']
+          } if valid_latlon_bounds?
+
+          xml.projectionPolicy get_projection_policy_message(projection_policy) if projection_policy
+
+          if new?
+            xml.attributes {
+              xml.attribute {
+                xml.name 'the_geom'
+                xml.minOccurs 0
+                xml.maxOccurs 1
+                xml.nillable true
+                xml.binding 'com.vividsolutions.jts.geom.Point'
+              }
+            }
+          else
             xml.metadataLinks {
               @metadata_links.each{ |m|
                 xml.metadataLink {
@@ -55,13 +98,13 @@ module RGeoServer
           end
         }
       end
-      @message = builder.doc.to_xml 
+      @message = builder.doc.to_xml
     end
 
 
     # @param [RGeoServer::Catalog] catalog
     # @param [Hash] options
-    def initialize catalog, options 
+    def initialize catalog, options
       super({})
       _run_initialize_callbacks do
         @catalog = catalog
@@ -84,42 +127,42 @@ module RGeoServer
 
         @name = options[:name].strip
         @route = route
-      end        
+      end
     end
 
-
     def profile_xml_to_hash profile_xml
       doc = profile_xml_to_ng profile_xml
       h = {
-        "name" => doc.at_xpath('//name').text.strip, 
+        "name" => doc.at_xpath('//name').text.strip,
         "title" => doc.at_xpath('//title/text()').to_s,
-        "abstract" => doc.at_xpath('//abstract/text()').to_s, 
-        "workspace" => @workspace.name, 
+        "abstract" => doc.at_xpath('//abstract/text()').to_s,
+        "workspace" => @workspace.name,
         "data_store" => @data_store.name,
         "nativeName" => doc.at_xpath('//nativeName/text()').to_s,
         "srs" => doc.at_xpath('//srs/text()').to_s,
-        "nativeBoundingBox" => { 
-          'minx' => doc.at_xpath('//nativeBoundingBox/minx/text()').to_s,
-          'miny' => doc.at_xpath('//nativeBoundingBox/miny/text()').to_s,
-          'maxx' => doc.at_xpath('//nativeBoundingBox/maxx/text()').to_s,
-          'maxy' => doc.at_xpath('//nativeBoundingBox/maxy/text()').to_s,
+        "native_bounds" => {
+          'minx' => doc.at_xpath('//nativeBoundingBox/minx/text()').to_s.to_f,
+          'miny' => doc.at_xpath('//nativeBoundingBox/miny/text()').to_s.to_f,
+          'maxx' => doc.at_xpath('//nativeBoundingBox/maxx/text()').to_s.to_f,
+          'maxy' => doc.at_xpath('//nativeBoundingBox/maxy/text()').to_s.to_f,
           'crs' => doc.at_xpath('//nativeBoundingBox/crs/text()').to_s
         },
-        "latLonBoundingBox" => { 
-          'minx' => doc.at_xpath('//latLonBoundingBox/minx/text()').to_s,
-          'miny' => doc.at_xpath('//latLonBoundingBox/miny/text()').to_s,
-          'maxx' => doc.at_xpath('//latLonBoundingBox/maxx/text()').to_s,
-          'maxy' => doc.at_xpath('//latLonBoundingBox/maxy/text()').to_s,
+        "latlon_bounds" => {
+          'minx' => doc.at_xpath('//latLonBoundingBox/minx/text()').to_s.to_f,
+          'miny' => doc.at_xpath('//latLonBoundingBox/miny/text()').to_s.to_f,
+          'maxx' => doc.at_xpath('//latLonBoundingBox/maxx/text()').to_s.to_f,
+          'maxy' => doc.at_xpath('//latLonBoundingBox/maxy/text()').to_s.to_f,
           'crs' => doc.at_xpath('//latLonBoundingBox/crs/text()').to_s
         },
-        "metadataLinks" => doc.xpath('//metadataLinks/metadataLink').collect{ |m| 
-          { 
-            'type' => m.at_xpath('//type/text()').to_s, 
+        "projection_policy" => get_projection_policy_sym(doc.at_xpath('//projectionPolicy').text.strip),
+        "metadataLinks" => doc.xpath('//metadataLinks/metadataLink').collect{ |m|
+          {
+            'type' => m.at_xpath('//type/text()').to_s,
             'metadataType' => m.at_xpath('//metadataType/text()').to_s,
             'content' => m.at_xpath('//content/text()').to_s
-          } 
+          }
         },
-        "attributes" => doc.xpath('//attributes/attribute').collect{ |a| 
+        "attributes" => doc.xpath('//attributes/attribute').collect{ |a|
           {
             'name' => a.at_xpath('//name/text()').to_s,
             'minOccurs' => a.at_xpath('//minOccurs/text()').to_s,
@@ -128,10 +171,39 @@ module RGeoServer
             'binding' => a.at_xpath('//binding/text()').to_s
           }
         }
-      }.freeze  
-      h  
+      }.freeze
+      h
     end
 
+    def valid_native_bounds?
+      native_bounds &&
+        ![native_bounds['minx'], native_bounds['miny'], native_bounds['maxx'], native_bounds['maxy'], native_bounds['crs']].compact.empty?
+    end
 
+    def valid_latlon_bounds?
+      latlon_bounds &&
+        ![latlon_bounds['minx'], latlon_bounds['miny'], latlon_bounds['maxx'], latlon_bounds['maxy'], latlon_bounds['crs']].compact.empty?
+    end
+
+    private
+    def get_projection_policy_sym value
+      case value.upcase
+      when 'FORCE_DECLARED' then :force
+      when 'REPROJECT_TO_DECLARED' then :reproject
+      when 'NONE' then :keep
+      else
+        raise ArgumentError, "There is not correspondent to '%s'" % value
+      end
+    end
+
+    def get_projection_policy_message value
+      case value
+      when :force then 'FORCE_DECLARED'
+      when :reproject then 'REPROJECT_TO_DECLARED'
+      when :keep then 'NONE'
+      else
+        raise ArgumentError, "There is not correspondent to '%s'" % value
+      end
+    end
   end
-end 
+end

data/lib/rgeoserver/layer.rb

@@ -5,32 +5,32 @@ module RGeoServer
 
     OBJ_ATTRIBUTES = {:enabled => 'enabled', :queryable => 'queryable', :path => 'path', :catalog => 'catalog', :name => 'name', :default_style => 'default_style', :alternate_styles => 'alternate_styles', :metadata => 'metadata', :attribution => 'attribution', :layer_type => 'type' }
     OBJ_DEFAULT_ATTRIBUTES = {
-      :enabled => 'true', 
-      :queryable => 'true', 
-      :path => '/', 
-      :catalog => nil, 
-      :name => nil, 
-      :default_style => nil, 
-      :alternate_styles => [], 
+      :enabled => 'true',
+      :queryable => 'true',
+      :path => '/',
+      :catalog => nil,
+      :name => nil,
+      :default_style => nil,
+      :alternate_styles => [],
       :metadata => {
         'GWC.autoCacheStyles' => 'true',
         'GWC.gutter' => '0',
         'GWC.enabled' => 'true',
         'GWC.cacheFormats' => 'image/jpeg,image/png',
         'GWC.gridSets' => 'EPSG:4326,EPSG:900913'
-      }, 
+      },
       :attribution => {
-        'logo_height' => '0', 
-        'logo_width' => '0', 
+        'logo_height' => '0',
+        'logo_width' => '0',
         'title' => ''
-      }, 
-      :layer_type => nil 
+      },
+      :layer_type => nil
     }
 
     define_attribute_methods OBJ_ATTRIBUTES.keys
     update_attribute_accessors OBJ_ATTRIBUTES
 
-    @@route = "layers" 
+    @@route = "layers"
     @@resource_name = "layer"
 
     def self.resource_name
@@ -46,12 +46,12 @@ module RGeoServer
     end
 
     def route
-      @@route  
+      @@route
     end
 
     # No direct layer creation
-    def create_route 
-      nil 
+    def create_route
+      nil
     end
 
     def update_params name_route = @name
@@ -60,15 +60,15 @@ module RGeoServer
 
     def message
       builder = Nokogiri::XML::Builder.new do |xml|
-        xml.layer { 
-          xml.name @name 
-          xml.path path 
-          xml.type_ layer_type 
-          xml.enabled @enabled 
+        xml.layer {
+          xml.name @name
+          xml.path path
+          xml.type_ layer_type
+          xml.enabled @enabled
           xml.queryable @queryable
           xml.defaultStyle {
             xml.name default_style
-          } 
+          }
           xml.styles {
             alternate_styles.each { |s|
               xml.style {
@@ -77,23 +77,23 @@ module RGeoServer
             }
           } unless alternate_styles.empty?
           xml.resource(:class => resource.class.resource_name){
-            xml.name resource.name 
+            xml.name resource.name
           } unless resource.nil?
           xml.metadata {
             metadata.each_pair { |k,v|
               xml.entry(:key => k) {
                 xml.text v
               }
-            } 
+            }
           }
           xml.attribution {
             xml.title attribution['title'] unless attribution['title'].empty?
             xml.logoWidth attribution['logo_width']
-            xml.logoHeight attribution['logo_height'] 
+            xml.logoHeight attribution['logo_height']
           } if !attribution['logo_width'].nil? && !attribution['logo_height'].nil?
         }
       end
-      return builder.doc.to_xml 
+      return builder.doc.to_xml
     end
 
     # @param [RGeoServer::Catalog] catalog
@@ -108,16 +108,16 @@ module RGeoServer
         @name = options[:name].strip
         #@default_style = options[:default_style] || ''
         #@alternate_styles = options[:alternate_styles] || []
-      end        
+      end
       @route = route
     end
 
     def resource= r
-      if r.is_a?(RGeoServer::Coverage) || r.is_a?(RGeoServer::FeatureType) 
+      if r.is_a?(RGeoServer::Coverage) || r.is_a?(RGeoServer::FeatureType)
         @resource = r
       else
-        raise 'Unknown resource type'  
-      end  
+        raise 'Unknown resource type'
+      end
     end
 
     def resource
@@ -134,7 +134,7 @@ module RGeoServer
           when 'featureType'
             return RGeoServer::FeatureType.new @catalog, :workspace => workspace, :data_store => store, :name => name
           else
-            raise 'Unknown resource type'  
+            raise 'Unknown resource type'
           end
         else
           nil
@@ -160,7 +160,7 @@ module RGeoServer
       workspace, _, store = link.match(/workspaces\/(.*?)\/(.*?)\/(.*?)\/(.*?)\/#{name}.xml$/).to_a[1,3]
 
       h = {
-        "name" => name, 
+        "name" => name,
         "path" => doc.at_xpath('//path/text()').to_s,
         "default_style" => doc.at_xpath('//defaultStyle/name/text()').to_s,
         "alternate_styles" => doc.xpath('//styles/style/name/text()').collect{ |s| s.to_s},
@@ -168,7 +168,7 @@ module RGeoServer
         "type" => doc.at_xpath('//type/text()').to_s,
         "enabled" => doc.at_xpath('//enabled/text()').to_s,
         "queryable" => doc.at_xpath('//queryable/text()').to_s,
-        "attribution" => { 
+        "attribution" => {
           "title" => doc.at_xpath('//attribution/title/text()').to_s,
           "logo_width" => doc.at_xpath('//attribution/logoWidth/text()').to_s,
           "logo_height" => doc.at_xpath('//attribution/logoHeight/text()').to_s
@@ -177,14 +177,14 @@ module RGeoServer
           "type" => doc.at_xpath('//resource/@class').to_s,
           "name" => doc.at_xpath('//resource/name/text()').to_s,
           "store" => store,
-          "workspace" => workspace 
+          "workspace" => workspace
         },
-        "metadata" => doc.xpath('//metadata/entry').inject({}){ |h, e| h.merge(e['key']=> e.text.to_s) } 
+        "metadata" => doc.xpath('//metadata/entry').inject({}){ |h, e| h.merge(e['key']=> e.text.to_s) }
       }.freeze
-      h  
+      h
     end
 
-    def workspace 
+    def workspace
       resource.workspace
     end
 
@@ -203,7 +203,7 @@ module RGeoServer
     #  }
     #  > lyr.seed :issue, options
 
-    # @param[String] operation  
+    # @param[String] operation
     # @option operation[Symbol] :issue seed
     # @option operation[Symbol] :truncate seed
     # @option operation[Symbol] :status of the seeding thread
@@ -224,7 +224,7 @@ module RGeoServer
     # @param[Hash] options for seed message
     def build_seed_request operation, options
       builder = Nokogiri::XML::Builder.new do |xml|
-        xml.seedRequest { 
+        xml.seedRequest {
           xml.name prefixed_name
 
           xml.srs {
@@ -233,9 +233,9 @@ module RGeoServer
 
           xml.bounds {
             xml.coords {
-              options[:bounds][:coords].each { |dbl| 
+              options[:bounds][:coords].each { |dbl|
                 xml.double dbl
-              } 
+              }
             }
           } unless options[:bounds].nil?
 
@@ -246,7 +246,7 @@ module RGeoServer
           }
 
           xml.parameters {
-            options[:parameters].each_pair { |k,v| 
+            options[:parameters].each_pair { |k,v|
               xml.entry {
                 xml.string k.upcase
                 xml.string v
@@ -259,4 +259,4 @@ module RGeoServer
     end
   end
 
-end 
+end

data/lib/rgeoserver/layergroup.rb

@@ -3,13 +3,16 @@ module RGeoServer
   # A layer group is a grouping of layers and styles that can be accessed as a single layer in a WMS GetMap request. A Layer group is often referred to as a "base map".
   class LayerGroup < ResourceInfo
 
-    OBJ_ATTRIBUTES = {:catalog => 'catalog', :name => 'name', :layers => 'layers', :styles => 'styles', :bounds => 'bounds', :metadata => 'metadata' }
-    OBJ_DEFAULT_ATTRIBUTES = {:catalog => nil, :name => nil, :layers => [], :styles => [], :bounds => {'minx'=>'', 'miny' =>'', 'maxx'=>'', 'maxy'=>'', 'crs' =>''}, :metadata => {} }
+    OBJ_ATTRIBUTES = {:catalog => 'catalog', :name => 'name', :workspace => 'workspace', :layers => 'layers', :styles => 'styles', :bounds => 'bounds', :metadata => 'metadata' }
+    OBJ_DEFAULT_ATTRIBUTES = {:catalog => nil, :name => nil, :workspace => nil, :layers => [], :styles => [], :bounds => {'minx'=>nil, 'miny' =>nil, 'maxx'=>nil, 'maxy'=>nil, 'crs' =>nil}, :metadata => {} }
 
     define_attribute_methods OBJ_ATTRIBUTES.keys
     update_attribute_accessors OBJ_ATTRIBUTES
 
-    @@route = "layergroups" 
+    @@xml_list_node = "layerGroups"
+    @@xml_node = "layerGroup"
+
+    @@route = "layergroups"
     @@resource_name = "layerGroup"
 
     def self.resource_name
@@ -17,23 +20,26 @@ module RGeoServer
     end
 
     def self.root_xpath
-      "//#{@@route}/#{@@resource_name}"
+      "//#{@@xml_list_node}/#{@@xml_node}"
     end
 
     def self.member_xpath
-      "//#{resource_name}"
+      "//#{@@xml_node}"
     end
 
     def route
-      @@route  
+      @@route
     end
 
     def message
       builder = Nokogiri::XML::Builder.new do |xml|
-        xml.layerGroup { 
+        xml.layerGroup {
           xml.name @name
+          xml.workspace {
+            xml.name workspace.name
+          } unless workspace.nil?
           xml.layers {
-            layers.each { |l| 
+            layers.each { |l|
               xml.layer {
                 xml.name l.name
               }
@@ -47,15 +53,15 @@ module RGeoServer
             }
           } unless styles.nil?
           xml.bounds {
-            xml.minx bounds['minx']
-            xml.maxx bounds['maxx']
-            xml.miny bounds['miny']
-            xml.maxy bounds['maxy']
-            xml.crs bounds['crs']
-          } if @bounds
+            xml.minx bounds['minx'] if bounds['minx']
+            xml.maxx bounds['maxx'] if bounds['miny']
+            xml.miny bounds['miny'] if bounds['maxx']
+            xml.maxy bounds['maxy'] if bounds['maxy']
+            xml.crs bounds['crs'] if bounds['crs']
+          } if valid_bounds?
         }
       end
-      return builder.doc.to_xml 
+      return builder.doc.to_xml
     end
 
     # @param [RGeoServer::Catalog] catalog
@@ -66,10 +72,11 @@ module RGeoServer
       _run_initialize_callbacks do
         @catalog = catalog
         @name = options[:name].strip
-      end        
+        @workspace = options[:workspace]
+      end
       @route = route
     end
-    
+
     # @param [Array<RGeoServer::Style>] sl list of styles
     def styles= sl
       if sl.inject(true){|t,s| t && s.is_a?(RGeoServer::Style)}
@@ -79,7 +86,7 @@ module RGeoServer
         raise 'Unknown list of styles'
       end
     end
-    
+
     def styles
       @styles ||= begin
         unless profile['styles'].empty?
@@ -101,38 +108,106 @@ module RGeoServer
         raise 'Unknown list of layers'
       end
     end
-    
+
     def layers
-      @layers ||= begin
-        unless profile['layers'].empty?
-          return profile['layers'].each{ |s| RGeoServer::Layer.new @catalog, :name => s.name }
+      @layers =
+        unless new?
+          begin
+            unless profile['layers'].empty?
+              return profile['layers'].map{ |s| RGeoServer::Layer.new @catalog, :name => s }
+            else
+              nil
+            end
+          rescue Exception => e
+            nil
+          end
         else
-          nil
+          @layers || []
         end
-      rescue Exception => e
-        nil
+    end
+
+    def workspace
+      if new?
+        return @workspace
+      else
+        return RGeoServer::Workspace.new @catalog, name: profile['workspace']
       end
     end
 
+    def bounds
+      @bounds = valid_bounds? ? @bounds : profile['bounds']
+    end
+
+    def valid_bounds?
+      @bounds &&
+        ![@bounds['minx'], @bounds['miny'], @bounds['maxx'], @bounds['maxy'], @bounds['crs']].compact.empty?
+    end
+
+    def recalculate_bounds
+      bbox = BoundingBox.new
+
+      layers.each do |layer|
+        case layer.resource
+        when RGeoServer::FeatureType
+          b = layer.resource.latlon_bounds
+          bbox.add b['minx'], b['miny']
+          bbox.add b['maxx'], b['maxy']
+        else
+          raise NotImplementedError, 'The bounds calculation for coverage resource was not implemented.'
+        end
+      end
+
+      @bounds =
+        {'minx' => bbox.min[0], 'miny' => bbox.min[1],
+        'maxx' => bbox.max[0], 'maxy' => bbox.max[1],
+        'crs' => @bounds['crs']}
+
+      bounds
+    end
+
+    # Retrieve the resource profile as a hash and cache it
+    # @return [Hash]
+    def profile
+      if @profile && !@profile.empty?
+        return @profile
+      end
+
+      @profile =
+        begin
+          h = unless @workspace
+                profile_xml_to_hash(@catalog.search @route => @name )
+              else
+                profile_xml_to_hash(@catalog.search workspaces: @workspace, @route => @name )
+              end
+          @new = false
+          h
+        rescue RestClient::ResourceNotFound
+          # The resource is new
+          @new = true
+          {}
+        end.freeze
+    end
+
     def profile_xml_to_hash profile_xml
       doc = profile_xml_to_ng profile_xml
       name = doc.at_xpath('//name/text()').to_s
 
       h = {
-        "name" => name, 
+        "name" => name,
+        "workspace" => doc.xpath('//workspace/name/text()').to_s,
         "layers" => doc.xpath('//layers/layer/name/text()').collect{|l| l.to_s},
         "styles" => doc.xpath('//styles/style/name/text()').collect{|s| s.to_s},
-        "bounds" => { 
-          "minx" => doc.at_xpath('//bounds/minx/text()').to_s,
-          "maxx" => doc.at_xpath('//bounds/maxx/text()').to_s,
-          "miny" => doc.at_xpath('//bounds/miny/text()').to_s,
-          "maxy" => doc.at_xpath('//bounds/maxy/text()').to_s,
-          "crs" => doc.at_xpath('//bounds/crs/text()')
+        "bounds" => {
+          "minx" => doc.at_xpath('//bounds/minx/text()').to_s.to_f,
+          "maxx" => doc.at_xpath('//bounds/maxx/text()').to_s.to_f,
+          "miny" => doc.at_xpath('//bounds/miny/text()').to_s.to_f,
+          "maxy" => doc.at_xpath('//bounds/maxy/text()').to_s.to_f,
+          "crs" => doc.at_xpath('//bounds/crs/text()').to_s
         },
-        "metadata" => doc.xpath('//metadata/entry').inject({}){ |h, e| h.merge(e['key']=> e.text.to_s) } 
+        "metadata" => doc.xpath('//metadata/entry').inject({}){ |h, e| h.merge(e['key']=> e.text.to_s) }
       }.freeze
-      h  
+      h
     end
 
   end
-end 
+end