code cleanup

Author: nllong

lib/measures/urban_geometry_creation/measure.rb

@@ -127,7 +127,7 @@ def run(model, runner, user_arguments)
       surface_elevation = feature.surface_elevation.to_f
       surface_elevation = OpenStudio.convert(surface_elevation, 'ft', 'm').get
       site.setElevation(surface_elevation)
-    rescue
+    rescue StandardError
       @runner.registerWarning("Surface elevation not set for building '#{name}'")
     end
 
@@ -196,4 +196,4 @@ def run(model, runner, user_arguments)
 end
 
 # register the measure to be used by the application
-UrbanGeometryCreation.new.registerWithApplication
+UrbanGeometryCreation.new.registerWithApplication

lib/measures/urban_geometry_creation/tests/urban_geometry_creation_test.rb

@@ -47,7 +47,7 @@ def test_one_building
 
     geojson_file = File.absolute_path(File.join(File.dirname(__FILE__), 'nrel_stm_footprints.geojson'))
 
-    feature_id = '59a9ce2b42f7d007c059d2ee' #Energy Systems Integration Facility
+    feature_id = '59a9ce2b42f7d007c059d2ee' # Energy Systems Integration Facility
 
     surrounding_buildings = 'None'
     # surrounding_buildings = "ShadingOnly"
@@ -100,9 +100,8 @@ def test_one_building_w_surrounding_buildings
 
     geojson_file = File.absolute_path(File.join(File.dirname(__FILE__), 'nrel_stm_footprints.geojson'))
 
-    feature_id = '59a9ce2b42f7d007c059d2f0' #Education Center
-   
-   
+    feature_id = '59a9ce2b42f7d007c059d2f0' # Education Center
+
     # surrounding_buildings = "None"
     surrounding_buildings = 'ShadingOnly'
     # surrounding_buildings = "All"

lib/measures/urban_geometry_creation_zoning/measure.rb

@@ -131,7 +131,7 @@ def run(model, runner, user_arguments)
       surface_elevation = feature.surface_elevation.to_f
       surface_elevation = OpenStudio.convert(surface_elevation, 'ft', 'm').get
       site.setElevation(surface_elevation)
-    rescue
+    rescue StandardError
       @runner.registerWarning("Surface elevation not set for building '#{name}'")
     end
 

lib/measures/urban_geometry_creation_zoning/tests/urban_geometry_creation_test.rb

@@ -47,7 +47,7 @@ def test_one_building
 
     geojson_file = File.absolute_path(File.join(File.dirname(__FILE__), 'nrel_stm_footprints.geojson'))
 
-    feature_id = '59a9ce2b42f7d007c059d2ee' #Energy Systems Integration Facility
+    feature_id = '59a9ce2b42f7d007c059d2ee' # Energy Systems Integration Facility
 
     surrounding_buildings = 'None'
     # surrounding_buildings = "ShadingOnly"
@@ -100,7 +100,7 @@ def test_one_building_w_surrounding_buildings
 
     geojson_file = File.absolute_path(File.join(File.dirname(__FILE__), 'nrel_stm_footprints.geojson'))
 
-    feature_id = '59a9ce2b42f7d007c059d2f0' #Education Center
+    feature_id = '59a9ce2b42f7d007c059d2f0' # Education Center
 
     # surrounding_buildings = "None"
     surrounding_buildings = 'ShadingOnly'

lib/urbanopt/geojson/building.rb

@@ -33,23 +33,21 @@
 module URBANopt
   module GeoJSON # :nodoc: all
     class DistrictSystem < Feature
-
       def initialize(feature)
         super(feature)
       end
 
       ##
-      # Used to describe the feature type using the base method from the Feature class. 
+      # Used to describe the feature type using the base method from the Feature class.
       def feature_type
         'District System'
-      end     
+      end
 
       ##
       # Returns the district system properties schema.
       def schema_file
         return File.join(File.dirname(__FILE__), 'schema', 'district_system_properties.json')
       end
-      
     end
   end
 end

lib/urbanopt/geojson/district_system.rb

@@ -34,13 +34,11 @@
 module URBANopt
   module GeoJSON
     class Extension < OpenStudio::Extension::Extension
-     
-     
       def initialize # :nodoc:
         @root_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
       end
 
-      ## 
+      ##
       # Returns the absolute path of the measures or returns nil, in case no measures are
       # added. It can be used while configuring OSWs.
       def measures_dir
@@ -56,7 +54,7 @@ def files_dir
 
       # The directory containing common files like copyright and license notices which are used to update measures and other code.
       # This method will only be applied to measures in the current repository and
