charta 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1ebd7fd8007ba50a0fd0b0a4fbbf6449a25f58a
-  data.tar.gz: 0f64a9330f1b9dd64e4070f4b1c2721c1ff87bf7
+  metadata.gz: 7330e4893e3f07c1558d79a93fd56077ed7a6e38
+  data.tar.gz: d101ae5be607fd0a6ce27447c03504a74cdfd03a
 SHA512:
-  metadata.gz: b3d86e98cfae5d05b12b27f745a46a27802aedfcd3b54ae173c32421b4ca7882abc0f510dd234441086c5620e2a460362cf9cc08f8c0b79cb39f0ff7cde592a2
-  data.tar.gz: 82d85768aca4670d5885ec144062d774860e9c70954c69f0093b80520ec15fe667776599d4ec1cb27c5c1078625f8939d5af2f43acd2d6ae21e178ca63ed0ebc
+  metadata.gz: 5a779aff4072ca8118cb65e66b711816b51e1a6f2194b520a174c5b7549072afe064581e245940c59fcf7126274b1f463d732792b17101dcf044fa57891dcee2
+  data.tar.gz: a68643928b9578e298b665d8f576b3a51f95e3b8635aa6231501f886e57a5eb1d866c915d604d64c4a691d535b1b654a6fd30757e78bba5fb871f83994d5c683

data/lib/charta/geo_json.rb

@@ -98,7 +98,12 @@ module Charta
         end.join(', ') + ')'
       end
 
-      alias geometry_collection_to_ewkt feature_collection_to_ewkt
+      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'])

data/lib/charta/geometry.rb

@@ -129,7 +129,7 @@ module Charta
     # 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?
+      return nil unless surface? && !@feature.is_empty?
       point = @feature.centroid
       [point.y, point.x]
     end
@@ -155,7 +155,7 @@ module Charta
       as_multi_type = "multi_#{as_type}".to_sym
       if type == as_type
         items << @feature
-      elsif as_type == :geometry_collection
+      elsif type == :geometry_collection
         @feature.each do |geom|
           type_name = Charta.underscore(geom.geometry_type.type_name).to_sym
           if type_name == as_type

data/lib/charta/gml.rb

@@ -72,7 +72,7 @@ module Charta
 
       def document_to_ewkt(gml, srid)
         # whole document
-        if gml.css("#{OGR_PREFIX}|FeatureCollection").nil? || gml.css("#{GML_PREFIX}|featureMember").nil?
+        if gml.css("#{OGR_PREFIX}|FeatureCollection").empty? || gml.css("#{GML_PREFIX}|featureMember").empty?
           # fragment
           if gml.root.name && TAGS.include?(gml.root.name)
             object_to_ewkt(gml.root, srid)

data/lib/charta/version.rb

@@ -1,3 +1,3 @@
 module Charta
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

metadata

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