es_query_builder 2.0.2 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48081a664a93e6ba790601ed3e4bf39f3239991f
-  data.tar.gz: 5f10af03250a30bb84830ea03c7cc589cdef6e4b
+  metadata.gz: 6a1838cd288b76c74d37cbc4c6199e4eadd30ef8
+  data.tar.gz: 76a7fb2124afa3408b1438bc02ff2e76d1921aeb
 SHA512:
-  metadata.gz: d02ada8f7df40f7892310a6c9e981eafa9d16b75c6afa2b25237671219bbaee5983b38b62d040f3d0d28435021b82d3c90447786db4c4e19107adc948739352e
-  data.tar.gz: 54a60e9ed8baaf829113378fe2d9d7a5bd899a8d9fe54ad26a4e6ae5e93e4ece06dc9b1c34038d39ff79c572fdc34e07120055cd3aafedc8f814115006eb9343
+  metadata.gz: 73227dcb19043fc35af84edf55c8c1b9eaae72a09c066bd3e9850e866009ab384815d778ce14a3debeab793f0fb3f2163f846255ca8ce3200865c80a17c820e8
+  data.tar.gz: d2a6823a4e719c9d51d022a4c141542a118078f8fab6c024d207262d4dfbfb840dc4d254fe7e2288f7ab56140d8376360d99aec2d51fd01ba2fcd69a365a655b

data/lib/constants.rb

@@ -1,4 +1,5 @@
 module Constants
   MAX_BULK_INDEX_SIZE = 2000
   FUNCTION_SCORE_METHODS = %w(multiply sum avg first max min)
+  RADIUS_OF_EARTH = 6378.1
 end

data/lib/misc/geo_bounding_box_point.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+require_relative '../constants'
+
+module Misc
+  # Point Class
+  class GeoBoundingBoxPoint
+    include AttributesReader
+
+    # @params [Numeric] lat latitude
+    # @params [Numeric] lng longitude
+    # @params [Array|String] latlng
+    #   latitude and longitude as array or string
+    #   Format in [lon, lat] when array, such as [-70,40]
+    #   Format in lat,lon when string, such as '40,-70'
+    # @params [String] geohash point geohash
+    def initialize(lat: nil, lng: nil, radius: nil, latlng: nil, geo_hash: nil)
+      if lat.present? && lng.present?
+        @lat = lat.to_f
+        @lng = lng.to_f
+        @radius = radius.to_f
+        @type = :float
+      elsif latlng.present?
+        @latlng = latlng
+        @type = latlng.class.name.downcase.intern
+      elsif geo_hash.present?
+        @geo_hash = geo_hash
+        @type = :geohash
+      else
+        raise 'Provide Point as floating values latitude and longitude
+               or a string or an array or a geohash'
+      end
+    end
+
+    # @return [Hash] serialized json query for object
+    def settings
+      case @type
+      when :float
+        get_bounding_box_point
+      when :array || :string
+        @latlng
+      when :geohash
+        @geohash
+      end
+    end
+
+    # @!visibility protected
+    def lat_expr
+      @lat
+    end
+
+    # @!visibility protected
+    def lng_expr
+      @lng
+    end
+
+    # @!visibility protected
+    def latlng_expr
+      @latlng
+    end
+
+    # @!visibility protected
+    def geo_hash_expr
+      @geo_hash
+    end
+
+    def get_coordinates
+      radius_of_earth = Constants::RADIUS_OF_EARTH
+      pi = Math::PI
+      deg_to_rad =  pi/180
+      lat_in_rad = @lat * deg_to_rad
+      lon_in_rad = @lng * deg_to_rad
+      delta_rad = @radius/radius_of_earth
+      ne_coordinates = {
+          latitude: (lat_in_rad + delta_rad)/ deg_to_rad,
+          longitude: (lon_in_rad + delta_rad)/ deg_to_rad
+      }
+      sw_coordinates = {
+          latitude: (lat_in_rad - delta_rad)/ deg_to_rad,
+          longitude: (lon_in_rad - delta_rad)/ deg_to_rad
+      }
+      nw_coordinates = {
+          latitude: (lat_in_rad - delta_rad)/ deg_to_rad,
+          longitude: (lon_in_rad + delta_rad)/ deg_to_rad
+      }
+      se_coordinates = {
+          latitude: (lat_in_rad + delta_rad)/ deg_to_rad,
+          longitude: (lon_in_rad - delta_rad)/ deg_to_rad
+      }
+      {ne_coordinates: ne_coordinates, sw_coordinates: sw_coordinates, nw_coordinates: nw_coordinates, se_coordinates: se_coordinates}
+    end
+
+    def get_bounding_box_point
+      direction_coordinates = get_coordinates
+      ne_lat_lng, sw_lat_lng =  direction_coordinates[:ne_coordinates], direction_coordinates[:sw_coordinates]
+      {
+        top_right: {lat: ne_lat_lng[:latitude].to_f,
+                   lon: ne_lat_lng[:longitude].to_f},
+        bottom_left: {lat: sw_lat_lng[:latitude].to_f,
+                     lon: sw_lat_lng[:longitude].to_f}
+      }
+    end
+
+  end
+end
+

