urbanopt-geojson 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2547449dedf14b525ac23dd243c71a7b4e139ddce51ba4e84472cbec330fbc68
-  data.tar.gz: cc2971734955eb04ce013a1d7a12ecdb9cbe249bb8466ba1edc6131b44c468da
+  metadata.gz: 566987c365d84a289682ac42258d4feddbb68bfc24525179cb963ace27a71017
+  data.tar.gz: a647418e27a8a0a92813646811e79183dcbe6d2ef24384dde7d2ab00ddf557a7
 SHA512:
-  metadata.gz: 88eb991e3efff0a5ec2396ad86a0c93db9d3993783dfd99d3496106118561b24396848a10df5592ac79837c7f35bebaed2d2facba670cdfc2e544cbfdf378ccb
-  data.tar.gz: 22bbfdebc96a575126c6f178209acb67d2a65bc776401c32f5ccc4e8d2fe4151f0a6d74b8470b3dd7b40bc41fe8076403d7f805ddc892875d6f032586fff8fb2
+  metadata.gz: 01f0c79e94c2fb950319e44d2a68d3b23124bc5007c7748957ded2744a46361dbafc52fb9ce81b4ec19061734fae6c5626ffabbc60633a2a876e431549737717
+  data.tar.gz: 48bcaf433af03988fde0448c70ee707e572ab008f1c4bf5608c6e29c8d2795a65b5a204b7b32495abcec63e510e35f55d2c88738ad34d3e7e7fd04b8bed9ea86

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # URBANopt GeoJSON Gem
 
+## Version 0.11.2
+* Allow null for some optional fields by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/273
+* Added UO-ResStock connection variable to the site properties schema by @rawadelkontar in https://github.com/urbanopt/urbanopt-geojson-gem/pull/270
+
+
+**Full Changelog**: https://github.com/urbanopt/urbanopt-geojson-gem/compare/v0.11.1...v0.11.2
+
+## Version 0.11.1
+Date Range: 01/09/24
+
+* downgrade json-schema to 2.7 by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/267
+
+**Full Changelog**: https://github.com/urbanopt/urbanopt-geojson-gem/compare/v0.11.0...v0.11.1
+
 ## Version 0.11.0
 Date Range: 7/19/23 - 01/09/24
 
@@ -10,7 +24,6 @@ Date Range: 7/19/23 - 01/09/24
 * this fixes a test that didn't get merged properly in the tests PR by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/264
 * Support OpenStudio 3.7 by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/265
 
-
 **Full Changelog**: https://github.com/urbanopt/urbanopt-geojson-gem/compare/v0.10.0...v0.11.0
 
 ## Version 0.10.0

data/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
+URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/lib/measures/urban_geometry_creation/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
+URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/lib/measures/urban_geometry_creation/measure.rb

@@ -121,7 +121,7 @@ class UrbanGeometryCreation < OpenStudio::Measure::ModelMeasure
       if scale_footprint_area_by_floor_area
         building_hash = feature.to_hash
         if building_hash[:number_of_stories] && building_hash[:floor_area]
-          scaled_footprint_area = building_hash[:floor_area].to_f / building_hash[:number_of_stories].to_f
+          scaled_footprint_area = building_hash[:floor_area].to_f / building_hash[:number_of_stories]
           @runner.registerInfo("Desired footprint area in ft2: #{scaled_footprint_area}")
         end
       end

data/lib/measures/urban_geometry_creation/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>urban_geometry_creation</name>
   <uid>5ab85d6b-c9af-4361-8ab9-613ee99a5666</uid>
-  <version_id>583499fb-4275-4787-9168-e3383dca0fc6</version_id>
-  <version_modified>2023-11-20T17:10:01Z</version_modified>
+  <version_id>114e5a3f-0e66-47f2-aa96-299f71b4ef0f</version_id>
+  <version_modified>2024-06-25T21:15:26Z</version_modified>
   <xml_checksum>D254E772</xml_checksum>
   <class_name>UrbanGeometryCreation</class_name>
   <display_name>UrbanGeometryCreation</display_name>
