urbanopt-geojson 0.2.0 → 0.3.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 870b9ea6276a059c4eb18b0128ab7bea9d0b1ffb
-  data.tar.gz: 1fe21a2f8de24867eb607672cd848574eca1226d
+SHA256:
+  metadata.gz: c39b696dfeba6148591053638dfd4c67b4106738acd2d34e6406cca33165901f
+  data.tar.gz: 310869f65715b4ed07ca3354f437f5adaaadf66dcf6badaf51c857d045d850a2
 SHA512:
-  metadata.gz: 0771a25df9ba8a02f4867b314c2f88a6cc2c62c7321dc14f8b055d4e7514a0bd2b0ae9341d0410358d09bbb634ccb6ce6a2215894472ef4d0a676f3341b6c231
-  data.tar.gz: d7a7b009954797acaf314ce6e81a60733823d9baac89493398ea787cbe0b77ef00e904beed35ae5e527a052eb93fba298344993218c2248d85b25083021335d1
+  metadata.gz: e77fce00f95547496fde539cde2188c6321de99a9d3995d431925f5a2d3f6f94d60394c0f3ce6dbf4b359255a50e46819c9c787d1d7d46a41db171fa85e2be8b
+  data.tar.gz: b22042f699522747efc14258ca56e4a45135f05ca7a700e8b78f6ffc02632839ee8c2159f87dd859f7320c1ac575f8e6feb0c6dcc895eabcd546f964ce85f6c7

data/.rubocop.yml

@@ -6,5 +6,5 @@ AllCops:
 
 
 inherit_from:
-  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop.yml
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
 

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # URBANopt GeoJSON Gem
  
