geoq 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65f99517f2c00af9dadaaebb0648a1b74ef265b5
-  data.tar.gz: c68af107652e020f66b2cb670f65bbc677d9f557
+  metadata.gz: 3a8fda162158377b2f584680d2b3039160b2aed5
+  data.tar.gz: 77028b68a15d7cce1581e9a97138a42e75491fb6
 SHA512:
-  metadata.gz: a572ce5d989f3d7cbec851fc00a5e70646a357de19b44910cb892fc4bece21c1752abcb3bc3e1642b50c7a582ac0c167e21de97e16cc4d175f5a758c8b129976
-  data.tar.gz: 47dbb2f5207155b763ee5832c24dc6257787de7e9e656ece19cbc16d9bc42d0cc6424170452a7b46415a168bfb3e978612179c838d28ca41eb2e95b6fb65e6d5
+  metadata.gz: 7346ed0ef0f70cd81c8f3e081622f4697f0db823f97ba994d09406713df4f0054ca60912ae5f7fad92fe65c4976d0586520d3c747af544fd2e1e23a31f4412f8
+  data.tar.gz: dc6fdfad9dd14d1eaf8192b9c7f204664136688c179a444225635f68eb5c2b7c4610521ce40c480cd6861e78277e75817255002f209348917f120d7fd390979b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geoq (0.0.2)
+    geoq (0.0.3)
       gli (~> 2.17)
       os (~> 1.0)
       pr_geohash (~> 1.0)

data/bin/geoq

@@ -22,7 +22,7 @@ Geospatial utility belt
 
     Will output the geohash 9q5 as a geojson geometry.
 
-    Most commands will accept a Lat/Lon (comma-separated), a Geohash
+    Most commands will accept a Lat/Lon (comma or tab-separated), a Geohash
     (base 32 encoded), a WKT, or a GeoJSON input.
 
     The tool should recognize the input type based on its format.
@@ -118,15 +118,13 @@ command :gh do |c|
 end
 
 GEOJSON_IO_URL_LIMIT = 27000 # crudely derived via experimentation
-map_desc = "
-Plot input on geojson.io.
 
+desc "Plot input on geojson.io."
+long_desc "
 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
+We rely on url-encoding the desired GeoJSON to transfer it to geojson.io,
+so long inputs over 27k characters will be rejected."
 command :map do |c|
   c.action do |global_options,options,args|
     entities = Geoq::GeomReader.new(STDIN)

data/lib/geoq/geom_reader.rb

@@ -42,7 +42,7 @@ module Geoq
           [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.gsub("\t", ",")).split(",").map(&:to_f).reverse)), line)]
       else
         [Wkt.new(wkt.parse(line), line)]
       end
@@ -61,7 +61,7 @@ module Geoq
     end
 
     def latlon?(line)
-      !!LAT_LON_REGEX.match(strip_whitespace(line))
+      !!LAT_LON_REGEX.match(strip_whitespace(line.gsub(/\t/, ",")))
     end
 
     private

data/lib/geoq/version.rb

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

data/test/commands_test.rb

@@ -9,11 +9,11 @@ module Geoq
       assert_equal "FeatureCollection", json["type"]
       assert_equal ["type", "features"].sort, json.keys.sort
       features = json["features"]
-      assert_equal 6, features.count
+      assert_equal 7, features.count
 
-      assert_equal ["Polygon", "Point", "Point", "Point", "Point", "Point"], features.map { |f| f["geometry"]["type"] }
+      assert_equal ["Polygon", "Point", "Point", "Point", "Point", "Point", "Point"], features.map { |f| f["geometry"]["type"] }
       # encodes properties
-      assert_equal [{}, {}, {}, {"a" => "b"}, {}, {"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"]
@@ -21,7 +21,7 @@ module Geoq
 
 
       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], [3.0, 4.0]], 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], [-45.3, 18.3], [3.0, 4.0]], features.map { |f| f["geometry"]["coordinates"] }
     end
 
     def test_feature_collection_given_feature_collection

data/test/geom_reader_test.rb

@@ -38,6 +38,9 @@ module Geoq
       assert reader.latlon?("0, 0")
       assert reader.latlon?("123.456,98.2")
       assert reader.latlon?("  -123.456,-98.2 ")
+      assert reader.latlon?("123.456	98.2")
+      assert reader.latlon?("123.456\t98.2")
+      assert reader.decode("34\t-118").first.is_a?(LatLon)
     end
 
     def test_correct_lat_lon_ordering

data/test/test_helper.rb

@@ -28,6 +28,7 @@ module Geoq::TestData
               "POINT (1.0 2.0)",
               {type: "Feature", properties: {a: "b"}, geometry: {type: "Point", coordinates: [3,4]}}.to_json,
               "34.52,-118.3",
+              "18.3\t-45.3",
               {type: "FeatureCollection", features: [{type: "Feature", properties: {a: "b"}, geometry: {type: "Point", coordinates: [3,4]}}]}.to_json]
     stream(inputs)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geoq
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Horace Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: geoq is a command-line utility for GIS format conversion and common GIS operations