data/lib/queries/geo_bounding_box_query_builder.rb

@@ -0,0 +1,123 @@
+# Filters documents that include only hits that exists within a specific distance from a geo point.
+require_relative 'query_builder'
+module Queries
+  class GeoBoundingBoxQueryBuilder < QueryBuilder
+
+    NAME = 'geo_bounding_box'
+    DEFAULT_DISTANCE_UNIT = ::Enums::DistanceUnits.meters
+
+=begin
+    @params:
+      field_name: geo_point field in the document which is matched with the given query
+      point: center point for this query
+      distance: The radius of the circle centred on the specified location. Points which fall into this circle are considered to be matches.
+      distance_unit: The distance can be specified in various units. See Distance Units.
+      distance_type: How to compute the distance. Can either be arc (default),
+                     or plane (faster, but inaccurate on long distances and close to the poles)
+      writable_name: Optional name field to identify the query
+      validation_method: Set to IGNORE_MALFORMED to accept geo points with invalid latitude or longitude,
+                         set to COERCE to additionally try and infer correct coordinates (default is STRICT).
+      ignore_unmapped: When set to true the ignore_unmapped option will ignore an unmapped field and will not match any documents for this query.
+                       When set to false (the default value) the query will throw an exception if the field is not mapped.
+=end
+
+    def initialize field_name:
+      @field_name = field_name
+      @point = nil
+      @distance = nil
+      @distance_unit = DEFAULT_DISTANCE_UNIT.distance_unit
+      @writable_name = nil
+      @validation_method = nil
+      @ignore_unmapped = nil
+    end
+
+    def query
+      query = {}
+      geo_query = self.common_query
+      geo_query[@field_name] = @point.settings
+      geo_query[:writable_name] = @writable_name
+      geo_query[:validation_method] = @validation_method
+      geo_query[:ignore_unmapped] = @ignore_unmapped
+      query[name.intern] = geo_query
+      return query
+    end
+
+    # Returns point
+    def point_expr
+      return @point
+    end
+
+    # Sets point
+    def point point
+      @point = point
+      return self
+    end
+
+    # Returns field_name
+    def field_name_expr
+      return @field_name
+    end
+
+    # Returns distance
+    def distance_expr
+      return @distance
+    end
+
+    # Returns distance_unit
+    def distance_unit_expr
+      return @distance_unit
+    end
+
+    # Sets distance and distance_unit
+    def distance distance, distance_unit= nil
+      @distance = distance
+      @distance_unit = distance_unit.distance_unit if distance_unit.present?
+      return self
+    end
+
+    # Returns distance_type
+    def distance_type_expr
+      return @distance_type
+    end
+
+    # Sets distance_type
+    def distance_type distance_type
+      @distance_type = distance_type.distance_type
+      return self
+    end
+
+    # Returns writable_name
+    def writable_name_expr
+      return @writable_name
+    end
+
+    # Sets writable_name
+    def writable_name writable_name
+      @writable_name = writable_name
+      return self
+    end
+
+    # Returns validation_method
+    def validation_method_expr
+      return @validation_method
+    end
+
+    # Sets validation_method
+    def validation_method validation_method
+      @validation_method = validation_method.validation_method
+      return self
+    end
+
+    # Returns ignore_unmapped
+    def ignore_unmapped_expr
+      return @ignore_unmapped
+    end
+
+    # Sets ignore_unmapped
+    def ignore_unmapped ignore_unmapped
+      @ignore_unmapped = ignore_unmapped
+      return self
+    end
+
+  end
+end

