charta 0.2.3 → 0.3.0

data/lib/charta/kml.rb

@@ -22,7 +22,9 @@ module Charta
     end
 
     def to_ewkt
-      "SRID=#{@srid};" + self.class.document_to_ewkt(@kml)
+      srid_part = @srid.nil? ? '' : "SRID=#{@srid};"
+
+      srid_part + self.class.document_to_ewkt(@kml)
     end
 
     def valid?
@@ -46,15 +48,18 @@ module Charta
 
       def document_to_ewkt(kml)
         return 'GEOMETRYCOLLECTION EMPTY' if kml.css('Document').nil?
+
         'GEOMETRYCOLLECTION(' + kml.css('Placemark').collect do |placemark|
           TAGS.collect do |tag|
             next if placemark.css(tag).empty?
+
             placemark.css(tag).collect do |fragment|
               object_to_ewkt(fragment)
             end.compact.join(', ')
           end.compact.join(', ')
         end.compact.join(', ') + ')'
       end
+
       alias geometry_collection_to_ewkt document_to_ewkt
 
       def feature_to_ewkt(kml)
@@ -63,13 +68,14 @@ module Charta
 
       def point_to_ewkt(kml)
         return 'POINT EMPTY' if kml.css('coordinates').nil?
+
         'POINT(' + kml.css('coordinates').collect { |coords| coords.content.split ',' }.flatten.join(' ') + ')'
       end
 
       def line_string_to_ewkt(kml)
         return 'LINESTRING EMPTY' if kml.css('coordinates').nil?
 
-        'LINESTRING(' + kml.css('coordinates').collect { |coords| coords.content.split(/\r\n|\n| /) }.flatten.reject(&:empty?).collect { |c| c.split ',' }.collect { |dimension| %(#{dimension.first} #{dimension[1]}) }.join(', ') + ')'
+        "LINESTRING(#{transform_coordinates(kml)})"
       end
 
       def polygon_to_ewkt(kml)
@@ -79,7 +85,7 @@ module Charta
           next if kml.css(boundary).empty?
 
           kml.css(boundary).collect do |hole|
-            '(' + hole.css('coordinates').collect { |coords| coords.content.split(/\r\n|\n| /) }.flatten.reject(&:empty?).collect { |c| c.split ',' }.collect { |dimension| %(#{dimension.first} #{dimension[1]}) }.join(', ') + ')'
+            "(#{transform_coordinates(hole)})"
           end.join(', ')
         end.compact.join(', ') + ')'
       end
@@ -87,6 +93,18 @@ module Charta
       def multigeometry_to_ewkt(_kml)
         raise :not_implemented
       end
+
+      private
+
+        def transform_coordinates(coordinates)
+          coordinates.css('coordinates')
+                     .collect { |coords| coords.content.split(/\r\n|\n| /) }
+                     .flatten
+                     .reject(&:empty?)
+                     .collect { |c| c.split ',' }
+                     .collect { |dimension| %(#{dimension.first} #{dimension[1]}) }
+                     .join(', ')
+        end
     end
   end
 end

data/lib/charta/multi_polygon.rb

@@ -15,7 +15,7 @@ module Charta
 
     # Extract polygons ordered by 'PointOnSurface' position
     def polygons
-      @polygons ||= feature._elements.map do |polygon|
+      @polygons ||= feature.elements.map do |polygon|
         Polygon.new(polygon)
       end || []
     end

data/lib/charta/point.rb

@@ -12,7 +12,8 @@ module Charta
     alias latitude y
 
     def distance(point)
-      raise ArgumentError, "wrong type: Charta::Point required" if point.class.name != "Charta::Point"
+      raise ArgumentError.new('wrong type: Charta::Point required') if point.class.name != 'Charta::Point'
+
       to_rgeo.distance(point.to_rgeo)
     end
   end

data/lib/charta/version.rb

@@ -1,3 +1,3 @@
 module Charta
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.3.0'.freeze
 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,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: charta
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
-- Brice TEXIER
+- Ekylibre developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rgeo
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: rgeo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
   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
   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: 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,67 +123,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
@@ -183,9 +202,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: []
@@ -195,7 +214,7 @@ 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:
   - - ">="