lita-onewheel-forecast-io 1.9.1 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33e09546f949c74898eca3909bc15e4bb6356645fe3023c71d2dede103916326
-  data.tar.gz: 8f78e1ef1893a01f97c66d55a5f5cfa27bc614f9fddde9f63ab328c56c05a858
+  metadata.gz: 852d0e1530401241fb6fdfcb48bd96ca52e08f6a09b4d0ecda3133d655e650b4
+  data.tar.gz: d616a450faec2c0343a966f52f4bb8eb65b5542a745b66e6f394ddb3924ebc00
 SHA512:
-  metadata.gz: 5a7a60d3b098e5301d01e17010b995d55b5f3cf608d3f978dd7a016e82dafeaa7bd3fc6d9c12acef7e2f6d4926d459054cb02245990f7f195a27d74245e65038
-  data.tar.gz: b31aa8bcad56cd473c73e824b1ff85a5f1b3d2e69446cd18feacac67a54995e92b688bf480c17d6da62b39f0af95920d9f2a6f9102ed2fcc4ac7c16138032c0b
+  metadata.gz: 12f61c91537470b93659483b493b0583ae0052da64d081e7c3022b53d5831f0b5ed28ab0700da01e4492007d7bf647cde4d8c8a8a60b6681cce59bdc234250fc
+  data.tar.gz: 1bffa394dd2accd79dc33bf7df4876d63d2a460d1867bfa7be2b9ce3766cfc22cb47cb49ad0520a12e7c0d905da63d4076e69a5c4d3bd8c46131b96d9f869189

data/lib/lita/handlers/forecasts.rb

@@ -5,19 +5,21 @@ module ForecastIo
     def ascii_rain_forecast(forecast)
       (str, precip_type) = do_the_rain_chance_thing(forecast, ascii_chars, 'precipProbability')
       max = get_max_by_data_key(forecast, 'minutely', 'precipProbability')
-      "1hr #{precip_type} probability #{(Time.now).strftime('%H:%M').to_s}|#{str}|#{(Time.now + 3600).strftime('%H:%M').to_s} max #{(max.to_f * 100).round(2)}%"
+      agg = get_aggregate_by_data_key(forecast, 'minutely', 'precipIntensity')
+      "1hr #{precip_type} probability #{(Time.now).strftime('%H:%M').to_s}|#{str}|#{(Time.now + 3600).strftime('%H:%M').to_s} max #{(max.to_f * 100).round(2)}%, #{get_accumulation agg} accumulation"
     end
 
     def ansi_rain_forecast(forecast)
       (str, precip_type) = do_the_rain_chance_thing(forecast, ansi_chars, 'precipProbability') #, 'probability', get_rain_range_colors)
       max = get_max_by_data_key(forecast, 'minutely', 'precipProbability')
-      "1hr #{precip_type} probability #{(Time.now).strftime('%H:%M').to_s}|#{str}|#{(Time.now + 3600).strftime('%H:%M').to_s} max #{(max.to_f * 100).round(2)}%"
+      agg = get_aggregate_by_data_key(forecast, 'minutely', 'precipIntensity')
+      "1hr #{precip_type} probability #{(Time.now).strftime('%H:%M').to_s}|#{str}|#{(Time.now + 3600).strftime('%H:%M').to_s} max #{(max.to_f * 100).round(2)}%, #{get_accumulation agg} accumulation"
     end
 
     def ansi_rain_intensity_forecast(forecast)
       (str, precip_type) = do_the_rain_intensity_thing(forecast, ansi_chars, 'precipIntensity') #, 'probability', get_rain_range_colors)
-      max_str = get_max_by_data_key(forecast, 'minutely', 'precipIntensity')
-      "1hr #{precip_type} intensity #{(Time.now).strftime('%H:%M').to_s}|#{str}|#{(Time.now + 3600).strftime('%H:%M').to_s} max: #{max_str}"
+      agg = get_aggregate_by_data_key(forecast, 'minutely', 'precipIntensity')
+      "1hr #{precip_type} intensity #{(Time.now).strftime('%H:%M').to_s}|#{str}|#{(Time.now + 3600).strftime('%H:%M').to_s}, #{get_accumulation agg} accumulation"
     end
 
     def ansi_humidity_forecast(forecast)
