charta 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5cef2f555beb27d13a0cbc3bbc24f64f9143d2cb
-  data.tar.gz: 64f46d959388ca952edbb53e8deb4a887335bc9f
+SHA256:
+  metadata.gz: 4fbd9a97d2afc3f7fac4856628353c24a686fad2a416c0d12dbb00b448f6d9a4
+  data.tar.gz: '0267836321e3643033bcd873e7672144a37bf0f0b293cd9440a7f01de84a02dc'
 SHA512:
-  metadata.gz: 99614ef99edfdbd74e8d107279a1e8533b887cc3e4e503ba7355c60f964a4aeb95e5778debd35dc3fd4c385c61c3a199f412ac1252691accf0b079e60530b99d
-  data.tar.gz: 4abce4b81dd5ccab25fcb6778b896615c627d389aec8cd465301595ff9e171f1af7c64bb1f1b7f3947d4d9b73ca5a16cc23c508303796e254f57a92ac0f7a56d
+  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,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:
     - gem install bundler
     - bundle install --path vendor/bundle
@@ -11,4 +11,4 @@ test:
     paths:
       - vendor/bundle
   script:
-    - bundle exec rake test
+    - bundle exec rake test

data/lib/charta.rb

@@ -1,7 +1,12 @@
 # Gathers geomatic calculations
 # Completes RGeo
+require 'bigdecimal'
+require 'bigdecimal/util'
 require 'rgeo'
 require 'rgeo/proj4'
+
+require 'charta/coordinates'
+require 'charta/ewkt_serializer'
 require 'charta/geometry'
 require 'charta/geometry_collection'
 require 'charta/point'

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

@@ -0,0 +1,65 @@
+module Charta
+  module Coordinates
+    class << self
+
+      # Force coordinates to 2D
+      def flatten(hash)
+        map_coordinates(hash) { |position| position[0..1] }
+      end
+
+      def map_coordinates(hash, &block)
+        case hash['type']
+          when 'FeatureCollection'
+            map_feature_collection_coordinates hash, &block
+          when 'Feature'
+            map_feature_coordinates hash, &block
+          else
+            map_geometry_coordinates hash, &block
+        end
+      end
+
+      def normalize_4326_geometry(json)
+        map_coordinates json do |(x, y)|
+          [((x + 180.to_d) % 360.to_d) - 180.to_d, ((y + 90.to_d) % 180.to_d) - 90.to_d]
+        end
+      end
+
+      private
+
+        def map_feature_collection_coordinates(hash, &block)
+          hash.merge 'features' => hash['features'].map { |feature| map_feature_coordinates feature, &block }
+        end
+
+        def map_feature_coordinates(hash, &block)
+          hash.merge 'geometry' => map_geometry_coordinates(hash['geometry'], &block)
+        end
+
+        def map_geometry_coordinates(hash, &block)
+          if hash['type'] == 'GeometryCollection'
+            map_geometry_collection_coordinates hash, &block
+          else
+            coordinates = hash['coordinates']
+            mapped =
+              case hash['type']
+                when 'Point' then
+                  block.call coordinates
+                when 'MultiPoint', 'LineString'
+                  coordinates.map(&block)
+                when 'MultiLineString', 'Polygon'
+                  coordinates.map { |line| line.map(&block) }
+                when 'MultiPolygon'
+                  coordinates.map { |poly| poly.map { |line| line.map(&block) } }
+                else
+                  raise StandardError, "Cannot handle: #{hash['type'].inspect}. In #{hash.inspect}"
+              end
+
+            hash.merge 'coordinates' => mapped
+          end
+        end
+
+        def map_geometry_collection_coordinates(hash, &block)
+          hash.merge 'geometries' => hash['geometries'].map { |geometry| map_geometry_coordinates(geometry, &block) }
+        end
+    end
+  end
+end

data/lib/charta/ewkt_serializer.rb

