charta 0.1.13 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f5026ab204ac67b2187e5a338c178009582401ef
-  data.tar.gz: 07f73034e6c19c9f307b59aa4aecc359767b7544
+SHA256:
+  metadata.gz: 305d47070fc660134d7a4bed344db7efb555c9729a30e771af105a263c6aee01
+  data.tar.gz: 4cfab59ae1d9f4034eb066bcf05e3a4c49b117604879e3e1e282a50e2c234f64
 SHA512:
-  metadata.gz: 9cb51c59524dfb7c022069d805f936282dc143419ec124bcc7d491ae6fe1b692ab397bd377bee875b663564319ad97111748e9db640df71583470bffbf868963
-  data.tar.gz: 26e4afcc4e8ec23478883923af1313fe91ef64cc071b3892a7d0963bddb9bc00ad2f79b05782725f99cc9f718fd90f634a9421cdbb97456aa4a838498477ab9f
+  metadata.gz: 7cc82941e2062fa2309c294dc02b912528faf4a4893b34ee4a719a62ecd77422a1ff97d7c0255246dc4b9b014b2839bff6f7169e38d4be78cbb883d83352c26d
+  data.tar.gz: 2193fbd5aa27ddca33cbd4ef3257168d2c567d1b8e4eb3def8ae2bcaed05e22aaeb82e8f6a17640955a7d92ff38835ab2d41a4f7f1e8dd01193db9fdab8dc31d

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.rb

@@ -1,5 +1,7 @@
 # Gathers geomatic calculations
 # Completes RGeo
+require 'bigdecimal'
+require 'bigdecimal/util'
 require 'rgeo'
 require 'charta/coordinates'
 require 'charta/ewkt_serializer'

data/lib/charta/bounding_box.rb

@@ -24,5 +24,9 @@ module Charta
     def to_a
       [[@y_min, @x_min], [@y_max, @x_max]]
     end
+
+    def to_bbox_string
+      "#{@x_min}, #{@y_min}, #{x_max}, #{y_max}"
+    end
   end
 end

data/lib/charta/coordinates.rb

@@ -20,7 +20,7 @@ module Charta
 
       def normalize_4326_geometry(json)
         map_coordinates json do |(x, y)|
-          [((x + 180) % 360) - 180, ((y + 90) % 180) - 90]
+          [((x + 180.to_d) % 360.to_d) - 180.to_d, ((y + 90.to_d) % 180.to_d) - 90.to_d]
         end
       end
 
@@ -58,7 +58,7 @@ module Charta
         end
 
         def map_geometry_collection_coordinates(hash, &block)
-          hash.merge 'geometries' => map_geometry_coordinates(hash['geometries'], &block)
+          hash.merge 'geometries' => hash['geometries'].map { |geometry| map_geometry_coordinates(geometry, &block) }
         end
     end
   end

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,17 +219,25 @@ module Charta
       other_geometry = Charta.new_geometry(other).transform(srid)
       feature.union(other_geometry.feature)
     end
+
     alias + merge
 
     def intersection(other)
       other_geometry = Charta.new_geometry(other).transform(srid)
-      feature.intersection(other_geometry.feature)
+
+      Charta.new_geometry(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 +319,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/point.rb

@@ -10,5 +10,10 @@ module Charta
       feature.y
     end
     alias latitude y
+
+    def distance(point)
+      raise ArgumentError, "wrong type: Charta::Point required" if point.class.name != "Charta::Point"
+      to_rgeo.distance(point.to_rgeo)
+    end
   end
 end

data/lib/charta/polygon.rb

@@ -8,5 +8,10 @@ module Charta
       end
       @exterior_ring
     end
+
+    def distance(point)
+      polygon_centroid = Charta.new_point(*centroid, 4326)
+      polygon_centroid.distance(point)
+    end
   end
 end

data/lib/charta/version.rb

@@ -1,3 +1,3 @@
 module Charta
-  VERSION = '0.1.13'.freeze
+  VERSION = '0.1.18'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charta
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.18
 platform: ruby
 authors:
 - Brice TEXIER
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2020-12-09 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,9 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Simple tool over geos and co
 test_files: []