git-fit 0.18.2 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41afe213d0cfd11467217bc1fca559a90d791d08131f4ad2a8b1be69655cdfbe
-  data.tar.gz: bd97306411a2b55af3a0253646cbd43aff7907d4253175ea88372cea457f7e0c
+  metadata.gz: 4885ddbb01fd4680fac6ae16c6fd3c1b90092910abcef29b317cacd351ee3c1a
+  data.tar.gz: e5257d8d6ddcbd46e8e8e07fda87316fcea76ebc1f47ed0da784ba744e6f4e35
 SHA512:
-  metadata.gz: eee9145cb899365d6cc669dcc065e6df9d9785ce97522c3e0f561f40225193400f664158b7335395d655b4c5a4d927e835098a39a1a4cb686ff38f4deac455e0
-  data.tar.gz: 748ed231a6b7ac6fe293e6c5481da6207cf87472645214019c468ed9f95628f2943bd955980df2e4d56456af6f7dae7891c53b0d67159d9ebb799c20b6e2dbeb
+  metadata.gz: c398fbe3e1740edf11ee63e02dd7f22816d6c0304144844f66e6a41e42415f79e263a6a8d6b8d26b4959a64c6d38a4e7e971d2bc97465daacc3475a611ebd380
+  data.tar.gz: 3cf2651b1d8754e28f23f682970757b4e4ba3f1cecda3126c127ccb71ebe09f0c9ce2244ea6f48a1119b46d97a110ed15fcc59c0a8f403c8960fc67e6c745b50

data/lib/git_fit/elevation/terrain_coeff.rb

@@ -4,6 +4,8 @@ require 'msgpack'
 require 'net/http'
 require 'uri'
 
+require_relative 'terrain_lookup'
+
 module GitFit
   module Elevation
     module TerrainCoeff
@@ -49,33 +51,39 @@ module GitFit
         end
 
         def hysteresis_threshold(m_val)
-          return 2.0 if m_val <= 0
-          pav = model['pav_h']
-          return 2.0 if m_val <= pav[0][0]
-          return pav[-1][1] if m_val >= pav[-1][0]
-          pav.each_with_index do |(_xk, yk), i|
-            next unless i + 1 < pav.size
-            return yk if m_val <= pav[i + 1][0]
-          end
-          pav[-1][1]
+          Lookup.hysteresis_threshold(model['pav_h'], m_val)
         end
 
         def dem_spacing(gain_per_km:, range_per_km:, seg_density:)
-          nearest_neighbor_spacing(gain_per_km, range_per_km, seg_density)
+          Lookup.nearest_neighbor_spacing(lookup, gain_per_km, range_per_km, seg_density)
         rescue StandardError => e
           warn "TerrainCoeff: dem_spacing fallback to 181m (#{e.message})"
           181
         end
 
         def elevations_for(locations)
+          uniq_vals = uniquify_locations(locations)
+          elevs = {}
+          uniq_vals.each_slice(100).with_index do |slice, bi|
+            elevs.merge!(fetch_dem_batch(slice, bi))
+            sleep 0.15
+          end
+          locations.map { |lat, lng| elevs[grid_key(lat, lng)] }
+        end
+
+        def uniquify_locations(locations)
           uniq = {}
           locations.each { |lat, lng| uniq[grid_key(lat, lng)] ||= [lat, lng] }
-          uniq_vals = uniq.values
+          uniq.values
+        end
 
+        def fetch_dem_batch(slice, batch_idx)
           elevs = {}
-          uniq_vals.each_slice(100).with_index do |slice, bi|
-            qs = slice.map { |la, ln| "#{la},#{ln}" }.join('|')
-            uri = URI("#{DEM_URL}?locations=#{qs.gsub(',', '%2C').gsub('|', '%7C')}")
+          qs = slice.map { |la, ln| "#{la},#{ln}" }.join('|')
+          uri = URI("#{DEM_URL}?locations=#{qs.gsub(',', '%2C').gsub('|', '%7C')}")
+          attempt = 0
+          loop do
+            # rubocop:disable Style/RedundantBegin
             begin
               res = Net::HTTP.get_response(uri)
               if res.code == '200'