@@ -0,0 +1,92 @@
+module Charta
+  module EwktSerializer
+
+    class << self
+      def object_to_ewkt(hash)
+        type = hash[:type] || hash['type']
+        send("#{type.gsub(/(.)([A-Z])/, '\1_\2').downcase}_to_ewkt", hash)
+      end
+
+      private
+
+        def feature_collection_to_ewkt(hash)
+          return 'GEOMETRYCOLLECTION EMPTY' if hash['features'].nil?
+          'GEOMETRYCOLLECTION(' + hash['features'].collect do |feature|
+            object_to_ewkt(feature)
+          end.join(', ') + ')'
+        end
+
+        def geometry_collection_to_ewkt(hash)
+          return 'GEOMETRYCOLLECTION EMPTY' if hash['geometries'].nil?
+          'GEOMETRYCOLLECTION(' + hash['geometries'].collect do |feature|
+            object_to_ewkt(feature)
+          end.join(', ') + ')'
+        end
+
+        def feature_to_ewkt(hash)
+          object_to_ewkt(hash['geometry'])
+        end
+
+        def point_to_ewkt(hash)
+          return 'POINT EMPTY' if hash['coordinates'].nil?
+          'POINT(' + hash['coordinates'].join(' ') + ')'
+        end
+
+        def line_string_to_ewkt(hash)
+          return 'LINESTRING EMPTY' if hash['coordinates'].nil?
+          'LINESTRING(' + hash['coordinates'].collect do |point|
+            point.join(' ')
+          end.join(', ') + ')'
+        end
+
+        def polygon_to_ewkt(hash)
+          return 'POLYGON EMPTY' if hash['coordinates'].nil?
+          'POLYGON(' + hash['coordinates'].collect do |hole|
+            '(' + hole.collect do |point|
+              point.join(' ')
+            end.join(', ') + ')'
+          end.join(', ') + ')'
+        end
+
+        def multi_point_to_ewkt(hash)
+          return 'MULTIPOINT EMPTY' if hash['coordinates'].nil?
+          'MULTIPOINT(' + hash['coordinates'].collect do |point|
+            '(' + point.join(' ') + ')'
+          end.join(', ') + ')'
+        end
+
+        def multi_line_string_to_ewkt(hash)
+          return 'MULTILINESTRING EMPTY' if hash['coordinates'].nil?
+          'MULTILINESTRING(' + hash['coordinates'].collect do |line|
+            '(' + line.collect do |point|
+              point.join(' ')
+            end.join(', ') + ')'
+          end.join(', ') + ')'
+        end
+
+        def multipolygon_to_ewkt(hash)
+          return 'MULTIPOLYGON EMPTY' if hash['coordinates'].nil?
+          'MULTIPOLYGON(' + hash['coordinates'].collect do |polygon|
+            '(' + polygon.collect do |hole|
+              '(' + hole.collect do |point|
+                point.join(' ')
+              end.join(', ') + ')'
+            end.join(', ') + ')'
+          end.join(', ') + ')'
+        end
+
+        # for PostGIS ST_ASGeoJSON compatibility
+        def multi_polygon_to_ewkt(hash)
+          return 'MULTIPOLYGON EMPTY' if hash['coordinates'].nil?
+          'MULTIPOLYGON(' + hash['coordinates'].collect do |polygon|
+            '(' + polygon.collect do |hole|
+              '(' + hole.collect do |point|
+                point.join(' ')
+              end.join(', ') + ')'
+            end.join(', ') + ')'
+          end.join(', ') + ')'
+        end
+    end
+
+  end
+end

data/lib/charta/geo_json.rb

@@ -7,12 +7,14 @@ module Charta
 
     def initialize(data, srid = :WGS84)
       srid ||= :WGS84
-      @json = self.class.flatten(data.is_a?(Hash) ? data : JSON.parse(data))
+      @json = Coordinates.flatten(data.is_a?(Hash) ? data : JSON.parse(data))
       lsrid = @json['crs']['properties']['name'] if @json.is_a?(Hash) &&
                                                     @json['crs'].is_a?(Hash) &&
                                                     @json['crs']['properties'].is_a?(Hash)
       lsrid ||= srid
       @srid = ::Charta.find_srid(lsrid)
+
+      @json = Coordinates.normalize_4326_geometry(@json) if @srid.to_i == 4326
     end
 
     def geom
@@ -24,7 +26,7 @@ module Charta
     end
 
     def to_ewkt
-      "SRID=#{@srid};" + self.class.object_to_ewkt(@json)
+      "SRID=#{srid};" + EwktSerializer.object_to_ewkt(@json)
     end
 
     def valid?
@@ -42,131 +44,14 @@ module Charta
         false
       end
 
-      # Force coordinates to 2D
       def flatten(hash)
-        if hash['type'] == 'FeatureCollection'
-          flatten_feature_collection(hash)
-        elsif hash['type'] == 'Feature'
-          flatten_feature(hash)
-        else
-          flatten_geometry(hash)
-        end
-      end
-
-      def flatten_feature_collection(hash)
-        hash.merge('features' => hash['features'].map { |f| flatten_feature(f) })
-      end
-
-      def flatten_feature(hash)
-        hash.merge('geometry' => flatten_geometry(hash['geometry']))
-      end
-
-      def flatten_geometry(hash)
-        coordinates = hash['coordinates']
-        flattened =
-          case hash['type']
-          when 'Point' then
-            flatten_position(coordinates)
-          when 'MultiPoint', 'LineString'
-            coordinates.map { |p| flatten_position(p) }
-          when 'MultiLineString', 'Polygon'
-            coordinates.map { |l| l.map { |p| flatten_position(p) } }
-          when 'MultiPolygon'
-            coordinates.map { |m| m.map { |l| l.map { |p| flatten_position(p) } } }
-          when 'GeometryCollection' then
-            return hash.merge('geometries' => hash['geometries'].map { |g| flatten_geometry(g) })
-          else
-            raise StandardError, "Cannot handle: #{hash['type'].inspect}. In #{hash.inspect}"
-          end
-
-        hash.merge('coordinates' => flattened)
-      end
-
-      def flatten_position(position)
-        position[0..1]
-      end
-
-      def object_to_ewkt(hash)
-        type = hash[:type] || hash['type']
-        send("#{type.gsub(/(.)([A-Z])/, '\1_\2').downcase}_to_ewkt", hash)
-      end
-
-      def feature_collection_to_ewkt(hash)
-        return 'GEOMETRYCOLLECTION EMPTY' if hash['features'].nil?
-        'GEOMETRYCOLLECTION(' + hash['features'].collect do |feature|
-          object_to_ewkt(feature)
-        end.join(', ') + ')'
-      end
-
-      def geometry_collection_to_ewkt(hash)
-        return 'GEOMETRYCOLLECTION EMPTY' if hash['geometries'].nil?
-        'GEOMETRYCOLLECTION(' + hash['geometries'].collect do |feature|
-          object_to_ewkt(feature)
-        end.join(', ') + ')'
-      end
-
-      def feature_to_ewkt(hash)
-        object_to_ewkt(hash['geometry'])
-      end
-
-      def point_to_ewkt(hash)
-        return 'POINT EMPTY' if hash['coordinates'].nil?
-        'POINT(' + hash['coordinates'].join(' ') + ')'
-      end
-
-      def line_string_to_ewkt(hash)
-        return 'LINESTRING EMPTY' if hash['coordinates'].nil?
-        'LINESTRING(' + hash['coordinates'].collect do |point|
-          point.join(' ')
-        end.join(', ') + ')'
-      end
-
-      def polygon_to_ewkt(hash)
-        return 'POLYGON EMPTY' if hash['coordinates'].nil?
-        'POLYGON(' + hash['coordinates'].collect do |hole|
-          '(' + hole.collect do |point|
-            point.join(' ')
-          end.join(', ') + ')'
-        end.join(', ') + ')'
-      end
-
-      def multi_point_to_ewkt(hash)
-        return 'MULTIPOINT EMPTY' if hash['coordinates'].nil?
-        'MULTIPOINT(' + hash['coordinates'].collect do |point|
-          '(' + point.join(' ') + ')'
-        end.join(', ') + ')'
-      end
-
-      def multi_line_string_to_ewkt(hash)
-        return 'MULTILINESTRING EMPTY' if hash['coordinates'].nil?
-        'MULTILINESTRING(' + hash['coordinates'].collect do |line|
-          '(' + line.collect do |point|
-            point.join(' ')
-          end.join(', ') + ')'
-        end.join(', ') + ')'
-      end
-
-      def multipolygon_to_ewkt(hash)
-        return 'MULTIPOLYGON EMPTY' if hash['coordinates'].nil?
-        'MULTIPOLYGON(' + hash['coordinates'].collect do |polygon|
-          '(' + polygon.collect do |hole|
-            '(' + hole.collect do |point|
-              point.join(' ')
-            end.join(', ') + ')'
-          end.join(', ') + ')'
-        end.join(', ') + ')'
+        Coordinates.flatten hash
       end
 
-      # for PostGIS ST_ASGeoJSON compatibility
-      def multi_polygon_to_ewkt(hash)
-        return 'MULTIPOLYGON EMPTY' if hash['coordinates'].nil?
-        'MULTIPOLYGON(' + hash['coordinates'].collect do |polygon|
-          '(' + polygon.collect do |hole|
-            '(' + hole.collect do |point|
-              point.join(' ')
-            end.join(', ') + ')'
-          end.join(', ') + ')'
-        end.join(', ') + ')'
+      %i[object_to_ewkt feature_collection_to_ewkt geometry_collection_to_ewkt feature_to_ewkt point_to_ewkt line_string_to_ewkt polygon_to_ewkt multi_point_to_ewkt multi_line_string_to_ewkt multipolygon_to_ewkt multi_polygon_to_ewkt].each do |m|
+        define_method m do |*args|
+          EwktSerializer.send m, *args
+        end
       end
     end
   end

data/lib/charta/geometry.rb

@@ -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,
@@ -143,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
 
@@ -205,6 +223,11 @@ 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)

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.2.2'.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.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Brice TEXIER
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - brice@ekylibre.com
 executables: []
@@ -168,6 +168,8 @@ files:
 - charta.gemspec
 - lib/charta.rb
 - lib/charta/bounding_box.rb
+- lib/charta/coordinates.rb
+- lib/charta/ewkt_serializer.rb
 - lib/charta/geo_json.rb
 - lib/charta/geojson_import.rb
 - lib/charta/geometry.rb
@@ -185,7 +187,7 @@ homepage: https://github.com/ekylibre/charta
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,9 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Simple tool over geos and co
 test_files: []