urbanopt-geojson 0.2.0.pre2 → 0.3.1

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

@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "http://json-schema.org/openstudio-urban-modeling/district_system_properties.json#",
-  "title": "URBANopt Electrical Line",
-  "description": "Schema for an URBANopt Electrical Line object",
+  "id": "http://json-schema.org/openstudio-urban-modeling/electrical_connector_properties.json#",
+  "title": "URBANopt Electrical Connector",
+  "description": "Schema for an URBANopt Electrical Connector object",
   "type": "object",
   "properties": {
     "id": {
@@ -17,7 +17,7 @@
       "description": "Type of feature.",
       "type": "string",
       "enum": [
-        "ElectricalLine"
+        "ElectricalConnector"
       ]
     },
     "source_name": {
@@ -46,7 +46,7 @@
       "description": "Total length (ft) of the line, generated on export.",
       "type": "number"
     },
-    "start_junction_id": {
+    "startJunctionId": {
       "description": "Id of the junction that this line starts at.",
       "type": "string"
     },
@@ -67,7 +67,7 @@
             "type": "string"
         }
     },
-    "end_junction_id": {
+    "endJunctionId": {
       "description": "Id of the junction that this line ends at.",
       "type": "string"
     },
@@ -79,8 +79,8 @@
     "type",
     "id",
     "connector_type",
-    "start_junction_id",
-    "end_junction_id"
+    "startJunctionId",
+    "endJunctionId"
   ],
   "additionalProperties": false,
   "definitions": {

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "http://json-schema.org/openstudio-urban-modeling/district_system_properties.json#",
+  "id": "http://json-schema.org/openstudio-urban-modeling/electrical_junction_properties.json#",
   "title": "URBANopt Electrical Junction",
   "description": "Schema for an URBANopt Electrical Junction object",
   "type": "object",
@@ -35,11 +35,11 @@
     "connector_type": {
       "$ref": "#/definitions/ElectricalJunctionType"
     },
-    "building_id": {
+    "buildingId": {
       "description": "Id of building if this junction is inside a building.",
       "type": "string"
     },
-    "district_system_id": {
+    "DSId": {
       "description": "Id of district system if this junction is inside a district system.",
       "type": "string"
     },
@@ -49,8 +49,7 @@
   },
   "required": [
     "type",
-    "id",
-    "connector_type"
+    "id"
   ],
   "additionalProperties": false,
   "definitions": {

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "http://json-schema.org/openstudio-urban-modeling/district_system_properties.json#",
+  "id": "http://json-schema.org/openstudio-urban-modeling/thermal_connector_properties.json#",
   "title": "URBANopt Thermal Connector",
   "description": "Schema for an URBANopt Thermal Connector object",
   "type": "object",

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "http://json-schema.org/openstudio-urban-modeling/district_system_properties.json#",
+  "id": "http://json-schema.org/openstudio-urban-modeling/thermal_junction_properties.json#",
   "title": "URBANopt Thermal Junction",
   "description": "Schema for an URBANopt Thermal Junction object",
   "type": "object",

data/lib/urbanopt/geojson/update_areas.rb

@@ -97,6 +97,6 @@ geojson[:features].each do |feature|
   # std::vector<Point3d> toLocalCartesian(const std::vector<PointLatLon>& points) const;
 end
 
-File.open(ARGV[0], 'w') do |file|
+File.open(ARGV[0], 'w') do |file| # rubocop:disable Lint/ShadowingOuterLocalVariable
   file << JSON.pretty_generate(geojson)
 end

data/lib/urbanopt/geojson/validate_geojson.rb

@@ -133,7 +133,9 @@ Dir.glob('denver_district*.geojson').each do |p|
       end
 
       all_errors[p][-1].concat(errors)
+    # rubocop:disable Lint/RescueException
     rescue Exception => e
+      # rubocop:enable Lint/RescueException
       all_errors[p][-1] << "Error '#{e.message}' occurred: "
       all_errors[p][-1] << e.backtrace.to_s
     end

data/lib/urbanopt/geojson/version.rb

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

data/lib/urbanopt/geojson/workflows/building.osw.out

@@ -899,7 +899,7 @@
             "default_value": "Inferred",
             "choice_values": [
               "Inferred",
-              "Ideal Air Loads",
+              "VRF",
               "PTAC with hot water heat",
               "PTAC with gas coil heat",
               "PTAC with electric baseboard heat",
@@ -955,7 +955,7 @@
             ],
             "choice_display_names": [
               "Inferred",
-              "Ideal Air Loads",
+              "VRF",
               "PTAC with hot water heat",
               "PTAC with gas coil heat",
               "PTAC with electric baseboard heat",
@@ -1511,7 +1511,7 @@
             "default_value": "Inferred",
             "choice_values": [
               "Inferred",
-              "Ideal Air Loads",
+              "VRF",
               "PTAC with hot water heat",
               "PTAC with gas coil heat",
               "PTAC with electric baseboard heat",
@@ -1567,7 +1567,7 @@
             ],
             "choice_display_names": [
               "Inferred",
-              "Ideal Air Loads",
+              "VRF",
               "PTAC with hot water heat",
               "PTAC with gas coil heat",
               "PTAC with electric baseboard heat",

data/urbanopt-geojson-gem.gemspec

@@ -11,32 +11,28 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Library and measures to translate URBANopt GeoJSON format to OpenStudio'
   spec.description   = 'Library and measures to translate URBANopt GeoJSON format to OpenStudio'
-  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
   spec.homepage      = 'https://github.com/urbanopt/urbanopt-geojson-gem'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|lib.measures.*tests|spec|features)/}) }
   end
   spec.bindir        = 'exe'
   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.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '12.3.1'
-  spec.add_development_dependency 'rspec', '3.7.0'
+  spec.required_ruby_version = '~> 2.5.0'
+
+  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.1.0'
+  spec.add_dependency 'openstudio-extension', '~> 0.2.3'
+  spec.add_dependency 'urbanopt-core', '~> 0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-geojson
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre2
+  version: 0.3.1
 platform: ruby
 authors:
 - Tanushree Charan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,56 +18,42 @@ 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.1
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.7.0
-- !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
+        version: '3.7'
 - !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.1.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
 description: Library and measures to translate URBANopt GeoJSON format to OpenStudio
 email:
 - tanushree.charan@nrel.gov
@@ -169,23 +155,17 @@ 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
 - lib/measures/urban_geometry_creation/README.md.erb
 - lib/measures/urban_geometry_creation/measure.rb
 - lib/measures/urban_geometry_creation/measure.xml
-- lib/measures/urban_geometry_creation/tests/nrel_stm_footprints.geojson
-- lib/measures/urban_geometry_creation/tests/shadowed_tests.rb
-- lib/measures/urban_geometry_creation/tests/urban_geometry_creation_test.rb
 - lib/measures/urban_geometry_creation_zoning/LICENSE.md
 - lib/measures/urban_geometry_creation_zoning/README.md
 - lib/measures/urban_geometry_creation_zoning/README.md.erb
 - lib/measures/urban_geometry_creation_zoning/measure.rb
 - lib/measures/urban_geometry_creation_zoning/measure.xml
-- lib/measures/urban_geometry_creation_zoning/tests/nrel_stm_footprints.geojson
-- lib/measures/urban_geometry_creation_zoning/tests/urban_geometry_creation_zoning_test.rb
 - lib/urbanopt-geojson.rb
 - lib/urbanopt/geojson.rb
 - lib/urbanopt/geojson/building.rb
@@ -227,17 +207,17 @@ 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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 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(', ') + ')'