charta 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f4d4b8c77ea6aa5ca3e9193b3c0eadfc5379e94
-  data.tar.gz: 8452aca0e8b426053fded96f161cb556dab02713
+  metadata.gz: b57d9dc1461dc8978d34f13e8724d173fcb9a95a
+  data.tar.gz: 7dda0f7c5d00088060e6475b88a770bb19365f06
 SHA512:
-  metadata.gz: e06c74e261508bdce78f9e04e0203ef9c2afe079cf691d283020ed7dc42aace2fdf38f3c943122a19c320ae8a5f25fe9055adf6416766d6d5502a95ad52844dd
-  data.tar.gz: e930f668c1e6967d09289f3cd698f3ff4dbceeccaab9ab1dbad5858cb0fb6d304a67668dac15e4c3fddf3a9aa4a46abf40c128ad60e73568c1954d8afd1ac0cc
+  metadata.gz: d4b1f0c6e499b09df8c156d3bf449f5655c4f686586624f42b6cf8b8d2bb1efede40e1d53444a2f70d64f24f70502edc153d51acba254c7643eab0935233b4e3
+  data.tar.gz: 2db91883e43df8348abeffb14398613b1e8503e5bc12e182c1d241ef18da05d8ef35fefabe71711153e2665ba5bd135857e2899dee95cb7f95816aed8cc09b82

data/lib/charta/geometry.rb

@@ -1,14 +1,15 @@
 require 'json'
 require 'rgeo/geo_json'
 require 'rgeo/svg' # integrated lib for now
+require 'byebug'
 
 module Charta
   # Represents a Geometry with SRID
   class Geometry
-    def initialize(ewkt, properties = {})
-      @ewkt = ewkt
+    def initialize(feature, properties = {})
+      @feature = feature
       @properties = properties
-      raise ArgumentError, 'Need EWKT to instantiate Geometry' if @ewkt.to_s =~ /\A[[:space:]]*\z/
+      # raise ArgumentError, 'Need EWKT to instantiate Geometry' if @ewkt.to_s =~ /\A[[:space:]]*\z/
     end
 
     def inspect
@@ -18,7 +19,7 @@ module Charta
     # Returns the type of the geometry as a string. Example: point,
     # multi_polygon, geometry_collection...
     def type
-      Charta.underscore(feature.geometry_type.type_name).to_sym
+      Charta.underscore(@feature.geometry_type.type_name).to_sym
     end
 
     # Returns the type of the geometry as a string. EG: 'ST_Linestring', 'ST_Polygon',
@@ -26,29 +27,29 @@ module Charta
     # in the case of the string and ST in front that is returned, as well as the fact
     # that it will not indicate whether the geometry is measured.
     def collection?
-      feature.geometry_type == RGeo::Feature::GeometryCollection
+      @feature.geometry_type == RGeo::Feature::GeometryCollection
     end
 
     # Return the spatial reference identifier for the ST_Geometry
     def srid
-      feature.srid.to_i
+      @feature.srid.to_i
     end
 
     # Returns the underlaying object managed by Charta: the RGeo feature
     def to_rgeo
-      feature
+      @feature
     end
 
     # Returns the Well-Known Text (WKT) representation of the geometry/geography without SRID metadata
     def to_text
-      feature.as_text
+      @feature.as_text
     end
     alias as_text to_text
     alias to_wkt to_text
 
     # Returns EWKT: WKT with its SRID
     def to_ewkt
-      @ewkt.to_s
+      Charta.generate_ewkt(@feature).to_s
     end
     alias to_s to_ewkt
 
@@ -60,7 +61,7 @@ module Charta
     #  Return the Well-Known Binary (WKB) representation of the geometry with SRID meta data.
     def to_binary
       generator = RGeo::WKRep::WKBGenerator.new(tag_format: :ewkbt, emit_ewkbt_srid: true)
-      generator.generate(feature)
+      generator.generate(@feature)
     end
     alias to_ewkb to_binary
 
@@ -78,7 +79,7 @@ module Charta
 
     # Return the geometry as Scalar Vector Graphics (SVG) path data.
     def to_svg_path
-      RGeo::SVG.encode(feature)
+      RGeo::SVG.encode(@feature)
     end
 
     # Return the geometry as a Geometry Javascript Object Notation (GeoJSON) element.
