charta 0.2.2 → 0.4.0

data/lib/charta.rb

@@ -1,17 +1,18 @@
 # Gathers geomatic calculations
 # Completes RGeo
+require 'bigdecimal'
+require 'bigdecimal/util'
 require 'rgeo'
 require 'rgeo/proj4'
-require 'charta/geometry'
-require 'charta/geometry_collection'
-require 'charta/point'
-require 'charta/line_string'
-require 'charta/polygon'
-require 'charta/multi_polygon'
-require 'charta/bounding_box'
-require 'charta/geo_json'
-require 'charta/gml'
-require 'charta/kml'
+require 'zeitwerk'
+
+loader = Zeitwerk::Loader.for_gem
+loader.inflector.inflect(
+  'geo_json' => 'GeoJSON',
+  'gml' => 'GML',
+  'kml' => 'KML'
+)
+loader.setup
 
 unless RGeo::CoordSys::Proj4.supported?
   puts "Proj4 is not supported. Some actions won't work"
@@ -26,75 +27,27 @@ module Charta
   }.freeze
 
   class << self
+    def default_feature_factory=(factory)
+      @default_feature_factory = factory
+      @geometry_factory = nil
+    end
+
+    # @deprecated This is deprecated and will be removed in 0.4
+    def default_feature_factory
+      @default_feature_factory || (self.default_feature_factory = Factory::SimpleFeatureFactory.build)
+    end
+
+    def geometry_factory
+      @geometry_factory ||= Factory::SimpleGeometryFactory.new(feature_factory: default_feature_factory)
+    end
+
+    # @deprecated This is deprecated and will be removed in 0.4
     def new_feature(coordinates, srs = nil, format = nil, _flatten_collection = true, _options = {})
-      geom_ewkt = nil
-      if coordinates.is_a?(RGeo::Feature::Instance)
-        return Geometry.feature(coordinates)
-      elsif coordinates.is_a?(::Charta::Geometry)
-        return coordinates
-      elsif coordinates.to_s =~ /\A[[:space:]]*\z/
-        geom_ewkt = empty_geometry(srs).to_ewkt
-      elsif coordinates.is_a?(Hash) || (coordinates.is_a?(String) && ::Charta::GeoJSON.valid?(coordinates)) # GeoJSON
-        srid = srs ? find_srid(srs) : :WGS84
-        geom_ewkt = ::Charta::GeoJSON.new(coordinates, srid).to_ewkt
-      elsif coordinates.is_a?(String)
-        geom_ewkt = if coordinates =~ /\A[A-F0-9]+\z/ # WKB
-                      if srs && srid = find_srid(srs)
-                        generate_ewkt RGeo::Geos.factory(srid: srid).parse_wkb(coordinates)
-                      else
-                        generate_ewkt Geometry.factory.parse_wkb(coordinates)
-                      end
-                    elsif format == 'gml' && ::Charta::GML.valid?(coordinates)
-                      # required format 'cause kml geometries return empty instead of failing
-                      ::Charta::GML.new(coordinates, srid).to_ewkt
-                    elsif format == 'kml' && ::Charta::KML.valid?(coordinates)
-                      ::Charta::KML.new(coordinates).to_ewkt
-                    elsif coordinates =~ /^SRID\=\d+\;/i
-                      if feature = Geometry.feature(coordinates)
-                        generate_ewkt feature
-                      else
-                        Charta::GeometryCollection.empty.feature
-                      end
-                    else # WKT expected
-                      if srs && srid = find_srid(srs)
-                        begin
-                          f = RGeo::Geos.factory(srid: srid).parse_wkt(coordinates)
-                        rescue RGeo::Error::ParseError => e
-                          raise "Invalid EWKT (#{e.message}): #{coordinates}"
-                        end
-                        generate_ewkt f
-                      else
-                        generate_ewkt Geometry.feature(coordinates)
-                      end
-                    end
-      else # Default for RGeo
-        geom_ewkt = generate_ewkt coordinates
-      end
-      if geom_ewkt.to_s =~ /\A[[:space:]]*\z/
-        raise ArgumentError, "Invalid data: coordinates=#{coordinates.inspect}, srid=#{srid.inspect}"
-      end
-      Geometry.feature(geom_ewkt)
+      default_feature_factory.new_feature(coordinates, srs: srs, format: format)
     end
 
     def new_geometry(coordinates, srs = nil, format = nil, _flatten_collection = true, _options = {})
