rgeo-geojson 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d19417fa49fc036ec401b5d31bcd199127f4763271ea4dabf9ba71c42f52c597
-  data.tar.gz: 5cc770263b8cf0fabaab1afc4e5460ba09286817eb6e6c5141ceb60a79e141fe
+  metadata.gz: 31e3acae0a1cc1b8b417a6e66a03ea7b162cc598f6a48dfaf73a93535d13bbd9
+  data.tar.gz: 31eb694d0d74d5fb8d41b6c6d1b07017ec71aefd080678a27565b60bb037e29b
 SHA512:
-  metadata.gz: 2674558dd3cc38448be259d1559b8e8e30a6320a35c20d09c6ddb7e16a02cd5c6ef78cbf6629793781921a6dcae8ce5360ade73fb9e0b35b7cc52c362c2dcc80
-  data.tar.gz: 42cbf6b73fede00bd88970eb29cecdd6a6128450615cd366da2bae91a40243182ed17dccbd21c7e7f97a8a9622f1f9ac402f2ff9b64545eb69b0f5cb488bc302
+  metadata.gz: 181c8f3958610b3df6f6c830af066590b438fd3955cdd9cdfe7c80a00791a7038d9db37c711412380f4fd11a8f56b308c7fb7c50cfbc7b2c8bd3988dc680d90a
+  data.tar.gz: f3d13428ed86ee87c6850626df4cc6146170f89b163d47d3db8226f03b21096fd40badafb178e59205418daf354e1f5d549776a382c22f2145c7a69ae65d1d63

data/History.md

@@ -1,3 +1,9 @@
+### 2.1.0 / 2018-11-27
+
+* Allow rgeo 2.0
+* Require ruby 2.3+
+
+
 ### 2.0.0 / 2018-01-13
 
 * Remove :json_parser option #38

data/lib/rgeo/geo_json/coder.rb

@@ -44,14 +44,14 @@ module RGeo
         if @entity_factory.is_feature_collection?(object)
           {
             "type" => "FeatureCollection",
-            "features" => @entity_factory.map_feature_collection(object) { |f| _encode_feature(f) },
+            "features" => @entity_factory.map_feature_collection(object) { |f| encode_feature(f) },
           }
         elsif @entity_factory.is_feature?(object)
-          _encode_feature(object)
+          encode_feature(object)
         elsif object.nil?
           nil
         else
-          _encode_geometry(object)
+          encode_geometry(object)
         end
       end
 
@@ -66,9 +66,8 @@ module RGeo
         if input.is_a?(String)
           input = JSON.parse(input)
         end
-        unless input.is_a?(Hash)
-          return nil
-        end
+        return unless input.is_a?(Hash)
+
         case input["type"]
         when "FeatureCollection"
           features = input["features"]
@@ -76,14 +75,14 @@ module RGeo
           decoded_features = []
           features.each do |f|
             if f["type"] == "Feature"
-              decoded_features << _decode_feature(f)
+              decoded_features << decode_feature(f)
             end
           end
           @entity_factory.feature_collection(decoded_features)
         when "Feature"
-          _decode_feature(input)
+          decode_feature(input)
         else
-          _decode_geometry(input)
+          decode_geometry(input)
         end
       end
 
@@ -98,10 +97,10 @@ module RGeo
 
       private
 
-      def _encode_feature(object) # :nodoc:
+      def encode_feature(object)
         json = {
           "type" => "Feature",
-          "geometry" => _encode_geometry(@entity_factory.get_feature_geometry(object)),
+          "geometry" => encode_geometry(@entity_factory.get_feature_geometry(object)),
           "properties" => @entity_factory.get_feature_properties(object).dup,
         }
         id = @entity_factory.get_feature_id(object)
@@ -109,7 +108,7 @@ module RGeo
         json
       end
 