@@ -89,7 +90,7 @@ module Charta
 
     # Returns object in JSON (Hash)
     def to_json_object
-      RGeo::GeoJSON.encode(feature)
+      RGeo::GeoJSON.encode(@feature)
     end
 
     # Test if the other measure is equal to self
@@ -97,7 +98,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)
+      @feature.equals?(other_geometry.feature)
     end
 
     # Test if the other measure is equal to self
@@ -105,23 +106,23 @@ 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)
+      !@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
+      [RGeo::Feature::Polygon, RGeo::Feature::MultiPolygon].include? @feature.geometry_type
     end
 
     # Returns area in unit corresponding to the SRS
     def area
-      surface? ? feature.area : 0
+      surface? ? @feature.area : 0
     end
 
     # Returns true if this Geometry is an empty geometrycollection, polygon,
     # point etc.
     def empty?
-      feature.is_empty?
+      @feature.is_empty?
     end
     alias blank? empty?
 
@@ -129,14 +130,14 @@ module Charta
     # of mass of the geometry as a POINT.
     def centroid
       return nil unless surface?
-      point = feature.centroid
+      point = @feature.centroid
       [point.y, point.x]
     end
 
     # Returns a POINT guaranteed to lie on the surface.
     def point_on_surface
       return nil unless surface?
-      point = feature.point_on_surface
+      point = @feature.point_on_surface
       [point.y, point.x]
     end
 
@@ -153,9 +154,9 @@ module Charta
       items = []
       as_multi_type = "multi_#{as_type}".to_sym
       if type == as_type
-        items << feature
+        items << @feature
       elsif as_type == :geometry_collection
-        feature.each do |geom|
+        @feature.each do |geom|
           type_name = Charta.underscore(geom.geometry_type.type_name).to_sym
           if type_name == as_type
             items << geom
@@ -166,7 +167,7 @@ module Charta
           end
         end
       end
-      Charta.new_geometry(feature.factory.send(as_multi_type, items))
+      Charta.new_geometry(@feature.factory.send(as_multi_type, items))
     end
 
     # Returns a new geometry with the coordinates converted into the new SRS
@@ -179,39 +180,39 @@ module Charta
       raise "Cannot find proj for SRID: #{new_srid}" if new_proj_entry.nil?
       new_feature = RGeo::CoordSys::Proj4.transform(
         database.get(srid).proj4,
-        feature,
+        @feature,
         new_proj_entry.proj4,
         self.class.factory(new_srid)
       )
       generator = RGeo::WKRep::WKTGenerator.new(tag_format: :ewkt, emit_ewkt_srid: true)
-      self.class.new(generator.generate(new_feature))
+      Charta.new_geometry(generator.generate(new_feature))
     end
 
     # Produces buffer
     def buffer(radius)
-      feature.buffer(radius)
+      @feature.buffer(radius)
     end
 
     def merge(other)
       other_geometry = Charta.new_geometry(other).transform(srid)
-      feature.union(other_geometry.feature)
+      @feature.union(other_geometry.feature)
     end
     alias + merge
 
     def intersection(other)
       other_geometry = Charta.new_geometry(other).transform(srid)
-      feature.intersection(other_geometry.feature)
+      @feature.intersection(other_geometry.feature)
     end
 
     def difference(other)
       other_geometry = Charta.new_geometry(other).transform(srid)
-      feature.difference(other_geometry.feature)
+      @feature.difference(other_geometry.feature)
     end
     alias - difference
 
     def bounding_box
       unless defined? @bounding_box
-        bbox = RGeo::Cartesian::BoundingBox.create_from_geometry(feature)
+        bbox = RGeo::Cartesian::BoundingBox.create_from_geometry(@feature)
         instance_variable_set('@x_min', bbox.min_x || 0)
         instance_variable_set('@y_min', bbox.min_y || 0)
         instance_variable_set('@x_max', bbox.max_x || 0)
@@ -232,7 +233,7 @@ module Charta
     end
 
     def feature
-      self.class.feature(@ewkt)
+      @feature
     end
 
     def to_json_feature
@@ -245,10 +246,37 @@ module Charta
       end
 
       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