-      # returns the absolute path of the +doc_templates_dir+ or nil if there is none. 
+      # returns the absolute path of the +doc_templates_dir+ or nil if there is none.
       def doc_templates_dir
         return File.absolute_path(File.join(@root_dir, 'doc_templates'))
       end

lib/urbanopt/geojson/extension.rb

@@ -53,49 +53,48 @@ def method_missing(name, *args, &blk)
       end
 
       ##
-      # Returns the id of the feature. 
+      # Returns the id of the feature.
 
       def id
         return @feature_json[:properties][:id]
       end
 
       ##
-      # Returns the name of the feature.    
+      # Returns the name of the feature.
 
       def name
         return @feature_json[:properties][:name]
       end
 
       ##
-      # Raises an error if the +feature_type+ is not specified the the Feature's class.  
+      # Raises an error if the +feature_type+ is not specified the the Feature's class.
 
       def feature_type
         raise 'feature_type not implemented for Feature, override in your class'
       end
-      
+
       ##
-      # Raises an error if the +schema_file+ is not specified the the Feature's class.  
-    
+      # Raises an error if the +schema_file+ is not specified the the Feature's class.
+
       def schema_file
         raise 'schema_file not implemented for Feature, override in your class'
       end
-      
 
       def schema
         if @@feature_schema[feature_type].nil?
           @@schema_file_lock.synchronize do
             File.open(schema_file, 'r') do |file|
               @@feature_schema[feature_type] = JSON.parse(file.read, symbolize_names: true)
-              
-              #Allows additional properties.
+
+              # Allows additional properties.
               @@feature_schema[feature_type][:additionalProperties] = true
             end
           end
         end
 
         return @@feature_schema[feature_type]
       end
-      
+
       ##
       # Returns coordinate with the minimum longitute and latitude within a given +building_json+ .
       def get_min_lon_lat
@@ -119,7 +118,7 @@ def get_min_lon_lat
       # [Parameters]
       # +json+
       #
-      # For example: 
+      # For example:
       #
       #  polygon = {
       #     'geometry': {
@@ -167,7 +166,7 @@ def create_origin_lat_lon(runner)
 
       private
 
-      ## 
+      ##
       # Used to validate the feature by checking +feature_id+ , +geometry+, +properties+
       # and +geometry_type+ .
 
@@ -186,7 +185,7 @@ def validate_feat(feature) #:doc:
           raise("No properties found in '#{feature}'")
           return false
         end
-        
+
         errors = JSON::Validator.fully_validate(schema, feature[:properties])
         if !errors.empty?
           raise("Invalid properties for '#{feature}'\n  #{errors.join('\n  ')}")
@@ -204,4 +203,4 @@ def validate_feat(feature) #:doc:
       end
     end
   end
-end
+end

lib/urbanopt/geojson/feature.rb

@@ -42,7 +42,7 @@ class GeoFile < URBANopt::Core::FeatureFile
       @@schema_file_lock = Mutex.new
 
       ##
-      # Raises an error in case the GeoJSON file is not valid. 
+      # Raises an error in case the GeoJSON file is not valid.
       #
       # [Parameters]
       #
@@ -55,12 +55,11 @@ def initialize(data, path = nil)
         end
       end
 
-
       ##
       # [Parameters]
       #
       # Used to check the GeoJSON file path.
-      # * +path+ - _Type:String_ - GeoJSON file path. 
+      # * +path+ - _Type:String_ - GeoJSON file path.
       def self.from_file(path)
         if path.nil? || path.empty?
           raise "GeoJSON file '#{path}' could not be found"
@@ -81,10 +80,8 @@ def json
         @geojson
       end
 
-      def path
-        @path
-      end
-      
+      attr_reader :path
+
       ##
       # This method loops through all the features in the GeoJSON file, creates new
       # Buildings or District Systems based on the feature type, and returns the features.
@@ -122,7 +119,7 @@ def get_feature_by_id(feature_id)
       end
 
       ##
-      # Returns the file path for the +geojson_schema.json+ . 
+      # Returns the file path for the +geojson_schema.json+ .
       def schema_file
         return File.join(File.dirname(__FILE__), 'schema', 'geojson_schema.json')
       end
@@ -142,17 +139,16 @@ def schema
       end
 
       ##
-      # Validates the GeoJSON file against the schema. 
+      # Validates the GeoJSON file against the schema.
       def valid?
         return JSON::Validator.validate(schema, @geojson)
       end
 
       ##
-      # Returns detailed validation results. 
+      # Returns detailed validation results.
       def validation_errors
         return JSON::Validator.fully_validate(schema, @geojson)
       end
-
     end
   end
 end