data/lib/queries/terms_query_builder.rb

@@ -32,7 +32,7 @@ module Queries
     def query
       query = {}
       terms_query = self.common_query
-      terms_query[@field_name.intern] = @values if @values.present?
+      terms_query[@field_name.intern] = @values
       terms_query[@field_name.intern] = @terms_lookup.settings if @terms_lookup.present?
       query[name.intern] = terms_query
       return query

data/lib/query_builders.rb

@@ -102,4 +102,13 @@ class QueryBuilders
   def self.match_all_query
     Queries::MatchAllQueryBuilder.new
   end
+
+  # @params [String] field_name
+  #   field on which exists query to be performed
+  # @return [Queries::GeoDistanceQueryBuilder]
+  #   geo_bounding_box_query_builder object
+  def self.geo_bounding_box_query(*args)
+    Queries::GeoBoundingBoxQueryBuilder.new(*args)
+  end
+
 end

data/lib/search_source_builder.rb

@@ -7,6 +7,7 @@ class SearchSourceBuilder
     @aggregations = []
     @sort = []
     @source = []
+    @_source = {}
     @size = nil
     @explain = nil
     @from = nil
@@ -22,7 +23,7 @@ class SearchSourceBuilder
     body[:query] = @query.query
     body[:aggregations] = @aggregations.map{|agg| agg.query}.reduce({}, :merge) if @aggregations.present?
     body[:sort] = @sort.map{|sort_object| sort_object.query} if @sort.present?
-    body[:_source] = @source
+    body[:_source] = @_source.presence || @source
     body[:size] = @size
     body[:explain] = @explain
     body[:from] = @from
@@ -80,6 +81,32 @@ class SearchSourceBuilder
     return self
   end
 
+# returns source_fields
+  def source_include_expr
+    return [] unless @_source[:include].present?
+    @_source[:include]
+  end
+
+  def source_exclude_expr
+    return [] unless @_source[:exclude].present?
+    @_source[:exclude]
+  end
+
+# sets source include fields
+  def source_include(include_list)
+    @_source[:include] = [] if @_source[:include].blank?
+    include_list.is_a?(Array) ? (@_source[:include] += include_list) : @_source[:include].append(include_list)
+    self
+  end
+
+# sets source exclude fields
+  def source_exclude(exclude_list)
+    @_source[:exclude] = [] if @_source[:exclude].blank?
+    exclude_list.is_a?(Array) ? (@_source[:exclude] += exclude_list) : @_source[:exclude].append(exclude_list)
+    self
+  end
+  
+
 # returns size
   def size_expr
     return @size

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: es_query_builder
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.6
 platform: ruby
 authors:
 - Mohib Yousuf
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,6 +129,7 @@ files:
 - lib/function_scores/weighted_score_function_builder.rb
 - lib/indexer.rb
 - lib/misc/bucket_order.rb
+- lib/misc/geo_bounding_box_point.rb
 - lib/misc/geo_point.rb
 - lib/misc/range.rb
 - lib/misc/script.rb
@@ -141,6 +142,7 @@ files:
 - lib/queries/dis_max_query_builder.rb
 - lib/queries/exists_query_builder.rb
 - lib/queries/function_score_query_builder.rb
+- lib/queries/geo_bounding_box_query_builder.rb
 - lib/queries/geo_distance_query_builder.rb
 - lib/queries/match_all_query_builder.rb
 - lib/queries/match_query_builder.rb