urbanopt-geojson 0.4.0 → 0.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/pull_request_template.md +2 -2
- data/CHANGELOG.md +39 -5
- data/CONTRIBUTING.md +1 -1
- data/Gemfile +1 -1
- data/LICENSE.md +29 -17
- data/RDOC_MAIN.md +26 -22
- data/README.md +2 -2
- data/Rakefile +16 -6
- data/doc_templates/LICENSE.md +27 -17
- data/doc_templates/copyright_erb.txt +40 -30
- data/doc_templates/copyright_js.txt +1 -1
- data/doc_templates/copyright_ruby.txt +17 -7
- data/docs/.vuepress/components/InnerJsonSchema.vue +7 -11
- data/docs/.vuepress/config.js +11 -1
- data/docs/.vuepress/highlight.js +1 -1
- data/docs/.vuepress/json-schema-deref-loader.js +22 -0
- data/docs/README.md +3 -4
- data/docs/package-lock.json +2526 -1587
- data/docs/package.json +9 -3
- data/lib/measures/urban_geometry_creation/LICENSE.md +27 -17
- data/lib/measures/urban_geometry_creation/README.md +9 -1
- data/lib/measures/urban_geometry_creation/measure.rb +16 -6
- data/lib/measures/urban_geometry_creation/measure.xml +33 -14
- data/lib/measures/urban_geometry_creation_zoning/LICENSE.md +27 -17
- data/lib/measures/urban_geometry_creation_zoning/README.md +1 -1
- data/lib/measures/urban_geometry_creation_zoning/measure.rb +16 -6
- data/lib/measures/urban_geometry_creation_zoning/measure.xml +11 -11
- data/lib/urbanopt-geojson.rb +16 -6
- data/lib/urbanopt/geojson.rb +16 -6
- data/lib/urbanopt/geojson/building.rb +25 -9
- data/lib/urbanopt/geojson/derived_extension.rb +16 -6
- data/lib/urbanopt/geojson/district_system.rb +16 -6
- data/lib/urbanopt/geojson/feature.rb +23 -8
- data/lib/urbanopt/geojson/geo_file.rb +17 -7
- data/lib/urbanopt/geojson/helper.rb +24 -7
- data/lib/urbanopt/geojson/logging.rb +16 -6
- data/lib/urbanopt/geojson/mapper_classes.rb +16 -6
- data/lib/urbanopt/geojson/model.rb +11 -1
- data/lib/urbanopt/geojson/region.rb +11 -1
- data/lib/urbanopt/geojson/scale_area.rb +17 -3
- data/lib/urbanopt/geojson/schema/building_properties.json +45 -6
- data/lib/urbanopt/geojson/schema/electrical_connector_properties.json +23 -14
- data/lib/urbanopt/geojson/schema/thermal_connector_properties.json +1 -1
- data/lib/urbanopt/geojson/schema/thermal_junction_properties.json +1 -1
- data/lib/urbanopt/geojson/update_areas.rb +11 -1
- data/lib/urbanopt/geojson/validate_geojson.rb +11 -1
- data/lib/urbanopt/geojson/version.rb +12 -2
- data/lib/urbanopt/geojson/zoning.rb +11 -1
- data/urbanopt-geojson-gem.gemspec +3 -4
- metadata +11 -24
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1177155e42c7b976e0bba641d13617dae7db1220e971fb44e2eacd36c56cf604
|
4
|
+
data.tar.gz: 3f652cdd3f2e48f0b03b3e8442ac6cbf59e8e11d022b2ced4ee169a217154a68
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 07f86e2c1b21a9c3ece7b22a45da2d80cb5bfe3231e5e8a774055abe8f27b62899ed7dac00691a8d960f20d8c3d94f14d0b8c15c17f99662d4e0ca2c9d363cd5
|
7
|
+
data.tar.gz: 93909d7d9d6d66756d8f67c8e21ed91153f67fd7f8ce3e848cbe351958071cb99257ce880c6035a44a101f95865033463b8a7f9b2fe65f5af6787271d8af4908
|
@@ -1,4 +1,4 @@
|
|
1
|
-
###
|
1
|
+
### Resolves #[issue number here]
|
2
2
|
|
3
3
|
### Pull Request Description
|
4
4
|
|
@@ -9,5 +9,5 @@
|
|
9
9
|
- [ ] Unit tests have been added or updated
|
10
10
|
- [ ] Documentation has been modified appropriately
|
11
11
|
- [ ] All ci tests pass (green)
|
12
|
-
- [ ] An [
|
12
|
+
- [ ] An [issue](https://github.com/urbanopt/urbanopt-geojson-gem/issues) has been created (which will be used for the changelog)
|
13
13
|
- [ ] This branch is up-to-date with develop
|
data/CHANGELOG.md
CHANGED
@@ -1,7 +1,41 @@
|
|
1
1
|
# URBANopt GeoJSON Gem
|
2
|
-
|
2
|
+
|
3
|
+
## Version 0.6.0
|
4
|
+
|
5
|
+
Date Range: 04/02/21 - 04/26/21
|
6
|
+
|
7
|
+
- Upgraded dependencies to support OpenStudio 3.2.0 and Ruby 2.7
|
8
|
+
|
9
|
+
## Version 0.5.3
|
10
|
+
|
11
|
+
Date Range: 02/13/21 - 04/01/21
|
12
|
+
|
13
|
+
- Fixed [#142]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/142 ), Update copyrights for 2021
|
14
|
+
- Fixed [#146]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/146 ), Fix longitude, latitude input when calculating the feature center (long,lat).
|
15
|
+
- Fixed [#148]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/148 ), remove comments in json schema element descriptions
|
16
|
+
|
17
|
+
## Version 0.5.2
|
18
|
+
|
19
|
+
Date Range: 12/10/20 - 02/12/21
|
20
|
+
|
21
|
+
- Fixed [#140]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/140 ), Add fields associated to EV charging to building properties schema.
|
22
|
+
|
23
|
+
## Version 0.5.1
|
24
|
+
|
25
|
+
Date Range: 12/02/20 - 12/09/20
|
26
|
+
|
27
|
+
- Fixed [#131]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/131 ), OpenStudio 3.1.0 support
|
28
|
+
- Fixed [#135]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/135 ), simplify dependencies
|
29
|
+
|
30
|
+
## Version 0.5.0
|
31
|
+
Date Range 09/26/20 - 12/02/20
|
32
|
+
|
33
|
+
- Fixed [#124]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/124 ), DOCUMENTATION: Add docs on scaling for building footprint using building area
|
34
|
+
- Fixed [#126]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/126 ), [BUG] setting timesteps_per_hour in a feature throws an error
|
35
|
+
- Fixed [#131]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/131 ), OpenStudio 3.1.0 support
|
36
|
+
|
3
37
|
## Version 0.4.0
|
4
|
-
Date
|
38
|
+
Date Range 08/08/20 - 09/25/20
|
5
39
|
|
6
40
|
Accepted Pull Requests: 11
|
7
41
|
- Fixed [#92]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/92 ), Adds scaling for building footprint using building area
|
@@ -36,7 +70,7 @@ Date Range 3/25/20 - 06/04/20
|
|
36
70
|
|
37
71
|
Updating to use with OpenStudio 3.0 and Ruby 2.5
|
38
72
|
|
39
|
-
Accepted Pull Requests:
|
73
|
+
Accepted Pull Requests:
|
40
74
|
- Fixed [#60]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/60 ), HPXML-based workflow for residential buildings
|
41
75
|
- Fixed [#83]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/83 ), Add new system types to building properties schema
|
42
76
|
- Fixed [#84]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/84 ), Updated system types with OpenStudio
|
@@ -77,6 +111,6 @@ error
|
|
77
111
|
- Fixed [#78]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/78 ), 0.2.0.pre2
|
78
112
|
- Fixed [#80]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/80 ), look for site features in project key instead of Site Origin feature
|
79
113
|
|
80
|
-
## Version 0.1.0
|
114
|
+
## Version 0.1.0
|
81
115
|
|
82
|
-
* Initial release of the URBANopt GeoJSON Gem
|
116
|
+
* Initial release of the URBANopt GeoJSON Gem
|
data/CONTRIBUTING.md
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
## Version 1.0
|
4
4
|
|
5
|
-
The URBANopt
|
5
|
+
The URBANopt™ team welcomes your contribution to the project. You can contribute to the URBANopt project in several ways: by using the software, reporting issues, contributing documentation, or contributing code back to the project. The GitHub [Contributing to Open Source](https://opensource.guide/how-to-contribute/) guide provides a good overview. If you contribute code, you agree that your contribution may be incorporated into the URBANopt Software Development Kit (SDK) and made available under the URBANopt SDK license.
|
6
6
|
|
7
7
|
The contribution process for URBANopt is composed of three steps:
|
8
8
|
|
data/Gemfile
CHANGED
data/LICENSE.md
CHANGED
@@ -1,27 +1,39 @@
|
|
1
|
-
|
1
|
+
# License
|
2
|
+
|
3
|
+
URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
|
2
4
|
contributors. All rights reserved.
|
3
5
|
|
4
|
-
Redistribution and use in source and binary forms, with or without modification,
|
6
|
+
Redistribution and use in source and binary forms, with or without modification,
|
5
7
|
are permitted provided that the following conditions are met:
|
6
8
|
|
7
|
-
Redistributions of source code must retain the above copyright notice, this list
|
9
|
+
Redistributions of source code must retain the above copyright notice, this list
|
8
10
|
of conditions and the following disclaimer.
|
9
11
|
|
10
|
-
Redistributions in binary form must reproduce the above copyright notice, this
|
11
|
-
list of conditions and the following disclaimer in the documentation and/or other
|
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
|
12
14
|
materials provided with the distribution.
|
13
|
-
|
14
|
-
Neither the name of the copyright holder nor the names of its contributors may be
|
15
|
-
used to endorse or promote products derived from this software without specific
|
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
|
16
18
|
prior written permission.
|
17
19
|
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
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
|
27
39
|
OF THE POSSIBILITY OF SUCH DAMAGE.
|
data/RDOC_MAIN.md
CHANGED
@@ -2,53 +2,57 @@
|
|
2
2
|
|
3
3
|
### [back to main docs](../)
|
4
4
|
|
5
|
-
The URBANopt
|
5
|
+
The URBANopt™ GeoJSON Gem has been developed by restructuring methods extracted from the
|
6
6
|
[urban_geometry_creation](https://github.com/NREL/openstudio-urban-measures/tree/develop/measures/urban_geometry_creation)
|
7
7
|
and
|
8
8
|
[urban_geometry_creation_zoning.](https://github.com/NREL/openstudio-urban-measures/tree/develop/measures/urban_geometry_creation_zoning)
|
9
9
|
|
10
|
-
The
|
10
|
+
The `urban_geometry_creation` measure can be used to create an OpenStudio Model for a
|
11
11
|
building feature from the feature file and create the surrounding buildings that are shading the
|
12
12
|
building feature as shading objects.
|
13
|
-
The arguments used in the measure are the
|
14
|
-
|
13
|
+
The arguments used in the measure are the `geojson_file`, `feature_id` of the building, `surrounding_buildings` and `scale_footprint_area_by_floor_area`. The
|
14
|
+
`surrounding_buildings` argument takes two possible choices - None or Shading Only. The None choice
|
15
15
|
would create no other buildings adjacent to the building feature while the Shading Only option
|
16
|
-
determines what other buildings are shading the building feature and creates them as OpenStudio
|
16
|
+
determines what other buildings are shading the building feature and creates them as OpenStudio
|
17
|
+
Shading Surfaces. The `scale_footprint_area_by_floor_area` is an optional argument that is set to
|
18
|
+
false by default. When set to true, the building footprint area is calculated from the
|
19
|
+
floor_area/number_of_stories for the building in the GeoJSON file and this footprint area is used to
|
20
|
+
scale the building coordinates and create the building.
|
17
21
|
|
18
|
-
The
|
19
|
-
|
20
|
-
in the OpenStudio Model. It takes in the
|
22
|
+
The `urban_geometry_creation_zoning` measure has the same capabilities as the
|
23
|
+
`urban_geometry_creation` measure, however it also creates core and perimeter zones for the spaces
|
24
|
+
in the OpenStudio Model. It takes in the `geojson_file`, `feature_id` of the building,
|
25
|
+
`surrounding_buildings` as arguments.
|
21
26
|
|
22
27
|
The main components of the gem are:
|
23
28
|
|
24
|
-
- geojson.rb : Base gem file that imports all modules and classes.
|
29
|
+
- geojson.rb : Base gem file that imports all modules and classes.
|
25
30
|
- extension.rb : The extension class inherits from OpenStudio::Extension::Extension, and
|
26
|
-
overrides the following methods as needed
|
31
|
+
overrides the following methods as needed
|
27
32
|
- _measures_dir_
|
28
33
|
- _files_dir_
|
29
34
|
- _doc_templates_dir_
|
30
|
-
- Gemfile and .gemspec : Describe the extension dependencies on other gems.
|
31
|
-
- Classes and Modules within
|
32
|
-
|
35
|
+
- Gemfile and .gemspec : Describe the extension dependencies on other gems.
|
36
|
+
- Classes and Modules within `lib/urbanopt/geojson`
|
33
37
|
|
34
38
|
*Modules that do not require instances for calling the methods:*
|
35
39
|
|
36
40
|
- URBANopt::GeoJSON::Helper : Contains methods extracted from the two measures to
|
37
|
-
perform utility-like tasks like -
|
41
|
+
perform utility-like tasks like - `is_shaded` and `is_shadowed`.
|
38
42
|
- URBANopt::GeoJSON::Zoning : Contains methods extracted from
|
39
|
-
|
43
|
+
`urban_geometry_creation_zoning`.
|
40
44
|
- URBANopt::GeoJSON::Model : Contains methods that perform tasks on an instance of
|
41
|
-
|
45
|
+
`OpenStudio::Model::Model`.
|
42
46
|
|
43
47
|
*Classes and subclasses that contain instance-dependant methods and private methods
|
44
48
|
that perform tasks on the given feature.*
|
45
49
|
|
46
|
-
- URBANopt::GeoJSON::GeoFile : Contains a
|
50
|
+
- URBANopt::GeoJSON::GeoFile : Contains a `get_feature` method that returns an
|
47
51
|
instance of a Feature Subclass for the the feature type. Also contains methods to validate the GeoJSON
|
48
|
-
file against the GeoJSON schema.
|
49
|
-
- URBANopt::GeoJSON::Feature : Contains methods to return
|
50
|
-
|
52
|
+
file against the GeoJSON schema.
|
53
|
+
- URBANopt::GeoJSON::Feature : Contains methods to return `feature id` , `name` ,
|
54
|
+
`multiple polygons coordinates` which are inherited by classes for all feature types.
|
51
55
|
- URBANopt::GeoJSON::Building : A subclass of Feature, contains class methods that
|
52
|
-
are specific to handling features of the Building type.
|
56
|
+
are specific to handling features of the Building type.
|
53
57
|
- URBANopt::GeoJSON::DistrictSystem : A subclass of Feature, contains class methods
|
54
|
-
that are specific to handling features of District System type. *Note: This subclass does not contain any methods yet*.
|
58
|
+
that are specific to handling features of District System type. *Note: This subclass does not contain any methods yet*.
|
data/README.md
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# URBANopt GeoJSON Gem
|
2
2
|
|
3
|
-
Library and measures to translate URBANopt
|
3
|
+
Library and measures to translate URBANopt™ GeoJSON format to OpenStudio. See the [developer documentation](https://urbanopt.github.io/urbanopt-geojson-gem/) for more details.
|
4
4
|
|
5
5
|
## Installation
|
6
6
|
|
@@ -12,7 +12,7 @@ gem 'urbanopt-geojson'
|
|
12
12
|
|
13
13
|
And then execute:
|
14
14
|
|
15
|
-
$ bundle
|
15
|
+
$ bundle install
|
16
16
|
|
17
17
|
Or install it yourself as:
|
18
18
|
|
data/Rakefile
CHANGED
@@ -1,21 +1,31 @@
|
|
1
1
|
# *********************************************************************************
|
2
|
-
# URBANopt
|
2
|
+
# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
|
3
3
|
# contributors. All rights reserved.
|
4
|
-
|
4
|
+
|
5
5
|
# Redistribution and use in source and binary forms, with or without modification,
|
6
6
|
# are permitted provided that the following conditions are met:
|
7
|
-
|
7
|
+
|
8
8
|
# Redistributions of source code must retain the above copyright notice, this list
|
9
9
|
# of conditions and the following disclaimer.
|
10
|
-
|
10
|
+
|
11
11
|
# Redistributions in binary form must reproduce the above copyright notice, this
|
12
12
|
# list of conditions and the following disclaimer in the documentation and/or other
|
13
13
|
# materials provided with the distribution.
|
14
|
-
|
14
|
+
|
15
15
|
# Neither the name of the copyright holder nor the names of its contributors may be
|
16
16
|
# used to endorse or promote products derived from this software without specific
|
17
17
|
# prior written permission.
|
18
|
-
|
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
|
+
|
19
29
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
20
30
|
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
21
31
|
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
data/doc_templates/LICENSE.md
CHANGED
@@ -1,27 +1,37 @@
|
|
1
|
-
URBANopt™, Copyright (c) 2019-
|
1
|
+
URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
|
2
2
|
contributors. All rights reserved.
|
3
3
|
|
4
|
-
Redistribution and use in source and binary forms, with or without modification,
|
4
|
+
Redistribution and use in source and binary forms, with or without modification,
|
5
5
|
are permitted provided that the following conditions are met:
|
6
6
|
|
7
|
-
Redistributions of source code must retain the above copyright notice, this list
|
7
|
+
Redistributions of source code must retain the above copyright notice, this list
|
8
8
|
of conditions and the following disclaimer.
|
9
9
|
|
10
|
-
Redistributions in binary form must reproduce the above copyright notice, this
|
11
|
-
list of conditions and the following disclaimer in the documentation and/or other
|
10
|
+
Redistributions in binary form must reproduce the above copyright notice, this
|
11
|
+
list of conditions and the following disclaimer in the documentation and/or other
|
12
12
|
materials provided with the distribution.
|
13
|
-
|
14
|
-
Neither the name of the copyright holder nor the names of its contributors may be
|
15
|
-
used to endorse or promote products derived from this software without specific
|
13
|
+
|
14
|
+
Neither the name of the copyright holder nor the names of its contributors may be
|
15
|
+
used to endorse or promote products derived from this software without specific
|
16
16
|
prior written permission.
|
17
17
|
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
18
|
+
Redistribution of this software, without modification, must refer to the software
|
19
|
+
by the same designation. Redistribution of a modified version of this software
|
20
|
+
(i) may not refer to the modified version by the same designation, or by any
|
21
|
+
confusingly similar designation, and (ii) must refer to the underlying software
|
22
|
+
originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
|
23
|
+
the term “URBANopt”, or any confusingly similar designation may not be used to
|
24
|
+
refer to any modified version of this software or any modified version of the
|
25
|
+
underlying software originally provided by Alliance without the prior written
|
26
|
+
consent of Alliance.
|
27
|
+
|
28
|
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
29
|
+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
30
|
+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
31
|
+
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
32
|
+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
33
|
+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
34
|
+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
35
|
+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
36
|
+
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
27
37
|
OF THE POSSIBILITY OF SUCH DAMAGE.
|
@@ -1,31 +1,41 @@
|
|
1
1
|
<%
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
2
|
+
# *********************************************************************************
|
3
|
+
# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
|
4
|
+
# contributors. All rights reserved.
|
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.
|
40
|
+
# *********************************************************************************
|
41
|
+
%>
|
@@ -1,4 +1,4 @@
|
|
1
1
|
/* @preserve
|
2
|
-
* URBANopt
|
2
|
+
* URBANopt (tm), Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
|
3
3
|
* Use of this source code is governed by the BSD 3-Clause license.
|
4
4
|
*/
|
@@ -1,21 +1,31 @@
|
|
1
1
|
# *********************************************************************************
|
2
|
-
# URBANopt™, Copyright (c) 2019-
|
2
|
+
# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
|
3
3
|
# contributors. All rights reserved.
|
4
|
-
|
4
|
+
|
5
5
|
# Redistribution and use in source and binary forms, with or without modification,
|
6
6
|
# are permitted provided that the following conditions are met:
|
7
|
-
|
7
|
+
|
8
8
|
# Redistributions of source code must retain the above copyright notice, this list
|
9
9
|
# of conditions and the following disclaimer.
|
10
|
-
|
10
|
+
|
11
11
|
# Redistributions in binary form must reproduce the above copyright notice, this
|
12
12
|
# list of conditions and the following disclaimer in the documentation and/or other
|
13
13
|
# materials provided with the distribution.
|
14
|
-
|
14
|
+
|
15
15
|
# Neither the name of the copyright holder nor the names of its contributors may be
|
16
16
|
# used to endorse or promote products derived from this software without specific
|
17
17
|
# prior written permission.
|
18
|
-
|
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
|
+
|
19
29
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
20
30
|
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
21
31
|
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
@@ -26,4 +36,4 @@
|
|
26
36
|
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
27
37
|
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
28
38
|
# OF THE POSSIBILITY OF SUCH DAMAGE.
|
29
|
-
# *********************************************************************************
|
39
|
+
# *********************************************************************************
|