charta 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5cef2f555beb27d13a0cbc3bbc24f64f9143d2cb
-  data.tar.gz: 64f46d959388ca952edbb53e8deb4a887335bc9f
+SHA256:
+  metadata.gz: 96bee13636a087302272ef4bc271ca0200e46aece932f932a2c9ff6b989254a8
+  data.tar.gz: 4d139f4c3d628b178862b6879edc2ba92e11f82e96f43d748def1ac063c89562
 SHA512:
-  metadata.gz: 99614ef99edfdbd74e8d107279a1e8533b887cc3e4e503ba7355c60f964a4aeb95e5778debd35dc3fd4c385c61c3a199f412ac1252691accf0b079e60530b99d
-  data.tar.gz: 4abce4b81dd5ccab25fcb6778b896615c627d389aec8cd465301595ff9e171f1af7c64bb1f1b7f3947d4d9b73ca5a16cc23c508303796e254f57a92ac0f7a56d
+  metadata.gz: 04b4a7e56bc7a412114f4f2713725d1304bc4c859911a2079a847b88511d80c5f20057df7a19f79c6b022b107ff9b1328b064084f0ebdf1e5335622afbff7f27
+  data.tar.gz: 3f8cec56a64a686abcfd14264df20b593c396fb0296b779b48c2697a630ad9bed6d16de61a86c12995fec6f74e5a1cf4ac1f65655e244a840393ea5448fd00ed

data/charta.gemspec

@@ -1,30 +1,31 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'charta/version'
+require_relative 'lib/charta/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'charta'
-  spec.version       = Charta::VERSION
-  spec.authors       = ['Brice TEXIER']
-  spec.email         = ['brice@ekylibre.com']
+  spec.name = 'charta'
+  spec.version = Charta::VERSION
+  spec.authors = ['Ekylibre developers']
+  spec.email = ['dev@ekylibre.com']
 
-  spec.summary       = 'Simple tool over geos and co'
-  spec.homepage      = 'https://github.com/ekylibre/charta'
-  spec.license       = 'MIT'
+  spec.summary = 'Simple tool over geos and co'
+  spec.required_ruby_version = '>= 2.6.0'
+  spec.homepage = 'https://gitlab.com/ekylibre'
+  spec.license = 'AGPL-3.0-only'
+
+  spec.files = Dir.glob(%w[lib/**/*.rb *.gemspec])
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'nokogiri', '>= 1.7.0'
-  spec.add_dependency 'rgeo', '~> 1.0'
-  spec.add_dependency 'json', '>= 1.8.0'
-  spec.add_dependency 'rgeo-geojson', '~> 1.0'
-  spec.add_dependency 'rgeo-proj4', '~> 1.0'
   spec.add_dependency 'activesupport', '~> 5.0'
+  spec.add_dependency 'json', '>= 1.8.0'
+  spec.add_dependency 'nokogiri', '>= 1.7.0'
+  spec.add_dependency 'rgeo', '~> 2.0'
+  spec.add_dependency 'rgeo-geojson', '~> 2.0'
+  spec.add_dependency 'rgeo-proj4', '~> 2.0'
+  spec.add_dependency 'victor', '~> 0.3.3'
+  spec.add_dependency 'zeitwerk', '~> 2.4.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'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rubocop', '1.3.1'
 end

data/lib/charta/bounding_box.rb

@@ -18,11 +18,15 @@ module Charta
     end
 
     def svg_view_box
-      [x_min, -y_max, width, height]
+      [x_min, y_min, width, height]
     end
 
     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'
