urbanopt-cli 0.4.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95f4b510da000f3f99a23e58a665722bfd5ee1526f662f5f7ebd567398963f36
-  data.tar.gz: 876a39d424ca5ee07126da660e3aad478b5ea7334bec3538e266d9bd54586c57
+  metadata.gz: aff17fbc8bc992bae6f6996722aaffe1c5c6da618808eb3da7c65e38091531f2
+  data.tar.gz: 8cc4327c2e5d9d81937c76fc3371795673b1a3f46783bb1794f00b687bf3ec1e
 SHA512:
-  metadata.gz: de1e2b6298df2a464a401e485c22ee8f8c67ee99486b94c50bc5ae6890c1e571433666eaa90de54e2d969e161bd7db2baae6da6b6e673e2139cf349300ad7896
-  data.tar.gz: d5ed2edc0bfdaddaf4860348d460c9dc74c27a82b850d7215b0bea230539fdb46969aa6b357f3c4c161bacc11e2fc82c24f7455a391a311c2da5c45b47d48ba2
+  metadata.gz: 4a46b6736438e5ffa779321ee1fa9e20a4bdb5b7fe067891f763da4d650da66e576ecaf2e9ab9a984cb2212f2b8316c6a47d25e1fe2eecc8c3e141bb094fafef
+  data.tar.gz: f1aca2e9be941ba1c8a21a2072c9110de9837f5d2128139f0c7e9fa175865ff1269c29e03c7f9e3883cbe64c27672873a4a5f7d6fcc6d2e75bcf7d07a473b688

data/.gitignore

@@ -12,8 +12,9 @@
 .vscode/
 .idea/
 
-# rbenv virtualenv management file
+# virtualenv management
 .ruby-version
+.python-version
 
 # rspec failure tracking
 .rspec_status
@@ -21,6 +22,7 @@
 # rspec test folder
 spec/test_directory
 spec/test_directory_res
+spec/test_directory_elec
 
 Gemfile.lock
 .rubocop*

data/CHANGELOG.md

@@ -1,5 +1,64 @@
 # Changelog
 
