charta 0.2.2 → 0.4.0

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,17 @@ 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/geometry.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'rgeo/geo_json'
 require 'rgeo/svg' # integrated lib for now
 require 'active_support/core_ext/module/delegation'
+require 'victor' # for SVG
 
 module Charta
   # Represents a Geometry with SRID
@@ -63,16 +64,36 @@ module Charta
 
     alias to_ewkb to_binary
 
-    # Pas bien compris le fonctionnement
+    # Generate SVG from geometry
+    # @param [Hash] options , the options for SVG object.
+    # @option options [Hash] :mode could be :stroke or :fill
+    # @option options [Hash] :color could be "orange", "red", "blue" or HTML color "#14TF15"
+    # @option options [Hash] :fill_opacity could be '0' to '100'
+    # @option options [Hash] :stroke_linecap could be 'round', 'square', 'butt'
+    # @option options [Hash] :stroke_linejoin default 'round'
+    # @option options [Hash] :stroke_width default '5%'
+    # @note more informations on https://developer.mozilla.org/fr/docs/Web/SVG/Tutorial/Fills_and_Strokes
+    # @return [String] the SVG image
     def to_svg(options = {})
-      svg = '<svg xmlns="http://www.w3.org/2000/svg" version="1.1"'
-      { preserve_aspect_ratio: 'xMidYMid meet',
-        width: 180, height: 180,
-        view_box: bounding_box.svg_view_box.join(' ') }.merge(options).each do |attr, value|
-        svg << " #{Charta.camelcase(attr.to_s, :lower)}=\"#{value}\""
+      # set default options if not present
+      options[:mode] ||= :stroke
+      options[:color] ||= 'black'
+      options[:fill_opacity] ||= '100' # 0 to 100
+      options[:stroke_linecap] ||= 'butt' # round, square, butt
+      options[:stroke_linejoin] ||= 'round' #
+      options[:stroke_width] ||= '5%'
+
+      svg = Victor::SVG.new template: :html
+      svg.setup width: 180, height: 180, viewBox: bounding_box.svg_view_box.join(' ')
+      # return a stroke SVG with options
+      if options[:mode] == :stroke
+        svg.path d: to_svg_path, fill: 'none', stroke: options[:color], stroke_linecap: options[:stroke_linecap],
+stroke_linejoin: options[:stroke_linejoin], stroke_width: options[:stroke_width]
+      # return a fill SVG with options
+      elsif options[:mode] == :fill
+        svg.path d: to_svg_path, fill: options[:color], fill_opacity: options[:fill_opacity]
       end
-      svg << "><path d=\"#{to_svg_path}\"/></svg>"
-      svg
+      svg.render
     end
 
     # Return the geometry as Scalar Vector Graphics (SVG) path data.
@@ -97,6 +118,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,17 +127,30 @@ 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
 
     # Returns true if Geometry is a Surface
     def surface?
-      [RGeo::Feature::Polygon, RGeo::Feature::MultiPolygon].include? feature.geometry_type
+      if collection?
+        feature.any? { |geometry| Charta.new_geometry(geometry).surface? }
+      else
+        [RGeo::Feature::Polygon, RGeo::Feature::MultiPolygon].include? feature.geometry_type
+      end
     end
 
     # Returns area in unit corresponding to the SRS
     def area
-      surface? ? feature.area : 0
+      if surface?
+        if collection?
+          feature.sum { |geometry| Charta.new_geometry(geometry).area }
+        else
+          feature.area
+        end
+      else
+        0
+      end
     end
 
     # Returns true if this Geometry is an empty geometrycollection, polygon,
@@ -130,6 +165,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
@@ -137,16 +173,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)
+      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
 
@@ -174,10 +217,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,
@@ -205,6 +250,11 @@ module Charta
       feature.intersection(other_geometry.feature)
     end
 
+    def intersects?(other)
+      other_geometry = Charta.new_geometry(other).transform(srid)
+      feature.intersects?(other_geometry.feature)
+    end
+
     def difference(other)
       other_geometry = Charta.new_geometry(other).transform(srid)
       feature.difference(other_geometry.feature)
@@ -241,7 +291,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
@@ -250,7 +300,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
 
@@ -269,6 +320,7 @@ module Charta
 
     def respond_to_missing?(name, include_private = false)
       return false if name == :init_with
+
       super
     end
 
@@ -279,11 +331,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

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

@@ -10,5 +10,11 @@ module Charta
       feature.y
     end
     alias latitude y
+
+    def distance(point)
+      raise ArgumentError.new('wrong type: Charta::Point required') if point.class.name != 'Charta::Point'
+
+      to_rgeo.distance(point.to_rgeo)
+    end
   end
 end

data/lib/charta/polygon.rb

@@ -8,5 +8,10 @@ module Charta
       end
       @exterior_ring
     end
+
+    def distance(point)
+      polygon_centroid = Charta.new_point(*centroid, 4326)
+      polygon_centroid.distance(point)
+    end
   end
 end

data/lib/charta/version.rb

@@ -1,3 +1,3 @@
 module Charta
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.4.0'.freeze
 end