-      return coordinates if coordinates.is_a?(::Charta::Geometry)
-      feature = Charta.new_feature(coordinates, srs, format, _flatten_collection, _options)
-      type = feature.geometry_type
-      geom = case type
-             when RGeo::Feature::Point then
-               Point.new(feature)
-             when RGeo::Feature::LineString then
-               LineString.new(feature)
-             when RGeo::Feature::Polygon then
-               Polygon.new(feature)
-             when RGeo::Feature::MultiPolygon then
-               MultiPolygon.new(feature)
-             when RGeo::Feature::GeometryCollection then
-               GeometryCollection.new(feature)
-             else
-               Geometry.new(feature)
-             end
-      geom
+      geometry_factory.new_geometry(coordinates, srs: srs, format: format)
     end
 
     def new_point(lat, lon, srid = 4326)
@@ -106,12 +59,18 @@ module Charta
       options[:srid] ||= new_geometry(points.first).srid if points.any?
       options[:srid] ||= 4326
 
-      ewkt = "SRID=#{options[:srid]};LINESTRING(" + points.map { |wkt| p = new_geometry(wkt); "#{p.x} #{p.y}" }.join(', ') + ')'
+      points_coordinates = points.map do |wkt|
+        p = new_geometry(wkt)
+
+        "#{p.x} #{p.y}"
+      end
+
+      ewkt = "SRID=#{options[:srid]};LINESTRING(#{points_coordinates.join(', ')})"
       new_geometry(ewkt)
     end
 
     def empty_geometry(srid = :WGS84)
-      GeometryCollection.empty(srid)
+      geometry_factory.empty_geometry(srid)
     end
 
     def generate_ewkt(feature)
@@ -138,23 +97,16 @@ module Charta
     end
 
     # Check and returns the SRID matching with srname or SRID.