@@ -108,7 +108,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>9A4578CE</checksum>
+      <checksum>3C275955</checksum>
     </file>
     <file>
       <filename>README.md</filename>

data/lib/measures/urban_geometry_creation_zoning/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
+URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/lib/measures/urban_geometry_creation_zoning/measure.rb

@@ -110,7 +110,8 @@ class UrbanGeometryCreationZoning < OpenStudio::Measure::ModelMeasure
       @runner.registerWarning("Surface elevation not set for building '#{name}'")
     end
 
-    if feature.type == 'Building'
+    case feature.type
+    when 'Building'
       # make requested building, zoning is set to true
       spaces = feature.create_building(:spaces_per_floor, model, @origin_lat_lon, @runner, true)
       if spaces.nil? || spaces.empty?
@@ -157,7 +158,7 @@ class UrbanGeometryCreationZoning < OpenStudio::Measure::ModelMeasure
         URBANopt::GeoJSON::Helper.convert_to_shading_surface_group(space)
       end
 
-    elsif feature.type == 'District System'
+    when 'District System'
       district_system_type = feature[:properties][:district_system_type]
       if district_system_type == 'Community Photovoltaic'
         shading_surfaces = URBANopt::GeoJSON::Helper.create_photovoltaics(feature, 0, model, @origin_lat_lon, @runner)

data/lib/measures/urban_geometry_creation_zoning/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>urban_geometry_creation_zoning</name>
   <uid>96ea1317-76ac-4670-b51d-71ee3f4fdd65</uid>
-  <version_id>4d47bb3f-6e49-4309-a4e0-5f2c3748b947</version_id>
-  <version_modified>2023-11-20T17:10:01Z</version_modified>
+  <version_id>8b2f1d05-725a-4f06-bcac-1fb685f12f89</version_id>
+  <version_modified>2024-06-25T21:15:28Z</version_modified>
   <xml_checksum>D254E772</xml_checksum>
   <class_name>UrbanGeometryCreationZoning</class_name>
   <display_name>UrbanGeometryCreationZoning</display_name>
@@ -89,7 +89,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>9A4578CE</checksum>
+      <checksum>3C275955</checksum>
     </file>
     <file>
       <filename>README.md</filename>

data/lib/urbanopt/geojson/building.rb

@@ -103,12 +103,13 @@ module URBANopt
         end
 
         spaces = []
-        if create_method == :space_per_floor || create_method == :spaces_per_floor
+        case create_method
+        when :space_per_floor, :spaces_per_floor
           (-number_of_stories_below_ground + 1..number_of_stories_above_ground).each do |story_number|
             new_spaces = create_space_per_floor(story_number, floor_to_floor_height, model, origin_lat_lon, runner, zoning, scaled_footprint_area)
             spaces.concat(new_spaces)
           end
-        elsif create_method == :space_per_building
+        when :space_per_building
           spaces = create_space_per_building(-number_of_stories_below_ground * floor_to_floor_height, number_of_stories_above_ground * floor_to_floor_height, model, origin_lat_lon, runner, zoning, other_building)
         end
         return spaces
@@ -417,10 +418,8 @@ module URBANopt
           space = space.get
           space.setName("Building Story #{story_number} Space")
           space.surfaces.each do |surface|
-            if surface.surfaceType == 'Wall'
-              if story_number < 1
-                surface.setOutsideBoundaryCondition('Ground')
-              end
+            if surface.surfaceType == 'Wall' && (story_number < 1)
+              surface.setOutsideBoundaryCondition('Ground')
             end
           end
           spaces << space

data/lib/urbanopt/geojson/district_system.rb

@@ -8,10 +8,6 @@ require 'urbanopt/geojson/feature'
 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.
       def feature_type

