charta 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91f9f91e9ceb0d429d73dcc7ac1223f82853607f
-  data.tar.gz: 57434c3c458690a13b12ce33dc6f71c9d534cd47
+  metadata.gz: cf89b408699b34e871d1b85a23315e3e2d735b5c
+  data.tar.gz: '02795fccd17495a483a93d3a1752c874a28d7e48'
 SHA512:
-  metadata.gz: '07914f06a851f73c3ee4dfef1e37c8904367c926173d2521982b9e72713491e8119963b74612faed35200e67b717c68f037201f8addd7e5cdbcd80d345e4530b'
-  data.tar.gz: 4b249d994fe723c1a2da0b9366709bcc9bd193d11e3477a7c117f933c2e2ea53d1a77f4fb39b0618f856a22a7ce35b6f0159763a6a216d3b2f0be21dee364bad
+  metadata.gz: b9c290de3bebb7d8d10ef5a3b179fa7adaedc20555a82552500cf30dd3131594824efb8292f9a618f030aeedaf9e4775f4f165f32074e755df860204abbf1988
+  data.tar.gz: 363f6dc4da4a6f296460f9e38ec34051a8a980069829c362827e6d29bb3f110c51976b9e9890ea5b0badd52af5093f5658cf6ab7ee43558bb985b2d5b3b2e1ca

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/charta.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'charta/version'

data/lib/charta/geometry.rb

@@ -6,9 +6,8 @@ module Charta
   # Represents a Geometry with SRID
   class Geometry
     def initialize(feature, properties = {})
-      @feature = feature
+      self.feature = feature
       @properties = properties
-      # raise ArgumentError, 'Need EWKT to instantiate Geometry' if @ewkt.to_s =~ /\A[[:space:]]*\z/
     end
 
     def inspect
@@ -18,7 +17,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 +25,30 @@ 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
+    # Returns the Well-Known Text (WKT) representation of the geometry/geography
+    # without SRID metadata
     def to_text
-      @feature.as_text.match(/\ASRID=.*;(.*)/)[1]
+      feature.as_text.match(/\ASRID=.*;(.*)/)[1]
     end
     alias as_text to_text
     alias to_wkt to_text
 
     # Returns EWKT: WKT with its SRID
     def to_ewkt
-      Charta.generate_ewkt(@feature).to_s
+      Charta.generate_ewkt(feature).to_s
     end
     alias to_s to_ewkt
 
@@ -60,7 +60,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 +78,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 +89,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 +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)
+      feature.equals?(other_geometry.feature)
     end
 
     # Test if the other measure is equal to self
@@ -105,38 +105,38 @@ 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?
 
     # Computes the geometric center of a geometry, or equivalently, the center
     # of mass of the geometry as a POINT.
     def centroid
-      return nil unless surface? && !@feature.is_empty?
-      point = @feature.centroid
+      return nil unless surface? && !feature.is_empty?
+      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 +153,9 @@ module Charta
       items = []
       as_multi_type = "multi_#{as_type}".to_sym
       if type == as_type
-        items << @feature
+        items << feature
       elsif 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 +166,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,7 +179,7 @@ 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)
       )
@@ -189,29 +189,29 @@ module Charta
 
     # 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)
@@ -231,8 +231,23 @@ module Charta
       Charta.find_srid(name_or_srid)
     end
 
+    # TODO: Manage YAML domain type to ensure maintainability of YAML
+    # serialization in time.
     def feature
-      @feature
+      if @feature.nil?
+        if @ewkt.nil?
+          raise StandardError, 'Invalid geometry (no feature, no EWKT)'
+        else
+          @feature = ::Charta::Geometry.from_ewkt(@ewkt)
+          @properties = @options.dup if @options
+        end
+      end
+      @feature.dup
+    end
+
+    def feature=(new_feature)
+      raise ArgumentError, "Feature can't be nil" if new_feature.nil?
+      @feature = new_feature
     end
 
     def to_json_feature(properties = {})
@@ -254,8 +269,6 @@ module Charta
         from_ewkt(ewkt_or_rgeo)
       end
 
-      private
-
       def from_rgeo(rgeo)
         srid = rgeo.srid
         RGeo::Feature.cast(rgeo, factory: Geometry.factory(srid))
@@ -273,6 +286,8 @@ module Charta
         raise "Invalid EWKT (#{e.class.name}: #{e.message}): #{ewkt}"
       end
 
+      private
+
       def geos_factory(srid)
         RGeo::Geos.factory(
           srid: srid,

data/lib/charta/geometry_collection.rb

@@ -3,12 +3,12 @@ module Charta
   class GeometryCollection < Geometry
     def self.empty(srid = nil)
       srid = Charta.find_srid(srid.nil? ? :WGS84 : srid)
-      feature = Charta.new_feature("GEOMETRYCOLLECTION EMPTY", srid)
+      feature = Charta.new_feature('GEOMETRYCOLLECTION EMPTY', srid)
       new(feature)
     end
 
     def to_json_feature_collection(collection_properties = [])
-      features = feature.each.with_index.collect do |f,i|
+      features = feature.each.with_index.collect do |f, i|
         properties = {}
         properties = collection_properties[i] unless collection_properties[i].nil?
 

data/lib/charta/version.rb

@@ -1,3 +1,3 @@
 module Charta
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charta
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Brice TEXIER
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri