charta 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b57d9dc1461dc8978d34f13e8724d173fcb9a95a
-  data.tar.gz: 7dda0f7c5d00088060e6475b88a770bb19365f06
+  metadata.gz: 6e8a91f2b818cc99ed6f77f938f4c38b70e9be7d
+  data.tar.gz: 5a9de8a40efb3fcae10738f9630c508f11e42e50
 SHA512:
-  metadata.gz: d4b1f0c6e499b09df8c156d3bf449f5655c4f686586624f42b6cf8b8d2bb1efede40e1d53444a2f70d64f24f70502edc153d51acba254c7643eab0935233b4e3
-  data.tar.gz: 2db91883e43df8348abeffb14398613b1e8503e5bc12e182c1d241ef18da05d8ef35fefabe71711153e2665ba5bd135857e2899dee95cb7f95816aed8cc09b82
+  metadata.gz: 55ba30dc33527c548e2105cd0c557884270811e0a17be36f4d2563ebce23e7d506f5f11f9bbc019c977407f80d3c5af945a9175e4a385762e3a486a0c8030e3d
+  data.tar.gz: b66842d74f9ce47c4478b989f46c01fb59dd7ab01503c6eba6334f8cd1cfd6bb363869d2bfd064686c38fb1e4b60c43beb6a964f56545df567f5422a6ffe7444

data/.travis.yml

@@ -1,5 +1,7 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.2.3
-before_install: gem install bundler -v 1.14.6
+  - 2.2.7
+before_install:
+  - gem install bundler -v 1.14.6
+  - sudo apt-get install -f libgeos-dev libproj-dev
+script: bundle exec rake test

data/lib/charta.rb

@@ -73,7 +73,7 @@ module Charta
 
     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)
+      feature = Charta.new_feature(coordinates, srs, format, _flatten_collection, _options)
       type = feature.geometry_type
       geom = case type
              when RGeo::Feature::Point then
@@ -93,7 +93,8 @@ module Charta
     end
 
     def new_point(lat, lon, srid = 4326)
-      Point.new("SRID=#{srid};POINT(#{lon} #{lat})")
+      feature = Charta.new_feature("SRID=#{srid};POINT(#{lon} #{lat})")
+      Point.new(feature)
     end
 
     def make_line(points, options = {})

data/lib/charta/geometry_collection.rb

@@ -3,7 +3,8 @@ module Charta
   class GeometryCollection < Geometry
     def self.empty(srid = nil)
       srid = Charta.find_srid(srid.nil? ? :WGS84 : srid)
-      new("SRID=#{srid};GEOMETRYCOLLECTION EMPTY")
+      feature = Charta.new_feature("GEOMETRYCOLLECTION EMPTY", srid)
+      new(feature)
     end
 
     def to_json_feature_collection

data/lib/charta/line_string.rb

@@ -14,8 +14,7 @@ module Charta
 
     def points
       @points ||= feature.points.map do |point|
-        generator = RGeo::WKRep::WKTGenerator.new(tag_format: :ewkt, emit_ewkt_srid: true)
-        Point.new(generator.generate(point))
+        Point.new(point)
       end || []
     end
   end

data/lib/charta/multi_polygon.rb

@@ -15,14 +15,9 @@ module Charta
 
     # Extract polygons ordered by 'PointOnSurface' position
     def polygons
-      unless defined? @polygons
-        @polygons = []
-        feature.each do |polygon|
-          generator = RGeo::WKRep::WKTGenerator.new(tag_format: :ewkt, emit_ewkt_srid: true)
-          @polygons << Polygon.new(generator.generate(polygon))
-        end
-      end
-      @polygons
+      @polygons ||= feature._elements.map do |polygon|
+        Polygon.new(polygon)
+      end || []
     end
   end
 end

data/lib/charta/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charta
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Brice TEXIER
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Simple tool over geos and co