charta 0.1.14 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3577d17c7733172a8e6d2c13e621872c853b80f4
-  data.tar.gz: 9c87811e1f18b4a03c4eee424711b50bca955f5f
+SHA256:
+  metadata.gz: 4fbd9a97d2afc3f7fac4856628353c24a686fad2a416c0d12dbb00b448f6d9a4
+  data.tar.gz: '0267836321e3643033bcd873e7672144a37bf0f0b293cd9440a7f01de84a02dc'
 SHA512:
-  metadata.gz: def555154b7633cd1d6e45a0bd302762bd5d27c0c4b6643dad27967493cfcd3246a666b9b72f057224aa1c061ff9b09176adcac8970b19ae4979c1c76a735551
-  data.tar.gz: 9d7909aab7f4ec0eee6fbd8a3e40c756edd3e6e54ed205d061609c8cd771f4054a57be9210eb09222d4ff12640fb10c2a305df5c772b6bb44dcaf01151c6caa2
+  metadata.gz: 76960df71f7e14223da5c28b93dfad64f6ffd563609408cf04eea019afb23c1f7fbeaf3a49775a251152581ac6650a8d9688e7d96230d3aed687cdcb90390eda
+  data.tar.gz: a987c577129ff328b5b8ae574b28dc83ea0a54a308c6e02c0986db53837f06d62429545c48dac75bd5a96b241f98beaaf6d63a5eab3d51ad56abfc31ffac3de3

data/.gitignore

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

data/.gitlab-ci.yml

@@ -2,12 +2,13 @@ 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:
+    - gem install bundler
     - bundle install --path vendor/bundle
   cache:
     key: bundle
     paths:
       - vendor/bundle
   script:
-    - bundle exec rake test
+    - bundle exec rake test

data/charta.gemspec

@@ -18,10 +18,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'nokogiri', '>= 1.7.0'
-  spec.add_dependency 'rgeo', '~> 0.6.0'
+  spec.add_dependency 'rgeo', '~> 1.0'
   spec.add_dependency 'json', '>= 1.8.0'
-  spec.add_dependency 'rgeo-geojson', '~> 0.4.3'
-  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_dependency 'rgeo-geojson', '~> 1.0'
+  spec.add_dependency 'rgeo-proj4', '~> 1.0'
+  spec.add_dependency 'activesupport', '~> 5.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'byebug'

data/lib/charta.rb

@@ -3,6 +3,8 @@
 require 'bigdecimal'
 require 'bigdecimal/util'
 require 'rgeo'
+require 'rgeo/proj4'
+
 require 'charta/coordinates'
 require 'charta/ewkt_serializer'
 require 'charta/geometry'

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

@@ -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

@@ -1,6 +1,7 @@
 require 'json'
 require 'rgeo/geo_json'
 require 'rgeo/svg' # integrated lib for now
+require 'active_support/core_ext/module/delegation'
 
 module Charta
   # Represents a Geometry with SRID
@@ -33,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
 
@@ -50,6 +47,7 @@ module Charta
     def to_ewkt
       Charta.generate_ewkt(feature).to_s
     end
+
     alias to_s to_ewkt
 
     def ewkt
@@ -62,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
@@ -85,6 +84,7 @@ module Charta
     def to_geojson
       to_json_object.to_json
     end
+
     alias to_json to_geojson
 
     # Returns object in JSON (Hash)
@@ -110,12 +110,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 +135,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 +155,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 +215,7 @@ module Charta
       other_geometry = Charta.new_geometry(other).transform(srid)
       feature.union(other_geometry.feature)
     end
+
     alias + merge
 
     def intersection(other)
@@ -203,10 +223,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
@@ -231,20 +257,21 @@ 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
-      if @feature.nil?
-        if @ewkt.nil?
-          raise StandardError, 'Invalid geometry (no feature, no EWKT)'
-        else
+      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)'
         end
       end
       @feature.dup
     end
 
+    alias to_rgeo feature
+
     def feature=(new_feature)
       raise ArgumentError, "Feature can't be nil" if new_feature.nil?
       @feature = new_feature
@@ -254,6 +281,20 @@ 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)
@@ -276,7 +317,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
@@ -288,52 +329,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.14'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charta
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.3
 platform: ruby
 authors:
 - Brice TEXIER
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rgeo-proj4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - brice@ekylibre.com
 executables: []
@@ -159,7 +187,7 @@ homepage: https://github.com/ekylibre/charta
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -174,9 +202,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: []