+    # @deprecated
     def find_srid(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
+      Factory::SridProvider.build.find(srname_or_srid)
     end
 
     def from(format, data)
       unless respond_to?("from_#{format}")
         raise "Unknown format: #{format.inspect}"
       end
+
       send("from_#{format}", data)
     end
 

data/lib/rgeo/svg.rb

@@ -7,63 +7,63 @@ module RGeo
 
       protected
 
-      def encode_point(feature)
-        'M' + coordinates(feature)
-      end
+        def encode_point(feature)
+          'M' + coordinates(feature)
+        end
 
-      def encode_multi_point(feature)
-        points = []
-        feature.each do |point|
-          points << encode_point(point)
+        def encode_multi_point(feature)
+          points = []
+          feature.each do |point|
+            points << encode_point(point)
+          end
+          points.join(' ')
         end
-        points.join(' ')
-      end
 
-      def encode_line_string(feature)
-        points = []
-        feature.points.each do |point|
-          points << coordinates(point)
+        def encode_line_string(feature)
+          points = []
+          feature.points.each do |point|
+            points << coordinates(point)
+          end
+          'M' + points.join('L')
         end
-        'M' + points.join('L')
-      end
 
-      def encode_multi_line_string(feature)
-        line_strings = []
-        feature.each do |line_string|
-          line_strings << encode_line_string(line_string)
+        def encode_multi_line_string(feature)
+          line_strings = []
+          feature.each do |line_string|
+            line_strings << encode_line_string(line_string)
+          end
+          line_strings.join(' ')
         end
-        line_strings.join(' ')
-      end
 
-      def encode_polygon(feature)
-        rings = []
-        # TODO: Optimize useless last point repetition
-        rings << encode_line_string(feature.exterior_ring) + 'Z'
-        feature.interior_rings.each do |ring|
-          rings << encode_line_string(ring) + 'Z'
+        def encode_polygon(feature)
+          rings = []
+          # TODO: Optimize useless last point repetition
+          rings << encode_line_string(feature.exterior_ring) + 'Z'
+          feature.interior_rings.each do |ring|
+            rings << encode_line_string(ring) + 'Z'
+          end
+          rings.join(' ')
         end
-        rings.join(' ')
-      end
 
-      def encode_multi_polygon(feature)
-        polygons = []
-        feature.each do |polygon|
-          polygons << encode_polygon(polygon)
+        def encode_multi_polygon(feature)
+          polygons = []
+          feature.each do |polygon|
+            polygons << encode_polygon(polygon)
+          end
+          polygons.join(' ')
         end
-        polygons.join(' ')
-      end
 
-      def encode_geometry_collection(feature)
-        geometries = []
-        feature.each do |geometry|
-          geometries << encode(geometry)
+        def encode_geometry_collection(feature)
+          geometries = []
+          feature.each do |geometry|
+            geometries << encode(geometry)
+          end
+          geometries.join(' ')
         end
-        geometries.join(' ')
-      end
 
-      def coordinates(feature)
-        feature.x.to_s + ',' + feature.y.to_s
-      end
+        def coordinates(feature)
+          feature.x.to_s + ',' + feature.y.to_s
+        end
     end
   end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: charta
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
-- Brice TEXIER
+- Ekylibre developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
+- !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: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -30,70 +58,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rgeo-geojson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rgeo-geojson
+  name: rgeo-proj4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rgeo-proj4
+  name: victor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,65 +137,72 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
 description: 
 email:
-- brice@ekylibre.com
+- dev@ekylibre.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitlab-ci.yml"
-- ".travis.yml"
-- CODE_OF_CONDUCT.md
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
 - charta.gemspec
 - lib/charta.rb
 - lib/charta/bounding_box.rb
+- lib/charta/coordinates.rb
+- lib/charta/ewkt_serializer.rb
+- lib/charta/factory/ewkt_feature_builder.rb
+- lib/charta/factory/feature_factory_base.rb
+- lib/charta/factory/simple_feature_factory.rb
+- lib/charta/factory/simple_geometry_factory.rb
+- lib/charta/factory/srid_provider.rb
+- lib/charta/factory/transformers/ewkt_passthrough.rb
+- lib/charta/factory/transformers/ewkt_transformer.rb
+- lib/charta/factory/transformers/ewkt_transformer_chain.rb
+- lib/charta/factory/transformers/from_geo_json_transformer.rb
+- lib/charta/factory/transformers/from_gml_transformer.rb
+- lib/charta/factory/transformers/from_kml_transformer.rb
+- lib/charta/factory/transformers/from_wkb_transformer.rb
+- lib/charta/factory/transformers/transformation_error.rb
 - lib/charta/geo_json.rb
 - lib/charta/geojson_import.rb
 - lib/charta/geometry.rb
@@ -181,9 +216,9 @@ files:
 - lib/charta/polygon.rb
 - lib/charta/version.rb
 - lib/rgeo/svg.rb
-homepage: https://github.com/ekylibre/charta
+homepage: https://gitlab.com/ekylibre
 licenses:
-- MIT
+- AGPL-3.0-only
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -193,15 +228,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.2.26
 signing_key: 
 specification_version: 4
 summary: Simple tool over geos and co

data/.gitignore

@@ -1,11 +0,0 @@
-*~
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-.byebug_history

data/.gitlab-ci.yml

@@ -1,14 +0,0 @@
-stages:
-  - test
-
-test:
-  image: registry.gitlab.com/ekylibre/docker-base-images/ruby2.3:master
-  before_script:
-    - gem install bundler
-    - bundle install --path vendor/bundle
-  cache:
-    key: bundle
-    paths:
-      - vendor/bundle
-  script:
-    - bundle exec rake test

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.7
-before_install:
-  - gem install bundler -v 1.14.6
-  - sudo apt-get install -f libgeos-dev libproj-dev
-script: bundle exec rake test

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at brice@ekylibre.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in charta.gemspec
-gemspec

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 Brice TEXIER
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.