charta 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2df82681d22428e8a351eb7021b92633c58734d
-  data.tar.gz: 882e807081a9b46d51ce58e67b823268f98921a7
+  metadata.gz: f5026ab204ac67b2187e5a338c178009582401ef
+  data.tar.gz: 07f73034e6c19c9f307b59aa4aecc359767b7544
 SHA512:
-  metadata.gz: d1bda79d73e0533c5f768266ea2543d5af2776d5435efaf5f81dab0f519ae5fb39864a2d20ae3ef0d4b80300e3af5b965f46dc767b057f1db8034bb0e7276722
-  data.tar.gz: 2de5ce38da7e6a7258336fb96a0b05c9a24f7e7d0d8d531a232d82abc279eddd0c111bdaed944120e60c8c1c85fa2b06114e7c91781d06c7509ddabd264677fa
+  metadata.gz: 9cb51c59524dfb7c022069d805f936282dc143419ec124bcc7d491ae6fe1b692ab397bd377bee875b663564319ad97111748e9db640df71583470bffbf868963
+  data.tar.gz: 26e4afcc4e8ec23478883923af1313fe91ef64cc071b3892a7d0963bddb9bc00ad2f79b05782725f99cc9f718fd90f634a9421cdbb97456aa4a838498477ab9f

data/.gitlab-ci.yml

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

data/lib/charta.rb

@@ -1,6 +1,8 @@
 # Gathers geomatic calculations
 # Completes RGeo
 require 'rgeo'
+require 'charta/coordinates'
+require 'charta/ewkt_serializer'
 require 'charta/geometry'
 require 'charta/geometry_collection'
 require 'charta/point'

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) % 360) - 180, ((y + 90) % 180) - 90]
+        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' => map_geometry_coordinates(hash['geometries'], &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/version.rb

@@ -1,3 +1,3 @@
 module Charta
-  VERSION = '0.1.12'.freeze
+  VERSION = '0.1.13'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charta
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Brice TEXIER
@@ -130,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -139,6 +140,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