Update overpass_parser

Author: frodrigo

Gemfile.lock

@@ -1,9 +1,10 @@
 GIT
   remote: https://github.com/teritorio/overpass_parser-rb.git
-  revision: 0b88a4eaf84d580bc761c6aea8a31663f63b20e9
+  revision: f58f0da05054fe84521a61d32b4f2450490e6db6
   specs:
     overpass_parser (1.0.0)
       rice (~> 4.0)
+      sorbet-struct-comparable (~> 1.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -132,6 +133,8 @@ GEM
     sorbet-static-and-runtime (0.5.11295)
       sorbet (= 0.5.11295)
       sorbet-runtime (= 0.5.11295)
+    sorbet-struct-comparable (1.3.0)
+      sorbet-runtime (>= 0.5)
     spoom (1.2.4)
       erubi (>= 1.10.0)
       sorbet-static-and-runtime (>= 0.5.10187)

datasources/sources/overpass_select.rb

@@ -4,6 +4,8 @@
 require 'active_support/all'
 require 'cgi'
 require 'overpass_parser/visitor'
+require 'overpass_parser/nodes/query_objects'
+require 'overpass_parser/nodes/selectors'
 
 require 'sorbet-runtime'
 
@@ -73,12 +75,12 @@ def initialize(job_id, destination_id, name, settings)
   end
 
   def deep_select(object, &block)
-    if object.is_a?(Array)
-      object.collect{ |o|
+    if object.is_a?(OverpassParser::Nodes::QueryObjects)
+      object.selectors&.to_overpass
+    elsif object.is_a?(OverpassParser::Nodes::Request) || object.is_a?(OverpassParser::Nodes::QueryUnion)
+      object.queries.collect{ |o|
         deep_select(o, &block)
       }.flatten(1).compact
-    elsif object.is_a?(Hash)
-      deep_select(object.values, &block) + (block.call(object) ? [object] : [])
     end
   end
 
@@ -88,18 +90,13 @@ def osm_tags
 
     if @selectors.blank?
       tree = OverpassParser.tree(@settings.query)
-      tags_all = {}
-      selects = deep_select(tree) { |o| o[:type] == :query_object }.select{ |query_object|
-        query_object[:selectors].present?
-      }.collect{ |query_object|
-        query_object[:selectors].to_overpass
-      }
+      selects = deep_select(tree[0])
 
       super().deep_merge_array({
         'data' => selects.collect{ |select|
           {
             'select' => [select],
-            'interest' => tags_all.merge(@settings.interest&.to_h{ |key| [key, nil] } || {}),
+            'interest' => @settings.interest&.to_h{ |key| [key, nil] } || {},
             'sources' => [@job_id, @destination_id].uniq
           }
         }