charta 0.2.0 → 0.3.1

data/lib/charta/geometry.rb

@@ -6,8 +6,6 @@ require 'active_support/core_ext/module/delegation'
 module Charta
   # Represents a Geometry with SRID
   class Geometry
-    delegate_missing_to :to_rgeo
-
     def initialize(feature, properties = {})
       self.feature = feature
       @properties = properties
@@ -36,16 +34,12 @@ module Charta
       feature.srid.to_i
     end
 
-    # Returns the underlaying object managed by Charta: the RGeo feature
-    def to_rgeo
-      feature
-    end
-
     # Returns the Well-Known Text (WKT) representation of the geometry/geography
     # without SRID metadata
     def to_text
       feature.as_text.match(/\ASRID=.*;(.*)/)[1]
     end
+
     alias as_text to_text
     alias to_wkt to_text
 
@@ -53,6 +47,7 @@ module Charta
     def to_ewkt
       Charta.generate_ewkt(feature).to_s
     end
+
     alias to_s to_ewkt
 
     def ewkt
@@ -65,6 +60,7 @@ module Charta
       generator = RGeo::WKRep::WKBGenerator.new(tag_format: :ewkbt, emit_ewkbt_srid: true)
       generator.generate(feature)
     end
+
     alias to_ewkb to_binary
 
     # Pas bien compris le fonctionnement
@@ -88,6 +84,7 @@ module Charta
     def to_geojson
       to_json_object.to_json
     end
+
     alias to_json to_geojson
 
     # Returns object in JSON (Hash)
@@ -100,6 +97,7 @@ module Charta
       other_geometry = Charta.new_geometry(other).transform(srid)
       return true if empty? && other_geometry.empty?
       return inspect == other_geometry.inspect if collection? && other_geometry.collection?
+
       feature.equals?(other_geometry.feature)
     end
 
@@ -108,17 +106,30 @@ module Charta
       other_geometry = Charta.new_geometry(other).transform(srid)
       return true if empty? && other_geometry.empty?
       return inspect == other_geometry.inspect if collection? && other_geometry.collection?
+
       !feature.equals?(other_geometry.feature)
     end
 
     # Returns true if Geometry is a Surface
     def surface?
-      [RGeo::Feature::Polygon, RGeo::Feature::MultiPolygon].include? feature.geometry_type
+      if collection?
+        feature.any? { |geometry| Charta.new_geometry(geometry).surface? }
+      else
+        [RGeo::Feature::Polygon, RGeo::Feature::MultiPolygon].include? feature.geometry_type
+      end
     end
 
     # Returns area in unit corresponding to the SRS
     def area
-      surface? ? feature.area : 0
+      if surface?
+        if collection?
+          feature.sum { |geometry| Charta.new_geometry(geometry).area }
+        else
+          feature.area
+        end
+      else
+        0
+      end
     end
 
     # Returns true if this Geometry is an empty geometrycollection, polygon,
@@ -126,12 +137,14 @@ module Charta
     def empty?
       feature.is_empty?
     end
+
     alias blank? empty?
 
     # Computes the geometric center of a geometry, or equivalently, the center
     # of mass of the geometry as a POINT.
     def centroid
       return nil unless surface? && !feature.is_empty?
+
       point = feature.centroid
       [point.y, point.x]
     end
@@ -139,16 +152,23 @@ module Charta
     # Returns a POINT guaranteed to lie on the surface.
     def point_on_surface
       return nil unless surface?
+
       point = feature.point_on_surface
       [point.y, point.x]
     end
 
     def convert_to(new_type)
       case new_type
-      when type then self
-      when :multi_point then flatten_multi(:point)
-      when :multi_line_string then flatten_multi(:line_string)
-      when :multi_polygon then flatten_multi(:polygon)
+      when type
+        self
+      when :multi_point
+        flatten_multi(:point)
+      when :multi_line_string
+        flatten_multi(:line_string)
+      when :multi_polygon
+        flatten_multi(:polygon)
+      else
+        self
       end
     end
 