data/lib/urbanopt/geojson/feature.rb

@@ -19,9 +19,7 @@ module URBANopt
         @feature_json = validate_feat(feature)
       end
 
-      # rubocop:disable Style/MethodMissing
       def method_missing(name, *args, &blk)
-        # rubocop:enable Style/MethodMissing
         if @feature_json[:properties].keys.map(&:to_sym).include? name.to_sym
 
           return @feature_json[:properties][name.to_sym]
@@ -196,10 +194,11 @@ module URBANopt
       def get_multi_polygons(json = @feature_json)
         geometry_type = json[:geometry][:type]
         multi_polygons = []
-        if geometry_type == 'Polygon'
+        case geometry_type
+        when 'Polygon'
           polygons = json[:geometry][:coordinates]
           multi_polygons = [polygons]
-        elsif geometry_type == 'MultiPolygon'
+        when 'MultiPolygon'
           multi_polygons = json[:geometry][:coordinates]
         end
         return multi_polygons
@@ -256,8 +255,7 @@ module URBANopt
         central_latitude = Math.atan2(z, central_square_root)
 
         [central_longitude * 180 / Math::PI,
-          central_latitude * 180 / Math::PI]
-
+         central_latitude * 180 / Math::PI]
       end
 
       private
@@ -292,8 +290,9 @@ module URBANopt
         end
 
         geometry_type = feature[:geometry][:type]
-        if geometry_type == 'Polygon'
-        elsif geometry_type == 'MultiPolygon'
+        case geometry_type
+        when 'Polygon'
+        when 'MultiPolygon'
         else
           raise("Unknown geometry type '#{geometry_type}'")
           return false

data/lib/urbanopt/geojson/geo_file.rb

@@ -47,7 +47,6 @@ module URBANopt
           symbolize_names: true
         )
 
-
         # validate geojson file against schema
         geojson_errors = validate(@@geojson_schema, geojson_file)
         unless geojson_errors.empty?
@@ -83,6 +82,7 @@ module URBANopt
               if feature[:properties][:name].nil?
                 raise('No name found for Building Feature')
               end
+
               if feature[:properties][:number_of_stories].nil?
                 @@logger.warn("Number of stories is required to calculate shading using the UrbanGeometryCreation measure.\n" \
                   "Not validating #{feature[:properties][:id]} against schema and ignoring in shading calculations")
@@ -96,6 +96,7 @@ module URBANopt
               if feature[:properties][:name].nil?
                 raise('No name found for Building Feature')
               end
+
               @@logger.warn("OS-HPXML files may not conform to schema, which is usually ok.\n" \
                 "Not validating #{feature[:properties][:id]} against schema")
             # Else validate for all required properties in the schema
@@ -196,16 +197,17 @@ module URBANopt
           { site: :electricity_emissions_annual_historical_subregion, feature: :electricity_emissions_annual_historical_subregion },
           { site: :electricity_emissions_future_year, feature: :electricity_emissions_future_year },
           { site: :electricity_emissions_hourly_historical_year, feature: :electricity_emissions_hourly_historical_year },
-          { site: :electricity_emissions_annual_historical_year, feature: :electricity_emissions_annual_historical_year }
+          { site: :electricity_emissions_annual_historical_year, feature: :electricity_emissions_annual_historical_year },
+          { site: :characterize_residential_buildings_from_buildstock_csv, feature: :characterize_residential_buildings_from_buildstock_csv },
+          { site: :resstock_buildstock_csv_path, feature: :resstock_buildstock_csv_path },
+          { site: :uo_buildstock_mapping_csv_path, feature: :uo_buildstock_mapping_csv_path }
         ]
 
         add_props.each do |prop|
