aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/chouette
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/chouette')
-rw-r--r--app/models/chouette/journey_pattern.rb2
-rw-r--r--app/models/chouette/stop_area.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index ff85f376a..9c3ef78fa 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -177,7 +177,7 @@ module Chouette
i += 1
_start = _end
_end = stop_points[i]
- val += costs_between(_start, _end)[:distance]
+ val += costs_between(_start, _end)[:distance] || 0
end
val
end
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index 1918c90d1..79eb314bc 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -383,11 +383,11 @@ module Chouette
end
def activated?
- deleted_at.nil? && confirmed_at
+ !!(deleted_at.nil? && confirmed_at)
end
def deactivated?
- deleted_at && confirmed_at.nil?
+ !!(deleted_at && confirmed_at.nil?)
end
def activate