-      def _encode_geometry(object) # :nodoc:
+      def encode_geometry(object)
         case object
         when RGeo::Feature::Point
           {
@@ -144,77 +143,77 @@ module RGeo
         when RGeo::Feature::GeometryCollection
           {
             "type" => "GeometryCollection",
-            "geometries" => object.map { |geom| _encode_geometry(geom) }
+            "geometries" => object.map { |geom| encode_geometry(geom) }
           }
         else
           nil
         end
       end
 
-      def _decode_feature(input) # :nodoc:
+      def decode_feature(input)
         geometry = input["geometry"]
         if geometry
-          geometry = _decode_geometry(geometry)
-          return nil unless geometry
+          geometry = decode_geometry(geometry)
+          return unless geometry
         end
         @entity_factory.feature(geometry, input["id"], input["properties"])
       end
 
-      def _decode_geometry(input) # :nodoc:
+      def decode_geometry(input)
         case input["type"]
         when "GeometryCollection"
-          _decode_geometry_collection(input)
+          decode_geometry_collection(input)
         when "Point"
-          _decode_point_coords(input["coordinates"])
+          decode_point_coords(input["coordinates"])
         when "LineString"
-          _decode_line_string_coords(input["coordinates"])
+          decode_line_string_coords(input["coordinates"])
         when "Polygon"
-          _decode_polygon_coords(input["coordinates"])
+          decode_polygon_coords(input["coordinates"])
         when "MultiPoint"
-          _decode_multi_point_coords(input["coordinates"])
+          decode_multi_point_coords(input["coordinates"])
         when "MultiLineString"
-          _decode_multi_line_string_coords(input["coordinates"])
+          decode_multi_line_string_coords(input["coordinates"])
         when "MultiPolygon"
-          _decode_multi_polygon_coords(input["coordinates"])
+          decode_multi_polygon_coords(input["coordinates"])
         else
           nil
         end
       end
 
-      def _decode_geometry_collection(input)  # :nodoc:
-        geometries_ = input["geometries"]
-        geometries_ = [] unless geometries_.is_a?(Array)
-        decoded_geometries_ = []
-        geometries_.each do |g_|
-          g_ = _decode_geometry(g_)
-          decoded_geometries_ << g_ if g_
+      def decode_geometry_collection(input)
+        geometries = input["geometries"]
+        geometries = [] unless geometries.is_a?(Array)
+        decoded_geometries = []
+        geometries.each do |geometry|
+          geometry = decode_geometry(geometry)
+          decoded_geometries << geometry if geometry
         end
-        @geo_factory.collection(decoded_geometries_)
+        @geo_factory.collection(decoded_geometries)
       end
 
-      def _decode_point_coords(point_coords)  # :nodoc:
-        return nil unless point_coords.is_a?(Array)
+      def decode_point_coords(point_coords)
+        return unless point_coords.is_a?(Array)
         @geo_factory.point(*(point_coords[0...@num_coordinates].map(&:to_f))) rescue nil
       end
 
-      def _decode_line_string_coords(line_coords) # :nodoc:
-        return nil unless line_coords.is_a?(Array)
+      def decode_line_string_coords(line_coords)
+        return unless line_coords.is_a?(Array)
         points = []
         line_coords.each do |point_coords|
-          point = _decode_point_coords(point_coords)
+          point = decode_point_coords(point_coords)
           points << point if point
         end
         @geo_factory.line_string(points)
       end
 
-      def _decode_polygon_coords(poly_coords) # :nodoc:
-        return nil unless poly_coords.is_a?(Array)
+      def decode_polygon_coords(poly_coords)
+        return unless poly_coords.is_a?(Array)
         rings = []
         poly_coords.each do |ring_coords|
-          return nil unless ring_coords.is_a?(Array)
+          return unless ring_coords.is_a?(Array)
           points = []
           ring_coords.each do |point_coords|
-            point = _decode_point_coords(point_coords)
+            point = decode_point_coords(point_coords)
             points << point if point
           end
           ring = @geo_factory.linear_ring(points)
@@ -227,31 +226,31 @@ module RGeo
         end
       end
 
-      def _decode_multi_point_coords(multi_point_coords) # :nodoc:
-        return nil unless multi_point_coords.is_a?(Array)
+      def decode_multi_point_coords(multi_point_coords)
+        return unless multi_point_coords.is_a?(Array)
         points = []
         multi_point_coords.each do |point_coords|
-          point = _decode_point_coords(point_coords)
+          point = decode_point_coords(point_coords)
           points << point if point
         end
         @geo_factory.multi_point(points)
       end
 
-      def _decode_multi_line_string_coords(multi_line_coords) # :nodoc:
-        return nil unless multi_line_coords.is_a?(Array)
+      def decode_multi_line_string_coords(multi_line_coords)
+        return unless multi_line_coords.is_a?(Array)
         lines = []
         multi_line_coords.each do |line_coords|
-          line = _decode_line_string_coords(line_coords)
+          line = decode_line_string_coords(line_coords)
           lines << line if line
         end
         @geo_factory.multi_line_string(lines)
       end
 
-      def _decode_multi_polygon_coords(multi_polygon_coords) # :nodoc:
-        return nil unless multi_polygon_coords.is_a?(Array)
+      def decode_multi_polygon_coords(multi_polygon_coords)
+        return unless multi_polygon_coords.is_a?(Array)
         polygons = []
         multi_polygon_coords.each do |poly_coords|
-          poly = _decode_polygon_coords(poly_coords)
+          poly = decode_polygon_coords(poly_coords)
           polygons << poly if poly
         end
         @geo_factory.multi_polygon(polygons)

data/lib/rgeo/geo_json/version.rb

@@ -1,5 +1,5 @@
 module RGeo
   module GeoJSON
-    VERSION = "2.0.0".freeze
+    VERSION = "2.1.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-geojson
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Convert RGeo data to and from GeoJSON.