+                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.new("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,101 @@
+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/factory/ewkt_feature_builder.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    class EwktFeatureBuilder
+      # @param [String] ewkt EWKT representation of a feature
+      # @return [RGeo::Feature::Instance]
+      def from_ewkt(ewkt)
+        if ewkt.to_s =~ /\A[[:space:]]*\z/
+          raise ArgumentError.new("Invalid data: #{ewkt.inspect}")
+        end
+
+        Geometry.feature(ewkt)
+      end
+    end
+  end
+end

data/lib/charta/factory/feature_factory_base.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    class FeatureFactoryBase
+      def new_feature(coordinates, srs: nil, format: nil)
+        raise StandardError.new('Not implemented')
+      end
+
+      def empty_feature(srs = :WGS84)
+        new_feature('GEOMETRYCOLLECTION EMPTY', srs: srs)
+      end
+    end
+  end
+end

data/lib/charta/factory/simple_feature_factory.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    class SimpleFeatureFactory < FeatureFactoryBase
+      class << self
+        def build
+          new(
+            ewkt_builder: EwktFeatureBuilder.new,
+            srid_provider: SridProvider.build,
+            transformer: Transformers::EwktTransformerChain.build
+          )
+        end
+      end
+
+      # @return [EwktFeatureBuilder]
+      attr_reader :ewkt_builder
+      # @return [SridProvider]
+      attr_reader :srid_provider
+      # @return [Transformers::EwktTransformer]
+      attr_reader :transformer
+
+      def initialize(ewkt_builder:, srid_provider:, transformer:)
+        @ewkt_builder = ewkt_builder
+        @srid_provider = srid_provider
+        @transformer = transformer
+      end
+
+      def new_feature(coordinates, srs: nil, format: nil)
+        if coordinates.is_a?(Charta::Geometry)
+          coordinates
+        elsif coordinates.is_a?(RGeo::Feature::Instance)
+          Geometry.feature(coordinates)
+        elsif coordinates.to_s =~ /\A[[:space:]]*\z/
+          empty_feature(srs)
+        else
+          convert_feature(coordinates, srs: srs, format: format)
+        end
+      end
+
+      private
+
+        def convert_feature(coordinates, srs: nil, format: nil)
+          srid = srs.nil? ? nil : srid_provider.find(srs)
+
+          ewkt_builder.from_ewkt(transformer.transform(coordinates, srid: srid, format: format))
+        end
+    end
+  end
+end

data/lib/charta/factory/simple_geometry_factory.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    class SimpleGeometryFactory
+      # @return [SimpleFeatureFactory]
+      attr_reader :feature_factory
+
+      # @param [SimpleFeatureFactory] feature_factory
+      def initialize(feature_factory:)
+        @feature_factory = feature_factory
+      end
+
+      def new_geometry(coordinates, srs: nil, format: nil)
+        if coordinates.is_a?(::Charta::Geometry)
+          coordinates
+        else
+          wrap(feature_factory.new_feature(coordinates, srs: srs, format: format))
+        end
+      end
+
+      def empty_geometry(srs)
+        wrap(feature_factory.empty_feature(srs))
+      end
+
+      protected
+
+        def wrap(feature)
+          case feature.geometry_type
+          when RGeo::Feature::Point
+            Point.new(feature)
+          when RGeo::Feature::LineString
+            LineString.new(feature)
+          when RGeo::Feature::Polygon
+            Polygon.new(feature)
+          when RGeo::Feature::MultiPolygon
+            MultiPolygon.new(feature)
+          when RGeo::Feature::GeometryCollection
+            GeometryCollection.new(feature)
+          else
+            Geometry.new(feature)
+          end
+        end
+    end
+  end
+end

data/lib/charta/factory/srid_provider.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    class SridProvider
+      SRS = {
+        WGS84: 4326,
+        CRS84: 4326,
+        RGF93: 2143
+      }.freeze
+
+      class << self
+        def build
+          new(SRS)
+        end
+      end
+
+      def initialize(srs)
+        @srs = srs
+      end
+
+      def find(srname_or_srid)
+        if srname_or_srid.to_s =~ /\Aurn:ogc:def:crs:.*\z/
+          x = srname_or_srid.split(':').last.upcase.to_sym
+          @srs[x] || x
+        elsif srname_or_srid.to_s =~ /\AEPSG::?(\d{4,5})\z/
+          srname_or_srid.split(':').last
+        elsif srname_or_srid.to_s =~ /\A\d+\z/
+          srname_or_srid.to_i
+        else
+          @srs[srname_or_srid] || srname_or_srid
+        end
+      end
+    end
+  end
+end

data/lib/charta/factory/transformers/ewkt_passthrough.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    module Transformers
+      class EwktPassthrough < EwktTransformer
+        # @return [Boolean]
+        def handles?(value, format:)
+          value.is_a?(String) && format.nil?
+        end
+
+        # @param [String, Hash] value
+        # @return [String] ewkt representation of value
+        def transform(value, srid: nil, format: nil)
+          value
+        end
+      end
+    end
+  end
+end

data/lib/charta/factory/transformers/ewkt_transformer.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    module Transformers
+      class EwktTransformer
+        # @return [Boolean]
+        def handles?(value, format:)
+          false
+        end
+
+        # @param [String, Hash] value
+        # @return [String] ewkt representation of value
+        def transform(value, srid: nil, format: nil)
+          raise StandardError.new('Not implemented')
+        end
+      end
+    end
+  end
+end

data/lib/charta/factory/transformers/ewkt_transformer_chain.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    module Transformers
+      class EwktTransformerChain < EwktTransformer
+        class << self
+          def build
+            new(
+              Transformers::FromGeoJsonTransformer.new,
+              Transformers::FromWkbTransformer.new,
+              Transformers::FromGmlTransformer.new,
+              Transformers::FromKmlTransformer.new,
+              Transformers::EwktPassthrough.new
+            )
+          end
+        end
+
+        # @return [Array<EwktTransformer>]
+        attr_reader :transformers
+
+        def initialize(*transformers)
+          @transformers = transformers
+        end
+
+        # @return [Boolean]
+        def handles?(value, format:)
+          transformers.any? { |t| t.handles?(value, format: format) }
+        end
+
+        # @param [String, Hash] value
+        # @return [String] ewkt representation of value
+        def transform(value, srid: nil, format: nil)
+          transformer = transformers.detect { |t| t.handles?(value, format: format) }
+          raise TransformationError.new('Not handled') if transformer.nil?
+
+          transformer.transform(value, srid: srid, format: format)
+        end
+      end
+    end
+  end
+end

data/lib/charta/factory/transformers/from_geo_json_transformer.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    module Transformers
+      class FromGeoJsonTransformer < EwktTransformer
+        # @return [Boolean]
+        def handles?(value, format:)
+          value.is_a?(Hash) || (value.is_a?(String) && Charta::GeoJSON.valid?(value)) # GeoJSON
+        end
+
+        # @param [String, Hash] value
+        # @return [String] ewkt representation of value
+        def transform(value, srid: nil, format: nil)
+          Charta::GeoJSON.new(value, srid).to_ewkt
+        end
+      end
+    end
+  end
+end

data/lib/charta/factory/transformers/from_gml_transformer.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    module Transformers
+      class FromGmlTransformer < EwktTransformer
+        # @return [Boolean]
+        def handles?(value, format:)
+          value.is_a?(String) && format == 'gml' && Charta::GML.valid?(value)
+        end
+
+        # @param [String, Hash] value
+        # @return [String] ewkt representation of value
+        def transform(value, srid: nil, format: nil)
+          Charta::GML.new(value, srid).to_ewkt
+        end
+      end
+    end
+  end
+end

data/lib/charta/factory/transformers/from_kml_transformer.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    module Transformers
+      class FromKmlTransformer < EwktTransformer
+        # @return [Boolean]
+        def handles?(value, format:)
+          value.is_a?(String) && format == 'kml' && Charta::KML.valid?(value)
+        end
+
+        # @param [String, Hash] value
+        # @return [String] ewkt representation of value
+        def transform(value, srid: nil, format: nil)
+          Charta::KML.new(value, srid).to_ewkt
+        end
+      end
+    end
+  end
+end

data/lib/charta/factory/transformers/from_wkb_transformer.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    module Transformers
+      class FromWkbTransformer < EwktTransformer
+        # @return [Boolean]
+        def handles?(value, format:)
+          value.is_a?(String) && !!(value =~ /\A[A-F0-9]+\z/)
+        end
+
+        # @param [String, Hash] value
+        # @return [String] ewkt representation of value
+        def transform(value, srid: nil, format: nil)
+          if srid.nil?
+            Geometry.factory.parse_wkb(value)
+          else
+            RGeo::Geos.factory(srid: srid).parse_wkb(value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/charta/factory/transformers/transformation_error.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Charta
+  module Factory
+    module Transformers
+      class TransformationError < StandardError
+      end
+    end
+  end
+end