From f523a92c15f3bc96c56eb997c7f72be015bd4fad Mon Sep 17 00:00:00 2001 From: Sasha Boginsky <41092741+sashadev-sky@users.noreply.github.com> Date: Sat, 8 Jun 2019 01:38:13 -0400 Subject: [PATCH 1/2] Reverse map refresh bug --- app/models/map.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/map.rb b/app/models/map.rb index 0ff3c51d4..3ea108ebd 100755 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -195,6 +195,7 @@ def average_cm_per_pixel if !warpables.empty? scales = [] count = 0 + average = 0 placed_warpables.each do |warpable| count += 1 res = warpable.cm_per_pixel @@ -202,7 +203,8 @@ def average_cm_per_pixel scales << res unless res.nil? end total_sum = (scales.inject { |sum, n| sum + n }) if scales - return total_sum / count if total_sum + average = total_sum/count if total_sum + average else 0 end From 8494c672ec170a76f185f154a7e797830ac6ff5f Mon Sep 17 00:00:00 2001 From: Sasha Boginsky <41092741+sashadev-sky@users.noreply.github.com> Date: Sat, 8 Jun 2019 01:41:05 -0400 Subject: [PATCH 2/2] Fix codeclimate --- app/models/map.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/map.rb b/app/models/map.rb index 3ea108ebd..29dda0c27 100755 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -203,7 +203,7 @@ def average_cm_per_pixel scales << res unless res.nil? end total_sum = (scales.inject { |sum, n| sum + n }) if scales - average = total_sum/count if total_sum + average = total_sum / count if total_sum average else 0