+
+      private
+
+      def from_rgeo(rgeo)
+        srid = rgeo.srid
+        RGeo::Feature.cast(rgeo, factory: Geometry.factory(srid))
+      end
+
+      def from_ewkt(ewkt)
+        # Cleans empty geometries
+        ewkt.gsub!(/(GEOMETRYCOLLECTION|GEOMETRY|((MULTI)?(POINT|LINESTRING|POLYGON)))\(\)/, '\1 EMPTY')
+        srs = ewkt.split(/[\=\;]+/)[0..1]
+        srid = nil
+        srid = srs[1] if srs[0] =~ /srid/i
+        srid ||= 4326
+        factory(srid).parse_wkt(ewkt)
+      rescue RGeo::Error::ParseError => e
+        raise "Invalid EWKT (#{e.class.name}: #{e.message}): #{ewkt}"
+      end
+
+      def geos_factory(srid)
         RGeo::Geos.factory(
-          # srs_database: srs_database,
           srid: srid,
-          # has_z_coordinate: true,
           wkt_generator: {
             type_format: :ewkt,
             emit_ewkt_srid: true,
@@ -268,16 +296,29 @@ module Charta
         )
       end
 
-      def feature(ewkt)
-        # Cleans empty geometries
-        ewkt.gsub!(/(GEOMETRYCOLLECTION|GEOMETRY|((MULTI)?(POINT|LINESTRING|POLYGON)))\(\)/, '\1 EMPTY')
-        srs = ewkt.split(/[\=\;]+/)[0..1]
-        srid = nil
-        srid = srs[1] if srs[0] =~ /srid/i
-        srid ||= 4326
-        factory(srid).parse_wkt(ewkt)
-      rescue RGeo::Error::ParseError => e
-        raise "Invalid EWKT (#{e.class.name}: #{e.message}): #{ewkt}"
+      def projected_factory(srid)
+        proj4 = '+proj=cea +lon_0=0 +lat_ts=30 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs'
+        RGeo::Geographic.projected_factory(
+          srid: srid,
+          wkt_generator: {
+            type_format: :ewkt,
+            emit_ewkt_srid: true,
+            convert_case: :upper
+          },
+          wkt_parser: {
+            support_ewkt: true
+          },
+          wkb_generator:  {
+            type_format: :ewkb,
+            emit_ewkb_srid: true,
+            hex_format: true
+          },
+          wkb_parser: {
+            support_ewkb: true
+          },
+          projection_srid: 6933,
+          projection_proj4: proj4
+        )
       end
     end
   end

data/lib/charta/version.rb

@@ -1,3 +1,3 @@
 module Charta
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/lib/charta.rb

@@ -25,12 +25,14 @@ module Charta
   }.freeze
 
   class << self
-    def new_geometry(coordinates, srs = nil, format = nil, _flatten_collection = true, _options = {})
+    def new_feature(coordinates, srs = nil, format = nil, _flatten_collection = true, _options = {})
       geom_ewkt = nil
-      if coordinates.to_s =~ /\A[[:space:]]*\z/
-        geom_ewkt = empty_geometry(srs).to_ewkt
+      if coordinates.is_a?(RGeo::Feature::Instance)
+        return Geometry.feature(coordinates)
       elsif coordinates.is_a?(::Charta::Geometry)
-        geom_ewkt = coordinates.to_ewkt
+        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
@@ -66,21 +68,26 @@ module Charta
       if geom_ewkt.to_s =~ /\A[[:space:]]*\z/
         raise ArgumentError, "Invalid data: coordinates=#{coordinates.inspect}, srid=#{srid.inspect}"
       end
-      type = Geometry.feature(geom_ewkt).geometry_type
-      # puts type.inspect
+      Geometry.feature(geom_ewkt)
+    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)
+      type = feature.geometry_type
       geom = case type
              when RGeo::Feature::Point then
-               Point.new(geom_ewkt)
+               Point.new(feature)
              when RGeo::Feature::LineString then
-               LineString.new(geom_ewkt)
+               LineString.new(feature)
              when RGeo::Feature::Polygon then
-               Polygon.new(geom_ewkt)
+               Polygon.new(feature)
              when RGeo::Feature::MultiPolygon then
-               MultiPolygon.new(geom_ewkt)
+               MultiPolygon.new(feature)
              when RGeo::Feature::GeometryCollection then
-               GeometryCollection.new(geom_ewkt)
+               GeometryCollection.new(feature)
              else
-               Geometry.new(geom_ewkt)
+               Geometry.new(feature)
              end
       geom
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charta
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brice TEXIER
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri