geoq 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 370393af98fde48cdbf577971ac0024ef6c36dde
-  data.tar.gz: 5ece21e4e719a0f601fe5a22560d1423d16189e0
+  metadata.gz: 65f99517f2c00af9dadaaebb0648a1b74ef265b5
+  data.tar.gz: c68af107652e020f66b2cb670f65bbc677d9f557
 SHA512:
-  metadata.gz: ad791e2f4b9adc2f2056aa871e2bcda2c047b8c09ada892d5607c0aaff05bb060e5147ba7e38bd28ba54bd9841fec8197f1dd04fbf0d585d4eaa5975f7bf8fc8
-  data.tar.gz: aa9d613c4ac743b2c0b32309cbfe60e226a1405f1b3227fe9b0302817a33c71a25c53c72410b0664b03fff90418eb39001c04810a84814fc169ea03218a5fcca
+  metadata.gz: a572ce5d989f3d7cbec851fc00a5e70646a357de19b44910cb892fc4bece21c1752abcb3bc3e1642b50c7a582ac0c167e21de97e16cc4d175f5a758c8b129976
+  data.tar.gz: 47dbb2f5207155b763ee5832c24dc6257787de7e9e656ece19cbc16d9bc42d0cc6424170452a7b46415a168bfb3e978612179c838d28ca41eb2e95b6fb65e6d5

data/.travis.yml

@@ -1,3 +1,6 @@
 language: ruby
 rvm:
-  - 2.2
+  - 2.2
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install -y jq

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    geoq (0.0.1)
+    geoq (0.0.2)
       gli (~> 2.17)
+      os (~> 1.0)
       pr_geohash (~> 1.0)
       rgeo (~> 1.0)
       rgeo-geojson (~> 2.0)
@@ -53,6 +54,7 @@ GEM
       ruby-progressbar
     multi_json (1.13.1)
     multi_test (0.1.2)
+    os (1.0.0)
     pr_geohash (1.0.0)
     pry (0.11.3)
       coderay (~> 1.1.0)

data/LICENSE.txt

@@ -0,0 +1,7 @@
+Copyright (c) 2018 Horace Williams, http://worace.works
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -4,6 +4,7 @@ require 'rubygems/package_task'
 require 'rdoc/task'
 require 'cucumber'
 require 'cucumber/rake/task'
+require "bundler/gem_tasks"
 Rake::RDocTask.new do |rd|
   rd.main = "README.rdoc"
   rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")

data/bin/geoq

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'gli'
+require 'os'
 begin # XXX: Remove this begin/rescue before distributing your app
 require 'geoq'
 rescue LoadError
@@ -114,7 +115,29 @@ command :gh do |c|
       end
     end
   end
+end
+
+GEOJSON_IO_URL_LIMIT = 27000 # crudely derived via experimentation
+map_desc = "
+Plot input on geojson.io.
+
+Input will be converted to a GeoJSON FeatureCollection, similarly to 'geoq gj fc'
+
+We rely on url-encoding the desired GeoJSON to transfer it to geojson.io, so long inputs
+over 27k characters will be rejected."
 
+desc map_desc
+command :map do |c|
+  c.action do |global_options,options,args|
+    entities = Geoq::GeomReader.new(STDIN)
+    geojson = Geoq::Commands::GeoJson::FeatureCollection.new(entities).output
+    if geojson.length > GEOJSON_IO_URL_LIMIT
+      raise ArgumentError.new("'geoq map' failed because provided geojson exceeds geojson.io limit")
+    end
+    url = "http://geojson.io#data=data:application/json,#{URI.encode(geojson)}"
+    open_command = OS.mac? ? 'open' : 'xdg-open'
+    exec("#{open_command} #{url}")
+  end
 end
 
 pre do |global,command,options,args|

data/geoq.gemspec

@@ -26,4 +26,5 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency('rgeo', '~>1.0')
   s.add_runtime_dependency('rgeo-geojson', '~>2.0')
   s.add_runtime_dependency('pr_geohash', '~>1.0')
+  s.add_runtime_dependency('os', '~>1.0')
 end

data/lib/geoq/geom_reader.rb

@@ -22,7 +22,7 @@ module Geoq
 
     def each(&block)
       instream.each_line do |l|
-        block.call(decode(l))
+        decode(l).each(&block)
       end
     end
 
@@ -32,13 +32,19 @@ module Geoq
         p1 = factory.point(lon1, lat1)
         p2 = factory.point(lon2, lat2)
         geom = RGeo::Cartesian::BoundingBox.create_from_points(p1, p2).to_geometry
-        Geohash.new(geom, strip_whitespace(line))
+        [Geohash.new(geom, strip_whitespace(line))]
       elsif geojson?(line)
-        GeoJson.new(RGeo::GeoJSON.decode(line), line)
+        decoded = RGeo::GeoJSON.decode(line)
+        case decoded
+        when RGeo::GeoJSON::FeatureCollection
+          decoded.map { |f| GeoJson.new(f, line) }
+        else
+          [GeoJson.new(decoded, line)]
+        end
       elsif latlon?(line)
-        LatLon.new(factory.point(*strip_whitespace(line).split(",").map(&:to_f).reverse), line)
+        [LatLon.new(factory.point(*strip_whitespace(line).split(",").map(&:to_f).reverse), line)]
       else
-        Wkt.new(wkt.parse(line), line)
+        [Wkt.new(wkt.parse(line), line)]
       end
     end
 

data/lib/geoq/version.rb

@@ -1,3 +1,3 @@
 module Geoq
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/test/commands_test.rb

@@ -9,19 +9,33 @@ module Geoq
       assert_equal "FeatureCollection", json["type"]
       assert_equal ["type", "features"].sort, json.keys.sort
       features = json["features"]
-      assert_equal 5, features.count
+      assert_equal 6, features.count
 
+      assert_equal ["Polygon", "Point", "Point", "Point", "Point", "Point"], features.map { |f| f["geometry"]["type"] }
       # encodes properties
-      assert_equal [{}, {}, {}, {"a" => "b"}, {}], features.map { |f| f["properties"] }
+      assert_equal [{}, {}, {}, {"a" => "b"}, {}, {"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", "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], [-118.3, 34.52]], features.map { |f| f["geometry"]["coordinates"] }
+      assert_equal [gh, [0.0,1.0], [1.0, 2.0], [3.0, 4.0], [-118.3, 34.52], [3.0, 4.0]], features.map { |f| f["geometry"]["coordinates"] }
+    end
+
+    def test_feature_collection_given_feature_collection
+      input = TestData.stream([TestData.fc.to_json])
+      fc = Geoq::Commands::GeoJson::FeatureCollection.new(input)
+      json = JSON.parse(fc.output)
+      assert_equal "FeatureCollection", json["type"]
+      assert_equal 2, json["features"].count
+
+      input = TestData.stream([TestData.fc.to_json, "9q"])
+      fc = Geoq::Commands::GeoJson::FeatureCollection.new(input)
+      json = JSON.parse(fc.output)
+      assert_equal "FeatureCollection", json["type"]
+      assert_equal 3, json["features"].count
     end
 
     def test_geohash_point

data/test/entity_test.rb

@@ -0,0 +1,21 @@
+require "test_helper"
+require "json"
+
+module Geoq
+  class CommandsTest < Minitest::Test
+    def reader
+      i,o = IO.pipe
+      o.close
+      GeomReader.new(i)
+    end
+
+    def test_decoding_returns_list_of_features
+      gh = reader.decode("9q").first
+      assert_equal({"type"=>"Polygon", "coordinates"=>[[[-123.75, 33.75], [-112.5, 33.75], [-112.5, 39.375], [-123.75, 39.375], [-123.75, 33.75]]]}, gh.as_geojson)
+
+      assert_equal 1, reader.decode("9q").count
+      assert_equal 1, reader.decode("1,2").count
+      assert_equal 2, reader.decode(TestData.fc.to_json).count
+    end
+  end
+end

data/test/geom_reader_test.rb

@@ -52,5 +52,10 @@ module Geoq
       point = TestData.stream(["34, -118"]).first
       assert_equal "9qh1", point.gh_string(4)
     end
+
+    def test_gj_feature_collections_read_as_multiple
+      reader = TestData.stream([TestData.fc.to_json])
+      assert_equal 2, reader.count
+    end
   end
 end

data/test/test_helper.rb

@@ -8,6 +8,11 @@ require "minitest/spec"
 Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new
 
 module Geoq::TestData
+  def self.fc
+    {type: "FeatureCollection", features: [{type: "Feature", properties: {a: "b"}, geometry: {type: "Point", coordinates: [3,4]}},
+                                           {type: "Feature", properties: {a: "b"}, geometry: {type: "Point", coordinates: [5,6]}}]}
+  end
+
   def self.stream(strings)
     r,w = IO.pipe
     strings.each do |s|
@@ -22,7 +27,8 @@ module Geoq::TestData
               {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,
-              "34.52,-118.3"]
+              "34.52,-118.3",
+              {type: "FeatureCollection", features: [{type: "Feature", properties: {a: "b"}, geometry: {type: "Point", coordinates: [3,4]}}]}.to_json]
     stream(inputs)
   end
 end

data/test/usage_test.rb

@@ -2,22 +2,15 @@ require "test_helper"
 
 module Geoq
   class UsageTest < Minitest::Test
-    def script_setup
+    def self.script_setup
       File.read("./usage.md").match(/```setup\n(.+)\n```/)[1]
     end
 
-    def examples
+    def self.examples
       File.read("./usage.md").scan(/```example\n(.*?)```\n/m).to_a.flatten.map { |match| match.split("\n=> ") }
     end
 
-    def setup
-    end
-
-    def test_reads_examples
-      assert_equal 15, examples.count
-    end
-
-    def checked_command(command)
+    def self.checked_command(command)
       result = `#{command.gsub("geoq", "bundle exec bin/geoq")}`
       if $? != 0
         raise RuntimeError.new("Command #{command} exited with non-zero response code.")
@@ -25,11 +18,15 @@ module Geoq
       result
     end
 
-    def test_run_examples
-      examples.each do |command, expected_output|
-        result = checked_command(command)
+    examples.each_with_index do |(command, expected_output), index|
+      define_method("test_#{index}") do
+        result = self.class.checked_command(command)
         assert_equal expected_output, result, "Checked example: #{command} failed"
       end
     end
+
+    def test_reads_examples
+      assert_equal 16, self.class.examples.count
+    end
   end
 end

data/usage.md

@@ -23,6 +23,13 @@ printf "9q5\n9q4\n" | geoq gj fc
 => {"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[-119.53125,33.75],[-118.125,33.75],[-118.125,35.15625],[-119.53125,35.15625],[-119.53125,33.75]]]}},{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[-120.9375,33.75],[-119.53125,33.75],[-119.53125,35.15625],[-120.9375,35.15625],[-120.9375,33.75]]]}}]}
 ```
 
+Concat multiple GeoJSON Feature Collections into a single collection
+
+```example
+printf "9q5\n{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[-119.53125,33.75],[-118.125,33.75],[-118.125,35.15625],[-119.53125,35.15625],[-119.53125,33.75]]]}},{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[-120.9375,33.75],[-119.53125,33.75],[-119.53125,35.15625],[-120.9375,35.15625],[-120.9375,33.75]]]}}]}" | geoq gj fc | jq ".features | length"
+=> 3
+```
+
 Converts Geohashes, WKTs, Lat/Lons, and GeoJSON into GeoJSON
 
 ```example

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geoq
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Horace Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 
 email: horace@worace.works
 executables:
@@ -147,6 +161,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- LICENSE.txt
 - README.md
 - README.rdoc
 - Rakefile
@@ -161,6 +176,7 @@ files:
 - lib/geoq/geom_reader.rb
 - lib/geoq/version.rb
 - test/commands_test.rb
+- test/entity_test.rb
 - test/geom_reader_test.rb
 - test/test_helper.rb
 - test/usage_test.rb