@@ -176,10 +196,12 @@ module Charta
     def transform(new_srid)
       return self if new_srid == srid
       raise 'Proj is not supported. Cannot tranform' unless RGeo::CoordSys::Proj4.supported?
+
       new_srid = Charta::SRS[new_srid] || new_srid
       database = self.class.srs_database
       new_proj_entry = database.get(new_srid)
       raise "Cannot find proj for SRID: #{new_srid}" if new_proj_entry.nil?
+
       new_feature = RGeo::CoordSys::Proj4.transform(
         database.get(srid).proj4,
         feature,
@@ -199,6 +221,7 @@ module Charta
       other_geometry = Charta.new_geometry(other).transform(srid)
       feature.union(other_geometry.feature)
     end
+
     alias + merge
 
     def intersection(other)
@@ -206,10 +229,16 @@ module Charta
       feature.intersection(other_geometry.feature)
     end
 
+    def intersects?(other)
+      other_geometry = Charta.new_geometry(other).transform(srid)
+      feature.intersects?(other_geometry.feature)
+    end
+
     def difference(other)
       other_geometry = Charta.new_geometry(other).transform(srid)
       feature.difference(other_geometry.feature)
     end
+
     alias - difference
 
     def bounding_box
@@ -234,22 +263,24 @@ module Charta
       Charta.find_srid(name_or_srid)
     end
 
-    # TODO: Manage YAML domain type to ensure maintainability of YAML
-    # serialization in time.
+    # Returns the underlaying object managed by Charta: the RGeo feature
     def feature
       unless defined? @feature
         if defined? @ewkt
           @feature = ::Charta::Geometry.from_ewkt(@ewkt)
           @properties = @options.dup if @options
         else
-          raise StandardError, 'Invalid geometry (no feature, no EWKT)'
+          raise StandardError.new('Invalid geometry (no feature, no EWKT)')
         end
       end
       @feature.dup
     end
 
+    alias to_rgeo feature
+
     def feature=(new_feature)
-      raise ArgumentError, "Feature can't be nil" if new_feature.nil?
+      raise ArgumentError.new("Feature can't be nil") if new_feature.nil?
+
       @feature = new_feature
     end
 
@@ -257,6 +288,21 @@ module Charta
       { type: 'Feature', properties: properties, geometry: to_json_object }
     end
 
+    def method_missing(name, *args, &block)
+      target = to_rgeo
+      if target.respond_to? name
+        target.send name, *args
+      else
+        raise StandardError.new("Method #{name} does not exist for #{self.class.name}")
+      end
+    end
+
+    def respond_to_missing?(name, include_private = false)
+      return false if name == :init_with
+
+      super
+    end
+
     class << self
       def srs_database
         @srs_database ||= RGeo::CoordSys::SRSDatabase::Proj4Data.new('epsg', authority: 'EPSG', cache: true)
@@ -264,11 +310,13 @@ module Charta
 
       def factory(srid = 4326)
         return projected_factory(srid) if srid.to_i == 4326
+
         geos_factory(srid)
       end
 
       def feature(ewkt_or_rgeo)
         return from_rgeo(ewkt_or_rgeo) if ewkt_or_rgeo.is_a? RGeo::Feature::Instance
+
         from_ewkt(ewkt_or_rgeo)
       end
 
@@ -279,7 +327,7 @@ module Charta
 
       def from_ewkt(ewkt)
         # Cleans empty geometries
-        ewkt.gsub!(/(GEOMETRYCOLLECTION|GEOMETRY|((MULTI)?(POINT|LINESTRING|POLYGON)))\(\)/, '\1 EMPTY')
+        ewkt = ewkt.gsub(/(GEOMETRYCOLLECTION|GEOMETRY|((MULTI)?(POINT|LINESTRING|POLYGON)))\(\)/, '\1 EMPTY')
         srs = ewkt.split(/[\=\;]+/)[0..1]
         srid = nil
         srid = srs[1] if srs[0] =~ /srid/i
@@ -291,57 +339,52 @@ module Charta
 
       private
 
-      def geos_factory(srid)
-        RGeo::Geos.factory(
-          srid: srid,
-          wkt_generator: {
-            type_format: :ewkt,
-            emit_ewkt_srid: true,
-            convert_case: :upper
-          },
-          wkt_parser: {
-            support_ewkt: true
-          },
-          wkb_generator:  {
-            type_format: :ewkb,
-            emit_ewkb_srid: true,
-            hex_format: true
-          },
-          wkb_parser: {
-            support_ewkb: true
-          }
-        )
-      end
-
-      def projected_factory(srid)
-        proj4 = '+proj=cea +lon_0=0 +lat_ts=30 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs'
-        RGeo::Geographic.projected_factory(
-          srid: srid,
-          wkt_generator: {
-            type_format: :ewkt,
-            emit_ewkt_srid: true,
-            convert_case: :upper
-          },
-          wkt_parser: {
-            support_ewkt: true
-          },
-          wkb_generator:  {
-            type_format: :ewkb,
-            emit_ewkb_srid: true,
-            hex_format: true
-          },
-          wkb_parser: {
-            support_ewkb: true
-          },
-          projection_srid: 6933,
-          projection_proj4: proj4
-        )
-      end
-    end
+        def geos_factory(srid)
+          RGeo::Geos.factory(
+            srid: srid,
+            wkt_generator: {
+              type_format: :ewkt,
+              emit_ewkt_srid: true,
+              convert_case: :upper
+            },
+            wkt_parser: {
+              support_ewkt: true
+            },
+            wkb_generator: {
+              type_format: :ewkb,
+              emit_ewkb_srid: true,
+              hex_format: true
+            },
+            wkb_parser: {
+              support_ewkb: true
+            }
+          )
+        end
 
-    def respond_to_missing?(name, include_private = false)
-      return false if name == :init_with
-      super
+        def projected_factory(srid)
+          proj4 = '+proj=cea +lon_0=0 +lat_ts=30 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs'
+          RGeo::Geographic.projected_factory(
+            srid: srid,
+            wkt_generator: {
+              type_format: :ewkt,
+              emit_ewkt_srid: true,
+              convert_case: :upper
+            },
+            wkt_parser: {
+              support_ewkt: true
+            },
+            wkb_generator: {
+              type_format: :ewkb,
+              emit_ewkb_srid: true,
+              hex_format: true
+            },
+            wkb_parser: {
+              support_ewkb: true
+            },
+            projection_srid: 6933,
+            projection_proj4: proj4
+          )
+        end
     end
   end
 end

data/lib/charta/geometry_collection.rb

@@ -1,10 +1,12 @@
 module Charta
   # Represent a Geometry with contains other geometries
   class GeometryCollection < Geometry
-    def self.empty(srid = nil)
-      srid = Charta.find_srid(srid.nil? ? :WGS84 : srid)
-      feature = Charta.new_feature('GEOMETRYCOLLECTION EMPTY', srid)
-      new(feature)
+    class << self
+      def empty(srid = nil)
+        srid = Charta.find_srid(srid.nil? ? :WGS84 : srid)
+        feature = Charta.new_feature('GEOMETRYCOLLECTION EMPTY', srid)
+        new(feature)
+      end
     end
 
     def to_json_feature_collection(collection_properties = [])

data/lib/charta/gml.rb

@@ -83,6 +83,7 @@ module Charta
           'GEOMETRYCOLLECTION(' + gml.css("#{GML_PREFIX}|featureMember").collect do |feature|
             TAGS.collect do |tag|
               next if feature.css("#{GML_PREFIX}|#{tag}").empty?
+
               feature.css("#{GML_PREFIX}|#{tag}").collect do |fragment|
                 object_to_ewkt(fragment, srid)
               end.compact.join(', ')
@@ -90,6 +91,7 @@ module Charta
           end.compact.join(', ') + ')'
         end
       end
+
       alias geometry_collection_to_ewkt document_to_ewkt
 
       def transform(data, from_srid, to_srid)
@@ -101,8 +103,9 @@ module Charta
 
         wkt = 'POLYGON(' + %w[outerBoundaryIs innerBoundaryIs].collect do |boundary|
           next if gml.css("#{GML_PREFIX}|#{boundary}").empty?
+
           gml.css("#{GML_PREFIX}|#{boundary}").collect do |hole|
-            '(' + hole.css("#{GML_PREFIX}|coordinates").collect { |coords| coords.content.split(/\r\n|\n| /) }.flatten.reject(&:empty?).collect { |c| c.split ',' }.collect { |dimension| %(#{dimension.first} #{dimension[1]}) }.join(', ') + ')'
+            "(#{transform_coordinates(hole)})"
           end.join(', ')
         end.compact.join(', ') + ')'
 
@@ -115,6 +118,7 @@ module Charta
 
       def point_to_ewkt(gml, srid)
         return 'POINT EMPTY' if gml.css("#{GML_PREFIX}|coordinates").nil?
+
         wkt = 'POINT(' + gml.css("#{GML_PREFIX}|coordinates").collect { |coords| coords.content.split ',' }.flatten.join(' ') + ')'
 
         unless gml['srsName'].nil? || Charta.find_srid(gml['srsName']).to_s == srid.to_s
@@ -127,7 +131,7 @@ module Charta
       def line_string_to_ewkt(gml, srid)
         return 'LINESTRING EMPTY' if gml.css("#{GML_PREFIX}|coordinates").nil?
 
-        wkt = 'LINESTRING(' + gml.css("#{GML_PREFIX}|coordinates").collect { |coords| coords.content.split(/\r\n|\n| /) }.flatten.reject(&:empty?).collect { |c| c.split ',' }.collect { |dimension| %(#{dimension.first} #{dimension[1]}) }.join(', ') + ')'
+        wkt = "LINESTRING(#{transform_coordinates(gml)})"
 
         unless gml['srsName'].nil? || Charta.find_srid(gml['srsName']).to_s == srid.to_s
           wkt = transform(wkt, Charta.find_srid(gml['srsName']), srid)
@@ -135,6 +139,18 @@ module Charta
 
         wkt
       end
+
+      private
+
+        def transform_coordinates(coordinates)
+          coordinates.css("#{GML_PREFIX}|coordinates")
+                     .collect { |coords| coords.content.split(/\r\n|\n| /) }
+                     .flatten
+                     .reject(&:empty?)
+                     .collect { |c| c.split ',' }
+                     .collect { |dimension| %(#{dimension.first} #{dimension[1]}) }
+                     .join(', ')
+        end
     end
   end
 end

data/lib/charta/gml_import.rb

@@ -63,30 +63,30 @@ class GmlImport
 
   private
 
-  def featurize(node)
-    if node.element? && node.xpath('.//gml:Polygon')
-      geojson_feature = {}
-
-      geometry = node.xpath('.//gml:Polygon')
-      geometry.first['srsName'] = 'EPSG:2154'
-
-      if ::Charta::GML.valid?(geometry)
-
-        # properties
-        id = (Time.zone.now.to_i.to_s + Time.zone.now.usec.to_s)
-
-        geojson_feature = {
-          type: 'Feature',
-          properties: {
-            internal_id: id
-          }.reject { |_, v| v.nil? },
-          geometry: ::Charta.new_geometry(geometry.to_xml, nil, 'gml').transform(:WGS84).to_geojson
-        }.reject { |_, v| v.nil? }
-
-        return geojson_feature
-      else
-        return false
+    def featurize(node)
+      if node.element? && node.xpath('.//gml:Polygon')
+        geojson_feature = {}
+
+        geometry = node.xpath('.//gml:Polygon')
+        geometry.first['srsName'] = 'EPSG:2154'
+
+        if ::Charta::GML.valid?(geometry)
+
+          # properties
+          id = (Time.zone.now.to_i.to_s + Time.zone.now.usec.to_s)
+
+          geojson_feature = {
+            type: 'Feature',
+            properties: {
+              internal_id: id
+            }.reject { |_, v| v.nil? },
+            geometry: ::Charta.new_geometry(geometry.to_xml, nil, 'gml').transform(:WGS84).to_geojson
+          }.reject { |_, v| v.nil? }
+
+          return geojson_feature
+        else
+          return false
+        end
       end
     end
-  end
 end