aemo 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af33790f5a576ac6da8a1f0cc9973ef110b27a18adc57284e6adbbeca3cfcd4d
-  data.tar.gz: 2fcb685afe9f2abc772e977aeb46092cefc0468559dc9174675fc4d626488219
+  metadata.gz: e034dcfeaf28060aa39be81b16e66a689ba571d7c5394f668665b2a9a2f0d0bf
+  data.tar.gz: aaaeef50ee4cdbf78d33b4ce992ac8aa268e03e4ad33d272c4e2e7d784a54db2
 SHA512:
-  metadata.gz: e964f36accd95065c85e0c08f000fa19972236ccb12c8be8771f653ecaea9a25aea3055f5805dcf51cd62ea63f0b9d675eaad93c04f9b3c5e486d08a526ec5a8
-  data.tar.gz: 4143e9c15a816cb8725829910655aed83e59bd064f8addb0c8d419782df430933d65a77b314a36cb135aa5028d1030b3831f737084b672b1e56d24535ee62172
+  metadata.gz: 5fca44605b1d54f5199bfd8ba8e078703c74a9fb5c62628f1a9570508b64f2057187955842dadc764d7bc0d03c5851657ded9820fa79ee8ac962036377de3729
+  data.tar.gz: e0af286ab7bef3952a4159c0765389bdba82669b8f7c43c3fd03a4fdfff184e5480f0aad2f26d1850675ee94958e66cc36af94a5352e6929decb8555b39d5f73

data/lib/aemo/dispatchable.rb

@@ -3,7 +3,7 @@
 module AEMO
   class Region
     DISPATCH_TYPE   = ['Generator', 'Load Norm Off', 'Network Service Provider'].freeze
-    CATEGORY        = ['Market', 'Non-Market'].freeze
-    CLASSIFICATION  = ['Scheduled', 'Semi-Scheduled', 'Non-Scheduled'].freeze
+    CATEGORY        = %w[Market Non-Market].freeze
+    CLASSIFICATION  = %w[Scheduled Semi-Scheduled Non-Scheduled].freeze
   end
 end

data/lib/aemo/exceptions/invalid_nmi_allocation_type.rb

@@ -8,7 +8,7 @@ module AEMO
   # @since 0.3.0
   class InvalidNMIAllocationType < ArgumentError
     DEFAULT_MESSAGE = 'Not a valid allocation type, try one of ' \
-                      "#{AEMO::NMI::Allocation::SUPPORTED_TYPES.join(' |')}"
+                      "#{AEMO::NMI::Allocation::SUPPORTED_TYPES.join(' |')}".freeze
 
     # Initialize an InvalidNMIAllocationType
     #

data/lib/aemo/exceptions/time_error.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module AEMO
+  # AEMO::TimeError
+  #
+  # @author Joel Courtney
+  # @abstract An exception for time errors.
+  # @since 0.6.0
+  class TimeError < ArgumentError
+    DEFAULT_MESSAGE = 'Not a valid time'
+
+    # Initialize an TimeError
+    #
+    # @param [String] msg the error message
+    # @return [AEMO::TimeError]
+    def initialize(msg: DEFAULT_MESSAGE)
+      super
+    end
+  end
+end

data/lib/aemo/market/interval.rb

@@ -22,7 +22,7 @@ module AEMO
       # @param [Hash] options Hash of optional data values
       # @return [AEMO::Market::Interval]
       def initialize(datetime, options = {})
-        @datetime     = Time.parse("#{datetime} +1000")
+        @datetime     = ::Time.parse("#{datetime} +1000")
         @region       = options['REGION']
         @total_demand = options['TOTALDEMAND']
         @rrp          = options['RRP']
@@ -35,7 +35,7 @@ module AEMO
       # All AEMO Data aggregates to the trailing edge of the period (this makes it difficult to do daily aggregations :( )
       # @param [Boolean] trailing_edge selection of either the trailing edge of the period or the rising edge of the period for the date time
       # @return [Time] a time object of the trailing edge of the interval
-      def datetime(trailing_edge = true)
+      def datetime(trailing_edge: true)
         t = @datetime
         # If the datetime requested is the trailing edge, offset as per interval requirement
         unless trailing_edge
@@ -51,7 +51,7 @@ module AEMO
 
       # @return [Time] the time of the
       def interval_length