@@ -44,6 +46,17 @@ module ForecastIo
       end
     end
 
+    def get_aggregate_by_data_key(forecast, key, datum)
+      unless forecast[key].nil?
+        sum = 0
+        forecast[key]['data'].each do |data_point|
+          Lita.logger.debug "Adding #{data_point[datum]} to #{sum}"
+          sum += data_point[datum].to_f
+        end
+        sum.round(3)
+      end
+    end
+
     def do_the_rain_chance_thing(forecast, chars, key, use_color = config.colors, minute_limit = nil)
       if forecast['minutely'].nil?
         return 'No minute-by-minute data available.'
@@ -410,8 +423,9 @@ module ForecastIo
       end
 
       max = get_max_by_data_key(forecast, 'hourly', 'precipProbability')
+      agg = get_aggregate_by_data_key(forecast, 'hourly', 'precipIntensity')
 
-      "48 hr #{precip_type}s |#{str}| max #{(max.to_f * 100).round}%"
+      "48 hr #{precip_type}s |#{str}| max #{(max.to_f * 100).round}%, #{get_accumulation agg} accumulation"
     end
 
     def do_the_daily_wind_thing(forecast)

data/lib/lita/handlers/utils.rb

@@ -45,13 +45,12 @@ module ForecastIo
 
     # Geographical stuffs
     # Now with moar caching!
-    def optimistic_geo_wrapper(query)
+    def optimistic_geo_wrapper(query, geocoder_key)
       Lita.logger.debug "Optimistically geo wrapping #{query}!"
+      ::Geocoder.configure(
+          :api_key => geocoder_key
+      )
       geocoded = nil
-      # ::Geocoder.configure(
-      #     api_key: config.geocoder_key,
-      #     timeout: 10
-      # )
       result = ::Geocoder.search(query)
       Lita.logger.debug "Geocoder result: '#{result.inspect}'"
       if result[0]
@@ -63,36 +62,113 @@ module ForecastIo
     # Perform a geocoder lookup based on a) the query or b) the user's serialized state.
     # If neither of those exist, default to config location.
     def geo_lookup(user, query, persist = true)
-      Lita.logger.debug "Performing geolookup for '#{user.name}' for '#{query}'"
+      Lita.logger.debug "Performing geolookup for '#{user}' for '#{query}'"
+
+      geocoded = nil
 
       if query.nil? or query.empty?
-        Lita.logger.debug "No query specified, pulling from redis #{REDIS_KEY}, #{user.name}"
-        serialized_geocoded = redis.hget(REDIS_KEY, user.name)
+        Lita.logger.debug "No query specified, pulling from redis '#{REDIS_KEY}', '#{user}'"
+        serialized_geocoded = redis.hget(REDIS_KEY, user)
         unless serialized_geocoded == 'null' or serialized_geocoded.nil?
-          geocoded = JSON.parse(serialized_geocoded)
+          if serialized_geocoded[/^http/]
+            query = serialized_geocoded
+          else
+            geocoded = JSON.parse(serialized_geocoded)
+          end
+          Lita.logger.debug "Cached location: #{geocoded.inspect}"
         end
-        Lita.logger.debug "Cached location: #{geocoded.inspect}"
       end
 
       query = (query.nil?)? config.default_location : query
       Lita.logger.debug "q & g #{query.inspect} #{geocoded.inspect}"
 
-      unless geocoded
-        Lita.logger.debug "Redis hget failed, performing lookup for #{query}"
-        geocoded = optimistic_geo_wrapper query
-        Lita.logger.debug "Geolocation found.  '#{geocoded.inspect}' failed, performing lookup"
+      if query[/^http/] or (!geocoded.nil? and geocoded.key? 'geo') # For now this is aaronpk's loc
+        Lita.logger.debug "Getting location from #{query}"
+        resp = JSON.parse(RestClient.get query)
+
+        locality = ''
+        if resp['geo']
+          locality = resp['geo']['locality']
+        end
+
+        geocoded = optimistic_geo_wrapper locality, config.geocoder_key
+
+        # loc = Location.new(
+        #     locality,
+        #     resp['location']['latitude'],
+        #     resp['location']['longitude']
+        # )
+
         if persist
