lib/openstudio-standards/standards/standard.rb in openstudio-standards-0.6.0.rc2 vs lib/openstudio-standards/standards/standard.rb in openstudio-standards-0.6.3

@@ -51,28 +51,16 @@
   # @return [String] returns the lookup name as a string
   # @todo Unify the lookup names and eliminate this method
   def model_get_lookup_name(building_type)
     lookup_name = building_type
     case building_type
-    when 'SmallOffice'
+    when 'SmallOffice', 'SmallOfficeDetailed', 'MediumOffice', 'MediumOfficeDetailed', 'LargeOffice', 'LargeOfficeDetailed', 'Office'
       lookup_name = 'Office'
-    when 'SmallOfficeDetailed'
-      lookup_name = 'Office'
-    when 'MediumOffice'
-      lookup_name = 'Office'
-    when 'MediumOfficeDetailed'
-      lookup_name = 'Office'
-    when 'LargeOffice'
-      lookup_name = 'Office'
-    when 'LargeOfficeDetailed'
-      lookup_name = 'Office'
     when 'RetailStandalone'
       lookup_name = 'Retail'
     when 'RetailStripmall'
       lookup_name = 'StripMall'
-    when 'Office'
-      lookup_name = 'Office'
     end
     return lookup_name
   end
 
   # Loads the openstudio standards dataset for this standard.
@@ -137,10 +125,10 @@
         end
       end
     end
 
     # Check that standards data was loaded
-    if @standards_data.keys.size.zero?
+    if @standards_data.keys.empty?
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.standard', "OpenStudio Standards JSON data was not loaded correctly for #{template}.")
     end
     return @standards_data
   end
 end