-        Time.at(300)
+        ::Time.at(300)
       end
 
       # @return [Symbol] :dispatch or :trading
@@ -72,7 +72,7 @@ module AEMO
       # @return [Float] the value of the interval in Australian Dollars
       def value
         @value ||= Float::NAN
-        @value = (@total_demand * @rrp).round(2) if @total_demand.class == Float && @rrp.class == Float
+        @value = (@total_demand * @rrp).round(2) if @total_demand.instance_of?(Float) && @rrp.instance_of?(Float)
         @value
       end
     end

data/lib/aemo/market/node.rb

@@ -13,7 +13,11 @@ module AEMO
       attr_accessor :identifier
 
       def initialize(identifier)
-        raise ArgumentError, "Node Identifier '#{identifier}' is not valid." unless IDENTIFIERS.include?(identifier.upcase)
+        unless IDENTIFIERS.include?(identifier.upcase)
+          raise ArgumentError,
+                "Node Identifier '#{identifier}' is not valid."
+        end
+
         @identifier = identifier
         @current_trading = []
         @current_dispatch = []
@@ -23,7 +27,7 @@ module AEMO
       #
       # @return [Array<AEMO::Market::Interval>]
       def current_dispatch
-        @current_dispatch = AEMO::Market.current_dispatch(@identifier) if @current_dispatch.empty? || @current_dispatch.last.datetime != (Time.now - Time.now.to_i % 300)
+        @current_dispatch = AEMO::Market.current_dispatch(@identifier) if @current_dispatch.empty? || @current_dispatch.last.datetime != (::Time.now - (::Time.now.to_i % 300))
         @current_dispatch
       end
 
@@ -31,7 +35,9 @@ module AEMO
       #
       # @return [Array<AEMO::Market::Interval>]
       def current_trading
-        if @current_trading.empty? || @current_trading.select { |i| i.period_type == 'TRADE' }.last.datetime != (Time.now - Time.now.to_i % 300)
+        if @current_trading.empty? || @current_trading.select do |i|
+             i.period_type == 'TRADE'
+           end.last.datetime != (::Time.now - (::Time.now.to_i % 300))
           @current_trading = AEMO::Market.current_trading(@identifier)
         end
         @current_trading

data/lib/aemo/market.rb

@@ -20,8 +20,7 @@ module AEMO
         region = AEMO::Region.new(region) if region.is_a?(String)
 
         response = get "/mms.GRAPHS/GRAPHS/GRAPH_5#{region}1.csv"
-        values = parse_response(response)
-        values
+        parse_response(response)
       end
 
       # Description of method
@@ -32,8 +31,7 @@ module AEMO
         region = AEMO::Region.new(region) if region.is_a?(String)
 
         response = get "/mms.GRAPHS/GRAPHS/GRAPH_30#{region}1.csv"
-        values = parse_response(response)
-        values
+        parse_response(response)
       end
 
       # Return an array of historic trading values based on a start and finish

data/lib/aemo/msats.rb

@@ -13,9 +13,9 @@ module AEMO
   class MSATS
     # Globally set request headers
     HEADERS = {
-      'User-Agent'    => 'Ruby.AEMO.MSATS.Api',
-      'Accept'        => 'text/xml',
-      'Content-Type'  => 'text/xml'
+      'User-Agent' => 'Ruby.AEMO.MSATS.Api',
+      'Accept' => 'text/xml',
+      'Content-Type' => 'text/xml'
     }.freeze
 
     # We like to party
@@ -31,8 +31,7 @@ module AEMO
 
     # Class Methods
     class << self
-      attr_accessor :auth
-      attr_accessor :participant_id
+      attr_accessor :auth, :participant_id
 
       # Single NMI Master (C4) Report
       # /C4/PARTICIPANT_IDENTIFIER?transactionId=XXX&nmi=XXX&checksum=X&type=XXX&reason=XXX
