underpass 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 38e561ec9d01ca1013783c0ea8cedb34b00d52938db669d3f5feb4a10d7fd155
-  data.tar.gz: a99031218fec8de7c13d48df9c54e222445a2eb9dbb3399b1ab0605fe390d263
+SHA1:
+  metadata.gz: 11d35c1d3797aadc218d103eb479bff53656006e
+  data.tar.gz: 11274bfe826d9fad56468589b8684d700b05d65a
 SHA512:
-  metadata.gz: 0d89ebcb48cb6309caee1947acde9f8c946568256017cf4387155952ed2c4e13dbfc8a1d226b4127db7580fe7b70ad7c7250094124f2b9b81eef26338db650e6
-  data.tar.gz: 9ea52cceb5fcf0edb4ee634a4c012e6ffbc65c288be0f632fe77639f87aa6b4cee8996315eda23612515bc88cc72abd928f872249cbef95efb3f7e0712747cfe
+  metadata.gz: 841e51e09bfb4aff0878c796034d096bf73b660013ee65e0649708c238fa069b524958b3a36213e5d1aaecbaa1bbb5e7b604d4456a745e0bd631f03f7310bb57
+  data.tar.gz: 73a4d865183f8401e4dece8126f95fcd8b229d22a0a2d55e2e9d7b92b2a58bf39c067a9f4b75bf8ac06f2a2295b63502c6447f6b01b1fea878493ad67bf337a6

data/lib/underpass/ql/parser.rb

@@ -26,7 +26,7 @@ module Underpass
         end
 
         @ways.each_value do |way|
-          @matches << polygon_from_way(way, @nodes) if way.key?(:tags)
+          @matches << way_matches(way) if way.key?(:tags)
         end
 
         @matches
@@ -34,6 +34,18 @@ module Underpass
 
       private
 
+      def way_matches(way)
+        if open_way?(way)
+          polygon_from_way(way, @nodes)
+        else
+          line_string_from_way(way, @nodes)
+        end
+      end
+
+      def open_way?(way)
+        Underpass::QL::Shape.open_way?(way)
+      end
+
       def point_from_node(node)
         Underpass::QL::Shape.point_from_node(node)
       end
@@ -42,6 +54,10 @@ module Underpass
         Underpass::QL::Shape.polygon_from_way(way, nodes)
       end
 
+      def line_string_from_way(way, nodes)
+        Underpass::QL::Shape.line_string_from_way(way, nodes)
+      end
+
       def extract_indexed_nodes(elements)
         nodes = elements.select { |e| e[:type] == 'node' }
         nodes.map { |e| [e[:id], e] }.to_h

data/lib/underpass/ql/shape.rb

@@ -5,6 +5,10 @@ module Underpass
     # Contains factories for various RGeo shapes from ways and nodes parsed
     # with the Parser class
     class Shape
+      def self.open_way?(way)
+        way[:nodes].first == way[:nodes].last
+      end
+
       def self.polygon_from_way(way, nodes)
         f = RGeo::Geographic.spherical_factory(srid: 4326)
         f.polygon(line_string_from_way(way, nodes))
@@ -26,6 +30,7 @@ module Underpass
 
       # There should be some sort of 'decorator' to return an object
       # with the shape and a copy of the tags as
+      # Bonus: try to make it RGeo::GeoJSON.encode compatible
       # {
       #   tags: way[:tags],
       #   shape: shape

data/lib/underpass/version.rb

@@ -13,7 +13,7 @@ module Underpass
   module VERSION
     MAJOR = 0
     MINOR = 0
-    PATCH = 6
+    PATCH = 7
 
     STRING = [MAJOR, MINOR, PATCH].join('.')
   end

metadata

@@ -1,55 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: underpass
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Janos Rusiczki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.15.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.15.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.15.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 4.7.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 4.7.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.7.3
+- !ruby/object:Gem::Dependency
+  name: guard-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A library that translates Overpass API responses into RGeo objects