-          if project.key?(prop[:site]) && project[prop[:site]]
-            # property exists in site
-            if !feature[:properties].key?(prop[:feature]) || feature[:properties][prop[:feature]].nil? || feature[:properties][prop[:feature]].to_s.empty?
-              # property does not exist in feature or is nil: add site property (don't overwrite)
-              feature[:properties][prop[:feature]] = project[prop[:site]]
-            end
+          # property exists in site
+          if project.key?(prop[:site]) && project[prop[:site]] && (!feature[:properties].key?(prop[:feature]) || feature[:properties][prop[:feature]].nil? || feature[:properties][prop[:feature]].to_s.empty?)
+            # property does not exist in feature or is nil: add site property (don't overwrite)
+            feature[:properties][prop[:feature]] = project[prop[:site]]
           end
         end
 
@@ -226,7 +228,7 @@ module URBANopt
         result = nil
         if @@geojson_schema.nil?
           @@schema_file_lock.synchronize do
-            File.open(File.dirname(__FILE__) + '/schema/geojson_schema.json') do |f|
+            File.open("#{File.dirname(__FILE__)}/schema/geojson_schema.json") do |f|
               result = JSON.parse(f.read, symbolize_names: true)
             end
           end
@@ -236,7 +238,7 @@ module URBANopt
 
       def self.get_building_schema(strict)
         result = nil
-        File.open(File.dirname(__FILE__) + '/schema/building_properties.json') do |f|
+        File.open("#{File.dirname(__FILE__)}/schema/building_properties.json") do |f|
           result = JSON.parse(f.read)
         end
         if strict
@@ -249,7 +251,7 @@ module URBANopt
 
       def self.get_district_system_schema(strict)
         result = nil
-        File.open(File.dirname(__FILE__) + '/schema/district_system_properties.json') do |f|
+        File.open("#{File.dirname(__FILE__)}/schema/district_system_properties.json") do |f|
           result = JSON.parse(f.read)
         end
         if strict
@@ -262,7 +264,7 @@ module URBANopt
 
       def self.get_region_schema(strict)
         result = nil
-        File.open(File.dirname(__FILE__) + '/schema/region_properties.json') do |f|
+        File.open("#{File.dirname(__FILE__)}/schema/region_properties.json") do |f|
           result = JSON.parse(f.read)
         end
         if strict
@@ -275,7 +277,7 @@ module URBANopt
 
       def self.get_site_schema(strict)
         result = nil
-        File.open(File.dirname(__FILE__) + '/schema/site_properties.json') do |f|
+        File.open("#{File.dirname(__FILE__)}/schema/site_properties.json") do |f|
           result = JSON.parse(f.read)
         end
         if strict
@@ -288,7 +290,7 @@ module URBANopt
 
       def self.get_electrical_connector_schema(strict)
         result = nil
-        File.open(File.dirname(__FILE__) + '/schema/electrical_connector_properties.json') do |f|
+        File.open("#{File.dirname(__FILE__)}/schema/electrical_connector_properties.json") do |f|
           result = JSON.parse(f.read)
         end
         if strict
@@ -301,7 +303,7 @@ module URBANopt
 
       def self.get_electrical_junction_schema(strict)
         result = nil
-        File.open(File.dirname(__FILE__) + '/schema/electrical_junction_properties.json') do |f|
+        File.open("#{File.dirname(__FILE__)}/schema/electrical_junction_properties.json") do |f|
           result = JSON.parse(f.read)
         end
         if strict
@@ -314,7 +316,7 @@ module URBANopt
 
       def self.get_thermal_connector_schema(strict)
         result = nil
-        File.open(File.dirname(__FILE__) + '/schema/thermal_connector_properties.json') do |f|
+        File.open("#{File.dirname(__FILE__)}/schema/thermal_connector_properties.json") do |f|
           result = JSON.parse(f.read)
         end
         if strict
@@ -327,7 +329,7 @@ module URBANopt
 
       def self.get_thermal_junction_schema(strict)
         result = nil
-        File.open(File.dirname(__FILE__) + '/schema/thermal_junction_properties.json') do |f|
+        File.open("#{File.dirname(__FILE__)}/schema/thermal_junction_properties.json") do |f|
           result = JSON.parse(f.read)
         end
         if strict

