lita-onewheel-aqi 2.0.9 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 790b606deb76e9e81cbfde72a363c46e4d5d2aa0
-  data.tar.gz: 3e827a32469286d8785e7c5f364483aa8ae1f6f4
+  metadata.gz: 9d04773171d0c0dd5ae10537abfe5d3131a25d54
+  data.tar.gz: 39d74cd311c6c2fbf1c3bc8870849f7fa793c08d
 SHA512:
-  metadata.gz: f58f3e7abbd496f090757b5432a15b6b3bb61909958900e9c61f2455ab7908c40c7867ec1ea9dd913efd15e3906408bb40ee73429d6eb4b4aaa9315ffaef75e7
-  data.tar.gz: 1710cbc07724c8c8e64e3a036eb3ba42a11fbf871a617c90163cd87395742f3200278ba85142d8e1a2d9b1dc5326fa9c249b28d04226cf2b8f7ea12a1ecad957
+  metadata.gz: 514b49d9f19dfa4ef1b2321b9f1b207bf9228717bba124d666d6e00532e71192687908e527b32ce74ed5c7093c7596623d72ca05e4b58f6c0b5bce85d1526703
+  data.tar.gz: da51c6ec10fb801c5c7c2b69955f81f4d393bc4864ab42c48be64359134647129229f8c78f915781ca91f6f577ad93d654d16615467e3f4a3fbae142980456ba

data/lib/lita/handlers/onewheel_aqi.rb

@@ -82,7 +82,7 @@ module Lita
       end
 
       def get_location(response)
-        location = if response.matches[0].to_s.casecmp('aqi').zero?
+        location = if response.matches[0][0].to_s.length == 1
                      ''
                    else
                      response.matches[0][0]
@@ -125,6 +125,8 @@ module Lita
 
         if aqi['data']['iaqi']['pm25']
           reply += 'pm25: ' + color_str(aqi['data']['iaqi']['pm25']['v'].to_s) + '  '
+          ugm3 = pm25_to_ugm3 aqi['data']['iaqi']['pm25']['v'].to_s
+          reply += "#{ugm3} µgm3(est)  "
         end
         if aqi['data']['iaqi']['pm10']
           reply += 'pm10: ' + color_str(aqi['data']['iaqi']['pm10']['v'].to_s) + '  '
@@ -160,11 +162,13 @@ module Lita
         if aqi['data']['iaqi']['p']
           reply += 'pressure: ' + aqi['data']['iaqi']['p']['v'].to_s + 'mb  '
         end
-        if aqi['data']['iaqi']['pm10']
-          reply += 'pm10: ' + color_str(aqi['data']['iaqi']['pm10']['v'].to_s) + '  '
-        end
         if aqi['data']['iaqi']['pm25']
           reply += 'pm25: ' + color_str(aqi['data']['iaqi']['pm25']['v'].to_s) + '  '
+          ugm3 = pm25_to_ugm3 aqi['data']['iaqi']['pm25']['v']
+          reply += "#{ugm3} µgm3(est)  "
+        end
+        if aqi['data']['iaqi']['pm10']
+          reply += 'pm10: ' + color_str(aqi['data']['iaqi']['pm10']['v'].to_s) + '  '
         end
         if aqi['data']['iaqi']['t']
           reply += 'temp: ' + aqi['data']['iaqi']['t']['v'].to_s + 'C  '
@@ -206,17 +210,6 @@ module Lita
         str
       end
 
-      def extract_pmtwofive(aqi)
-        Lita.logger.debug "extract_pmtwofive with #{aqi}"
-        pm25 = ''
-        pm25 = if aqi['data']['iaqi']['pm25']
-                 aqi['data']['iaqi']['pm25']['v']
-               else
-                 "No PM2.5 data for #{aqi['data']['city']['name']}"
-               end
-        pm25
-      end
-
       # Geographical stuffs
       # Now with less caching!
       def optimistic_geo_wrapper(query)
@@ -237,6 +230,28 @@ module Lita
           lat: geocoded['geometry']['location']['lat'],
           lng: geocoded['geometry']['location']['lng'] }
       end
+
+      # Particulate Matter 2.5 to micrograms per cubic meter
+      def pm25_to_ugm3(pm25)
+        ranges = {
+          0..50 => [0, 50, 0.0, 12.0],
+          51..100 => [51, 100, 12.1, 35.4],
+          101..150 => [101, 150, 35.5, 55.4],
+          151..200 => [151, 200, 55.5, 150.4],
+          201..300 => [201, 300, 150.5, 250.4],
+          301..500 => [301, 500, 250.5, 500]
+        }
+        ranges.keys.each do |range_key|
+          next unless range_key.cover? pm25.to_i
+          low = ranges[range_key][0]
+          high = ranges[range_key][1]
+          min = ranges[range_key][2]
+          max = ranges[range_key][3]
+          step = (max - min) / (high - low)
+          ugm3 = (pm25.to_i - low) * step + min
+          return ugm3.round(2)
+        end
+      end
     end
 
     Lita.register_handler(OnewheelAqi)

data/lita-onewheel-aqi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-aqi'
-  spec.version       = '2.0.9'
+  spec.version       = '2.0.10'
   spec.authors       = ['Andrew Kreps']
   spec.email         = ['andrew.kreps@gmail.com']
   spec.description   = 'AQI data retrieval bot'

data/spec/lita/handlers/onewheel_aqi_spec.rb

@@ -34,11 +34,11 @@ describe Lita::Handlers::OnewheelAqi, lita_handler: true do
 
   it 'queries the aqi' do
     send_command 'aqi'
-    expect(replies.last).to include("AQI for Portland, OR, USA, ⚠️ 08Moderate ⚠️ pm25: 0876  pm10: 0340  updated 0860 minutes ago.  14(http://aqicn.org/city/usa/oregon/government-camp-multorpor-visibility/)")
+    expect(replies.last).to include("AQI for Portland, OR, USA, ⚠️ 08Moderate ⚠️ pm25: 0876  23.99 µgm3(est)  pm10: 0340  updated 0860 minutes ago.  14(http://aqicn.org/city/usa/oregon/government-camp-multorpor-visibility/)")
   end
 
   it 'queries the aqideets' do
     send_command 'aqideets'
-    expect(replies.last).to eq("AQI for Portland, OR, USA, ⚠️ 08Moderate ⚠️ humidity: 11%  pressure: 1014mb  pm10: 0340  pm25: 0876  temp: 34.65C  updated 0860 minutes ago.  14(http://aqicn.org/city/usa/oregon/government-camp-multorpor-visibility/)")
+    expect(replies.last).to eq("AQI for Portland, OR, USA, ⚠️ 08Moderate ⚠️ humidity: 11%  pressure: 1014mb  pm25: 0876  23.99 µgm3(est)  pm10: 0340  temp: 34.65C  updated 0860 minutes ago.  14(http://aqicn.org/city/usa/oregon/government-camp-multorpor-visibility/)")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-aqi
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors:
 - Andrew Kreps