charta 0.2.3 → 0.3.0

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

data/lib/charta/geo_json.rb

@@ -48,7 +48,10 @@ module Charta
         Coordinates.flatten hash
       end
 
-      %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|
+      %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

data/lib/charta/geometry.rb

@@ -97,6 +97,7 @@ module Charta
       other_geometry = Charta.new_geometry(other).transform(srid)
       return true if empty? && other_geometry.empty?
       return inspect == other_geometry.inspect if collection? && other_geometry.collection?
+
       feature.equals?(other_geometry.feature)
     end
 
@@ -105,6 +106,7 @@ module Charta
       other_geometry = Charta.new_geometry(other).transform(srid)
       return true if empty? && other_geometry.empty?
       return inspect == other_geometry.inspect if collection? && other_geometry.collection?
+
       !feature.equals?(other_geometry.feature)
     end
 
@@ -142,6 +144,7 @@ module Charta
     # of mass of the geometry as a POINT.
     def centroid
       return nil unless surface? && !feature.is_empty?
+
       point = feature.centroid
       [point.y, point.x]
     end
@@ -149,22 +152,23 @@ module Charta
     # Returns a POINT guaranteed to lie on the surface.
     def point_on_surface
       return nil unless surface?
+
       point = feature.point_on_surface
       [point.y, point.x]
     end
 
     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)
-        else
-          self
+      when type
+        self
+      when :multi_point
+        flatten_multi(:point)
+      when :multi_line_string
+        flatten_multi(:line_string)
+      when :multi_polygon
+        flatten_multi(:polygon)
+      else
+        self
       end
     end
 
@@ -192,10 +196,12 @@ module Charta
     def transform(new_srid)
       return self if new_srid == srid
       raise 'Proj is not supported. Cannot tranform' unless RGeo::CoordSys::Proj4.supported?
+
       new_srid = Charta::SRS[new_srid] || new_srid
       database = self.class.srs_database
       new_proj_entry = database.get(new_srid)
       raise "Cannot find proj for SRID: #{new_srid}" if new_proj_entry.nil?