data/lib/urbanopt/geojson/helper.rb

@@ -242,6 +242,7 @@ module URBANopt
         other_buildings[:features].each do |other_building|
           other_id = other_building[:properties][:id]
           next if other_id == building.id
+
           # Consider building, if other building type is ShadingOnly and other id is not equal to building id
           if other_building_type == 'ShadingOnly' && other_id != building.id
             # Checks if any building point is shaded by any other building point.
@@ -277,6 +278,7 @@ module URBANopt
               runner.registerInfo("Feature #{other_building[:properties][:id]} is acting as shading object for #{building.id}")
             end
             next unless shadowed
+
             new_building = building.create_other_building(:space_per_building, model, origin_lat_lon, runner, zoning, 0, other_building)
             if new_building.nil? || new_building.empty?
               runner.registerWarning("Failed to create spaces for other building '#{name}'")
@@ -321,6 +323,7 @@ module URBANopt
         if is_shaded(min_pair[:building_point], min_pair[:other_building_point], origin_lat_lon)
           return true
         end
+
         return false
       end
 
@@ -339,7 +342,8 @@ module URBANopt
         if distance < 1
           return true
         end
-        elevation_angle = 2.5 #not sure of best value maybe allow as project level argument
+
+        elevation_angle = 2.5 # not sure of best value maybe allow as project level argument
         height = vector.z
         apparent_angle_rad = Math.atan2(height, distance)
         apparent_angle = OpenStudio.radToDeg(apparent_angle_rad)
@@ -351,9 +355,9 @@ module URBANopt
         return result
       end
 
-            class << self
-              private :is_shaded
-            end
-          end
-        end
+      class << self
+        private :is_shaded
       end
+    end
+  end
+end

data/lib/urbanopt/geojson/logging.rb

@@ -7,7 +7,7 @@ require 'logger'
 
 module URBANopt
   module GeoJSON
-    @@logger = Logger.new(STDERR)
+    @@logger = Logger.new($stderr)
     @@logger.progname = 'URBANopt::GeoJSON'
 
     def self.logger

data/lib/urbanopt/geojson/mapper_classes.rb

@@ -46,15 +46,16 @@ module URBANopt
           feature_file = scenario.feature_file
           feature = feature_file.get_feature_by_id(feature_id)
           raise "Cannot find feature '#{feature_id}' in '#{scenario.geometry_file}'" if feature.nil?
+
           # deep clone of @@osw before we configure it #:nodoc:
           osw = Marshal.load(Marshal.dump(@@osw))
           osw[:name] = feature_name
           osw[:description] = feature_name
-          end
+        end
         # rubocop:disable Lint/ReturnInVoidContext
         return osw
-       # rubocop:enable Lint/ReturnInVoidContext
-     end
+        # rubocop:enable Lint/ReturnInVoidContext
+      end
     end
   end
 end

data/lib/urbanopt/geojson/model.rb

@@ -75,6 +75,7 @@ module URBANopt
         stories.each_index do |i|
           space_type = space_types[i]
           next if space_type.nil?
+
           stories[i].spaces.each do |space|
             space.setSpaceType(space_type)
           end

data/lib/urbanopt/geojson/region.rb

@@ -10,9 +10,6 @@ module URBANopt
     class Region < Feature
       ##
       # Used to initialize the feature. This method is inherited from the Feature class.
-      def initialize(feature)
-        super(feature)
-      end
 
       ##
       # Used to describe the Region feature type using the base method from the Feature class.

data/lib/urbanopt/geojson/scale_area.rb

@@ -30,6 +30,7 @@ module URBANopt
         @vertices = vertices
         @centroid = OpenStudio.getCentroid(vertices)
         raise "Cannot compute centroid for '#{vertices}'" if @centroid.empty?
+
         @centroid = @centroid.get
         @desired_area = desired_area
         @new_vertices = vertices
