diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 23cf631..fb04627 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -1,4 +1,3 @@ - name: nightly_build on: @@ -8,12 +7,6 @@ on: # 5 am UTC (11pm MDT the day before) every weekday night in MDT - cron: '21 5 * * 2-6' -# Cancels an existing job (of the same workflow) if it is still running -# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow -# concurrency: -# group: ${{ github.workflow }}-${{ github.ref }} -# cancel-in-progress: true - env: # This env var should enforce develop branch of all dependencies FAVOR_LOCAL_GEMS: true @@ -21,22 +14,26 @@ env: jobs: weeknight-tests: - # Pinned to `ubuntu-20.04`. When ubuntu-latest adopts 22.04 it would break for us since 22 only supports Ruby 3.1 - # https://github.com/ruby/setup-ruby#supported-platforms - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: - image: docker://nrel/openstudio:3.4.0 + image: docker://nrel/openstudio:3.6.1 steps: - - name: Checkout code - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - name: Update gems run: | + ruby --version bundle update + - name: List OpenStudio measures + run: bundle exec rake openstudio:list_measures + - name: Update OpenStudio measures + run: bundle exec rake openstudio:update_measures + - name: Test OpenStudio measures + run: bundle exec rake openstudio:test_with_openstudio - name: Run Rspec run: bundle exec rspec - # coveralls action docs: https://github.com/marketplace/actions/coveralls-github-action - name: Coveralls - uses: coverallsapp/github-action@master + # coveralls action docs: https://github.com/marketplace/actions/coveralls-github-action + uses: coverallsapp/github-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: "./coverage/lcov/urbanopt-geojson-gem.lcov" diff --git a/CHANGELOG.md b/CHANGELOG.md index aeb6f41..4cb5727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # URBANopt GeoJSON Gem +## Version 0.10.0 +Date Range: 12/5/22 - 7/19/23 + +- Updating dependencies for OpenStudio 3.6.1 +- Update license and references to the license file +- Add GHE district system type [#256](https://github.com/urbanopt/urbanopt-geojson-gem/issues/256) + ## Version 0.9.0 Date Range: 06/28/22 - 12/5/22 diff --git a/Gemfile b/Gemfile index 1de68d8..2384067 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,11 @@ gemspec # checkout the latest version (develop) from github. allow_local = ENV['FAVOR_LOCAL_GEMS'] +# pin this dependency to avoid unicode_normalize error +gem 'addressable', '2.8.1' +# pin this dependency to avoid using racc dependency (which has native extensions) +gem 'parser', '3.2.2.2' + # if allow_local && File.exist?('../openstudio-extension-gem') # gem 'openstudio-extension', path: '../openstudio-extension-gem' # elsif allow_local @@ -20,5 +25,5 @@ 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 diff --git a/LICENSE.md b/LICENSE.md index 1ff779b..ff1cffc 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other +URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -25,13 +25,18 @@ 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. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. +The name of the copyright holder(s), any contributors, the United States Government, +the United States Department of Energy, or any of their employees may not be used to +endorse or promote products derived from this software without specific prior written +permission from the respective party. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY 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. IN NO EVENT SHALL +THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED +STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index 22a8d5f..22dc04d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # URBANopt GeoJSON Gem -[![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-geojson-gem/badge.svg?branch=github-action-coveralls)](https://coveralls.io/github/urbanopt/urbanopt-geojson-gem?branch=github-action-coveralls) +[![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-geojson-gem/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-geojson-gem?branch=develop) +[![nightly_build](https://github.com/urbanopt/urbanopt-geojson-gem/actions/workflows/nightly_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-geojson-gem/actions/workflows/nightly_build.yml) Library and measures to translate URBANopt™ GeoJSON format to OpenStudio. See the [developer documentation](https://urbanopt.github.io/urbanopt-geojson-gem/) for more details. diff --git a/Rakefile b/Rakefile index 0fb8e02..83d8878 100644 --- a/Rakefile +++ b/Rakefile @@ -1,41 +1,6 @@ # ********************************************************************************* -# 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt™, Copyright © Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'bundler/gem_tasks' diff --git a/doc_templates/LICENSE.md b/doc_templates/LICENSE.md index 1ff779b..ff1cffc 100644 --- a/doc_templates/LICENSE.md +++ b/doc_templates/LICENSE.md @@ -1,4 +1,4 @@ -URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other +URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -25,13 +25,18 @@ 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. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. +The name of the copyright holder(s), any contributors, the United States Government, +the United States Department of Energy, or any of their employees may not be used to +endorse or promote products derived from this software without specific prior written +permission from the respective party. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY 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. IN NO EVENT SHALL +THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED +STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/doc_templates/copyright_erb.txt b/doc_templates/copyright_erb.txt index bbaba69..4c8d962 100644 --- a/doc_templates/copyright_erb.txt +++ b/doc_templates/copyright_erb.txt @@ -1,41 +1,6 @@ <% # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* %> diff --git a/doc_templates/copyright_js.txt b/doc_templates/copyright_js.txt index 8fa8c1a..fa2febd 100644 --- a/doc_templates/copyright_js.txt +++ b/doc_templates/copyright_js.txt @@ -1,4 +1,4 @@ /* @preserve - * URBANopt (tm), Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. - * Use of this source code is governed by the BSD 3-Clause license. + * URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. + * See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md */ diff --git a/doc_templates/copyright_ruby.txt b/doc_templates/copyright_ruby.txt index 95da28c..156c8da 100644 --- a/doc_templates/copyright_ruby.txt +++ b/doc_templates/copyright_ruby.txt @@ -1,39 +1,4 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* diff --git a/docs/package-lock.json b/docs/package-lock.json index 970e712..14c92fb 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -5121,9 +5121,9 @@ } }, "node_modules/decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", "engines": { "node": ">=0.10" } @@ -8958,9 +8958,9 @@ "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" }, "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -18169,9 +18169,9 @@ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==" }, "decompress-response": { "version": "3.3.0", @@ -21086,9 +21086,9 @@ "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "requires": { "brace-expansion": "^1.1.7" } diff --git a/lib/measures/.rubocop.yml b/lib/measures/.rubocop.yml index 091cd65..33b37e3 100644 --- a/lib/measures/.rubocop.yml +++ b/lib/measures/.rubocop.yml @@ -1,5 +1,6 @@ AllCops: Exclude: - 'spec/test_measures/**/*' +require: rubocop-performance inherit_from: - - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml + - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml diff --git a/lib/measures/urban_geometry_creation/LICENSE.md b/lib/measures/urban_geometry_creation/LICENSE.md index 47cc20b..ff1cffc 100644 --- a/lib/measures/urban_geometry_creation/LICENSE.md +++ b/lib/measures/urban_geometry_creation/LICENSE.md @@ -1,4 +1,4 @@ -URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -25,13 +25,18 @@ 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. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. +The name of the copyright holder(s), any contributors, the United States Government, +the United States Department of Energy, or any of their employees may not be used to +endorse or promote products derived from this software without specific prior written +permission from the respective party. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY 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. IN NO EVENT SHALL +THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED +STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/lib/measures/urban_geometry_creation/measure.rb b/lib/measures/urban_geometry_creation/measure.rb index d97b884..1771f7e 100644 --- a/lib/measures/urban_geometry_creation/measure.rb +++ b/lib/measures/urban_geometry_creation/measure.rb @@ -1,43 +1,8 @@ # frozen_string_literal: true # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'json' @@ -148,7 +113,8 @@ def run(model, runner, user_arguments) @runner.registerWarning("Surface elevation not set for building '#{name}'") end - if feature.type == 'Building' + case feature.type + when 'Building' # make requested building # pass in scaled_footprint_area (calculated from floor_area / number_of_stories) scaled_footprint_area = 0 @@ -205,7 +171,7 @@ def run(model, runner, user_arguments) 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) diff --git a/lib/measures/urban_geometry_creation/measure.xml b/lib/measures/urban_geometry_creation/measure.xml index 1ab00f5..9c02272 100644 --- a/lib/measures/urban_geometry_creation/measure.xml +++ b/lib/measures/urban_geometry_creation/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 urban_geometry_creation 5ab85d6b-c9af-4361-8ab9-613ee99a5666 - 9eeca0c7-ef9d-4829-aa2c-b2c138a963c1 - 20210602T203055Z + 7f03040a-cc98-4c54-ae40-f33db7f534b7 + 2023-07-06T15:57:24Z D254E772 UrbanGeometryCreation UrbanGeometryCreation @@ -104,52 +104,52 @@ + + LICENSE.md + md + license + 9A4578CE + + + README.md + md + readme + 74F54DC5 + README.md.erb erb readmeerb 703C9964 + + + OpenStudio + 1.9.0 + 1.9.0 + + measure.rb + rb + script + 4B36EB4E + nrel_stm_footprints.geojson geojson test 40290298 - - README.md - md - readme - 74F54DC5 - - - LICENSE.md - md - license - 03523BF4 - shadowed_tests.rb rb test - 682820CD + 1AD96F0B urban_geometry_creation_test.rb rb test - FD5181F7 - - - - OpenStudio - 1.9.0 - 1.9.0 - - measure.rb - rb - script - 3667C98F + CA11D7FF diff --git a/lib/measures/urban_geometry_creation/tests/shadowed_tests.rb b/lib/measures/urban_geometry_creation/tests/shadowed_tests.rb index 0359f50..b46263c 100644 --- a/lib/measures/urban_geometry_creation/tests/shadowed_tests.rb +++ b/lib/measures/urban_geometry_creation/tests/shadowed_tests.rb @@ -1,50 +1,15 @@ # frozen_string_literal: true # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'openstudio' require 'openstudio/ruleset/ShowRunnerOutput' require 'urbanopt/geojson' require 'minitest/autorun' -require_relative '../measure.rb' +require_relative '../measure' require 'fileutils' class UrbanGeometryCreationTest < MiniTest::Unit::TestCase diff --git a/lib/measures/urban_geometry_creation/tests/urban_geometry_creation_test.rb b/lib/measures/urban_geometry_creation/tests/urban_geometry_creation_test.rb index 630190d..f9054aa 100644 --- a/lib/measures/urban_geometry_creation/tests/urban_geometry_creation_test.rb +++ b/lib/measures/urban_geometry_creation/tests/urban_geometry_creation_test.rb @@ -1,50 +1,15 @@ # frozen_string_literal: true # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'openstudio' require 'openstudio/ruleset/ShowRunnerOutput' require 'urbanopt/geojson' require 'minitest/autorun' -require_relative '../measure.rb' +require_relative '../measure' require 'fileutils' class UrbanGeometryCreationTest < MiniTest::Unit::TestCase diff --git a/lib/measures/urban_geometry_creation_zoning/LICENSE.md b/lib/measures/urban_geometry_creation_zoning/LICENSE.md index 47cc20b..ff1cffc 100644 --- a/lib/measures/urban_geometry_creation_zoning/LICENSE.md +++ b/lib/measures/urban_geometry_creation_zoning/LICENSE.md @@ -1,4 +1,4 @@ -URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -25,13 +25,18 @@ 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. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. +The name of the copyright holder(s), any contributors, the United States Government, +the United States Department of Energy, or any of their employees may not be used to +endorse or promote products derived from this software without specific prior written +permission from the respective party. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY 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. IN NO EVENT SHALL +THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED +STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/lib/measures/urban_geometry_creation_zoning/measure.rb b/lib/measures/urban_geometry_creation_zoning/measure.rb index b225afe..7748237 100644 --- a/lib/measures/urban_geometry_creation_zoning/measure.rb +++ b/lib/measures/urban_geometry_creation_zoning/measure.rb @@ -1,43 +1,8 @@ # frozen_string_literal: true # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* # see the URL below for information on how to write OpenStudio measures diff --git a/lib/measures/urban_geometry_creation_zoning/measure.xml b/lib/measures/urban_geometry_creation_zoning/measure.xml index 1a21e80..1796b12 100644 --- a/lib/measures/urban_geometry_creation_zoning/measure.xml +++ b/lib/measures/urban_geometry_creation_zoning/measure.xml @@ -1,10 +1,10 @@ - 3.0 + 3.1 urban_geometry_creation_zoning 96ea1317-76ac-4670-b51d-71ee3f4fdd65 - c115c875-0e04-4ac9-990b-011811df23bb - 20210602T203056Z + c1c0bf6d-92a2-4a69-9446-e3ebf392c376 + 2023-07-06T15:57:24Z D254E772 UrbanGeometryCreationZoning UrbanGeometryCreationZoning @@ -86,16 +86,10 @@ - README.md.erb - erb - readmeerb - 703C9964 - - - nrel_stm_footprints.geojson - geojson - test - 40290298 + LICENSE.md + md + license + 9A4578CE README.md @@ -104,10 +98,10 @@ 0458EE16 - LICENSE.md - md - license - 03523BF4 + README.md.erb + erb + readmeerb + 703C9964 @@ -118,13 +112,13 @@ measure.rb rb script - 290A59E6 + 5827BCFA - urban_geometry_creation_zoning_test.rb - rb + OV_Buildings_Update_090420_res_eui_test.json + json test - 20775652 + F611B1E8 example_project_combined.json @@ -133,16 +127,16 @@ 9BC47B41 - out.txt - txt + nrel_stm_footprints.geojson + geojson test - 7FAF05F3 + 40290298 - OV_Buildings_Update_090420_res_eui_test.json - json + urban_geometry_creation_zoning_test.rb + rb test - F611B1E8 + 5C631B7A diff --git a/lib/measures/urban_geometry_creation_zoning/tests/urban_geometry_creation_zoning_test.rb b/lib/measures/urban_geometry_creation_zoning/tests/urban_geometry_creation_zoning_test.rb index ce638d8..1aa888a 100644 --- a/lib/measures/urban_geometry_creation_zoning/tests/urban_geometry_creation_zoning_test.rb +++ b/lib/measures/urban_geometry_creation_zoning/tests/urban_geometry_creation_zoning_test.rb @@ -1,43 +1,8 @@ # frozen_string_literal: true # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'openstudio' diff --git a/lib/urbanopt-geojson.rb b/lib/urbanopt-geojson.rb index 25e44f2..d7cd439 100644 --- a/lib/urbanopt-geojson.rb +++ b/lib/urbanopt-geojson.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative 'urbanopt/geojson' diff --git a/lib/urbanopt/geojson.rb b/lib/urbanopt/geojson.rb index 3ac3db1..5fd7dc4 100644 --- a/lib/urbanopt/geojson.rb +++ b/lib/urbanopt/geojson.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/geojson/feature' @@ -46,7 +11,6 @@ require 'urbanopt/geojson/helper' require 'urbanopt/geojson/model' require 'urbanopt/geojson/zoning' -require 'urbanopt/geojson/model' require 'urbanopt/geojson/derived_extension' require 'urbanopt/geojson/logging' require 'urbanopt/geojson/scale_area' diff --git a/lib/urbanopt/geojson/building.rb b/lib/urbanopt/geojson/building.rb index 26ffd0b..f1dcf8b 100644 --- a/lib/urbanopt/geojson/building.rb +++ b/lib/urbanopt/geojson/building.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/geojson/feature' diff --git a/lib/urbanopt/geojson/derived_extension.rb b/lib/urbanopt/geojson/derived_extension.rb index 4ba1554..b50514e 100644 --- a/lib/urbanopt/geojson/derived_extension.rb +++ b/lib/urbanopt/geojson/derived_extension.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/geojson/version' diff --git a/lib/urbanopt/geojson/district_system.rb b/lib/urbanopt/geojson/district_system.rb index 83f7c97..ac4e8b2 100644 --- a/lib/urbanopt/geojson/district_system.rb +++ b/lib/urbanopt/geojson/district_system.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/geojson/feature' diff --git a/lib/urbanopt/geojson/feature.rb b/lib/urbanopt/geojson/feature.rb index 4b9dcd5..484f912 100644 --- a/lib/urbanopt/geojson/feature.rb +++ b/lib/urbanopt/geojson/feature.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/core/feature' @@ -292,7 +257,7 @@ def find_feature_center(vertices) [central_longitude * 180 / Math::PI, central_latitude * 180 / Math::PI] - + end private diff --git a/lib/urbanopt/geojson/geo_file.rb b/lib/urbanopt/geojson/geo_file.rb index 4381d78..645da13 100644 --- a/lib/urbanopt/geojson/geo_file.rb +++ b/lib/urbanopt/geojson/geo_file.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'json-schema' diff --git a/lib/urbanopt/geojson/helper.rb b/lib/urbanopt/geojson/helper.rb index a4db4db..4e4212a 100644 --- a/lib/urbanopt/geojson/helper.rb +++ b/lib/urbanopt/geojson/helper.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/geojson/logging.rb b/lib/urbanopt/geojson/logging.rb index 4131d9b..209f035 100644 --- a/lib/urbanopt/geojson/logging.rb +++ b/lib/urbanopt/geojson/logging.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'logger' diff --git a/lib/urbanopt/geojson/mapper_classes.rb b/lib/urbanopt/geojson/mapper_classes.rb index dcf7f33..5addf53 100644 --- a/lib/urbanopt/geojson/mapper_classes.rb +++ b/lib/urbanopt/geojson/mapper_classes.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/scenario' diff --git a/lib/urbanopt/geojson/model.rb b/lib/urbanopt/geojson/model.rb index f627876..9c15a39 100644 --- a/lib/urbanopt/geojson/model.rb +++ b/lib/urbanopt/geojson/model.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/geojson/region.rb b/lib/urbanopt/geojson/region.rb index cf5543e..46e8712 100644 --- a/lib/urbanopt/geojson/region.rb +++ b/lib/urbanopt/geojson/region.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/geojson/feature' diff --git a/lib/urbanopt/geojson/scale_area.rb b/lib/urbanopt/geojson/scale_area.rb index 12322d5..c337198 100644 --- a/lib/urbanopt/geojson/scale_area.rb +++ b/lib/urbanopt/geojson/scale_area.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'json' diff --git a/lib/urbanopt/geojson/schema/district_system_properties.json b/lib/urbanopt/geojson/schema/district_system_properties.json index 29b38d2..520ee6f 100644 --- a/lib/urbanopt/geojson/schema/district_system_properties.json +++ b/lib/urbanopt/geojson/schema/district_system_properties.json @@ -97,17 +97,18 @@ "Central Hot Water", "Central Hot and Chilled Water", "Central Ambient Water", - "Central Hot and Cold Water", - "Community Photovoltaic", + "Central Hot and Cold Water", + "Community Photovoltaic", "Ground Mount Photovoltaic", "Transformer", "Transformer with Storage", "Capacitor", - "Electrical Substation" + "Electrical Substation", + "Ground Heat Exchanger" ] }, "equipmentType": { - "description": "Type of districct energy system equipment, listed in order of load served.", + "description": "Type of district energy system equipment, listed in order of load served.", "type": "string", "enum": [ "Air-Cooled Chiller--Cold Water", diff --git a/lib/urbanopt/geojson/schema/thermal_connector_properties.json b/lib/urbanopt/geojson/schema/thermal_connector_properties.json index 455a9d2..ef674f4 100644 --- a/lib/urbanopt/geojson/schema/thermal_connector_properties.json +++ b/lib/urbanopt/geojson/schema/thermal_connector_properties.json @@ -46,11 +46,11 @@ "description": "Total length of the connector in ft, generated on export.", "type": "number" }, - "start_junction_id": { + "startJunctionId": { "description": "Id of the junction that this connector starts at.", "type": "string" }, - "end_junction_id": { + "endJunctionId": { "description": "Id of the junction that this connector ends at.", "type": "string" }, @@ -69,8 +69,8 @@ "required": [ "type", "connector_type", - "start_junction_id", - "end_junction_id", + "startJunctionId", + "endJunctionId", "fluid_temperature_type", "flow_direction" ], diff --git a/lib/urbanopt/geojson/schema/thermal_junction_properties.json b/lib/urbanopt/geojson/schema/thermal_junction_properties.json index 3d528af..5211250 100644 --- a/lib/urbanopt/geojson/schema/thermal_junction_properties.json +++ b/lib/urbanopt/geojson/schema/thermal_junction_properties.json @@ -32,7 +32,7 @@ "description": "Feature name", "type": "string" }, - "connector_type": { + "junction_type": { "$ref": "#/definitions/ThermalJunctionType" }, "building_id": { @@ -47,6 +47,10 @@ "description": "Presence of pump: true if present, false if absent", "type": "boolean" }, + "is_ghe_start_loop": { + "description": "Determines whether this junction is present at the start of the loop for a Ground Heat Exchanger Network.", + "type": "boolean" + }, "connection_type": { "description": "Characterize the connection as series or parallel", "$ref": "#/definitions/ThermalJunctionConnectionType" @@ -57,7 +61,7 @@ }, "required": [ "type", - "connector_type", + "junction_type", "connection_type" ], "additionalProperties": false, diff --git a/lib/urbanopt/geojson/update_areas.rb b/lib/urbanopt/geojson/update_areas.rb index 5a77a88..6e6ceb5 100644 --- a/lib/urbanopt/geojson/update_areas.rb +++ b/lib/urbanopt/geojson/update_areas.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'openstudio' diff --git a/lib/urbanopt/geojson/validate_geojson.rb b/lib/urbanopt/geojson/validate_geojson.rb index 2d90b64..0a79984 100644 --- a/lib/urbanopt/geojson/validate_geojson.rb +++ b/lib/urbanopt/geojson/validate_geojson.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'json' diff --git a/lib/urbanopt/geojson/version.rb b/lib/urbanopt/geojson/version.rb index 4e589dd..d97c784 100644 --- a/lib/urbanopt/geojson/version.rb +++ b/lib/urbanopt/geojson/version.rb @@ -1,45 +1,10 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt module GeoJSON - VERSION = '0.9.0'.freeze + VERSION = '0.10.0'.freeze end end diff --git a/lib/urbanopt/geojson/zoning.rb b/lib/urbanopt/geojson/zoning.rb index b2dc085..268da19 100644 --- a/lib/urbanopt/geojson/zoning.rb +++ b/lib/urbanopt/geojson/zoning.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/spec/files/example_project_combine_GHE.json b/spec/files/example_project_combine_GHE.json new file mode 100644 index 0000000..5bd3ead --- /dev/null +++ b/spec/files/example_project_combine_GHE.json @@ -0,0 +1,960 @@ +{ + "type": "FeatureCollection", + "project": { + "id": "7c33a001-bccb-413e-ac87-67558b5d4b07", + "name": "New Project", + "surface_elevation": null, + "import_surrounding_buildings_as_shading": null, + "weather_filename": "USA_NY_Buffalo-Greater.Buffalo.Intl.AP.725280_TMY3.epw", + "tariff_filename": null, + "climate_zone": "6A", + "cec_climate_zone": null, + "begin_date": "2017-01-01T07:00:00.000Z", + "end_date": "2017-12-31T07:00:00.000Z", + "timesteps_per_hour": 1, + "default_template": "90.1-2013" + }, + "features": [ + { + "type": "Feature", + "properties": { + "id": "53340c2c-ab20-40db-aba1-11ac607c52a7", + "name": "Site Origin", + "type": "Site Origin", + "begin_date": "2017-01-01T07:00:00.000Z", + "end_date": "2017-12-31T07:00:00.000Z", + "cec_climate_zone": null, + "climate_zone": "6A", + "default_template": "90.1-2013", + "import_surrounding_buildings_as_shading": null, + "surface_elevation": null, + "tariff_filename": null, + "timesteps_per_hour": 1, + "weather_filename": "USA_NY_Buffalo-Greater.Buffalo.Intl.AP.725280_TMY3.epw" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.84948467732347, + 42.81677154451123 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "1", + "name": "Mixed_use 1", + "type": "Building", + "building_type": "Mixed use", + "floor_area": 752184, + "footprint_area": 188046, + "number_of_stories": 4, + "mixed_type_1": "Office", + "mixed_type_1_percentage": 50, + "mixed_type_2": "Food service", + "mixed_type_2_percentage": 50, + "mixed_type_3": "Strip shopping mall", + "mixed_type_3_percentage": 0, + "mixed_type_4": "Lodging", + "mixed_type_4_percentage": 0 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84650338745196, + 42.81331301863236 + ], + [ + -78.84652443964629, + 42.81463974371101 + ], + [ + -78.84680142363833, + 42.815293654042534 + ], + [ + -78.84744455124724, + 42.81514110006128 + ], + [ + -78.84728610028628, + 42.81478165791734 + ], + [ + -78.84786797764677, + 42.814643631760134 + ], + [ + -78.84721106637106, + 42.813153418927016 + ], + [ + -78.84650338745196, + 42.81331301863236 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "2", + "name": "Restaurant 1", + "type": "Building", + "building_type": "Food service", + "floor_area": 22313, + "footprint_area": 22313, + "number_of_stories": 1 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.8500120420453, + 42.81812185529549 + ], + [ + -78.85038975191084, + 42.81803226424341 + ], + [ + -78.850630729414, + 42.81857888627522 + ], + [ + -78.85025301954843, + 42.81866847653532 + ], + [ + -78.8500120420453, + 42.81812185529549 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "3", + "name": "Restaurant 10", + "type": "Building", + "building_type": "Food service", + "floor_area": 125631, + "footprint_area": 41877, + "number_of_stories": 3 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84962224800356, + 42.81329273502644 + ], + [ + -78.84929833482822, + 42.81337083838241 + ], + [ + -78.84983265832118, + 42.814563298664666 + ], + [ + -78.85015657149653, + 42.81448519681467 + ], + [ + -78.84962224800356, + 42.81329273502644 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "4", + "name": "Restaurant 12", + "type": "Building", + "building_type": "Food service", + "floor_area": 31623, + "footprint_area": 10541, + "number_of_stories": 3 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84907318596754, + 42.81342719667407 + ], + [ + -78.84862090048105, + 42.81353625345659 + ], + [ + -78.84871721918239, + 42.813751210926796 + ], + [ + -78.84916950466888, + 42.81364215452331 + ], + [ + -78.84907318596754, + 42.81342719667407 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "5", + "name": "Restaurant 14", + "type": "Building", + "building_type": "Food service", + "floor_area": 8804, + "footprint_area": 8804, + "number_of_stories": 1 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84809175426629, + 42.81367038997507 + ], + [ + -78.84848670778973, + 42.81357515750889 + ], + [ + -78.84857883872144, + 42.81378076888831 + ], + [ + -78.84818388519801, + 42.81387600103781 + ], + [ + -78.84809175426629, + 42.81367038997507 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "6", + "name": "Restaurant 15", + "type": "Building", + "building_type": "Food service", + "floor_area": 10689, + "footprint_area": 10689, + "number_of_stories": 1 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84846106738529, + 42.814495803077364 + ], + [ + -78.8486903952376, + 42.81444050756261 + ], + [ + -78.8484977578349, + 42.81401059666683 + ], + [ + -78.84826842998261, + 42.81406589256599 + ], + [ + -78.84846106738529, + 42.814495803077364 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "7", + "name": "Office 1", + "type": "Building", + "building_type": "Office", + "number_of_stories": 6, + "detailed_model_filename": "7.osm" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84733878006863, + 42.816466983030836 + ], + [ + -78.84854275129324, + 42.81617669028003 + ], + [ + -78.848356395545, + 42.81576080994094 + ], + [ + -78.84715242432038, + 42.81605110464406 + ], + [ + -78.84733878006863, + 42.816466983030836 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "8", + "name": "Hospital 1", + "type": "Building", + "building_type": "Outpatient health care", + "number_of_stories": 10, + "detailed_model_filename": "8.osm" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84973966335251, + 42.8154441454509 + ], + [ + -78.85049562542395, + 42.81525669280299 + ], + [ + -78.85078257620685, + 42.81588131780643 + ], + [ + -78.8505086568277, + 42.81594736368234 + ], + [ + -78.85041233812638, + 42.815732413845666 + ], + [ + -78.84991755499783, + 42.81585689105046 + ], + [ + -78.84973966335251, + 42.8154441454509 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "9", + "name": "Hospital 2", + "type": "Building", + "building_type": "Inpatient health care", + "number_of_stories": 3, + "detailed_model_filename": "9.osm" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.85083627755732, + 42.81600678613279 + ], + [ + -78.85056039001891, + 42.816076133580566 + ], + [ + -78.85072568130569, + 42.816450649528036 + ], + [ + -78.84940134236577, + 42.81677160705479 + ], + [ + -78.84958014898304, + 42.81716858994267 + ], + [ + -78.8507262115271, + 42.816890840117026 + ], + [ + -78.8508565789851, + 42.81719595796099 + ], + [ + -78.85132137101688, + 42.81708331517635 + ], + [ + -78.85083627755732, + 42.81600678613279 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "10", + "name": "Mixed use 2", + "type": "Building", + "building_type": "Mixed use", + "floor_area": 1278384, + "footprint_area": 159798, + "number_of_stories": 8, + "mixed_type_1": "Strip shopping mall", + "mixed_type_1_percentage": 25, + "mixed_type_2": "Food service", + "mixed_type_2_percentage": 25, + "mixed_type_3": "Office", + "mixed_type_3_percentage": 15, + "mixed_type_4": "Lodging", + "mixed_type_4_percentage": 35 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.85115264550463, + 42.81786093060211 + ], + [ + -78.85163483958878, + 42.81774467026972 + ], + [ + -78.85246596719499, + 42.819583261120755 + ], + [ + -78.85082390085432, + 42.819979162017745 + ], + [ + -78.85060552295334, + 42.81947573727234 + ], + [ + -78.85174564783776, + 42.81920483484765 + ], + [ + -78.85115264550463, + 42.81786093060211 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "11", + "name": "Restaurant 13", + "type": "Building", + "building_type": "Food service", + "floor_area": 32511, + "footprint_area": 10837, + "number_of_stories": 3 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84961163640645, + 42.81460851835703 + ], + [ + -78.84914661048371, + 42.81472064501696 + ], + [ + -78.84905029178236, + 42.81450569091638 + ], + [ + -78.84951531770513, + 42.81439356386673 + ], + [ + -78.84961163640645, + 42.81460851835703 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "12", + "name": "Mall 1", + "type": "Building", + "building_type": "Strip shopping mall", + "floor_area": 374409, + "footprint_area": 124803, + "number_of_stories": 3 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84768338040897, + 42.817161656757065 + ], + [ + -78.8482630702579, + 42.8170218879136 + ], + [ + -78.84915297130291, + 42.81900776764229 + ], + [ + -78.84857328145401, + 42.81914753199706 + ], + [ + -78.84768338040897, + 42.817161656757065 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "13", + "name": "Hotel 1", + "type": "Building", + "building_type": "Lodging", + "floor_area": 316160, + "footprint_area": 31616, + "number_of_stories": 10 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.8494955083645, + 42.819748790984335 + ], + [ + -78.84891089471263, + 42.81989327725856 + ], + [ + -78.8491389243777, + 42.82038967009544 + ], + [ + -78.84972353802956, + 42.82024518498119 + ], + [ + -78.8494955083645, + 42.819748790984335 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "14", + "name": "Residential 1", + "type": "Building", + "building_type": "Single-Family Detached", + "floor_area": 3055, + "footprint_area": 3055, + "number_of_stories_above_ground": 1, + "number_of_stories": 1, + "number_of_bedrooms": 3, + "foundation_type": "crawlspace - unvented", + "attic_type": "attic - vented", + "system_type": "Residential - furnace and central air conditioner", + "heating_system_fuel_type": "natural gas", + "template": "Residential IECC 2015 - Customizable Template Sep 2020" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84782863379475, + 42.81308406513335 + ], + [ + -78.84789445741784, + 42.813211653666144 + ], + [ + -78.8481085224459, + 42.81315222398479 + ], + [ + -78.84804269882281, + 42.813024635329356 + ], + [ + -78.84782863379475, + 42.81308406513335 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "15", + "name": "Residential 2", + "type": "Building", + "building_type": "Single-Family Detached", + "floor_area": 4260, + "footprint_area": 2130, + "number_of_stories_above_ground": 2, + "number_of_stories": 3, + "number_of_bedrooms": 4, + "foundation_type": "basement - unconditioned", + "attic_type": "attic - unvented", + "system_type": "Residential - boiler and room air conditioner", + "heating_system_fuel_type": "propane", + "template": "Residential IECC 2015 - Customizable Template Sep 2020" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84841249573596, + 42.81294385519362 + ], + [ + -78.8484849661432, + 42.81308642712324 + ], + [ + -78.84861900200103, + 42.81304976336804 + ], + [ + -78.84854653159381, + 42.8129071913539 + ], + [ + -78.84841249573596, + 42.81294385519362 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "16", + "name": "Residential 3", + "type": "Building", + "building_type": "Single-Family Detached", + "floor_area": 5500, + "footprint_area": 4655, + "number_of_stories_above_ground": 1, + "number_of_stories": 2, + "number_of_bedrooms": 5, + "foundation_type": "basement - conditioned", + "attic_type": "attic - conditioned", + "system_type": "Residential - electric resistance and no cooling", + "heating_system_fuel_type": "electricity", + "template": "Residential IECC 2015 - Customizable Template Sep 2020" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84901642777548, + 42.81281054264619 + ], + [ + -78.8492166996002, + 42.81276856688589 + ], + [ + -78.8492882250648, + 42.81294171638328 + ], + [ + -78.84919524192809, + 42.812957457222666 + ], + [ + -78.84925246216879, + 42.81307288984212 + ], + [ + -78.84915232658385, + 42.8130833837933 + ], + [ + -78.84901642777548, + 42.81281054264619 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "8c369df2-18e9-439a-8c25-875851c5aaf0", + "geometryType": "Rectangle", + "name": "New District System_1", + "type": "District System", + "footprint_area": 36733, + "footprint_perimeter": 781, + "floor_area": 36733, + "district_system_type": "Ground Heat Exchanger" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.85286283229338, + 42.816541935089646 + ], + [ + -78.85258540317935, + 42.815935053497185 + ], + [ + -78.85202932534177, + 42.8160718357266 + ], + [ + -78.85230675445584, + 42.81667871597671 + ], + [ + -78.85286283229338, + 42.816541935089646 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "0c1b5138-e3cc-4ccb-b4ff-403fad55e9c3", + "type": "ThermalJunction", + "DSId": "8c369df2-18e9-439a-8c25-875851c5aaf0", + "is_ghe_start_loop": true + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85216355997532, + 42.816365476697136 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "76bcf271-177c-46e6-8682-e70f3d376472", + "type": "ThermalJunction", + "buildingId": "9" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85110928795876, + 42.816612658545644 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "06279e72-cc7a-4bcc-9936-47805613c4e5", + "type": "ThermalConnector", + "startJunctionId": "0c1b5138-e3cc-4ccb-b4ff-403fad55e9c3", + "endJunctionId": "76bcf271-177c-46e6-8682-e70f3d376472", + "startFeatureId": "8c369df2-18e9-439a-8c25-875851c5aaf0", + "endFeatureId": "9", + "total_length": 296 + }, + "geometry": { + "type": "LineString", + "coordinates": [ + [ + -78.85216355997532, + 42.816365476697136 + ], + [ + -78.85110928795876, + 42.816612658545644 + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "62d93293-5c48-4b55-aa97-67c7a8d19f72", + "type": "ThermalJunction", + "buildingId": "9" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85072270763574, + 42.816035333224285 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "b0c5d72f-ec40-4213-b7d5-9329ded57d7b", + "type": "ThermalJunction", + "buildingId": "8" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85066366963542, + 42.81590998788833 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "aa465802-9736-4811-8629-0ff6624b1735", + "type": "ThermalConnector", + "startJunctionId": "62d93293-5c48-4b55-aa97-67c7a8d19f72", + "endJunctionId": "b0c5d72f-ec40-4213-b7d5-9329ded57d7b", + "startFeatureId": "9", + "endFeatureId": "8", + "total_length": 48 + }, + "geometry": { + "type": "LineString", + "coordinates": [ + [ + -78.85072270763574, + 42.816035333224285 + ], + [ + -78.85066366963542, + 42.81590998788833 + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "8d29ddda-d3de-4ee7-9de9-3ee05041d0c3", + "type": "ThermalJunction", + "buildingId": "8" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.8506279609464, + 42.81554475718902 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "32adaea4-f926-4dc6-94e2-634cf8fef84c", + "type": "ThermalJunction", + "DSId": "8c369df2-18e9-439a-8c25-875851c5aaf0" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.8523321619394, + 42.8159973449965 + ] + } + }, + { + "type": "Feature", + "properties": { + "type": "ThermalConnector", + "id": "fc0a12a2-a722-4998-9454-9a12b1121bf4", + "startJunctionId": "8d29ddda-d3de-4ee7-9de9-3ee05041d0c3", + "endJunctionId": "32adaea4-f926-4dc6-94e2-634cf8fef84c", + "startFeatureId": "8", + "endFeatureId": "8c369df2-18e9-439a-8c25-875851c5aaf0", + "total_length": 485 + }, + "geometry": { + "type": "LineString", + "coordinates": [ + [ + -78.8506279609464, + 42.81554475718902 + ], + [ + -78.8523321619394, + 42.8159973449965 + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/spec/files/example_project_combine_GHE_2.json b/spec/files/example_project_combine_GHE_2.json new file mode 100644 index 0000000..b6e4222 --- /dev/null +++ b/spec/files/example_project_combine_GHE_2.json @@ -0,0 +1,1121 @@ +{ + "type": "FeatureCollection", + "project": { + "id": "7c33a001-bccb-413e-ac87-67558b5d4b07", + "name": "New Project", + "surface_elevation": null, + "import_surrounding_buildings_as_shading": null, + "weather_filename": "USA_NY_Buffalo-Greater.Buffalo.Intl.AP.725280_TMY3.epw", + "tariff_filename": null, + "climate_zone": "6A", + "cec_climate_zone": null, + "begin_date": "2017-01-01T07:00:00.000Z", + "end_date": "2017-12-31T07:00:00.000Z", + "timesteps_per_hour": 1, + "default_template": "90.1-2013" + }, + "features": [ + { + "type": "Feature", + "properties": { + "id": "53340c2c-ab20-40db-aba1-11ac607c52a7", + "name": "Site Origin", + "type": "Site Origin", + "begin_date": "2017-01-01T07:00:00.000Z", + "end_date": "2017-12-31T07:00:00.000Z", + "cec_climate_zone": null, + "climate_zone": "6A", + "default_template": "90.1-2013", + "import_surrounding_buildings_as_shading": null, + "surface_elevation": null, + "tariff_filename": null, + "timesteps_per_hour": 1, + "weather_filename": "USA_NY_Buffalo-Greater.Buffalo.Intl.AP.725280_TMY3.epw", + "only_lv_customers": null, + "underground_cables_ratio": null, + "max_number_of_lv_nodes_per_building": null + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.84948467732347, + 42.81677154451123 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "1", + "name": "Mixed_use 1", + "type": "Building", + "building_type": "Mixed use", + "floor_area": 752184, + "footprint_area": 188046, + "number_of_stories": 4, + "mixed_type_1": "Office", + "mixed_type_1_percentage": 50, + "mixed_type_2": "Food service", + "mixed_type_2_percentage": 50, + "mixed_type_3": "Strip shopping mall", + "mixed_type_3_percentage": 0, + "mixed_type_4": "Lodging", + "mixed_type_4_percentage": 0 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84650338745196, + 42.81331301863236 + ], + [ + -78.84652443964629, + 42.81463974371101 + ], + [ + -78.84680142363833, + 42.815293654042534 + ], + [ + -78.84744455124724, + 42.81514110006128 + ], + [ + -78.84728610028628, + 42.81478165791734 + ], + [ + -78.84786797764677, + 42.814643631760134 + ], + [ + -78.84721106637106, + 42.813153418927016 + ], + [ + -78.84650338745196, + 42.81331301863236 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "2", + "name": "Restaurant 1", + "type": "Building", + "building_type": "Food service", + "floor_area": 22313, + "footprint_area": 22313, + "number_of_stories": 1 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.8500120420453, + 42.81812185529549 + ], + [ + -78.85038975191084, + 42.81803226424341 + ], + [ + -78.850630729414, + 42.81857888627522 + ], + [ + -78.85025301954843, + 42.81866847653532 + ], + [ + -78.8500120420453, + 42.81812185529549 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "3", + "name": "Restaurant 10", + "type": "Building", + "building_type": "Food service", + "floor_area": 125631, + "footprint_area": 41877, + "number_of_stories": 3 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84962224800356, + 42.81329273502644 + ], + [ + -78.84929833482822, + 42.81337083838241 + ], + [ + -78.84983265832118, + 42.814563298664666 + ], + [ + -78.85015657149653, + 42.81448519681467 + ], + [ + -78.84962224800356, + 42.81329273502644 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "4", + "name": "Restaurant 12", + "type": "Building", + "building_type": "Food service", + "floor_area": 31623, + "footprint_area": 10541, + "number_of_stories": 3 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84907318596754, + 42.81342719667407 + ], + [ + -78.84862090048105, + 42.81353625345659 + ], + [ + -78.84871721918239, + 42.813751210926796 + ], + [ + -78.84916950466888, + 42.81364215452331 + ], + [ + -78.84907318596754, + 42.81342719667407 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "5", + "name": "Restaurant 14", + "type": "Building", + "building_type": "Food service", + "floor_area": 8804, + "footprint_area": 8804, + "number_of_stories": 1 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84809175426629, + 42.81367038997507 + ], + [ + -78.84848670778973, + 42.81357515750889 + ], + [ + -78.84857883872144, + 42.81378076888831 + ], + [ + -78.84818388519801, + 42.81387600103781 + ], + [ + -78.84809175426629, + 42.81367038997507 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "6", + "name": "Restaurant 15", + "type": "Building", + "building_type": "Food service", + "floor_area": 10689, + "footprint_area": 10689, + "number_of_stories": 1 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84846106738529, + 42.814495803077364 + ], + [ + -78.8486903952376, + 42.81444050756261 + ], + [ + -78.8484977578349, + 42.81401059666683 + ], + [ + -78.84826842998261, + 42.81406589256599 + ], + [ + -78.84846106738529, + 42.814495803077364 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "7", + "name": "Office 1", + "type": "Building", + "building_type": "Office", + "number_of_stories": 6, + "detailed_model_filename": "7.osm" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84733878006863, + 42.816466983030836 + ], + [ + -78.84854275129324, + 42.81617669028003 + ], + [ + -78.848356395545, + 42.81576080994094 + ], + [ + -78.84715242432038, + 42.81605110464406 + ], + [ + -78.84733878006863, + 42.816466983030836 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "8", + "name": "Hospital 1", + "type": "Building", + "building_type": "Outpatient health care", + "number_of_stories": 10, + "detailed_model_filename": "8.osm" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84973966335251, + 42.8154441454509 + ], + [ + -78.85049562542395, + 42.81525669280299 + ], + [ + -78.85078257620685, + 42.81588131780643 + ], + [ + -78.8505086568277, + 42.81594736368234 + ], + [ + -78.85041233812638, + 42.815732413845666 + ], + [ + -78.84991755499783, + 42.81585689105046 + ], + [ + -78.84973966335251, + 42.8154441454509 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "9", + "name": "Hospital 2", + "type": "Building", + "building_type": "Inpatient health care", + "number_of_stories": 3, + "detailed_model_filename": "9.osm" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.85083627755732, + 42.81600678613279 + ], + [ + -78.85056039001891, + 42.816076133580566 + ], + [ + -78.85072568130569, + 42.816450649528036 + ], + [ + -78.84940134236577, + 42.81677160705479 + ], + [ + -78.84958014898304, + 42.81716858994267 + ], + [ + -78.8507262115271, + 42.816890840117026 + ], + [ + -78.8508565789851, + 42.81719595796099 + ], + [ + -78.85132137101688, + 42.81708331517635 + ], + [ + -78.85083627755732, + 42.81600678613279 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "10", + "name": "Mixed use 2", + "type": "Building", + "building_type": "Mixed use", + "floor_area": 1278384, + "footprint_area": 159798, + "number_of_stories": 8, + "mixed_type_1": "Strip shopping mall", + "mixed_type_1_percentage": 25, + "mixed_type_2": "Food service", + "mixed_type_2_percentage": 25, + "mixed_type_3": "Office", + "mixed_type_3_percentage": 15, + "mixed_type_4": "Lodging", + "mixed_type_4_percentage": 35 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.85115264550463, + 42.81786093060211 + ], + [ + -78.85163483958878, + 42.81774467026972 + ], + [ + -78.85246596719499, + 42.819583261120755 + ], + [ + -78.85082390085432, + 42.819979162017745 + ], + [ + -78.85060552295334, + 42.81947573727234 + ], + [ + -78.85174564783776, + 42.81920483484765 + ], + [ + -78.85115264550463, + 42.81786093060211 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "11", + "name": "Restaurant 13", + "type": "Building", + "building_type": "Food service", + "floor_area": 32511, + "footprint_area": 10837, + "number_of_stories": 3 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84961163640645, + 42.81460851835703 + ], + [ + -78.84914661048371, + 42.81472064501696 + ], + [ + -78.84905029178236, + 42.81450569091638 + ], + [ + -78.84951531770513, + 42.81439356386673 + ], + [ + -78.84961163640645, + 42.81460851835703 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "12", + "name": "Mall 1", + "type": "Building", + "building_type": "Strip shopping mall", + "floor_area": 374409, + "footprint_area": 124803, + "number_of_stories": 3 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84768338040897, + 42.817161656757065 + ], + [ + -78.8482630702579, + 42.8170218879136 + ], + [ + -78.84915297130291, + 42.81900776764229 + ], + [ + -78.84857328145401, + 42.81914753199706 + ], + [ + -78.84768338040897, + 42.817161656757065 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "13", + "name": "Hotel 1", + "type": "Building", + "building_type": "Lodging", + "floor_area": 316160, + "footprint_area": 31616, + "number_of_stories": 10 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.8494955083645, + 42.819748790984335 + ], + [ + -78.84891089471263, + 42.81989327725856 + ], + [ + -78.8491389243777, + 42.82038967009544 + ], + [ + -78.84972353802956, + 42.82024518498119 + ], + [ + -78.8494955083645, + 42.819748790984335 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "14", + "name": "Residential 1", + "type": "Building", + "building_type": "Single-Family Detached", + "floor_area": 3055, + "footprint_area": 3055, + "number_of_stories_above_ground": 1, + "number_of_stories": 1, + "number_of_bedrooms": 3, + "foundation_type": "crawlspace - unvented", + "attic_type": "attic - vented", + "system_type": "Residential - furnace and central air conditioner", + "heating_system_fuel_type": "natural gas", + "template": "Residential IECC 2015 - Customizable Template Sep 2020" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84782863379475, + 42.81308406513335 + ], + [ + -78.84789445741784, + 42.813211653666144 + ], + [ + -78.8481085224459, + 42.81315222398479 + ], + [ + -78.84804269882281, + 42.813024635329356 + ], + [ + -78.84782863379475, + 42.81308406513335 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "15", + "name": "Residential 2", + "type": "Building", + "building_type": "Single-Family Detached", + "floor_area": 4260, + "footprint_area": 2130, + "number_of_stories_above_ground": 2, + "number_of_stories": 3, + "number_of_bedrooms": 4, + "foundation_type": "basement - unconditioned", + "attic_type": "attic - unvented", + "system_type": "Residential - boiler and room air conditioner", + "heating_system_fuel_type": "propane", + "template": "Residential IECC 2015 - Customizable Template Sep 2020" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84841249573596, + 42.81294385519362 + ], + [ + -78.8484849661432, + 42.81308642712324 + ], + [ + -78.84861900200103, + 42.81304976336804 + ], + [ + -78.84854653159381, + 42.8129071913539 + ], + [ + -78.84841249573596, + 42.81294385519362 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "16", + "name": "Residenital 3", + "type": "Building", + "building_type": "Single-Family Detached", + "floor_area": 5500, + "footprint_area": 4655, + "number_of_stories_above_ground": 1, + "number_of_stories": 2, + "number_of_bedrooms": 5, + "foundation_type": "basement - conditioned", + "attic_type": "attic - conditioned", + "system_type": "Residential - electric resistance and no cooling", + "heating_system_fuel_type": "electricity", + "template": "Residential IECC 2015 - Customizable Template Sep 2020" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84901642777548, + 42.81281054264619 + ], + [ + -78.8492166996002, + 42.81276856688589 + ], + [ + -78.8492882250648, + 42.81294171638328 + ], + [ + -78.84919524192809, + 42.812957457222666 + ], + [ + -78.84925246216879, + 42.81307288984212 + ], + [ + -78.84915232658385, + 42.8130833837933 + ], + [ + -78.84901642777548, + 42.81281054264619 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "0b575a8f-97d1-47e6-b329-7ef7566d26f2", + "geometryType": "Rectangle", + "name": "New District System_1", + "type": "District System", + "district_system_type":"Ground Heat Exchanger", + "footprint_area": 45601, + "footprint_perimeter": 873, + "floor_area": 45601 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.85372193709603, + 42.818301199899366 + ], + [ + -78.85339382171796, + 42.81761835371546 + ], + [ + -78.85278669937853, + 42.81777531839998 + ], + [ + -78.8531148147566, + 42.818458162850504 + ], + [ + -78.85372193709603, + 42.818301199899366 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "15a25e2f-c425-46e9-8036-b1d0d09127e2", + "geometryType": "Rectangle", + "name": "New District System_2", + "type": "District System", + "district_system_type": "Ground Heat Exchanger", + "footprint_area": 32651, + "footprint_perimeter": 735, + "floor_area": 32651 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.85234092847948, + 42.81546939083259 + ], + [ + -78.85207796196407, + 42.814903219676495 + ], + [ + -78.85154987199657, + 42.815035203681305 + ], + [ + -78.85181283851198, + 42.81560137362911 + ], + [ + -78.85234092847948, + 42.81546939083259 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "54972e87-4681-4050-a534-c6c6fa9dc197", + "type": "ThermalJunction", + "DSId": "15a25e2f-c425-46e9-8036-b1d0d09127e2", + "is_ghe_start_loop": true + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85210623275802, + 42.81552804715616 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "b38eeb88-9fb8-415f-9551-6f3da6a082ed", + "type": "ThermalJunction", + "DSId": "0b575a8f-97d1-47e6-b329-7ef7566d26f2" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85315065120615, + 42.81768122277698 + ] + } + }, + { + "type": "Feature", + "properties": { + "type": "ThermalConnector", + "id": "a251809f-00a2-4982-8dc3-96d34fcb5727", + "startJunctionId": "54972e87-4681-4050-a534-c6c6fa9dc197", + "endJunctionId": "b38eeb88-9fb8-415f-9551-6f3da6a082ed", + "startFeatureId": "15a25e2f-c425-46e9-8036-b1d0d09127e2", + "endFeatureId": "0b575a8f-97d1-47e6-b329-7ef7566d26f2", + "total_length": 834 + }, + "geometry": { + "type": "LineString", + "coordinates": [ + [ + -78.85210623275802, + 42.81552804715616 + ], + [ + -78.85315065120615, + 42.81768122277698 + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "0142e75a-2a98-4b2d-9016-b6636922a8c3", + "type": "ThermalJunction", + "DSId": "0b575a8f-97d1-47e6-b329-7ef7566d26f2" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85296702354428, + 42.81815059389858 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "2bb7fb78-dfe0-4ffe-9aa2-98766c500ab3", + "type": "ThermalJunction", + "buildingId": "10" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85193472950549, + 42.81840808235308 + ] + } + }, + { + "type": "Feature", + "properties": { + "type": "ThermalConnector", + "id": "09340c8f-5e8d-443b-96e4-8b49f174a9a7", + "startJunctionId": "0142e75a-2a98-4b2d-9016-b6636922a8c3", + "endJunctionId": "2bb7fb78-dfe0-4ffe-9aa2-98766c500ab3", + "startFeatureId": "0b575a8f-97d1-47e6-b329-7ef7566d26f2", + "endFeatureId": "10", + "total_length": 292 + }, + "geometry": { + "type": "LineString", + "coordinates": [ + [ + -78.85296702354428, + 42.81815059389858 + ], + [ + -78.85193472950549, + 42.81840808235308 + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "8c6064ee-f9b7-440b-95cd-e2a163fd39a5", + "type": "ThermalJunction", + "buildingId": "10" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85142736592312, + 42.817794693633836 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "f621584e-4a8b-413d-b405-eb44ff16a927", + "type": "ThermalJunction", + "buildingId": "9" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85109324705694, + 42.81713860125753 + ] + } + }, + { + "type": "Feature", + "properties": { + "type": "ThermalConnector", + "id": "1cadebde-30a0-4f6d-aee0-0d544a586de3", + "startJunctionId": "8c6064ee-f9b7-440b-95cd-e2a163fd39a5", + "endJunctionId": "f621584e-4a8b-413d-b405-eb44ff16a927", + "startFeatureId": "10", + "endFeatureId": "9", + "total_length": 256 + }, + "geometry": { + "type": "LineString", + "coordinates": [ + [ + -78.85142736592312, + 42.817794693633836 + ], + [ + -78.85109324705694, + 42.81713860125753 + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "d038f83c-0232-4058-9116-fed1520085f7", + "type": "ThermalJunction", + "buildingId": "9" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85083627755733, + 42.81600678613278 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "92603808-dd2e-48d8-93b6-55afd352ac9d", + "type": "ThermalJunction", + "buildingId": "8" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85078257620687, + 42.81588131780642 + ] + } + }, + { + "type": "Feature", + "properties": { + "type": "ThermalConnector", + "id": "9b07a783-e0d9-4ab6-a820-148c61014cb5", + "startJunctionId": "d038f83c-0232-4058-9116-fed1520085f7", + "endJunctionId": "92603808-dd2e-48d8-93b6-55afd352ac9d", + "startFeatureId": "9", + "endFeatureId": "8", + "total_length": 48 + }, + "geometry": { + "type": "LineString", + "coordinates": [ + [ + -78.85083627755733, + 42.81600678613278 + ], + [ + -78.85078257620687, + 42.81588131780642 + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "7803cfb8-3e1e-497e-b8e5-628dbd9cc6ba", + "type": "ThermalJunction", + "buildingId": "8" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85061207392705, + 42.81551017482588 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "43f1cb29-0b84-47ec-afff-4f982dc794ab", + "type": "ThermalJunction", + "DSId": "15a25e2f-c425-46e9-8036-b1d0d09127e2" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.85165903746848, + 42.815270238833634 + ] + } + }, + { + "type": "Feature", + "properties": { + "type": "ThermalConnector", + "id": "cef57522-03e4-44ae-816e-ac54a554fd07", + "startJunctionId": "7803cfb8-3e1e-497e-b8e5-628dbd9cc6ba", + "endJunctionId": "43f1cb29-0b84-47ec-afff-4f982dc794ab", + "startFeatureId": "8", + "endFeatureId": "15a25e2f-c425-46e9-8036-b1d0d09127e2", + "total_length": 294 + }, + "geometry": { + "type": "LineString", + "coordinates": [ + [ + -78.85061207392705, + 42.81551017482588 + ], + [ + -78.85165903746848, + 42.815270238833634 + ] + ] + } + } + ], + "mappers": [], + "scenarios": [ + { + "feature_mappings": [], + "id": "72301739-c6c3-4dd7-bf1a-f37c8eff40db", + "name": "New Scenario" + } + ] +} diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5225817..4ca6386 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'simplecov' diff --git a/spec/urbanopt/geojson/building_spec.rb b/spec/urbanopt/geojson/building_spec.rb index cc7f46d..d6f4157 100644 --- a/spec/urbanopt/geojson/building_spec.rb +++ b/spec/urbanopt/geojson/building_spec.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative '../../spec_helper' diff --git a/spec/urbanopt/geojson/feature_spec.rb b/spec/urbanopt/geojson/feature_spec.rb index 8d6950a..0fc06b1 100644 --- a/spec/urbanopt/geojson/feature_spec.rb +++ b/spec/urbanopt/geojson/feature_spec.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative '../../spec_helper' diff --git a/spec/urbanopt/geojson/geo_file_spec.rb b/spec/urbanopt/geojson/geo_file_spec.rb index f5c8e7a..301141d 100644 --- a/spec/urbanopt/geojson/geo_file_spec.rb +++ b/spec/urbanopt/geojson/geo_file_spec.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative '../../spec_helper' @@ -81,6 +46,34 @@ expect(geojson_errors).to be_empty end + it 'validate geojson file with ground heat exchanger' do + geojson_file = File.open(File.join(@spec_files_dir, 'example_project_combine_GHE.json')) do |f| + result = JSON.parse(f.read, symbolize_names: true) + end + + schema = File.open(File.dirname(__FILE__) + '/../../../lib/urbanopt/geojson/schema/geojson_schema.json') do |f| + result = JSON.parse(f.read, symbolize_names: true) + end + + geojson_errors = URBANopt::GeoJSON::GeoFile.validate(schema, geojson_file) + + expect(geojson_errors).to be_empty + end + + it 'validate geojson file with two ground heat exchangers' do + geojson_file = File.open(File.join(@spec_files_dir, 'example_project_combine_GHE_2.json')) do |f| + result = JSON.parse(f.read, symbolize_names: true) + end + + schema = File.open(File.dirname(__FILE__) + '/../../../lib/urbanopt/geojson/schema/geojson_schema.json') do |f| + result = JSON.parse(f.read, symbolize_names: true) + end + + geojson_errors = URBANopt::GeoJSON::GeoFile.validate(schema, geojson_file) + + expect(geojson_errors).to be_empty + end + it 'raise error' do geojson_file = File.open(File.join(@spec_files_dir, 'invalid.geojson')) do |f| result = JSON.parse(f.read, symbolize_names: true) @@ -111,7 +104,7 @@ expect { geofile = URBANopt::GeoJSON::GeoFile.from_file( File.join(@spec_files_dir, 'invalid_emissions.geojson') ) }.to raise_error(RuntimeError) - + end end diff --git a/spec/urbanopt/geojson/helper_spec.rb b/spec/urbanopt/geojson/helper_spec.rb index d6d5bd2..84d5db8 100644 --- a/spec/urbanopt/geojson/helper_spec.rb +++ b/spec/urbanopt/geojson/helper_spec.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative '../../spec_helper' diff --git a/spec/urbanopt/geojson/model_spec.rb b/spec/urbanopt/geojson/model_spec.rb index 7896a0f..f0adf2f 100644 --- a/spec/urbanopt/geojson/model_spec.rb +++ b/spec/urbanopt/geojson/model_spec.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative '../../spec_helper' diff --git a/spec/urbanopt/geojson/urbanopt_geojson_spec.rb b/spec/urbanopt/geojson/urbanopt_geojson_spec.rb index 388c87f..5f67368 100644 --- a/spec/urbanopt/geojson/urbanopt_geojson_spec.rb +++ b/spec/urbanopt/geojson/urbanopt_geojson_spec.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative '../../spec_helper' diff --git a/spec/urbanopt/geojson/zoning_spec.rb b/spec/urbanopt/geojson/zoning_spec.rb index 3383e50..958f0c4 100644 --- a/spec/urbanopt/geojson/zoning_spec.rb +++ b/spec/urbanopt/geojson/zoning_spec.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative '../../spec_helper' diff --git a/urbanopt-geojson-gem.gemspec b/urbanopt-geojson-gem.gemspec index 30b5e07..398f806 100644 --- a/urbanopt-geojson-gem.gemspec +++ b/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 'urbanopt-core', '~> 0.9.0' + spec.add_runtime_dependency 'json-schema', '~> 2.7' + spec.add_runtime_dependency 'urbanopt-core', '~> 0.10.0' end