+
       new_feature = RGeo::CoordSys::Proj4.transform(
         database.get(srid).proj4,
         feature,
@@ -264,7 +270,7 @@ module Charta
           @feature = ::Charta::Geometry.from_ewkt(@ewkt)
           @properties = @options.dup if @options
         else
-          raise StandardError, 'Invalid geometry (no feature, no EWKT)'
+          raise StandardError.new('Invalid geometry (no feature, no EWKT)')
         end
       end
       @feature.dup
@@ -273,7 +279,8 @@ module Charta
     alias to_rgeo feature
 
     def feature=(new_feature)
-      raise ArgumentError, "Feature can't be nil" if new_feature.nil?
+      raise ArgumentError.new("Feature can't be nil") if new_feature.nil?
+
       @feature = new_feature
     end
 
@@ -292,6 +299,7 @@ module Charta
 
     def respond_to_missing?(name, include_private = false)
       return false if name == :init_with
+
       super
     end
 
@@ -302,11 +310,13 @@ module Charta
 
       def factory(srid = 4326)
         return projected_factory(srid) if srid.to_i == 4326
+
         geos_factory(srid)
       end
 
       def feature(ewkt_or_rgeo)
         return from_rgeo(ewkt_or_rgeo) if ewkt_or_rgeo.is_a? RGeo::Feature::Instance
+
         from_ewkt(ewkt_or_rgeo)
       end
 

data/lib/charta/geometry_collection.rb

@@ -1,10 +1,12 @@
 module Charta
   # Represent a Geometry with contains other geometries
   class GeometryCollection < Geometry
-    def self.empty(srid = nil)
-      srid = Charta.find_srid(srid.nil? ? :WGS84 : srid)
-      feature = Charta.new_feature('GEOMETRYCOLLECTION EMPTY', srid)
-      new(feature)
+    class << self
+      def empty(srid = nil)
+        srid = Charta.find_srid(srid.nil? ? :WGS84 : srid)
+        feature = Charta.new_feature('GEOMETRYCOLLECTION EMPTY', srid)
+        new(feature)
+      end
     end
 
     def to_json_feature_collection(collection_properties = [])

data/lib/charta/gml.rb

@@ -83,6 +83,7 @@ module Charta
           'GEOMETRYCOLLECTION(' + gml.css("#{GML_PREFIX}|featureMember").collect do |feature|
             TAGS.collect do |tag|
               next if feature.css("#{GML_PREFIX}|#{tag}").empty?
+
               feature.css("#{GML_PREFIX}|#{tag}").collect do |fragment|
                 object_to_ewkt(fragment, srid)
               end.compact.join(', ')
@@ -90,6 +91,7 @@ module Charta
           end.compact.join(', ') + ')'
         end
       end
+
       alias geometry_collection_to_ewkt document_to_ewkt
 
       def transform(data, from_srid, to_srid)
@@ -101,8 +103,9 @@ module Charta
 
         wkt = 'POLYGON(' + %w[outerBoundaryIs innerBoundaryIs].collect do |boundary|
           next if gml.css("#{GML_PREFIX}|#{boundary}").empty?
+
           gml.css("#{GML_PREFIX}|#{boundary}").collect do |hole|
-            '(' + hole.css("#{GML_PREFIX}|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(', ') + ')'
 
@@ -115,6 +118,7 @@ module Charta
 
       def point_to_ewkt(gml, srid)
         return 'POINT EMPTY' if gml.css("#{GML_PREFIX}|coordinates").nil?
+
         wkt = 'POINT(' + gml.css("#{GML_PREFIX}|coordinates").collect { |coords| coords.content.split ',' }.flatten.join(' ') + ')'
 
         unless gml['srsName'].nil? || Charta.find_srid(gml['srsName']).to_s == srid.to_s
@@ -127,7 +131,7 @@ module Charta
       def line_string_to_ewkt(gml, srid)
         return 'LINESTRING EMPTY' if gml.css("#{GML_PREFIX}|coordinates").nil?
 
-        wkt = 'LINESTRING(' + gml.css("#{GML_PREFIX}|coordinates").collect { |coords| coords.content.split(/\r\n|\n| /) }.flatten.reject(&:empty?).collect { |c| c.split ',' }.collect { |dimension| %(#{dimension.first} #{dimension[1]}) }.join(', ') + ')'
+        wkt = "LINESTRING(#{transform_coordinates(gml)})"
 
         unless gml['srsName'].nil? || Charta.find_srid(gml['srsName']).to_s == srid.to_s
           wkt = transform(wkt, Charta.find_srid(gml['srsName']), srid)
@@ -135,6 +139,18 @@ module Charta
 
         wkt
       end
+
+      private
+
+        def transform_coordinates(coordinates)
+          coordinates.css("#{GML_PREFIX}|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/gml_import.rb

@@ -63,30 +63,30 @@ class GmlImport
 
   private
 
-  def featurize(node)
-    if node.element? && node.xpath('.//gml:Polygon')
-      geojson_feature = {}
-
-      geometry = node.xpath('.//gml:Polygon')
-      geometry.first['srsName'] = 'EPSG:2154'
-
-      if ::Charta::GML.valid?(geometry)
-
-        # properties
-        id = (Time.zone.now.to_i.to_s + Time.zone.now.usec.to_s)
-
-        geojson_feature = {
-          type: 'Feature',
-          properties: {
-            internal_id: id
-          }.reject { |_, v| v.nil? },
-          geometry: ::Charta.new_geometry(geometry.to_xml, nil, 'gml').transform(:WGS84).to_geojson
-        }.reject { |_, v| v.nil? }
-
-        return geojson_feature
-      else
-        return false
+    def featurize(node)
+      if node.element? && node.xpath('.//gml:Polygon')
+        geojson_feature = {}
+
+        geometry = node.xpath('.//gml:Polygon')
+        geometry.first['srsName'] = 'EPSG:2154'
+
+        if ::Charta::GML.valid?(geometry)
+
+          # properties
+          id = (Time.zone.now.to_i.to_s + Time.zone.now.usec.to_s)
+
+          geojson_feature = {
+            type: 'Feature',
+            properties: {
+              internal_id: id
+            }.reject { |_, v| v.nil? },
+            geometry: ::Charta.new_geometry(geometry.to_xml, nil, 'gml').transform(:WGS84).to_geojson
+          }.reject { |_, v| v.nil? }
+
+          return geojson_feature
+        else
+          return false
+        end
       end
     end
-  end
 end