@@ -83,16 +91,28 @@ module GitFit
                 slice.each_with_index do |(lat, lng), i|
                   elevs[grid_key(lat, lng)] = results[i]['elevation'] if results[i]
                 end
+                break
+              elsif res.code == '429'
+                attempt += 1
+                if attempt < 5
+                  delay = 2**attempt
+                  warn "DEM batch #{batch_idx}: rate limited, retrying in #{delay}s (attempt #{attempt})"
+                  sleep(delay)
+                else
+                  warn "DEM batch #{batch_idx}: rate limited, giving up after #{attempt} attempts"
+                  break
+                end
               else
-                warn "DEM batch #{bi} HTTP #{res.code}"
+                warn "DEM batch #{batch_idx} HTTP #{res.code}"
+                break
               end
             rescue StandardError => e
-              warn "DEM batch #{bi}: #{e.message}"
+              warn "DEM batch #{batch_idx}: #{e.message}"
+              break
             end
-            sleep 0.15
+            # rubocop:enable Style/RedundantBegin
           end
-
-          locations.map { |lat, lng| elevs[grid_key(lat, lng)] }
+          elevs
         end
 
         def grid_key(lat, lng)
@@ -102,24 +122,6 @@ module GitFit
         def lookup
           model['lookup']
         end
-
-        private
-
-        def nearest_neighbor_spacing(gain_per_km, range_per_km, seg_density)
-          best = nil
-          best_dist = Float::INFINITY
-          lookup.each do |ref|
-            d = Math.sqrt(
-              (gain_per_km.to_f - ref['gk'])**2 +
-              (range_per_km.to_f - ref['rk'])**2 +
-              (seg_density.to_f - ref['sd'])**2,
-            )
-            next unless d < best_dist
-            best_dist = d
-            best = ref
-          end
-          best ? best['sp'] : 181
-        end
       end
     end
   end

data/lib/git_fit/elevation/terrain_lookup.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module GitFit
+  module Elevation
+    module TerrainCoeff
+      module Lookup
+        class << self
+          def nearest_neighbor_spacing(model_lookup, gain_per_km, range_per_km, seg_density)
+            best = nil
+            best_dist = Float::INFINITY
+            model_lookup.each do |ref|
+              d = Math.sqrt(
+                (gain_per_km.to_f - ref['gk'])**2 +
+                (range_per_km.to_f - ref['rk'])**2 +
+                (seg_density.to_f - ref['sd'])**2,
+              )
+              next unless d < best_dist
+              best_dist = d
+              best = ref
+            end
+            best ? best['sp'] : 181
+          end
+
+          def hysteresis_threshold(model_pav_h, m_val)
+            return 2.0 if m_val <= 0
+            return 2.0 if m_val <= model_pav_h[0][0]
+            return model_pav_h[-1][1] if m_val >= model_pav_h[-1][0]
+            model_pav_h.each_with_index do |(_xk, yk), i|
+              next unless i + 1 < model_pav_h.size
+              return yk if m_val <= model_pav_h[i + 1][0]
+            end
+            model_pav_h[-1][1]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_fit/elevation/train/collector.rb

@@ -37,7 +37,7 @@ module GitFit
 
         def resolve_sources(names)
           names.map do |name|
-            Sync::Base.adapters.find { |a| a.name.demodulize.downcase == name.to_s.downcase }
+            Sync::Base.adapters.find { |a| a.config_key == name.to_s }
           end.compact
         end
 

data/lib/git_fit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitFit
-  VERSION = '0.18.2'
+  VERSION = '0.18.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.18.3
 platform: ruby
 authors:
 - Lax
@@ -296,6 +296,7 @@ files:
 - lib/git_fit/elevation/data/dem_coeff.json
 - lib/git_fit/elevation/data/dem_lookup.json
 - lib/git_fit/elevation/terrain_coeff.rb
+- lib/git_fit/elevation/terrain_lookup.rb
 - lib/git_fit/elevation/train/collector.rb
 - lib/git_fit/elevation/train/fitter.rb
 - lib/git_fit/elevation/train/runner.rb