@@ -41,15 +42,7 @@ module URBANopt
         @eps  = eps
       end
 
-      attr_reader :zero
-
-      attr_reader :one
-
-      attr_reader :two
-
-      attr_reader :ten
-
-      attr_reader :eps
+      attr_reader :zero, :one, :two, :ten, :eps, :new_vertices
 
       ##
       # Used to determine new scaled vertices, by iteratively passing in the perimeter distance to
@@ -59,12 +52,11 @@ module URBANopt
         @new_vertices = URBANopt::GeoJSON::Zoning.divide_floor_print(@vertices, x[0].to_f, @runner, scale = true)
         new_area = OpenStudio.getArea(@new_vertices)
         raise "Cannot compute area for '#{@new_vertices}'" if new_area.empty?
+
         new_area = new_area.get
 
         return [new_area - @desired_area]
       end
-
-      attr_reader :new_vertices
-    end # ScaleArea
-  end # GeoJSON
-end # URBANopt
+    end
+  end
+end

data/lib/urbanopt/geojson/schema/building_properties.json

@@ -283,6 +283,18 @@
 		"ev_curtailment_frac": {
 			"description": "Fraction between 0 and 1 that denotes curtailment of EV charging load to better align EV charging with expected energy production from a solar PV system",
 			"type": "number"
+		},
+		"characterize_residential_buildings_from_buildstock_csv":{
+		"description" : "Enable UO and ResStock connection to characterize residential buildings by matching them (and their properties) with building from the BuildStock CSV. Optional for residential buildings.",
+		"type": "boolean"
+		},
+		"resstock_buildstock_csv_path":{
+		"description" : "Path to the buildstock CSV that the users want to sample from to find the closest match to their UO residential buildings features. Optional for residential buildings.",
+		"type": "string"
+		},
+		"uo_buildstock_mapping_csv_path":{
+			"description" : "Path to the uo_buildstock mapping CSV. IN this CSV users can set a match of the UO features with a buildstock building and its characteristics and the feature will run with the assigned buildstock characteristics. Optional for residential buildings.",
+			"type": "string"
 		}
 	},
 	"required": [
@@ -515,4 +527,4 @@
 			]
 		}
 	}
-}
+}

data/lib/urbanopt/geojson/schema/site_properties.json

@@ -77,15 +77,15 @@
 		},
 		"underground_cables_ratio": {
 			"description": "Ratio of overall cables that are underground vs. overhead for RNM analysis.",
-			"type": "number"
+			"type": ["number", "null"]
 		},
 		"only_lv_consumers": {
 			"description": "If true, only low voltage consumers will be considered in the RNM analysis.",
-			"type": "boolean"
+			"type": ["boolean", "null"]
 		},
 		"max_number_of_lv_nodes_per_building": {
 			"description": "Maximum number of low voltage nodes to represent a single building.",
-			"type": "number"
+			"type": ["number", "null"]
 		},
 		"emissions": {
 			"description": "Should be set to true to calculate electricity emissions for the associated building.",
@@ -211,9 +211,21 @@
 				"2018",
 				"2019"
 			]
+		},
+		"characterize_residential_buildings_from_buildstock_csv":{
+		"description" : "Enable UO and ResStock connection to characterize residential buildings by matching them (and their properties) with building from the BuildStock CSV.",
+		"type": "boolean"
+		},
+		"resstock_buildstock_csv_path":{
+		"description" : "Path to the buildstock CSV that the users want to sample from to find the closest match to their UO residential buildings features.",
+		"type": "string"
+		},
+		"uo_buildstock_mapping_csv_path":{
+		"description" : "Path to the uo_buildstock mapping CSV. IN this CSV users can set a match of the UO features with a buildstock building and its characteristics and the feature will run with the assigned buildstock characteristics",
+		"type": "string"
 		}
 	},
 	"required": [
 	],
 	"additionalProperties": false
