Rename directions

machinio · Jan 16, 2024 · c44a1ed · c44a1ed
1 parent c86a42a
commit c44a1ed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/lib/solr/spatial_rectangle.rb b/lib/solr/spatial_rectangle.rb
@@ -1,17 +1,17 @@
 module Solr
   class SpatialRectangle
-    attr_reader :upper_right, :lower_left
+    attr_reader :top_right, :bottom_left
 
-    def initialize(upper_right:, lower_left:)
-      raise ArgumentError, 'upper_right must be a Solr::SpatialPoint' unless upper_right.is_a?(Solr::SpatialPoint)
-      raise ArgumentError, 'lower_left must be a Solr::SpatialPoint' unless lower_left.is_a?(Solr::SpatialPoint)
+    def initialize(top_right:, bottom_left:)
+      raise ArgumentError, 'top_right must be a Solr::SpatialPoint' unless top_right.is_a?(Solr::SpatialPoint)
+      raise ArgumentError, 'bottom_left must be a Solr::SpatialPoint' unless bottom_left.is_a?(Solr::SpatialPoint)
 
-      @upper_right = upper_right
-      @lower_left = lower_left
+      @top_right = top_right
+      @bottom_left = bottom_left
     end
 
     def to_solr_s
-      "[#{lower_left.to_solr_s} TO #{upper_right.to_solr_s}]"
+      "[#{bottom_left.to_solr_s} TO #{top_right.to_solr_s}]"
     end
   end
 end
diff --git a/spec/query/request/filter_spec.rb b/spec/query/request/filter_spec.rb
@@ -26,9 +26,9 @@
     end
 
     context 'when value is spatial rectangle' do
-      let(:upper_right) { Solr::SpatialPoint.new(lat: 1.0, lon: 2.0) }
-      let(:lower_left) { Solr::SpatialPoint.new(lat: 3.0, lon: 4.0) }
-      let(:spatial_rectangle) { Solr::SpatialRectangle.new(upper_right: upper_right, lower_left: lower_left) }
+      let(:top_right) { Solr::SpatialPoint.new(lat: 1.0, lon: 2.0) }
+      let(:bottom_left) { Solr::SpatialPoint.new(lat: 3.0, lon: 4.0) }
+      let(:spatial_rectangle) { Solr::SpatialRectangle.new(top_right: top_right, bottom_left: bottom_left) }
 
       subject { described_class.new(type: :equal, field: :field, value: spatial_rectangle).to_solr_s }
       it { is_expected.to eq('field:([3.0,4.0 TO 1.0,2.0])') }

diff --git a/spec/spatial_rectangle_spec.rb b/spec/spatial_rectangle_spec.rb
@@ -2,8 +2,8 @@
   describe '#to_solr_s' do
     it 'returns a solr string' do
       expect(described_class.new(
-        upper_right: Solr::SpatialPoint.new(lat: 1.0, lon: 2.0),
-        lower_left: Solr::SpatialPoint.new(lat: 3.0, lon: 4.0)
+        top_right: Solr::SpatialPoint.new(lat: 1.0, lon: 2.0),
+        bottom_left: Solr::SpatialPoint.new(lat: 3.0, lon: 4.0)
       ).to_solr_s).to eq('[3.0,4.0 TO 1.0,2.0]')
     end
   end