geo-cli 0.0.1.pre2 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4636a266ddd9104cc19e1f45a67135f200789ac9
-  data.tar.gz: b794b6c2d0c5adff836dbf7925737b3c039fe536
+  metadata.gz: fe4a7f6a7976742fcd78ec2ed65c93f565202453
+  data.tar.gz: 00d8e7c4c7daed2c09606adb1df3db806dab4274
 SHA512:
-  metadata.gz: ddb013a6d8131ef1b0ee5468032723c319220c0d7777dd87d4a0d868d196a958a4d144f0caff090782607b7e46ebd0653c6ac4eefd464cee0d6889d80e6a15fd
-  data.tar.gz: 31bd21346a46d36bb85f1c7567b0df968b0afa2642824aa424253c1b472ee5d81b3743a9232ff2313126095bc51e302807188b0c5fbf6c19f98a0eaad4f829b6
+  metadata.gz: aec4b2c462c757cee0aa69a199544e7384f07065a638ad5278e5d3de8a833fc4724c669894a61ff2c4c04b593c9951523e1267b1ecb36d3280934d86a62eb131
+  data.tar.gz: 4cd9eeb76df744d9b1c9cf8d978add9db9b64a844bb0eb0ee9d13417f5f2a023496dd8c08ce33a171387f761572ab0af0d3554c191f5e055dfc070dfaecbb0a6

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    geo-cli (0.0.1)
-      gli (= 2.17.1)
+    geo-cli (0.0.1.pre2)
+      gli (~> 2.17)
       pr_geohash (~> 1.0)
-      rgeo
-      rgeo-geojson
+      rgeo (~> 1.0)
+      rgeo-geojson (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -73,13 +73,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
+  aruba (~> 0.14)
   geo-cli!
   minitest (~> 5.11)
-  minitest-reporters
-  pry
-  rake
-  rdoc
+  minitest-reporters (~> 1.2)
+  pry (~> 0.11)
+  rake (~> 12.3)
+  rdoc (~> 6.0)
 
 BUNDLED WITH
    1.16.1

data/bin/geo-cli

@@ -14,22 +14,22 @@ include GLI::App
 program_desc <<-desc
 Geospatial utility belt
 
-geo-cli is a command-line tool for converting between various
-GIS serialization formats. For example:
+    geo-cli is a command-line tool for converting between various
+    GIS serialization formats. For example:
 
-echo 9q5 | geo-cli gj geometry
+        echo 9q5 | geo-cli gj geometry
 
-Will output the geohash 9q5 as a geojson geometry.
+    Will output the geohash 9q5 as a geojson geometry.
 
-Most commands will accept a Geohash (base 32 encoded), a WKT,
-or a GeoJSON input, and should recognize the input based on its
-format.
+    Most commands will accept a Geohash (base 32 encoded), a WKT,
+    or a GeoJSON input, and should recognize the input based on its
+    format.
 
-Commands expect one geo entity per line.
+    Commands expect one geo entity per line.
 
-See COMMANDS for more possible commands.
+    See COMMANDS for more possible commands.
 
-See geo-cli <COMMAND> --help for more info on a given command.
+    See geo-cli <COMMAND> --help for more info on a given command.
 desc
 
 version GeoCli::VERSION
@@ -63,7 +63,8 @@ command :gj do |c|
   c.desc "Combine entities into a geojson feature collection"
   c.command :fc do |c|
     c.action do |global_options,options,args|
-      puts GeoCli::FeatureCollection.new(GeoCli::GeomReader.new(STDIN)).to_geojson
+      entities = GeoCli::GeomReader.new(STDIN)
+      puts GeoCli::Commands::GeoJson::FeatureCollection.new(entities).output
     end
   end
 end

data/lib/geo-cli/geom_reader.rb

@@ -3,6 +3,30 @@ require "rgeo"
 require "rgeo/geo_json"
 
 module GeoCli
+  module Commands
+    class Base
+      attr_reader :global_opts, :opts, :args, :instream
+      def initialize(instream, global_opts = {}, opts = {}, args = [])
+        @global_opts = global_opts
+        @opts = opts
+        @args = args
+        @instream = instream
+      end
+
+      def output
+        raise "Not implemented"
+      end
+    end
+
+    module GeoJson
+      class FeatureCollection < Base
+        def output
+          GeoCli::FeatureCollection.new(instream).to_geojson
+        end
+      end
+    end
+  end
+
   class Entity
     attr_reader :entity
 
@@ -37,6 +61,19 @@ module GeoCli
   end
 
   class GeoJson < Entity
+    def as_geojson(feature = false)
+      if feature
+        if entity.is_a?(RGeo::GeoJSON::Feature)
+          RGeo::GeoJSON.encode(entity)
+        else
+          {type: "Feature",
+           properties: {},
+           geometry: RGeo::GeoJSON.encode(entity)}
+        end
+      else
+        RGeo::GeoJSON.encode(entity)
+      end
+    end
   end
 
   class FeatureCollection
@@ -80,7 +117,7 @@ module GeoCli
         geom = RGeo::Cartesian::BoundingBox.create_from_points(p1, p2).to_geometry
         Geohash.new(geom)
       elsif geojson?(line)
-        Geojson.new(RGeo::GeoJSON.decode(line))
+        GeoJson.new(RGeo::GeoJSON.decode(line))
       else
         Wkt.new(wkt.parse(line))
       end

data/lib/geo-cli/version.rb

@@ -1,3 +1,3 @@
 module GeoCli
-  VERSION = '0.0.1.pre2'
+  VERSION = '0.0.1'
 end

data/test/geom_reader_test.rb

@@ -10,6 +10,23 @@ class TestGeomReader < Minitest::Test
     @reader = GeoCli::GeomReader.new(r)
   end
 
+  def stream(strings)
+    r,w = IO.pipe
+    strings.each do |s|
+      w.puts(s)
+    end
+    w.close
+    GeoCli::GeomReader.new(r)
+  end
+
+  def mixed_stream
+    inputs = ["9q5",
+              {type: "Point", coordinates: [0,1]}.to_json,
+              "POINT (1.0 2.0)",
+              {type: "Feature", properties: {a: "b"}, geometry: {type: "Point", coordinates: [3,4]}}.to_json]
+    stream(inputs)
+  end
+
   def test_recognizes_geohashes
     assert @reader.geohash?("9q5")
     assert @reader.geohash?("9Q5")
@@ -24,21 +41,31 @@ class TestGeomReader < Minitest::Test
   end
 
   def test_parse_objects
-    inputs = ["9q5",
-              {type: "Point", coordinates: [0,1]}.to_json,
-              "POINT (1.0 2.0)"]
-    parsed = make_reader(inputs).to_a
-    assert parsed[0].is_a? RGeo::Geos::CAPIPolygonImpl
-    assert parsed[1].is_a?(RGeo::Geos::CAPIPointImpl)
-    assert parsed[2].is_a?(RGeo::Geos::CAPIPointImpl)
+    parsed = mixed_stream.to_a
+    assert parsed[0].is_a? GeoCli::Geohash
+    assert parsed[1].is_a? GeoCli::GeoJson
+    assert parsed[2].is_a? GeoCli::Wkt
+    assert parsed[3].is_a? GeoCli::GeoJson
   end
 
-  def make_reader(strings)
-    r,w = IO.pipe
-    strings.each do |s|
-      w.puts(s)
-    end
-    w.close
-    GeoCli::GeomReader.new(r)
+  def test_feature_collection
+    fc = GeoCli::Commands::GeoJson::FeatureCollection.new(mixed_stream)
+    json = JSON.parse(fc.output)
+    assert_equal "FeatureCollection", json["type"]
+    assert_equal ["type", "features"].sort, json.keys.sort
+    features = json["features"]
+    assert_equal 4, features.count
+
+    # encodes properties
+    assert_equal [{}, {}, {}, {"a" => "b"}], features.map { |f| f["properties"] }
+    assert_equal Hash.new, features[0]["properties"]
+    assert_equal Hash.new, features[1]["properties"]
+    assert_equal Hash.new, features[2]["properties"]
+    assert_equal({"a" => "b"}, features[3]["properties"])
+
+    assert_equal ["Polygon", "Point", "Point", "Point"], features.map { |f| f["geometry"]["type"] }
+
+    gh = [[[-119.53125, 33.75], [-118.125, 33.75], [-118.125, 35.15625], [-119.53125, 35.15625], [-119.53125, 33.75]]]
+    assert_equal [gh, [0.0,1.0], [1.0, 2.0], [3.0, 4.0]], features.map { |f| f["geometry"]["coordinates"] }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre2
+  version: 0.0.1
 platform: ruby
 authors:
 - Horace Williams
@@ -197,9 +197,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1