-}
+}

data/lib/urbanopt/geojson/update_areas.rb

@@ -25,10 +25,11 @@ geojson[:features].each do |feature|
   # end
 
   multi_polygons = nil
-  if geometry[:type] == 'Polygon'
+  case geometry[:type]
+  when 'Polygon'
     polygons = geometry[:coordinates]
     multi_polygons = [polygons]
-  elsif geometry[:type] == 'MultiPolygon'
+  when 'MultiPolygon'
     multi_polygons = geometry[:coordinates]
   end
 

data/lib/urbanopt/geojson/validate_geojson.rb

@@ -8,7 +8,7 @@ require 'json-schema'
 
 def get_building_schema(strict)
   result = nil
-  File.open(File.dirname(__FILE__) + '/../schema/building_properties.json') do |f|
+  File.open("#{File.dirname(__FILE__)}/../schema/building_properties.json") do |f|
     result = JSON.parse(f.read)
   end
   if strict
@@ -21,7 +21,7 @@ end
 
 def get_taxlot_schema(strict)
   result = nil
-  File.open(File.dirname(__FILE__) + '/../schema/taxlot_properties.json') do |f|
+  File.open("#{File.dirname(__FILE__)}/../schema/taxlot_properties.json") do |f|
     result = JSON.parse(f.read)
   end
   if strict
@@ -34,7 +34,7 @@ end
 
 def get_district_system_schema(strict)
   result = nil
-  File.open(File.dirname(__FILE__) + '/../schema/district_system_properties.json') do |f|
+  File.open("#{File.dirname(__FILE__)}/../schema/district_system_properties.json") do |f|
     result = JSON.parse(f.read)
   end
   if strict
@@ -47,7 +47,7 @@ end
 
 def get_region_schema(strict)
   result = nil
-  File.open(File.dirname(__FILE__) + '/../schema/region_properties.json') do |f|
+  File.open("#{File.dirname(__FILE__)}/../schema/region_properties.json") do |f|
     result = JSON.parse(f.read)
   end
   if strict
@@ -95,13 +95,14 @@ Dir.glob('denver_district*.geojson').each do |p|
       type = data['type']
       errors = []
 
-      if /building/i.match(type)
+      case type
+      when /building/i
         errors = validate(building_schema, data)
-      elsif /district system/i.match(type)
+      when /district system/i
         errors = validate(district_system_schema, data)
-      elsif /taxlot/i.match(type)
+      when /taxlot/i
         errors = validate(taxlot_schema, data)
-      elsif /region/i.match(type)
+      when /region/i
         errors = validate(region_schema, data)
       else
         raise("Unknown type: '#{type}'")

data/lib/urbanopt/geojson/version.rb

@@ -5,6 +5,6 @@
 
 module URBANopt
   module GeoJSON
-    VERSION = '0.11.0'.freeze
+    VERSION = '0.11.2'.freeze
   end
 end

data/lib/urbanopt/geojson/zoning.rb

@@ -28,11 +28,12 @@ module URBANopt
           vertex_1 = nil
           vertex_2 = nil
           vertex_3 = nil
-          if i == 0
+          case i
+          when 0
             vertex_1 = vertices[n - 1]
             vertex_2 = vertices[i]
             vertex_3 = vertices[i + 1]
-          elsif i == (n - 1)
+          when n - 1
             vertex_1 = vertices[i - 1]
             vertex_2 = vertices[i]
             vertex_3 = vertices[0]

data/urbanopt-geojson-gem.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.18.2'
   spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
 
-  spec.add_runtime_dependency 'json-schema', '~> 2.8'
+  spec.add_runtime_dependency 'json-schema', '~> 2.7'
   spec.add_runtime_dependency 'urbanopt-core', '~> 0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-geojson
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.2
 platform: ruby
 authors:
 - Tanushree Charan
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: urbanopt-core
   requirement: !ruby/object:Gem::Requirement