@@ -52,22 +51,23 @@ module AEMO
         options[:inittransId]     ||= nil
 
         query = {
-          transactionId:  transaction_id,
-          # Note: AEMO has case sensitivity but no consistency across requests.
-          NMI:            nmi.nmi,
-          fromDate:       from_date,
-          toDate:         to_date,
-          asatDate:       as_at_date,
-          participantId:  @participant_id,
-          roleId:         options[:role_id],
-          inittransId:    options[:init_trans_id]
+          transactionId: transaction_id,
+          # NOTE: AEMO has case sensitivity but no consistency across requests.
+          NMI: nmi.nmi,
+          fromDate: from_date,
+          toDate: to_date,
+          asatDate: as_at_date,
+          participantId: @participant_id,
+          roleId: options[:role_id],
+          inittransId: options[:init_trans_id]
         }
 
-        response = get("/C4/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query: query, verify: (options[:verify_ssl] != false))
-        if response.response.code != '200'
-          response
-        else
+        response = get("/C4/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query:,
+                                                 verify: (options[:verify_ssl] != false))
+        if response.response.code == '200'
           response.parsed_response['aseXML']['Transactions']['Transaction']['ReportResponse']['ReportResults']
+        else
+          response
         end
       end
 
@@ -77,13 +77,14 @@ module AEMO
       # @return [Hash] The report results from the MSATS Limits web service query
       def msats_limits(options = {})
         query = {
-          transactionId:  transaction_id
+          transactionId: transaction_id
         }
-        response = get("/MSATSLimits/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query: query, verify: (options[:verify_ssl] != false))
-        if response.response.code != '200'
-          response
-        else
+        response = get("/MSATSLimits/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query:,
+                                                          verify: (options[:verify_ssl] != false))
+        if response.response.code == '200'
           response.parsed_response['aseXML']['Transactions']['Transaction']['ReportResponse']['ReportResults']
+        else
+          response
         end
       end
 
@@ -93,21 +94,30 @@ module AEMO
       # @param [Integer] delivery_point_identifier Delivery Point Identifier
       # @return [Hash] The response
       def nmi_discovery_by_delivery_point_identifier(jurisdiction_code, delivery_point_identifier, options = {})
-        raise ArgumentError, 'jurisdiction_code is not valid' unless %w[ACT NEM NSW QLD SA VIC TAS].include?(jurisdiction_code)
-        raise ArgumentError, 'delivery_point_identifier is not valid' unless delivery_point_identifier.respond_to?('to_i')
-        raise ArgumentError, 'delivery_point_identifier is not valid' if delivery_point_identifier.to_i < 10_000_000 || delivery_point_identifier.to_i > 99_999_999
+        raise ArgumentError, 'jurisdiction_code is not valid' unless %w[ACT NEM NSW QLD SA VIC
+                                                                        TAS].include?(jurisdiction_code)
+
+        unless delivery_point_identifier.respond_to?('to_i')
+          raise ArgumentError,
+                'delivery_point_identifier is not valid'
+        end
+        if delivery_point_identifier.to_i < 10_000_000 || delivery_point_identifier.to_i > 99_999_999
+          raise ArgumentError,
+                'delivery_point_identifier is not valid'
+        end
 
         query = {
-          transactionId:  transaction_id,
+          transactionId: transaction_id,
           jurisdictionCode: jurisdiction_code,
           deliveryPointIdentifier: delivery_point_identifier.to_i
         }
 
-        response = get("/NMIDiscovery/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query: query, verify: (options[:verify_ssl] != false))
-        if response.response.code != '200'
-          response
-        else
+        response = get("/NMIDiscovery/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query:,
+                                                           verify: (options[:verify_ssl] != false))
+        if response.response.code == '200'
           response.parsed_response['aseXML']['Transactions']['Transaction']['NMIDiscoveryResponse']['NMIStandingData']
+        else
+          response
         end
       end
 
@@ -117,19 +127,21 @@ module AEMO
       # @param [Integer] meter_serial_number The meter's serial number
       # @return [Hash] The response
       def nmi_discovery_by_meter_serial_number(jurisdiction_code, meter_serial_number, options = {})
-        raise ArgumentError, 'jurisdiction_code is not valid' unless %w[ACT NEM NSW QLD SA VIC TAS].include?(jurisdiction_code)
+        raise ArgumentError, 'jurisdiction_code is not valid' unless %w[ACT NEM NSW QLD SA VIC
+                                                                        TAS].include?(jurisdiction_code)
 
         query = {
-          transactionId:  transaction_id,
+          transactionId: transaction_id,
           jurisdictionCode: jurisdiction_code,
           meterSerialNumber: meter_serial_number.to_i
         }
 
-        response = get("/NMIDiscovery/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query: query, verify: (options[:verify_ssl] != false))
-        if response.response.code != '200'
-          response
-        else
+        response = get("/NMIDiscovery/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query:,
+                                                           verify: (options[:verify_ssl] != false))
+        if response.response.code == '200'
           response.parsed_response['aseXML']['Transactions']['Transaction']['NMIDiscoveryResponse']['NMIStandingData']
+        else
+          response
         end
       end
 
@@ -139,7 +151,8 @@ module AEMO
       # @param [Integer] meter_serial_number The meter's serial number
       # @return [Hash] The response
       def nmi_discovery_by_address(jurisdiction_code, options = {})
-        raise ArgumentError, 'jurisdiction_code is not valid' unless %w[ACT NEM NSW QLD SA VIC TAS].include?(jurisdiction_code)
+        raise ArgumentError, 'jurisdiction_code is not valid' unless %w[ACT NEM NSW QLD SA VIC
+                                                                        TAS].include?(jurisdiction_code)
 
         options[:building_or_property_name] ||= nil
         options[:location_descriptor] ||= nil
@@ -158,7 +171,7 @@ module AEMO
         options[:state_or_territory] ||= jurisdiction_code
 
         query = {
-          transactionId:  transaction_id,
+          transactionId: transaction_id,
           jurisdictionCode: jurisdiction_code,
           buildingOrPropertyName: options[:building_or_property_name],
           locationDescriptor: options[:location_descriptor],
@@ -177,12 +190,13 @@ module AEMO
           stateOrTerritory: options[:state_or_territory]
         }
 
-        response = get("/NMIDiscovery/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query: query, verify: (options[:verify_ssl] != false))
-        if response.response.code != '200'
-          response
-        else
+        response = get("/NMIDiscovery/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query:,
+                                                           verify: (options[:verify_ssl] != false))
+        if response.response.code == '200'
           myresponse = response.parsed_response['aseXML']['Transactions']['Transaction']['NMIDiscoveryResponse']['NMIStandingData']
           myresponse.is_a?(Hash) ? [myresponse] : myresponse
+        else
+          response
         end
       end
 
@@ -204,11 +218,12 @@ module AEMO
           reason: options[:reason]
         }
 
-        response = get("/NMIDetail/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query: query, verify: (options[:verify_ssl] != false))
-        if response.response.code != '200'
-          response
-        else
+        response = get("/NMIDetail/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query:,
+                                                        verify: (options[:verify_ssl] != false))
+        if response.response.code == '200'
           response.parsed_response['aseXML']['Transactions']['Transaction']['NMIStandingDataResponse']['NMIStandingData']
+        else
+          response
         end
       end
 
@@ -218,13 +233,14 @@ module AEMO
       # @return [Hash] The report results from the Participant System Status web service query
       def system_status(options = {})
         query = {
-          transactionId:  transaction_id
+          transactionId: transaction_id
         }
-        response = get("/ParticipantSystemStatus/#{@participant_id}", basic_auth: @auth, headers: HEADERS, query: query, verify: (options[:verify_ssl] != false))
-        if response.response.code != '200'
-          response
-        else
+        response = get("/ParticipantSystemStatus/#{@participant_id}", basic_auth: @auth, headers: HEADERS,
+                                                                      query:, verify: (options[:verify_ssl] != false))
+        if response.response.code == '200'
           response.parsed_response['aseXML']['Transactions']['Transaction']['ReportResponse']['ReportResults']
+        else
+          response
         end
       end
 
@@ -235,7 +251,7 @@ module AEMO
       # @return [Hash] authentication credentials
       def authorize(participant_id, username, password)
         @participant_id  = participant_id
-        @auth            = { username: username, password: password }
+        @auth            = { username:, password: }
       end
 
       # Check if credentials are available to use
@@ -249,7 +265,7 @@ module AEMO
       #
       # @return [String] the transaction id
       def transaction_id
-        Digest::SHA1.hexdigest(Time.now.to_s)[0..35]
+        Digest::SHA1.hexdigest(::Time.now.to_s)[0..35]
       end
     end
 

data/lib/aemo/nem12/data_stream_suffix.rb

@@ -29,7 +29,7 @@ module AEMO
       'U' => { stream: 'Check',  description: '',       units: 'kVAh' },
       'Y' => { stream: 'Check',  description: 'Q Metering',         units: 'Qh' },
       'W' => { stream: 'Check',  description: 'Par Metering Path',  units: '' },
-      'Z' => { stream: 'Check',  description: 'Volts or V2h or Amps or A2h',  units: '' },
+      'Z' => { stream: 'Check',  description: 'Volts or V2h or Amps or A2h',  units: '' }
       # Net Meter Streams
       # AEMO: NOTE THAT D AND J ARE PREVIOUSLY DEFINED
       # 'D' => { stream: 'Net',    description: 'Net', units: 'kWh' },

data/lib/aemo/nem12/quality_method.rb

@@ -5,12 +5,12 @@ module AEMO
   # @since 0.1.4
   class NEM12
     QUALITY_FLAGS = {
-      'A'     => 'Actual Data',
-      'E'     => 'Forward Estimated Data',
-      'F'     => 'Final Substituted Data',
-      'N'     => 'Null Data',
-      'S'     => 'Substituted Data',
-      'V'     => 'Variable Data'
+      'A' => 'Actual Data',
+      'E' => 'Forward Estimated Data',
+      'F' => 'Final Substituted Data',
+      'N' => 'Null Data',
+      'S' => 'Substituted Data',
+      'V' => 'Variable Data'
     }.freeze
 
     METHOD_FLAGS = {
@@ -23,17 +23,21 @@ module AEMO
       17 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Linear', description: '' },
       18 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Alternate', description: '' },
       19 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Zero', description: '' },
-      20 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Churn Correction (Like Day)', description: '' },
-      21 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Five-minute No Historical Data', description: '' },
+      20 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Churn Correction (Like Day)',
+              description: '' },
+      21 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Five-minute No Historical Data',
+              description: '' },
       51 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Previous Year', description: '' },
       52 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Previous Read', description: '' },
       53 => { type: %w[SUB], installation_type: 5, short_descriptor: 'Revision', description: '' },
       54 => { type: %w[SUB], installation_type: 5, short_descriptor: 'Linear', description: '' },
       55 => { type: %w[SUB], installation_type: 5, short_descriptor: 'Agreed', description: '' },
-      56 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Prior to First Read - Agreed', description: '' },
+      56 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Prior to First Read - Agreed',
+              description: '' },
       57 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Customer Class', description: '' },
       58 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Zero', description: '' },
-      59 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Five-minute No Historical Data', description: '' },
+      59 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Five-minute No Historical Data',
+              description: '' },
       61 => { type: %w[EST SUB], installation_type: 6, short_descriptor: 'Previous Year', description: '' },
       62 => { type: %w[EST SUB], installation_type: 6, short_descriptor: 'Previous Read', description: '' },
       63 => { type: %w[EST SUB], installation_type: 6, short_descriptor: 'Customer Class', description: '' },

data/lib/aemo/nem12/unit_of_measurement.rb

@@ -5,55 +5,55 @@ module AEMO
   # @since 0.1.4
   class NEM12
     UOM = {
-      'MWh'   => { name: 'Megawatt Hour', multiplier: 1e6 },
-      'kWh'   => { name: 'Kilowatt Hour', multiplier: 1e3 },
-      'Wh'    => { name: 'Watt Hour', multiplier: 1 },
-      'MW'    => { name: 'Megawatt', multiplier: 1e6 },
-      'kW'    => { name: 'Kilowatt', multiplier: 1e3 },
-      'W'     => { name: 'Watt', multiplier: 1 },
+      'MWh' => { name: 'Megawatt Hour', multiplier: 1e6 },
+      'kWh' => { name: 'Kilowatt Hour', multiplier: 1e3 },
+      'Wh' => { name: 'Watt Hour', multiplier: 1 },
+      'MW' => { name: 'Megawatt', multiplier: 1e6 },
+      'kW' => { name: 'Kilowatt', multiplier: 1e3 },
+      'W' => { name: 'Watt', multiplier: 1 },
       'MVArh' => { name: 'Megavolt Ampere Reactive Hour', multiplier: 1e6 },
       'kVArh' => { name: 'Kilovolt Ampere Reactive Hour', multiplier: 1e3 },
-      'VArh'  => { name: 'Volt Ampere Reactive Hour', multiplier: 1 },
-      'MVAr'  => { name: 'Megavolt Ampere Reactive', multiplier: 1e6 },
-      'kVAr'  => { name: 'Kilovolt Ampere Reactive', multiplier: 1e3 },
-      'VAr'   => { name: 'Volt Ampere Reactive', multiplier: 1 },
-      'MVAh'  => { name: 'Megavolt Ampere Hour', multiplier: 1e6 },
-      'kVAh'  => { name: 'Kilovolt Ampere Hour', multiplier: 1e3 },
-      'VAh'   => { name: 'Volt Ampere Hour', multiplier: 1 },
-      'MVA'   => { name: 'Megavolt Ampere', multiplier: 1e6 },
-      'kVA'   => { name: 'Kilovolt Ampere', multiplier: 1e3 },
-      'VA'    => { name: 'Volt Ampere', multiplier: 1 },
-      'kV'    => { name: 'Kilovolt', multiplier: 1e3 },
-      'V'     => { name: 'Volt', multiplier: 1 },
-      'kA'    => { name: 'Kiloampere', multiplier: 1e3 },
-      'A'     => { name: 'Ampere', multiplier: 1 },
-      'pf'    => { name: 'Power Factor', multiplier: 1 }
+      'VArh' => { name: 'Volt Ampere Reactive Hour', multiplier: 1 },
+      'MVAr' => { name: 'Megavolt Ampere Reactive', multiplier: 1e6 },
+      'kVAr' => { name: 'Kilovolt Ampere Reactive', multiplier: 1e3 },
+      'VAr' => { name: 'Volt Ampere Reactive', multiplier: 1 },
+      'MVAh' => { name: 'Megavolt Ampere Hour', multiplier: 1e6 },
+      'kVAh' => { name: 'Kilovolt Ampere Hour', multiplier: 1e3 },
+      'VAh' => { name: 'Volt Ampere Hour', multiplier: 1 },
+      'MVA' => { name: 'Megavolt Ampere', multiplier: 1e6 },
+      'kVA' => { name: 'Kilovolt Ampere', multiplier: 1e3 },
+      'VA' => { name: 'Volt Ampere', multiplier: 1 },
+      'kV' => { name: 'Kilovolt', multiplier: 1e3 },
+      'V' => { name: 'Volt', multiplier: 1 },
+      'kA' => { name: 'Kiloampere', multiplier: 1e3 },
+      'A' => { name: 'Ampere', multiplier: 1 },
+      'pf' => { name: 'Power Factor', multiplier: 1 }
     }.freeze
 
     UOM_NON_SPEC_MAPPING = {
-      'MWH'   => 'MWh',
-      'KWH'   => 'kWh',
-      'WH'    => 'Wh',
-      'MW'    => 'MW',
-      'KW'    => 'kW',
-      'W'     => 'W',
+      'MWH' => 'MWh',
+      'KWH' => 'kWh',
+      'WH' => 'Wh',
+      'MW' => 'MW',
+      'KW' => 'kW',
+      'W' => 'W',
       'MVARH' => 'MVArh',
       'KVARH' => 'kVArh',
-      'VARH'  => 'VArh',
-      'MVAR'  => 'MVAr',
-      'KVAR'  => 'kVAr',
-      'VAR'   => 'VAr',
-      'MVAH'  => 'MVAh',
-      'KVAH'  => 'kVAh',
-      'VAH'   => 'VAh',
-      'MVA'   => 'MVA',
-      'KVA'   => 'kVA',
-      'VA'    => 'VA',
-      'KV'    => 'kV',
-      'V'     => 'V',
-      'KA'    => 'kA',
-      'A'     => 'A',
-      'PF'    => 'pf'
+      'VARH' => 'VArh',
+      'MVAR' => 'MVAr',
+      'KVAR' => 'kVAr',
+      'VAR' => 'VAr',
+      'MVAH' => 'MVAh',
+      'KVAH' => 'kVAh',
+      'VAH' => 'VAh',
+      'MVA' => 'MVA',
+      'KVA' => 'kVA',
+      'VA' => 'VA',
+      'KV' => 'kV',
+      'V' => 'V',
+      'KA' => 'kA',
+      'A' => 'A',
+      'PF' => 'pf'
     }.freeze
   end
 end