charta 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69e1f8271f68097487faff44d6fa58e839d48bf5454b3b3954602eb0b0c68757
-  data.tar.gz: e5d6daa2bfac67254c34f48034cbebf88da5c57a7bab29d054bb2e0e3f3fa485
+  metadata.gz: 27a2e5f7689bcfa650af268dd6a6f0d8a62bdea6cc20fdc3b7e4b372d62205c8
+  data.tar.gz: 39cb1fb8023d04d19e211323987dd2a80231e616e34c81134729e7b7a231fbf0
 SHA512:
-  metadata.gz: 51fc00d1c39034ccc8beb499b80394422167f5ffa388d760d3f035a3e82f64e69261b485dd6e69e8b0e1e55c3729739fece0064984adafa71697ffd62303b9bb
-  data.tar.gz: 131d8f79f50a29887849d33a9ff81268ad4d7ad81d3e6fdbac92b3efdf6bda4232dab34ed2bca2995663e7f57a2912942787e251e71404d8ac97647ddac9b7b9
+  metadata.gz: ff3edbf296fe4736cd84da7a689ce5e2df6605aa1a181827b80bebc1e9d2131744b25bd491ebc180f946af615de60acba5f2463d2e97f1ab409f3d8fdb0c35fb
+  data.tar.gz: 1c418aba1d2113235ad8886a425a1a8ab49120d1bea3bdfb4dd7d2476b45f4022da4ac7503e67f8a2dd1272182e9d11174f5119b94f02d3eedbc708f92896824

data/.gitignore

@@ -9,3 +9,4 @@
 /spec/reports/
 /tmp/
 .byebug_history
+.ruby-version

data/.gitlab-ci.yml

@@ -2,7 +2,7 @@ stages:
   - test
 
 test:
-  image: registry.gitlab.com/ekylibre/docker-base-images/ruby2.3:master
+  image: registry.gitlab.com/ekylibre/docker-base-images/ruby2.3:1
   before_script:
     - bundle install --path vendor/bundle
   cache:
@@ -10,4 +10,4 @@ test:
     paths:
       - vendor/bundle
   script:
-    - bundle exec rake test
+    - bundle exec rake test

data/lib/charta/geometry.rb

@@ -43,6 +43,7 @@ module Charta
     def to_text
       feature.as_text.match(/\ASRID=.*;(.*)/)[1]
     end
+
     alias as_text to_text
     alias to_wkt to_text
 
@@ -50,6 +51,7 @@ module Charta
     def to_ewkt
       Charta.generate_ewkt(feature).to_s
     end
+
     alias to_s to_ewkt
 
     def ewkt
@@ -62,6 +64,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
@@ -85,6 +88,7 @@ module Charta
     def to_geojson
       to_json_object.to_json
     end
+
     alias to_json to_geojson
 
     # Returns object in JSON (Hash)
@@ -110,12 +114,24 @@ module Charta
 
     # 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,
@@ -123,6 +139,7 @@ module Charta
     def empty?
       feature.is_empty?
     end
+
     alias blank? empty?
 
     # Computes the geometric center of a geometry, or equivalently, the center
@@ -142,10 +159,16 @@ module Charta
 
     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 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)
+        else
+          self
       end
     end
 
@@ -196,6 +219,7 @@ module Charta
       other_geometry = Charta.new_geometry(other).transform(srid)
       feature.union(other_geometry.feature)
     end
+
     alias + merge
 
     def intersection(other)
@@ -203,10 +227,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
@@ -288,52 +318,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 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
+        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/version.rb

@@ -1,3 +1,3 @@
 module Charta
-  VERSION = '0.1.15'.freeze
+  VERSION = '0.1.16'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charta
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Brice TEXIER
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - brice@ekylibre.com
 executables: []
@@ -159,7 +159,7 @@ homepage: https://github.com/ekylibre/charta
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -174,8 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Simple tool over geos and co
 test_files: []