Merge remote-tracking branch 'upstream/pull/5408'

[rails.git] / app / controllers / geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 02ebc8a1bccb565796a62cafb911bbd7bdd17647..43f276efa020a35cfdbb1719155c4a3f5e61c1fe 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -229,12 +229,12 @@ class GeocoderController < ApplicationController
   end
 
   def to_decdeg(captures)
   end
 
   def to_decdeg(captures)

-    ns = captures.fetch("ns").casecmp("s").zero? ? -1 : 1
+    ns = captures.fetch("ns").casecmp?("s") ? -1 : 1

     nsd = BigDecimal(captures.fetch("nsd", "0"))
     nsm = BigDecimal(captures.fetch("nsm", "0"))
     nss = BigDecimal(captures.fetch("nss", "0"))
 
     nsd = BigDecimal(captures.fetch("nsd", "0"))
     nsm = BigDecimal(captures.fetch("nsm", "0"))
     nss = BigDecimal(captures.fetch("nss", "0"))
 

-    ew = captures.fetch("ew").casecmp("w").zero? ? -1 : 1
+    ew = captures.fetch("ew").casecmp?("w") ? -1 : 1

     ewd = BigDecimal(captures.fetch("ewd", "0"))
     ewm = BigDecimal(captures.fetch("ewm", "0"))
     ews = BigDecimal(captures.fetch("ews", "0"))
     ewd = BigDecimal(captures.fetch("ewd", "0"))
     ewm = BigDecimal(captures.fetch("ewm", "0"))
     ews = BigDecimal(captures.fetch("ews", "0"))