git-fit 0.7.9 → 0.8.0

data/lib/git_fit/geo/division_detector.rb

@@ -1,16 +1,19 @@
-require "json"
-require "fileutils"
-require_relative "reverse_geocode"
+# frozen_string_literal: true
+
+require 'json'
+require 'fileutils'
+require_relative 'reverse_geocode'
 
 module GitFit
   module Geo
     class DivisionDetector
-      KEEP_PLACEHOLDER = "gqqrFurkeU??".freeze
+      KEEP_PLACEHOLDER = 'gqqrFurkeU??'
       SAMPLE_INTERVAL_DEG = 0.01
-      CACHE_DIR = "data/cache"
-      POINT_CACHE_FILE = File.join(CACHE_DIR, "geo-point.jsonl")
+      CACHE_DIR = 'data/cache'
+      POINT_CACHE_FILE = File.join(CACHE_DIR, 'geo-point.jsonl')
 
-      def initialize(db:, amap_key: nil, batch: 20, limit: nil, strategy: "proportional", time_budget: nil, dry_run: false)
+      def initialize(db:, amap_key: nil, batch: 20, limit: nil, strategy: 'proportional', time_budget: nil,
+                     dry_run: false)
         @db = db
         @geocoder = ReverseGeocode.new(amap_key: amap_key)
         @amap_key = amap_key
@@ -39,9 +42,9 @@ module GitFit
         @total = activities.size
 
         if @total > 0 && @amap_key.nil?
-          $stdout.puts "WARNING: AMAP_API_KEY not configured. China coordinates will fail."
-          $stdout.puts "Set via: ENV[\"AMAP_API_KEY\"] or config.yml sync.amap.api_key"
-          $stdout.puts ""
+          $stdout.puts 'WARNING: AMAP_API_KEY not configured. China coordinates will fail.'
+          $stdout.puts 'Set via: ENV["AMAP_API_KEY"] or config.yml sync.amap.api_key'
+          $stdout.puts ''
         end
 
         $stdout.puts "Geo detection: #{@total} activities to process"
@@ -57,9 +60,9 @@ module GitFit
 
       def pending_activities
         dataset = @db[:activities]
-          .where(Sequel.lit("summary_polyline IS NOT NULL"))
+          .where(Sequel.lit('summary_polyline IS NOT NULL'))
           .where(Sequel.lit("summary_polyline != ''"))
-          .where(Sequel.lit("divisions IS NULL"))
+          .where(Sequel.lit('divisions IS NULL'))
           .order(Sequel.desc(:start_date))
         dataset = dataset.limit(@limit) if @limit
         dataset.all
@@ -121,13 +124,15 @@ module GitFit
         update_db(run_id, summary) unless @dry_run
         $stdout.puts "  #{prefix} #{run_id} → #{format_divisions(divisions)} (#{samples.size} samples)"
         @processed += 1
-      rescue => e
+      rescue StandardError => e
         $stdout.puts "  #{prefix} #{run_id} → error: #{e.message}"
         @errors += 1
       end
 
       def format_divisions(divisions)
-        divisions.map { |d| [d[:province], d[:city], d[:district], d[:township]].compact.reject(&:empty?).join(" ") }.join(" / ")
+        divisions.map do |d|
+          [d[:province], d[:city], d[:district], d[:township]].compact.reject(&:empty?).join(' ')
+        end.join(' / ')
       end
 
       def decode_points(polyline)
@@ -165,21 +170,21 @@ module GitFit
           key_counts[key] += 1
         end
         key_counts.map do |key, count|
-          province, city, district, township = key.split("|")
+          province, city, district, township = key.split('|')
           { province: province, city: city, district: district, township: township, count: count }
         end.sort_by { |r| -r[:count] }
       end
 
       def normalize_entry(raw)
         return nil unless raw
-        province = raw[:province] || raw["p"] || raw["province"]
-        province = nil if province.is_a?(Array) || province.to_s.empty? || province == "中华人民共和国"
+        province = raw[:province] || raw['p'] || raw['province']
+        province = nil if province.is_a?(Array) || province.to_s.empty? || province == '中华人民共和国'
         return nil unless province
         {
           province: province,
-          city: pick_field(raw, :city, "city", "c", "city") { |v| valid_name?(v) },
-          district: pick_field(raw, :district, "dist", "d"),
-          township: pick_field(raw, :township, "town", "t"),
+          city: pick_field(raw, :city, 'city', 'c', 'city') { |v| valid_name?(v) },
+          district: pick_field(raw, :district, 'dist', 'd'),
+          township: pick_field(raw, :township, 'town', 't'),
         }
       end
 
@@ -196,7 +201,7 @@ module GitFit
       end
 
       def division_key(result)
-        [result[:province], result[:city], result[:district], result[:township]].join("|")
+        [result[:province], result[:city], result[:district], result[:township]].join('|')
       end
 
       def build_summary(divisions, total_points)
@@ -210,15 +215,15 @@ module GitFit
           h[:n] = r[:count]
           h
         end
-        { divisions: division_list, total_sampled: total_points, source: "amap", processed_at: Time.now.utc.iso8601 }
+        { divisions: division_list, total_sampled: total_points, source: 'amap', processed_at: Time.now.utc.iso8601 }
       end
 
       def lookup_point_cache(coord_key)
         return nil unless File.exist?(POINT_CACHE_FILE)
