From: Tom Hughes <tom@compton.nu>
Date: Tue, 15 Oct 2024 17:25:30 +0000 (+0100)
Subject: Fix new rubocop warnings
X-Git-Tag: live~252
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/99f220cf69304a29fb587c5d78c54a145caba111

Fix new rubocop warnings
---

diff --git a/app/models/relation.rb b/app/models/relation.rb
index f09647320..69e2acfd1 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -234,7 +234,7 @@ class Relation < ApplicationRecord
       element = model.lock("for share").find_by(:id => m[1])
 
       # and check that it is OK to use.
-      raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}" unless element&.visible? && element&.preconditions_ok?
+      raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}" unless element&.visible? && element.preconditions_ok?
 
       hash[m[1]] = true
     end
diff --git a/lib/gpx.rb b/lib/gpx.rb
index 1bf7764ec..45a4dcf5f 100644
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -27,7 +27,7 @@ module GPX
             point.timestamp = Time.parse(reader.read_string).utc
           end
         when XML::Reader::TYPE_END_ELEMENT
-          if reader.name == "trkpt" && point && point.valid?
+          if reader.name == "trkpt" && point&.valid?
             point.altitude ||= 0
             yield point
             @actual_points += 1