+## Version 0.6.1
+
+Date Range 5/1/21 - 7/1/21
+
+- Fixed [#222]( https://github.com/urbanopt/urbanopt-cli/issues/222 ), Add a resilience flag to reopt processing
+- Fixed [#224]( https://github.com/urbanopt/urbanopt-cli/issues/224 ), Createbar and Floorspace mappers are out of date
+- Fixed [#227]( https://github.com/urbanopt/urbanopt-cli/issues/227 ), Runtime error when running urbanopt cli example project
+- Fixed [#233]( https://github.com/urbanopt/urbanopt-cli/issues/233 ), update rubocop configs to v4
+- Fixed [#235]( https://github.com/urbanopt/urbanopt-cli/issues/235 ), Re-add old residential types to the commercial hash
+- Fixed [#238]( https://github.com/urbanopt/urbanopt-cli/issues/238 ), Fix BuildingResidentialModel feature_id argument - JSON parse bug
+- Fixed [#240]( https://github.com/urbanopt/urbanopt-cli/issues/240 ), Update example mappers from urbanopt-example-geojson-project
+- Fixed [#242]( https://github.com/urbanopt/urbanopt-cli/issues/242 ), Add load_flexibility require to baseline mapper
+
+## Version 0.6.0
+
+Date Range 3/31/21 - 4/30/21
+
+- Fixed [#179]( https://github.com/urbanopt/urbanopt-cli/issues/179 ), Visualization : Annual End Use graphs, updating end-use tags
+- Fixed [#185]( https://github.com/urbanopt/urbanopt-cli/issues/185 ), Add additional fuels used by the residential workflow to the first chart (when they exist)
+- Updated dependencies for OpenStudio 3.2.0 / Ruby 2.7
+
+## Version 0.5.2
+
+Date Range 3/9/21 - 3/31/21
+
+- Fixed [#190]( https://github.com/urbanopt/urbanopt-cli/issues/190 ), Graceful rescue from "uo" command
+- Fixed [#191]( https://github.com/urbanopt/urbanopt-cli/issues/191 ), add error catching
+- Fixed [#197]( https://github.com/urbanopt/urbanopt-cli/issues/197 ), Update copyrights for 2021
+- Fixed [#200]( https://github.com/urbanopt/urbanopt-cli/issues/200 ), Scenario Level Assumptions File cannot be Defined by User
+- Fixed [#202]( https://github.com/urbanopt/urbanopt-cli/issues/202 ), Use the new Ditto-Reader CLI in the UO CLI - Remove Pycall Dependency
+- Fixed [#214]( https://github.com/urbanopt/urbanopt-cli/issues/214 ), reopt-scenario processing should allow selecting assumptions file
+- Fixed [#215]( https://github.com/urbanopt/urbanopt-cli/issues/215 ), Support running GMT (DES) directly from the main CLI
+- Fixed [#219]( https://github.com/urbanopt/urbanopt-cli/issues/219 ), Avoid saving feature reports twice.
+
+## Version 0.5.1
+
+Date Range 12/17/20 - 3/8/21
+
+- Fixed [#157]( https://github.com/urbanopt/urbanopt-cli/issues/157 ), Edit maximum value for y axis in visualization graphs
+- Fixed [#158]( https://github.com/urbanopt/urbanopt-cli/issues/158 ), Check units for Gas:Facility in visualization graphs
+- Fixed [#172]( https://github.com/urbanopt/urbanopt-cli/issues/172 ), Add district heating/cooling systems
+- Fixed [#174]( https://github.com/urbanopt/urbanopt-cli/issues/174 ), Ditto reader doesn't work in a virtualenv
+- Fixed [#175]( https://github.com/urbanopt/urbanopt-cli/issues/175 ), developer_nrel_key warning at each user command
+- Fixed [#176]( https://github.com/urbanopt/urbanopt-cli/issues/176 ), validate eui results
+- Fixed [#183]( https://github.com/urbanopt/urbanopt-cli/issues/183 ), Add EV charging measure to example project
+- Fixed [#184]( https://github.com/urbanopt/urbanopt-cli/issues/184 ), Change fuel units to kBtus on the monthly and net charts
+- Fixed [#187]( https://github.com/urbanopt/urbanopt-cli/issues/187 ), Tests shouldn't take so long
+- Fixed [#192]( https://github.com/urbanopt/urbanopt-cli/issues/192 ), Add electrical components to feature-file to work with opendss
+- Fixed [#199]( https://github.com/urbanopt/urbanopt-cli/issues/199 ), re-added the multifamily options to the commercial_building_types list.
+- Fixed [#200]( https://github.com/urbanopt/urbanopt-cli/issues/200 ), Scenario Level Assumptions File cannot be Defined by User
+- Fixed [#201]( https://github.com/urbanopt/urbanopt-cli/issues/201 ), OpenDSS should work with URBANopt
+- Fixed [#202]( https://github.com/urbanopt/urbanopt-cli/issues/202 ), Use the new Ditto-Reader CLI in the UO CLI - Remove Pycall Dependency
+- Fixed [#203]( https://github.com/urbanopt/urbanopt-cli/issues/203 ), Update CI to install Python and urbanopt-ditto-reader package
+
+## Version 0.5.0
+
+Date Range 11/17/20 - 12/16/20
+
+- Updated dependencies to support OpenStudio 3.1.0
 
 ## Version 0.4.1
 

data/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2)
 cmake_policy(SET CMP0048 NEW)
 
-project(UrbanOptCLI VERSION 0.3.1)
+project(UrbanOptCLI VERSION 0.6.0)
 
 include(FindOpenStudioSDK.cmake)
 
@@ -89,21 +89,21 @@ option(BUILD_PACKAGE "Build package" OFF)
 # need to  update the MD5sum for each platform and url below
 if(UNIX)
    if(APPLE)
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20200628-darwin.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "561b1f581f4cb236f0c4c984af195c93")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210608-darwin.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "c169a00c4b01e4a7e69321d0def3f72d")
    else()
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20200819-linux.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "91894dd2249f376dd28b4cb20dea7732")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210514-linux.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "5dd39375b9b5d3a947ef761f5dd2333a")
    endif()
 elseif(WIN32)
   if(CMAKE_CL_64)
-    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20200728-windows.tar.gz")
-    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "efd7e7a02ab31468648172b463d3b9a4")
+    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210514-windows.tar.gz")
+    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "2f403a31d7192fdb457e6fcfd0d47156")
   endif()
 endif()
 
 set(URBANOPT_CLI_GEMS_ZIP_LOCAL_PATH "${PROJECT_BINARY_DIR}/${URBANOPT_CLI_GEMS_ZIP_FILENAME}")
-set(URBANOPT_CLI_GEMS_DIR "${PROJECT_BINARY_DIR}/urbanopt_cli_gems")
+set(URBANOPT_CLI_GEMS_DIR "${PROJECT_BINARY_DIR}/urbanopt-cli-gems")
 if(EXISTS "${URBANOPT_CLI_GEMS_ZIP_LOCAL_PATH}")
   file(MD5 "${URBANOPT_CLI_GEMS_ZIP_LOCAL_PATH}" URBANOPT_CLI_GEMS_ZIP_MD5)
 endif()
@@ -125,15 +125,15 @@ set(RUBY_DIR "${PROJECT_BINARY_DIR}/ruby")
 
 if(UNIX)
    if(APPLE)
-     set(RUBY_ZIP_FILENAME "ruby-2.5.5-darwin.tar.gz")
-     set(RUBY_ZIP_EXPECTED_MD5 "2351d0505c7ac168477e02ea7900369a")
-   else() 
-     set(RUBY_ZIP_FILENAME "ruby-2.5.5-linux.tar.gz")
-     set(RUBY_ZIP_EXPECTED_MD5 "5c9ab1aeb3366e6e579592cbb72ddbef")
+     set(RUBY_ZIP_FILENAME "ruby-2.7.2-darwin.tar.gz")
+     set(RUBY_ZIP_EXPECTED_MD5 "1ee27d6381797a5af7398f8eee8edb07")
+   else()
+     set(RUBY_ZIP_FILENAME "ruby-2.7.2-linux.tar.gz")
+     set(RUBY_ZIP_EXPECTED_MD5 "853425b0c9878b064937f9e49688c6c6")
    endif()
 elseif(WIN32)
-     set(RUBY_ZIP_FILENAME "ruby-2.5.1-win32.tar.gz")
-     set(RUBY_ZIP_EXPECTED_MD5 "86e4b2376fdbae7467ddc613900e1941")
+     set(RUBY_ZIP_FILENAME "ruby-2.7.2-win32.tar.gz")
+     set(RUBY_ZIP_EXPECTED_MD5 "414a24f3ebb074534d2186595683c5b4")
 endif()
 
 set(RUBY_ZIP_LOCAL_PATH "${PROJECT_BINARY_DIR}/${RUBY_ZIP_FILENAME}")
@@ -176,7 +176,7 @@ elseif(WIN32)
 endif()
 
 install(DIRECTORY "${PROJECT_BINARY_DIR}/ruby" DESTINATION "." COMPONENT "Ruby" USE_SOURCE_PERMISSIONS)
-install(DIRECTORY "${PROJECT_BINARY_DIR}/urbanopt_cli_gems/" DESTINATION "gems" COMPONENT "UrbanOpt" USE_SOURCE_PERMISSIONS)
+install(DIRECTORY "${PROJECT_BINARY_DIR}/urbanopt-cli-gems/" DESTINATION "gems" COMPONENT "UrbanOpt" USE_SOURCE_PERMISSIONS)
 
 #if(WIN32)
 #  install(PROGRAMS "${OPENSTUDIO_SDK_PATH}/bin/install_utility.exe" DESTINATION bin COMPONENT "CLI")
@@ -212,7 +212,7 @@ elseif(UNIX)
 
   # These two will set the .deb install path correctly
    # ubuntu (18.04) uses libqdbm14
-  set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqdbm14")
+  set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqdbm14,sqlite3")
   set(CPACK_SET_DESTDIR ON)
   set(CPACK_INSTALL_PREFIX /usr/local/urbanopt-cli-${URBANOPT_CLI_VERSION})
 

data/FindOpenStudioSDK.cmake

@@ -1,6 +1,6 @@
 set(OPENSTUDIO_VERSION_MAJOR 3)
-set(OPENSTUDIO_VERSION_MINOR 0)
-set(OPENSTUDIO_VERSION_PATCH 1)
+set(OPENSTUDIO_VERSION_MINOR 2)
+set(OPENSTUDIO_VERSION_PATCH 0)
 set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
 
 find_package(openstudio "${OPENSTUDIO_VERSION}" CONFIG)
@@ -16,18 +16,23 @@ else()
   set(OPENSTUDIO_BASELINK "https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}"
     CACHE STRING "Base link to where the openstudio archives are hosted" FORCE)
 
-  set(OPENSTUDIO_VERSION_SHA "+09b7c8a554")
+  set(OPENSTUDIO_VERSION_SHA "+e11f0a08b2")
 
   if(APPLE)
-    set(OPENSTUDIO_EXPECTED_HASH f0c8df7811812fd1601db2842d2eea0b)
+    set(OPENSTUDIO_EXPECTED_HASH 883c0f83ab7a09875e851726e32ba591)
     set(OPENSTUDIO_PLATFORM "Darwin")
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(UNIX)
-    set(OPENSTUDIO_EXPECTED_HASH deeafa60b1f87f98527b85b3f0652ea4)
-    set(OPENSTUDIO_PLATFORM "Linux")
+    if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
+      set(OPENSTUDIO_EXPECTED_HASH 25c4cfe614676376581657440ba447ae)
+      set(OPENSTUDIO_PLATFORM "Ubuntu-20.04")
+    else() # Assumes 18.04
+      set(OPENSTUDIO_EXPECTED_HASH 623d3e10c17f1dc99bb869deb8a2550e)
+      set(OPENSTUDIO_PLATFORM "Ubuntu-18.04")
+    endif()
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(WIN32)
-    set(OPENSTUDIO_EXPECTED_HASH f4329ab725fe3e68203a112f8b9655e5)
+    set(OPENSTUDIO_EXPECTED_HASH 740d5d8ba67ca914412e12c618d2cc28)
     set(OPENSTUDIO_PLATFORM "Windows")
     set(OPENSTUDIO_EXT "tar.gz")
   endif()

data/Gemfile

@@ -34,33 +34,31 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # end
 
 # if allow_local && File.exist?('../urbanopt-scenario-gem')
-  # gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
+#  gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
 # elsif allow_local
-#  gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
+# gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
 # end
 
 # if allow_local && File.exist?('../urbanopt-geojson-gem')
 #   gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem'
 # elsif allow_local
-#   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
+# gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 # end
 
 # if allow_local && File.exist?('../urbanopt-reopt-gem')
-#   gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
+  #  gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
 # elsif allow_local
-#  gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
+gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
 # end
 
 # if allow_local && File.exist?('../openstudio-load-flexibility-measures')
 #   gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures'
 # elsif allow_local
-#   gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures', branch: 'master'
-# else
-#   gem 'openstudio-load-flexibility-measures', '0.1.3'
+#   gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'develop'
 # end
 
 # if allow_local && File.exist?('../urbanopt-reporting-gem')
-#   gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
+  # gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
 # elsif allow_local
-#  gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
+# gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
 # end

data/LICENSE.md

@@ -1,6 +1,6 @@
 # License
 
-URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -17,6 +17,16 @@ Neither the name of the copyright holder nor the names of its contributors may b
 used to endorse or promote products derived from this software without specific
 prior written permission.
 
+Redistribution of this software, without modification, must refer to the software
+by the same designation. Redistribution of a modified version of this software
+(i) may not refer to the modified version by the same designation, or by any
+confusingly similar designation, and (ii) must refer to the underlying software
+originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
+the term “URBANopt”, or any confusingly similar designation may not be used to
+refer to any modified version of this software or any modified version of the
+underlying software originally provided by Alliance without the prior written
+consent of Alliance.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

data/README.md

@@ -10,6 +10,7 @@ This is the command line interface (CLI) for the URBANopt™ SDK.
 gem 'urbanopt-cli'
 ```
 
+
 And then execute:
 
 ```terminal

data/Rakefile

@@ -1,21 +1,31 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
-#
+
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
-#
+
 # Redistributions of source code must retain the above copyright notice, this list
 # of conditions and the following disclaimer.
-#
+
 # Redistributions in binary form must reproduce the above copyright notice, this
 # list of conditions and the following disclaimer in the documentation and/or other
 # materials provided with the distribution.
-#
+
 # Neither the name of the copyright holder nor the names of its contributors may be
 # used to endorse or promote products derived from this software without specific
 # prior written permission.
-#
+
+# Redistribution of this software, without modification, must refer to the software
+# by the same designation. Redistribution of a modified version of this software
+# (i) may not refer to the modified version by the same designation, or by any
+# confusingly similar designation, and (ii) must refer to the underlying software
+# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
+# the term “URBANopt”, or any confusingly similar designation may not be used to
+# refer to any modified version of this software or any modified version of the
+# underlying software originally provided by Alliance without the prior written
+# consent of Alliance.
+
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

data/example_files/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-ruby '~> 2.5.0'
+ruby '~> 2.7.0'
 
 # Local gems are useful when developing and integrating the various dependencies.
 # To favor the use of local gems, set the following environment variable:
@@ -22,7 +22,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # if allow_local && File.exist?('../urbanopt-core-gem')
 #   gem 'urbanopt-core', path: '../urbanopt-core-gem'
 # elsif allow_local
-# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
+#   gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
 # end
 #
 
@@ -31,7 +31,7 @@ if allow_local && File.exist?('../openstudio-common-measures-gem')
 elsif allow_local
   gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
 else
-  gem 'openstudio-common-measures', '0.2.0'
+  gem 'openstudio-common-measures', '~> 0.4.0'
 end
 
 if allow_local && File.exist?('../openstudio-model-articulation-gem')
@@ -39,7 +39,7 @@ if allow_local && File.exist?('../openstudio-model-articulation-gem')
 elsif allow_local
   gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
 else
-  gem 'openstudio-model-articulation', '0.2.0'
+  gem 'openstudio-model-articulation', '~> 0.4.0'
 end
 
 if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
@@ -47,21 +47,37 @@ if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
 elsif allow_local
   gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'master'
 else
-  gem 'openstudio-load-flexibility-measures', '~> 0.1.3'
+  gem 'openstudio-load-flexibility-measures', '~> 0.3.1'
 end
 
-if allow_local && File.exist?('../urbanopt-geojson-gem')
+if allow_local && File.exist?('../openstudio-ee-gem')
+  gem 'openstudio-ee', path: '../openstudio-ee-gem'
+elsif allow_local
+  gem 'openstudio-ee', github: 'NREL/openstudio-ee-gem', branch: 'develop'
+else
+  gem 'openstudio-ee', '~> 0.4.0'
+end
+
+if allow_local && File.exist?('../openstudio-calibration-gem')
+  gem 'openstudio-calibration', path: '../openstudio-calibration-gem'
+elsif allow_local
+  gem 'openstudio-calibration', github: 'NREL/openstudio-calibration-gem', branch: 'develop'
+else
+  gem 'openstudio-calibration', '~> 0.4.0'
+end
+
+if allow_local && File.exists?('../urbanopt-geojson-gem')
   gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem'
 elsif allow_local
   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 else
-  gem 'urbanopt-geojson', '~> 0.4.0'
+  gem 'urbanopt-geojson', '~> 0.6.1'
 end
 
-if allow_local && File.exist?('../urbanopt-reporting-gem')
+if allow_local && File.exists?('../urbanopt-reporting-gem')
   gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
 elsif allow_local
   gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
 else
-  gem 'urbanopt-reporting', '~> 0.2.1'
+  gem 'urbanopt-reporting', '~> 0.4.0'
 end

data/example_files/example_project.json

@@ -33,7 +33,7 @@
         "end_date": "2017-12-31T07:00:00.000Z",
         "cec_climate_zone": null,
         "climate_zone": "6A",
-        "default_template": "90.1-2013",      
+        "default_template": "90.1-2013",
         "import_surrounding_buildings_as_shading": null,
         "surface_elevation": null,
         "tariff_filename": null,
@@ -45,8 +45,8 @@
         "coordinates": [
           -78.84948467732347,
           42.81677154451123
-        ] 
-      }      
+        ]
+      }
     },
 
     {
@@ -118,7 +118,11 @@
         "building_type": "Food service",
         "floor_area": 22313,
         "footprint_area": 22313,
-        "number_of_stories": 1
+        "number_of_stories": 1,
+        "ev_charging": true,
+        "ev_charging_behavior": "Business as Usual",
+        "ev_percent": 100,
+        "ev_curtailment_frac": 0.5
       },
       "geometry": {
         "type": "Polygon",
@@ -158,7 +162,9 @@
         "building_type": "Food service",
         "floor_area": 125631,
         "footprint_area": 41877,
-        "number_of_stories": 3
+        "number_of_stories": 3,
+        "ev_charging": true,
+        "ev_charging_station_type": "Typical Public"
       },
       "geometry": {
         "type": "Polygon",
@@ -198,7 +204,9 @@
         "building_type": "Food service",
         "floor_area": 31623,
         "footprint_area": 10541,
-        "number_of_stories": 3
+        "number_of_stories": 3,
+        "ev_charging": true,
+        "ev_charging_station_type": "Typical Public"
       },
       "geometry": {
         "type": "Polygon",
@@ -233,12 +241,15 @@
       "type": "Feature",
       "properties": {
         "id": "5",
-        "name": "Restaurant 14",
+        "name": "District Office 1",
         "type": "Building",
-        "building_type": "Food service",
+        "building_type": "Office",
+        "system_type": "VAV district chilled water with district hot water reheat",
         "floor_area": 8804,
         "footprint_area": 8804,
-        "number_of_stories": 1        
+        "number_of_stories": 1,
+        "ev_charging": true,
+        "ev_charging_station_type": "Typical Work"
       },
       "geometry": {
         "type": "Polygon",
@@ -273,12 +284,14 @@
       "type": "Feature",
       "properties": {
         "id": "6",
-        "name": "Restaurant 15",
+        "name": "District Office 2",
         "type": "Building",
-        "building_type": "Food service",
+        "building_type": "Office",
+        "system_type": "VAV district chilled water with district hot water reheat",
         "floor_area": 10689,
         "footprint_area": 10689,
-        "number_of_stories": 1        
+        "number_of_stories": 1,
+        "ev_charging": true
       },
       "geometry": {
         "type": "Polygon",
@@ -316,6 +329,7 @@
         "name": "Office 1",
         "type": "Building",
         "building_type": "Office",
+        "system_type": "VAV district chilled water with district hot water reheat",
         "number_of_stories": 6,
         "detailed_model_filename": "7.osm"
       },
@@ -355,6 +369,7 @@
         "name": "Hospital 1",
         "type": "Building",
         "building_type": "Outpatient health care",
+        "system_type": "VAV district chilled water with district hot water reheat",
         "number_of_stories": 10,
         "detailed_model_filename": "8.osm"
       },
@@ -392,9 +407,9 @@
             ]
           ]
         ]
-      }      
+      }
     },
-    
+
     {
       "type": "Feature",
       "properties": {
@@ -449,7 +464,7 @@
         ]
       }
     },
-    
+
     {
       "type": "Feature",
       "properties": {
@@ -505,7 +520,7 @@
         ]
       }
     },
-    
+
     {
       "type": "Feature",
       "properties": {
@@ -545,7 +560,7 @@
         ]
       }
     },
-    
+
     {"type": "Feature",
       "properties": {
         "id": "12",
@@ -582,9 +597,9 @@
             ]
           ]
         ]
-      }     
+      }
     },
-    
+
     {
       "type": "Feature",
       "properties": {
@@ -622,7 +637,7 @@
             ]
           ]
         ]
-      }      
+      }
     }
   ]
 }