-        File.open(POINT_CACHE_FILE, "r") do |f|
+        File.open(POINT_CACHE_FILE, 'r') do |f|
           f.each_line do |line|
             entry = JSON.parse(line) rescue next
-            return entry if entry["ck"] == coord_key
+            return entry if entry['ck'] == coord_key
           end
         end
         nil
@@ -229,7 +234,7 @@ module GitFit
         entry[:city] = result[:city] if result[:city]
         entry[:dist] = result[:district] if result[:district]
         entry[:town] = result[:township] if result[:township]
-        File.open(POINT_CACHE_FILE, "a") { |f| f.puts(JSON.generate(entry)) }
+        File.open(POINT_CACHE_FILE, 'a') { |f| f.puts(JSON.generate(entry)) }
       end
 
       def update_db(run_id, summary)
@@ -237,7 +242,7 @@ module GitFit
       end
 
       def mark_empty_divisions(run_id)
-        @db[:activities].where(run_id: run_id).update(divisions: "[]")
+        @db[:activities].where(run_id: run_id).update(divisions: '[]')
       end
 
       def load_caches

data/lib/git_fit/geo/nominatim_client.rb

@@ -1,12 +1,14 @@
-require "net/http"
-require "json"
-require "uri"
+# frozen_string_literal: true
+
+require 'net/http'
+require 'json'
+require 'uri'
 
 module GitFit
   module Geo
     class NominatimClient
-      BASE_URL = "https://nominatim.openstreetmap.org/reverse".freeze
-      USER_AGENT = "git-fit/1.0 (geo-detector)"
+      BASE_URL = 'https://nominatim.openstreetmap.org/reverse'
+      USER_AGENT = 'git-fit/1.0 (geo-detector)'
 
       def initialize
         @mutex = Mutex.new
@@ -20,17 +22,17 @@ module GitFit
         uri.query = URI.encode_www_form(
           lat: lat,
           lon: lng,
-          format: "jsonv2",
+          format: 'jsonv2',
           addressdetails: 1,
           zoom: 10,
         )
         resp = Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
           req = Net::HTTP::Get.new(uri)
-          req["User-Agent"] = USER_AGENT
+          req['User-Agent'] = USER_AGENT
           http.request(req)
         end
         body = JSON.parse(resp.body)
-        if body["error"]
+        if body['error']
           raise "Nominatim error: #{body["error"]}"
         end
         parse_response(body)
@@ -39,10 +41,10 @@ module GitFit
       private
 
       def parse_response(body)
-        addr = body["address"] || {}
-        country = addr["country"]
-        state = addr["state"]
-        { province: country, city: state, district: nil, township: nil, source: "nominatim" }
+        addr = body['address'] || {}
+        country = addr['country']
+        state = addr['state']
+        { province: country, city: state, district: nil, township: nil, source: 'nominatim' }
       end
 
       def rate_limit

data/lib/git_fit/geo/polyline.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitFit
   module Geo
     module Polyline
@@ -43,7 +45,7 @@ module GitFit
       end
 
       def encode(points)
-        result = ""
+        result = ''
         plat = 0
         plng = 0
 
@@ -63,7 +65,7 @@ module GitFit
 
       def encode_number(num)
         num = num < 0 ? ~(num << 1) : (num << 1)
-        result = ""
+        result = ''
 
         while num >= 0x20
           result += ((0x20 | (num & 0x1f)) + 63).chr

data/lib/git_fit/geo/reverse_geocode.rb

@@ -1,13 +1,15 @@
-require_relative "coord_transform"
-require_relative "amap_client"
-require_relative "nominatim_client"
+# frozen_string_literal: true
+
+require_relative 'coord_transform'
+require_relative 'amap_client'
+require_relative 'nominatim_client'
 
 module GitFit
   module Geo
     class ReverseGeocode
       CHINA_BBOX = {
         min_lng: 73, max_lng: 135,
-        min_lat: 18, max_lat: 54,
+        min_lat: 18, max_lat: 54
       }.freeze
 
       def initialize(amap_key: nil)
@@ -31,17 +33,17 @@ module GitFit
       end
 
       def lookup_china(lat, lng)
-        raise "AMap API key not configured" unless @amap
+        raise 'AMap API key not configured' unless @amap
         gcj_lat, gcj_lng = CoordTransform.wgs84_to_gcj02(lat, lng)
         @amap.reverse_geocode(gcj_lat, gcj_lng)
-      rescue => e
-        { province: nil, city: nil, district: nil, township: nil, source: "error", error: e.message }
+      rescue StandardError => e
+        { province: nil, city: nil, district: nil, township: nil, source: 'error', error: e.message }
       end
 
       def lookup_intl(lat, lng)
         @nominatim.reverse_geocode(lat, lng)
-      rescue => e
-        { province: nil, city: nil, district: nil, township: nil, source: "error", error: e.message }
+      rescue StandardError => e
+        { province: nil, city: nil, district: nil, township: nil, source: 'error', error: e.message }
       end
     end
   end

data/lib/git_fit/geo.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module GitFit
   module Geo
   end
 end
 
-require_relative "geo/polyline"
-require_relative "geo/coord_transform"
-require_relative "geo/amap_client"
-require_relative "geo/nominatim_client"
-require_relative "geo/reverse_geocode"
-require_relative "geo/division_detector"
+require_relative 'geo/polyline'
+require_relative 'geo/coord_transform'
+require_relative 'geo/amap_client'
+require_relative 'geo/nominatim_client'
+require_relative 'geo/reverse_geocode'
+require_relative 'geo/division_detector'