Download as
Browse Code »

Commit 8e78f277356f11caa0ad19f9e4b38c8bc41ae45e

Authored by Thiago Ribeiro
Committed by Rodrigo Souto
1 parent ef7c2df9
Exists in staging and in 41 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

Fix broken tests in sniffer plugin. 

Using method in lib/noosfero/geo_ref.rb instead of old method.

Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
Showing 2 changed files with 2 additions and 9 deletions   Show diff stats
plugins/sniffer/controllers/sniffer_plugin_myprofile_controller.rb
  Diff comments   View file @8e78f27
@@ -38,7 +38,7 @@ class SnifferPluginMyprofileController &lt; MyProfileController @@ -38,7 +38,7 @@ class SnifferPluginMyprofileController &lt; MyProfileController
38 response[:enterprises] = product_category.sniffer_plugin_enterprises.enabled.visible.map do |enterprise| 38 response[:enterprises] = product_category.sniffer_plugin_enterprises.enabled.visible.map do |enterprise|
39 profile_data = filter_visible_attr_profile(enterprise) 39 profile_data = filter_visible_attr_profile(enterprise)
40 profile_data[:balloonUrl] = url_for :controller => :sniffer_plugin_myprofile, :action => :map_balloon, :id => enterprise[:id], :escape => false 40 profile_data[:balloonUrl] = url_for :controller => :sniffer_plugin_myprofile, :action => :map_balloon, :id => enterprise[:id], :escape => false
41 - profile_data[:sniffer_plugin_distance] = distance_between_profiles(@profile, enterprise) 41 + profile_data[:sniffer_plugin_distance] = Noosfero::GeoRef.dist(@profile.lat, @profile.lng, enterprise.lat, enterprise.lng)
42 profile_data[:suppliersProducts] = filter_visible_attr_suppliers_products( 42 profile_data[:suppliersProducts] = filter_visible_attr_suppliers_products(
43 enterprise.products.sniffer_plugin_products_from_category(product_category) 43 enterprise.products.sniffer_plugin_products_from_category(product_category)
44 ) 44 )
@@ -109,7 +109,7 @@ class SnifferPluginMyprofileController &lt; MyProfileController @@ -109,7 +109,7 @@ class SnifferPluginMyprofileController &lt; MyProfileController
109 profiles = Profile.all :conditions => {:id => products.map { |p| target_profile_id(p) }} 109 profiles = Profile.all :conditions => {:id => products.map { |p| target_profile_id(p) }}
110 profiles_by_id = {} 110 profiles_by_id = {}
111 profiles.each do |p| 111 profiles.each do |p|
112 - p[:sniffer_plugin_distance] = distance_between_profiles(@profile, p) 112 + p[:sniffer_plugin_distance] = Noosfero::GeoRef.dist(@profile.lat, @profile.lng, p.lat, p.lng)
113 profiles_by_id[p.id] ||= p 113 profiles_by_id[p.id] ||= p
114 end 114 end
115 profiles_by_id 115 profiles_by_id
plugins/sniffer/lib/sniffer_plugin/helper.rb
  Diff comments   View file @8e78f27
@@ -2,13 +2,6 @@ module SnifferPlugin::Helper @@ -2,13 +2,6 @@ module SnifferPlugin::Helper
2 2
3 include Noosfero::GeoRef 3 include Noosfero::GeoRef
4 4
5 - def distance_between_profiles(source, target)  
6 - Math.sqrt(  
7 - (KM_LAT * ((target.lat || 0) - (source.lat || 0)))**2 +  
8 - (KM_LNG * ((target.lng || 0) - (source.lng || 0)))**2  
9 - )  
10 - end  
11 -  
12 def filter_visible_attr_profile(profile) 5 def filter_visible_attr_profile(profile)
13 filtered_profile = {} 6 filtered_profile = {}
14 visible_attributes = [:id, :name, :lat, :lng, :sniffer_plugin_distance] 7 visible_attributes = [:id, :name, :lat, :lng, :sniffer_plugin_distance]