+## Version 0.3.0.pre1
+
+Date Range 3/25/20 - 05/15/20
+
+Updating to use with OpenStudio 3.0 and Ruby 2.5
+
+Accepted Pull Requests: 5
+- Fixed [#60]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/60 ), HPXML-based workflow for residential buildings
+- Fixed [#83]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/83 ), Add new system types to building properties schema
+- Fixed [#84]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/84 ), Updated system types with OpenStudio
+- Fixed [#87]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/87 ), Adds nominal height for stories, test for confirming nominal height
+
 ## Version 0.2.0
 
 Date Range: 12/26/19 - 03/25/20

data/Gemfile

@@ -22,6 +22,3 @@ if allow_local && File.exist?('../urbanopt-core-gem')
 elsif allow_local
   gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
 end
-
-# simplecov has an unnecessary dependency on native json gem, use fork that does not require this
-gem 'simplecov', github: 'NREL/simplecov'

data/Rakefile

@@ -37,7 +37,7 @@ RSpec::Core::RakeTask.new(:spec)
 require 'openstudio/extension/rake_task'
 require 'urbanopt/geojson'
 rake_task = OpenStudio::Extension::RakeTask.new
-rake_task.set_extension_class(URBANopt::GeoJSON::Extension)
+rake_task.set_extension_class(URBANopt::GeoJSON::Extension, 'urbanopt/urbanopt-geojson-gem')
 
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new

data/lib/urbanopt/geojson/building.rb

@@ -402,6 +402,8 @@ module URBANopt
 
         building_story = OpenStudio::Model::BuildingStory.new(model)
         building_story.setName("Building Story #{story_number}")
+        building_story.setNominalZCoordinate(story_number * floor_to_floor_height)
+        building_story.setNominalFloortoFloorHeight(floor_to_floor_height)
         spaces.each do |space|
           space.setBuildingStory(building_story)
           thermal_zone = OpenStudio::Model::ThermalZone.new(model)

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

@@ -266,6 +266,7 @@
         "PTAC with hot water heat",
         "PTAC with hot water heat with central air source heat pump",
         "PTAC with gas coil heat",
+        "PTAC with gas boiler",
         "PTAC with electric baseboard heat",
         "PTAC with no heat",
         "PTAC with district hot water heat",
@@ -304,6 +305,7 @@
         "DOAS with fan coil air-cooled chiller and central air source heat pump",
         "DOAS with fan coil chiller with no heat",
         "VRF with DOAS",
+        "VRF",
         "Ground Source Heat Pumps with DOAS",
         "Baseboard district hot water heat",
         "Baseboard district hot water heat with direct evap coolers",
@@ -329,6 +331,8 @@
         "VAV with zone unit heaters",
         "VAV with electric baseboard heat",
         "VAV cool with zone heat pump heat",
+        "VAV district chilled water with district hot water reheat",
+        "VAV district chilled water with gas coil reheat",
         "PVAV with reheat",
         "PVAV with reheat with central air source heat pump",
         "PVAV with PFP boxes",

data/lib/urbanopt/geojson/version.rb

@@ -30,6 +30,6 @@
 
 module URBANopt
   module GeoJSON
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0.pre1'.freeze
   end
 end

data/urbanopt-geojson-gem.gemspec

@@ -25,18 +25,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  # this is not working right now
-  # spec.required_ruby_version = '~> 2.2.4'
+  spec.required_ruby_version = '~> 2.5.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.7'
 
   # lock the version of these dependencies due to using older version of Ruby.
-  spec.add_dependency 'public_suffix', '3.1.1'
+  # spec.add_dependency 'public_suffix', '3.1.1'
 
   # other dependencies
   spec.add_dependency 'json-schema'
-  spec.add_dependency 'openstudio-extension', '~> 0.1.5'
-  spec.add_dependency 'urbanopt-core', '~> 0.2.0'
+  spec.add_dependency 'openstudio-extension', '~> 0.2.3'
+  spec.add_dependency 'urbanopt-core', '~> 0.3.0.pre2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-geojson
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0.pre1
 platform: ruby
 authors:
 - Tanushree Charan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -54,20 +54,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: public_suffix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -88,28 +74,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: urbanopt-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0.pre2
 description: Library and measures to translate URBANopt GeoJSON format to OpenStudio
 email:
 - tanushree.charan@nrel.gov
@@ -169,7 +155,6 @@ files:
 - docs/schemas/site-properties.md
 - docs/schemas/thermal-connector-properties.md
 - docs/schemas/thermal-junction-properties.md
-- lib/change_log.rb
 - lib/measures/.rubocop.yml
 - lib/measures/urban_geometry_creation/LICENSE.md
 - lib/measures/urban_geometry_creation/README.md
@@ -227,17 +212,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Library and measures to translate URBANopt GeoJSON format to OpenStudio

data/lib/change_log.rb

@@ -1,147 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'github_api'
-require 'date'
-require 'optparse'
-require 'optparse/date'
-
-# Instructions:
-#   Get a token from github's settings (https://github.com/settings/tokens)
-#
-# Example:
-#   ruby change_log.rb -t abcdefghijklmnopqrstuvwxyz -s 2017-09-06
-#
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: change_log.rb [options]\n" \
-                'Prints New, Open, Closed Issues, and number of accepted PRs'
-  opts.separator ''
-
-  # defaults, go back 90 days
-  options[:start_date] = Date.today - 90
-  options[:end_date] = Date.today
-
-  opts.on('-s', '--start-date [DATE]', Date, 'Start of data (e.g. 2017-09-06)') do |v|
-    options[:start_date] = v
-  end
-  opts.on('-e', '--end-date [DATE]', Date, 'End of data (e.g. 2017-09-13)') do |v|
-    options[:end_date] = v
-  end
-  opts.on('-t', '--token [String]', String, 'Github API Token') do |v|
-    options[:token] = v
-  end
-end.parse!
-
-# Convert dates to time objects
-options[:start_date] = Time.parse(options[:start_date].to_s)
-options[:end_date] = Time.parse(options[:end_date].to_s)
-puts options
-
-### Repository options
-repo_owner = 'URBANopt'
-repo = 'urbanopt-geojson-gem'
-
-github = Github.new
-if options[:token]
-  puts 'Using github token'
-  github = Github.new oauth_token: options[:token]
-end
-
-total_open_issues = []
-total_open_pull_requests = []
-new_issues = []
-closed_issues = []
-accepted_pull_requests = []
-
-def get_num(issue)
-  issue.html_url.split('/')[-1].to_i
-end
-
-def get_issue_num(issue)
-  "\##{get_num(issue)}"
-end
-
-def get_html_url(issue)
-  issue.html_url
-end
-
-def get_title(issue)
-  issue.title
-end
-
-def print_issue(issue)
-  is_feature = false
-  issue.labels.each { |label| is_feature = true if label.name == 'Feature Request' }
-
-  if is_feature
-    "- Improved [#{get_issue_num(issue)}]( #{get_html_url(issue)} ), #{get_title(issue)}"
-  else
-    "- Fixed [#{get_issue_num(issue)}]( #{get_html_url(issue)} ), #{get_title(issue)}"
-  end
-end
-
-# Process Open Issues
-results = -1
-page = 1
-while results != 0
-  resp = github.issues.list user: repo_owner, repo: repo, sort: 'created', direction: 'asc',
-                            state: 'open', per_page: 100, page: page
-  results = resp.length
-  resp.env[:body].each do |issue, _index|
-    created = Time.parse(issue.created_at)
-    if !issue.key?(:pull_request)
-      total_open_issues << issue
-      if created >= options[:start_date] && created <= options[:end_date]
-        new_issues << issue
-      end
-    else
-      total_open_pull_requests << issue
-    end
-  end
-
-  page += 1
-end
-
-# Process Closed Issues
-results = -1
-page = 1
-while results != 0
-  resp = github.issues.list user: repo_owner, repo: repo, sort: 'created', direction: 'asc',
-                            state: 'closed', per_page: 100, page: page
-  results = resp.length
-  resp.env[:body].each do |issue, _index|
-    created = Time.parse(issue.created_at)
-    closed = Time.parse(issue.closed_at)
-    if !issue.key?(:pull_request)
-      if created >= options[:start_date] && created <= options[:end_date]
-        new_issues << issue
-      end
-      if closed >= options[:start_date] && closed <= options[:end_date]
-        closed_issues << issue
-      end
-    elsif closed >= options[:start_date] && closed <= options[:end_date]
-      accepted_pull_requests << issue
-    end
-  end
-
-  page += 1
-end
-
-closed_issues.sort! { |x, y| get_num(x) <=> get_num(y) }
-new_issues.sort! { |x, y| get_num(x) <=> get_num(y) }
-accepted_pull_requests.sort! { |x, y| get_num(x) <=> get_num(y) }
-total_open_pull_requests.sort! { |x, y| get_num(x) <=> get_num(y) }
-
-puts "Total Open Issues: #{total_open_issues.length}"
-puts "Total Open Pull Requests: #{total_open_pull_requests.length}"
-puts "\nDate Range: #{options[:start_date].strftime('%m/%d/%y')} - #{options[:end_date].strftime('%m/%d/%y')}:"
-puts "\nNew Issues: #{new_issues.length} (" + new_issues.map { |issue| get_issue_num(issue) }.join(', ') + ')'
-
-puts "\nClosed Issues: #{closed_issues.length}"
-closed_issues.each { |issue| puts print_issue(issue) }
-
-puts "\nAccepted Pull Requests: #{accepted_pull_requests.length}"
-accepted_pull_requests.each { |issue| puts print_issue(issue) }
-
-puts "\nAll Open Issues: #{total_open_issues.length} (" + total_open_issues.map { |issue| get_issue_num(issue) }.join(', ') + ')'