urbanopt-geojson 0.9.0 → 0.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/nightly_build.yml +19 -16
- data/CHANGELOG.md +20 -0
- data/CONTRIBUTING.md +2 -2
- data/Gemfile +10 -5
- data/LICENSE.md +16 -11
- data/README.md +2 -1
- data/Rakefile +2 -37
- data/doc_templates/LICENSE.md +16 -11
- data/doc_templates/copyright_erb.txt +2 -37
- data/doc_templates/copyright_js.txt +2 -2
- data/doc_templates/copyright_ruby.txt +2 -37
- data/docs/package-lock.json +3967 -3489
- data/lib/measures/.rubocop.yml +2 -1
- data/lib/measures/urban_geometry_creation/LICENSE.md +16 -11
- data/lib/measures/urban_geometry_creation/README.md +1 -1
- data/lib/measures/urban_geometry_creation/measure.rb +7 -41
- data/lib/measures/urban_geometry_creation/measure.xml +29 -29
- data/lib/measures/urban_geometry_creation_zoning/LICENSE.md +16 -11
- data/lib/measures/urban_geometry_creation_zoning/measure.rb +2 -37
- data/lib/measures/urban_geometry_creation_zoning/measure.xml +21 -27
- data/lib/urbanopt/geojson/building.rb +2 -37
- data/lib/urbanopt/geojson/derived_extension.rb +2 -37
- data/lib/urbanopt/geojson/district_system.rb +2 -37
- data/lib/urbanopt/geojson/feature.rb +3 -38
- data/lib/urbanopt/geojson/geo_file.rb +6 -38
- data/lib/urbanopt/geojson/helper.rb +2 -37
- data/lib/urbanopt/geojson/logging.rb +2 -37
- data/lib/urbanopt/geojson/mapper_classes.rb +2 -37
- data/lib/urbanopt/geojson/model.rb +2 -37
- data/lib/urbanopt/geojson/region.rb +2 -37
- data/lib/urbanopt/geojson/scale_area.rb +2 -37
- data/lib/urbanopt/geojson/schema/district_system_properties.json +5 -4
- data/lib/urbanopt/geojson/schema/thermal_connector_properties.json +6 -8
- data/lib/urbanopt/geojson/schema/thermal_junction_properties.json +7 -4
- data/lib/urbanopt/geojson/update_areas.rb +2 -37
- data/lib/urbanopt/geojson/validate_geojson.rb +2 -37
- data/lib/urbanopt/geojson/version.rb +3 -38
- data/lib/urbanopt/geojson/zoning.rb +2 -37
- data/lib/urbanopt/geojson.rb +2 -38
- data/lib/urbanopt-geojson.rb +2 -37
- data/package-lock.json +4706 -1
- data/urbanopt-geojson-gem.gemspec +1 -1
- metadata +4 -5
- data/Jenkinsfile +0 -10
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2547449dedf14b525ac23dd243c71a7b4e139ddce51ba4e84472cbec330fbc68
|
4
|
+
data.tar.gz: cc2971734955eb04ce013a1d7a12ecdb9cbe249bb8466ba1edc6131b44c468da
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 88eb991e3efff0a5ec2396ad86a0c93db9d3993783dfd99d3496106118561b24396848a10df5592ac79837c7f35bebaed2d2facba670cdfc2e544cbfdf378ccb
|
7
|
+
data.tar.gz: 22bbfdebc96a575126c6f178209acb67d2a65bc776401c32f5ccc4e8d2fe4151f0a6d74b8470b3dd7b40bc41fe8076403d7f805ddc892875d6f032586fff8fb2
|
@@ -1,5 +1,4 @@
|
|
1
|
-
|
2
|
-
name: nightly_build
|
1
|
+
name: Geojson-gem CI
|
3
2
|
|
4
3
|
on:
|
5
4
|
# push:
|
@@ -7,12 +6,8 @@ on:
|
|
7
6
|
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
|
8
7
|
# 5 am UTC (11pm MDT the day before) every weekday night in MDT
|
9
8
|
- cron: '21 5 * * 2-6'
|
10
|
-
|
11
|
-
|
12
|
-
# 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
|
13
|
-
# concurrency:
|
14
|
-
# group: ${{ github.workflow }}-${{ github.ref }}
|
15
|
-
# cancel-in-progress: true
|
9
|
+
pull_request:
|
10
|
+
types: [review_requested]
|
16
11
|
|
17
12
|
env:
|
18
13
|
# This env var should enforce develop branch of all dependencies
|
@@ -21,22 +16,30 @@ env:
|
|
21
16
|
|
22
17
|
jobs:
|
23
18
|
weeknight-tests:
|
24
|
-
|
25
|
-
# https://github.com/ruby/setup-ruby#supported-platforms
|
26
|
-
runs-on: ubuntu-20.04
|
19
|
+
runs-on: ubuntu-latest
|
27
20
|
container:
|
28
|
-
image: docker://nrel/openstudio:3.
|
21
|
+
image: docker://nrel/openstudio:3.7.0
|
29
22
|
steps:
|
30
|
-
-
|
31
|
-
|
23
|
+
- uses: actions/checkout@v4
|
24
|
+
- name: set git config options
|
25
|
+
shell: bash
|
26
|
+
run: |
|
27
|
+
git config --global --add safe.directory '*'
|
32
28
|
- name: Update gems
|
33
29
|
run: |
|
30
|
+
ruby --version
|
34
31
|
bundle update
|
32
|
+
- name: List OpenStudio measures
|
33
|
+
run: bundle exec rake openstudio:list_measures
|
34
|
+
- name: Update OpenStudio measures
|
35
|
+
run: bundle exec rake openstudio:update_measures
|
36
|
+
- name: Test OpenStudio measures
|
37
|
+
run: bundle exec rake openstudio:test_with_openstudio
|
35
38
|
- name: Run Rspec
|
36
39
|
run: bundle exec rspec
|
37
|
-
# coveralls action docs: https://github.com/marketplace/actions/coveralls-github-action
|
38
40
|
- name: Coveralls
|
39
|
-
|
41
|
+
# coveralls action docs: https://github.com/marketplace/actions/coveralls-github-action
|
42
|
+
uses: coverallsapp/github-action@v2
|
40
43
|
with:
|
41
44
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
42
45
|
path-to-lcov: "./coverage/lcov/urbanopt-geojson-gem.lcov"
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,25 @@
|
|
1
1
|
# URBANopt GeoJSON Gem
|
2
2
|
|
3
|
+
## Version 0.11.0
|
4
|
+
Date Range: 7/19/23 - 01/09/24
|
5
|
+
|
6
|
+
* Remove jenkins by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/260
|
7
|
+
* also run CI when a PR gets a review request by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/263
|
8
|
+
* modify connectors and junctions schema by @tanushree04 in https://github.com/urbanopt/urbanopt-geojson-gem/pull/261
|
9
|
+
* More tests by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/248
|
10
|
+
* this fixes a test that didn't get merged properly in the tests PR by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/264
|
11
|
+
* Support OpenStudio 3.7 by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/265
|
12
|
+
|
13
|
+
|
14
|
+
**Full Changelog**: https://github.com/urbanopt/urbanopt-geojson-gem/compare/v0.10.0...v0.11.0
|
15
|
+
|
16
|
+
## Version 0.10.0
|
17
|
+
Date Range: 12/5/22 - 7/19/23
|
18
|
+
|
19
|
+
- Updating dependencies for OpenStudio 3.6.1
|
20
|
+
- Update license and references to the license file
|
21
|
+
- Add GHE district system type [#256](https://github.com/urbanopt/urbanopt-geojson-gem/issues/256)
|
22
|
+
|
3
23
|
## Version 0.9.0
|
4
24
|
Date Range: 06/28/22 - 12/5/22
|
5
25
|
|
data/CONTRIBUTING.md
CHANGED
@@ -8,7 +8,7 @@ The contribution process for URBANopt is composed of three steps:
|
|
8
8
|
|
9
9
|
## 1. Send consent email
|
10
10
|
|
11
|
-
In order for us to distribute your code as part of URBANopt under the URBANopt SDK [license](https://github.com/urbanopt/urbanopt-
|
11
|
+
In order for us to distribute your code as part of URBANopt under the URBANopt SDK [license](https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md), we’ll need your consent. An email acknowledging your understanding of these terms and agreeing to them is all that will be asked of any contributor. Send an email to the URBANopt project manager ([see below](#documentation) for the address) including the following text and a list of co-contributors (if any):
|
12
12
|
|
13
13
|
*I agree to contribute to the URBANopt SDK. I agree to the following terms and conditions for my contributions: First, I agree that I am licensing the copyright to my contributions under the terms of the current URBANopt SDK license. Second, I hereby grant to Alliance for Sustainable Energy, LLC, to any successor manager and distributor of URBANopt SDK appointed by the U.S. Department of Energy, and to all recipients of a version of URBANopt SDK that includes my contributions, a non-exclusive, worldwide, royalty-free, irrevocable patent license under any patent claims owned by me, or owned by my employer and known to me, that are or will be,necessarily infringed upon by my contributions alone, or by combination of my contributions with the version of URBANopt SDK to which they are contributed, to make, have made, use, offer to sell, sell, import, and otherwise transfer any version of URBANopt SDK that includes my contributions, in source code and object code form. Third, I represent and warrant that I am authorized to make the contributions and grant the foregoing license(s). Additionally, if, to my knowledge, my employer has rights to intellectual property that covers my contributions, I represent and warrant that I have received permission to make these contributions and grant the foregoing license(s) on behalf of my employer.*
|
14
14
|
|
@@ -16,7 +16,7 @@ Once we have your consent on file, you’ll only need to redo it if conditions c
|
|
16
16
|
|
17
17
|
## 2. Scope agreement and timeline commitment
|
18
18
|
|
19
|
-
If your contribution is small (e.g. a bug fix), simply submit your contribution via GitHub. If you find a bug, first make sure it is not an already known issue, then report it in the GitHub [issue tracker](https://github.com/urbanopt/urbanopt-
|
19
|
+
If your contribution is small (e.g. a bug fix), simply submit your contribution via GitHub. If you find a bug, first make sure it is not an already known issue, then report it in the GitHub [issue tracker](https://github.com/urbanopt/urbanopt-geojson-gem/issues) for this repository. If your contribution is larger (e.g. a new feature or new functionality/capability), we’ll need to evaluate your proposed contribution first. We may ask you to revise your materials and make changes to it, which we will then re-review.
|
20
20
|
|
21
21
|
## 3. Technical contribution process
|
22
22
|
|
data/Gemfile
CHANGED
@@ -11,14 +11,19 @@ gemspec
|
|
11
11
|
# checkout the latest version (develop) from github.
|
12
12
|
allow_local = ENV['FAVOR_LOCAL_GEMS']
|
13
13
|
|
14
|
+
# pin this dependency to avoid unicode_normalize error
|
15
|
+
gem 'addressable', '2.8.1'
|
16
|
+
# pin this dependency to avoid using racc dependency (which has native extensions)
|
17
|
+
gem 'parser', '3.2.2.2'
|
18
|
+
|
14
19
|
# if allow_local && File.exist?('../openstudio-extension-gem')
|
15
20
|
# gem 'openstudio-extension', path: '../openstudio-extension-gem'
|
16
21
|
# elsif allow_local
|
17
22
|
# gem 'openstudio-extension', github: 'NREL/openstudio-extension-gem', branch: 'develop'
|
18
23
|
# end
|
19
24
|
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
+
if allow_local && File.exist?('../urbanopt-core-gem')
|
26
|
+
gem 'urbanopt-core', path: '../urbanopt-core-gem'
|
27
|
+
elsif allow_local
|
28
|
+
gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
|
29
|
+
end
|
data/LICENSE.md
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
URBANopt
|
1
|
+
URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
|
2
2
|
contributors. All rights reserved.
|
3
3
|
|
4
4
|
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
|
|
25
25
|
underlying software originally provided by Alliance without the prior written
|
26
26
|
consent of Alliance.
|
27
27
|
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
OF
|
28
|
+
The name of the copyright holder(s), any contributors, the United States Government,
|
29
|
+
the United States Department of Energy, or any of their employees may not be used to
|
30
|
+
endorse or promote products derived from this software without specific prior written
|
31
|
+
permission from the respective party.
|
32
|
+
|
33
|
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND
|
34
|
+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
35
|
+
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
36
|
+
THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED
|
37
|
+
STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT,
|
38
|
+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
39
|
+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
40
|
+
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
41
|
+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
|
42
|
+
WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
data/README.md
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
# URBANopt GeoJSON Gem
|
2
2
|
|
3
|
-
[![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-geojson-gem/badge.svg?branch=
|
3
|
+
[![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)
|
4
|
+
[![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)
|
4
5
|
|
5
6
|
Library and measures to translate URBANopt™ GeoJSON format to OpenStudio. See the [developer documentation](https://urbanopt.github.io/urbanopt-geojson-gem/) for more details.
|
6
7
|
|
data/Rakefile
CHANGED
@@ -1,41 +1,6 @@
|
|
1
1
|
# *********************************************************************************
|
2
|
-
# URBANopt™, Copyright
|
3
|
-
#
|
4
|
-
|
5
|
-
# Redistribution and use in source and binary forms, with or without modification,
|
6
|
-
# are permitted provided that the following conditions are met:
|
7
|
-
|
8
|
-
# Redistributions of source code must retain the above copyright notice, this list
|
9
|
-
# of conditions and the following disclaimer.
|
10
|
-
|
11
|
-
# Redistributions in binary form must reproduce the above copyright notice, this
|
12
|
-
# list of conditions and the following disclaimer in the documentation and/or other
|
13
|
-
# materials provided with the distribution.
|
14
|
-
|
15
|
-
# Neither the name of the copyright holder nor the names of its contributors may be
|
16
|
-
# used to endorse or promote products derived from this software without specific
|
17
|
-
# prior written permission.
|
18
|
-
|
19
|
-
# Redistribution of this software, without modification, must refer to the software
|
20
|
-
# by the same designation. Redistribution of a modified version of this software
|
21
|
-
# (i) may not refer to the modified version by the same designation, or by any
|
22
|
-
# confusingly similar designation, and (ii) must refer to the underlying software
|
23
|
-
# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
|
24
|
-
# the term “URBANopt”, or any confusingly similar designation may not be used to
|
25
|
-
# refer to any modified version of this software or any modified version of the
|
26
|
-
# underlying software originally provided by Alliance without the prior written
|
27
|
-
# consent of Alliance.
|
28
|
-
|
29
|
-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
30
|
-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
31
|
-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
32
|
-
# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
33
|
-
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
34
|
-
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
35
|
-
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
36
|
-
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
37
|
-
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
38
|
-
# OF THE POSSIBILITY OF SUCH DAMAGE.
|
2
|
+
# URBANopt™, Copyright © Alliance for Sustainable Energy, LLC.
|
3
|
+
# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md
|
39
4
|
# *********************************************************************************
|
40
5
|
|
41
6
|
require 'bundler/gem_tasks'
|
data/doc_templates/LICENSE.md
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
URBANopt
|
1
|
+
URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
|
2
2
|
contributors. All rights reserved.
|
3
3
|
|
4
4
|
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
|
|
25
25
|
underlying software originally provided by Alliance without the prior written
|
26
26
|
consent of Alliance.
|
27
27
|
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
OF
|
28
|
+
The name of the copyright holder(s), any contributors, the United States Government,
|
29
|
+
the United States Department of Energy, or any of their employees may not be used to
|
30
|
+
endorse or promote products derived from this software without specific prior written
|
31
|
+
permission from the respective party.
|
32
|
+
|
33
|
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND
|
34
|
+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
35
|
+
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
36
|
+
THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED
|
37
|
+
STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT,
|
38
|
+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
39
|
+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
40
|
+
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
41
|
+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
|
42
|
+
WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
@@ -1,41 +1,6 @@
|
|
1
1
|
<%
|
2
2
|
# *********************************************************************************
|
3
|
-
# URBANopt
|
4
|
-
#
|
5
|
-
|
6
|
-
# Redistribution and use in source and binary forms, with or without modification,
|
7
|
-
# are permitted provided that the following conditions are met:
|
8
|
-
|
9
|
-
# Redistributions of source code must retain the above copyright notice, this list
|
10
|
-
# of conditions and the following disclaimer.
|
11
|
-
|
12
|
-
# Redistributions in binary form must reproduce the above copyright notice, this
|
13
|
-
# list of conditions and the following disclaimer in the documentation and/or other
|
14
|
-
# materials provided with the distribution.
|
15
|
-
|
16
|
-
# Neither the name of the copyright holder nor the names of its contributors may be
|
17
|
-
# used to endorse or promote products derived from this software without specific
|
18
|
-
# prior written permission.
|
19
|
-
|
20
|
-
# Redistribution of this software, without modification, must refer to the software
|
21
|
-
# by the same designation. Redistribution of a modified version of this software
|
22
|
-
# (i) may not refer to the modified version by the same designation, or by any
|
23
|
-
# confusingly similar designation, and (ii) must refer to the underlying software
|
24
|
-
# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
|
25
|
-
# the term “URBANopt”, or any confusingly similar designation may not be used to
|
26
|
-
# refer to any modified version of this software or any modified version of the
|
27
|
-
# underlying software originally provided by Alliance without the prior written
|
28
|
-
# consent of Alliance.
|
29
|
-
|
30
|
-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
31
|
-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
32
|
-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
33
|
-
# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
34
|
-
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
35
|
-
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
36
|
-
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
37
|
-
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
38
|
-
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
39
|
-
# OF THE POSSIBILITY OF SUCH DAMAGE.
|
3
|
+
# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
|
4
|
+
# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md
|
40
5
|
# *********************************************************************************
|
41
6
|
%>
|
@@ -1,4 +1,4 @@
|
|
1
1
|
/* @preserve
|
2
|
-
* URBANopt (tm), Copyright (c)
|
3
|
-
*
|
2
|
+
* URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
|
3
|
+
* See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md
|
4
4
|
*/
|
@@ -1,39 +1,4 @@
|
|
1
1
|
# *********************************************************************************
|
2
|
-
# URBANopt
|
3
|
-
#
|
4
|
-
|
5
|
-
# Redistribution and use in source and binary forms, with or without modification,
|
6
|
-
# are permitted provided that the following conditions are met:
|
7
|
-
|
8
|
-
# Redistributions of source code must retain the above copyright notice, this list
|
9
|
-
# of conditions and the following disclaimer.
|
10
|
-
|
11
|
-
# Redistributions in binary form must reproduce the above copyright notice, this
|
12
|
-
# list of conditions and the following disclaimer in the documentation and/or other
|
13
|
-
# materials provided with the distribution.
|
14
|
-
|
15
|
-
# Neither the name of the copyright holder nor the names of its contributors may be
|
16
|
-
# used to endorse or promote products derived from this software without specific
|
17
|
-
# prior written permission.
|
18
|
-
|
19
|
-
# Redistribution of this software, without modification, must refer to the software
|
20
|
-
# by the same designation. Redistribution of a modified version of this software
|
21
|
-
# (i) may not refer to the modified version by the same designation, or by any
|
22
|
-
# confusingly similar designation, and (ii) must refer to the underlying software
|
23
|
-
# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
|
24
|
-
# the term “URBANopt”, or any confusingly similar designation may not be used to
|
25
|
-
# refer to any modified version of this software or any modified version of the
|
26
|
-
# underlying software originally provided by Alliance without the prior written
|
27
|
-
# consent of Alliance.
|
28
|
-
|
29
|
-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
30
|
-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
31
|
-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
32
|
-
# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
33
|
-
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
34
|
-
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
35
|
-
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
36
|
-
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
37
|
-
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
38
|
-
# OF THE POSSIBILITY OF SUCH DAMAGE.
|
2
|
+
# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
|
3
|
+
# See also https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md
|
39
4
|
# *********************************************************************************
|