location.rb in ratis-3.3.4

- old
+ new

@@ -3,37 +3,45 @@
   class Location
 
     attr_accessor :name, :area, :response, :areacode, :latitude, :longitude, :landmark_id, :address, :startaddr, :endaddr, :address_string
 
     def self.where(conditions)
-      location = conditions.delete :location
-      media = (conditions.delete(:media) || :w).to_s.upcase
+      location    = conditions.delete :location
+      media       = (conditions.delete(:media)      || 'W').to_s.upcase
       max_answers = conditions.delete(:max_answers) || 20
+      app_id      = conditions.delete(:app_id)      || 'WEB'
+      area        = conditions.delete(:area)
+      region      = conditions.delete(:region)
 
       raise ArgumentError.new('You must provide a location') unless location
       raise ArgumentError.new('You must provide media of A|W|I') unless ['A','W','I'].include? media
       raise ArgumentError.new('You must provide a numeric max_answers') unless (Integer max_answers rescue false)
       Ratis.all_conditions_used? conditions
 
-      response = Request.get 'Locate', {'Location' => location, 'Media' => media, 'Maxanswers' => max_answers}
+      response = Request.get 'Locate', {'Appid' => app_id,
+                                        'Location' => location,
+                                        'Area' => area,
+                                        'Region' => region,
+                                        'Maxanswers' => max_answers,
+                                        'Media' => media }
       return [] unless response.success?
 
-      meta = response.to_hash[:locate_response]
+      meta      = response.to_hash[:locate_response]
       locations = response.to_array :locate_response, :location
 
       locations.map do |location_hash|
-        location = Ratis::Location.new
-        location.name = location_hash[:name]
-        location.area = location_hash[:area]
-        location.response = meta[:responsecode]
-        location.areacode = location_hash[:areacode]
-        location.latitude = location_hash[:latitude]
-        location.longitude = location_hash[:longitude]
-        location.landmark_id = location_hash[:landmarkid] || 0
-        location.address = location_hash[:address] || ''
-        location.startaddr = location_hash[:startaddr] || ''
-        location.endaddr = location_hash[:endaddr] || ''
+        location                = Ratis::Location.new
+        location.name           = location_hash[:name]
+        location.area           = location_hash[:area]
+        location.response       = meta[:responsecode]
+        location.areacode       = location_hash[:areacode]
+        location.latitude       = location_hash[:latitude]
+        location.longitude      = location_hash[:longitude]
+        location.landmark_id    = location_hash[:landmarkid] || 0
+        location.address        = location_hash[:address] || ''
+        location.startaddr      = location_hash[:startaddr] || ''
+        location.endaddr        = location_hash[:endaddr] || ''
         location.address_string = build_address_string location_hash
         location
       end
     end
 
@@ -48,12 +56,12 @@
 
   private
 
     def self.build_address_string(location_hash)
       address_string = ''
-      address = location_hash[:address]
-      name = location_hash[:name]
-      area = location_hash[:area]
+      address        = location_hash[:address]
+      name           = location_hash[:name]
+      area           = location_hash[:area]
 
       if !address.blank?
         address_string << "#{address} #{name} (in #{area})"
       else
         startaddr = location_hash[:startaddr]