-          redis.hset(REDIS_KEY, user.name, geocoded.to_json)
+          redis.hset(REDIS_KEY, user, query)
+        end
+
+      else
+
+        unless geocoded
+          # uri = "https://atlas.p3k.io/api/geocode?input=#{URI.escape query}"
+          # Lita.logger.debug "Redis hget failed, performing lookup for #{query} on #{uri}"
+          geocoded = optimistic_geo_wrapper query, config.geocoder_key
+          # Catch network errors here
+          # begin
+          #   geocoded = JSON.parse RestClient.get(uri)
+          # rescue RuntimeError => e
+          #   puts "x"
+          # end
+
+          Lita.logger.debug "Geolocation found.  '#{geocoded.inspect}' failed, performing lookup"
+          if persist
+            redis.hset(REDIS_KEY, user, geocoded.to_json)
+          end
         end
+
+        # {"latitude": 45.51179,
+        #  "longitude": -122.67563,
+        #  "locality": "Portland",
+        #  "region": "Oregon",
+        #  "country": "USA",
+        #  "best_name": "Portland",
+        #  "full_name": "Portland, Oregon, USA",
+        #  "postal-code": "97201",
+        #  "timezone": "America\/Los_Angeles",
+        #  "offset": "-07:00",
+        #  "seconds": -25200,
+        #  "localtime": "2018-08-09T08:05:43-07:00"}
+
+        # loc = Location.new(
+        #   geocoded['best_name'],
+        #   geocoded['latitude'],
+        #   geocoded['longitude']
+        # )
+        # loc = Location.new(
+        #   geocoded['formatted_address'],
+        #   geocoded['geometry']['location']['lat'],
+        #   geocoded['geometry']['location']['lng']
+        # )
+
       end
 
-      Lita.logger.debug "geocoded: '#{geocoded}'"
-      loc = Location.new(
-          "#{geocoded['address']['city']}, #{geocoded['address']['state']}",
-          geocoded['lat'],
-          geocoded['lon']
-      )
+      Lita.logger.debug "best_name: #{geocoded['best_name']}"
+      Lita.logger.debug "display_name: #{geocoded['display_name']}"
+      Lita.logger.debug "formatted_address: #{geocoded['formatted_address']}"
+      if geocoded['best_name']
+        loc = Location.new(
+            geocoded['best_name'],
+            geocoded['latitude'],
+            geocoded['longitude'])
+      elsif geocoded['lon']
+        loc = Location.new(
+            "#{geocoded['address']['city']}, #{geocoded['address']['state']}",
+            geocoded['lat'],
+            geocoded['lon'])
+      else
+        loc = Location.new(
+            geocoded['formatted_address'],
+            geocoded['geometry']['location']['lat'],
+            geocoded['geometry']['location']['lng'])
+      end
 
+      Lita.logger.debug "geocoded: '#{geocoded}'"
       Lita.logger.debug "loc: '#{loc}'"
 
       loc
@@ -154,6 +230,8 @@ module ForecastIo
         uri += ",#{time}"
       end
 
+      uri += "?units=si"
+
       Lita.logger.debug "Requesting forcast data from: #{uri}"
       set_scale(user)
       gimme_some_weather uri
@@ -319,6 +397,14 @@ module ForecastIo
       end
     end
 
+    def get_accumulation(accum_mm)
+      if @scale == 'c' or @scale == 'k'
+        accum_mm.round(0).to_s + 'mm'
+      else
+        inches_from_mm(accum_mm).to_s + 'in'
+      end
+    end
+
     def get_humidity(humidity_decimal)
       (humidity_decimal * 100).round(0).to_s + '%'
     end
@@ -331,6 +417,10 @@ module ForecastIo
       ((degrees_f.to_f + 459.67) * 5/9).round(2)
     end
 
+    def inches_from_mm(dist_mm)
+      (dist_mm * 0.0393701).round(1)
+    end
+
     def kilometers(speed_imperial)
       (speed_imperial * 1.6).round(2)
     end

data/lita-onewheel-forecast-io.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-forecast-io'
-  spec.version       = '1.9.1'
+  spec.version       = '1.13.0'
   spec.authors       = ['Andrew Kreps']
   spec.email         = ['andrew.kreps@gmail.com']
   spec.description   = <<-EOS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-forecast-io
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.13.0
 platform: ruby
 authors:
 - Andrew Kreps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita