urbanopt-geojson 0.5.2 → 0.6.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (42) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +2 -3
  3. data/CHANGELOG.md +37 -0
  4. data/Gemfile +1 -1
  5. data/LICENSE.md +27 -17
  6. data/Rakefile +16 -6
  7. data/doc_templates/LICENSE.md +27 -17
  8. data/doc_templates/copyright_erb.txt +40 -30
  9. data/doc_templates/copyright_js.txt +1 -1
  10. data/doc_templates/copyright_ruby.txt +17 -7
  11. data/docs/package-lock.json +2534 -1585
  12. data/docs/package.json +9 -4
  13. data/lib/measures/urban_geometry_creation/LICENSE.md +27 -17
  14. data/lib/measures/urban_geometry_creation/measure.rb +16 -6
  15. data/lib/measures/urban_geometry_creation/measure.xml +12 -12
  16. data/lib/measures/urban_geometry_creation_zoning/LICENSE.md +27 -17
  17. data/lib/measures/urban_geometry_creation_zoning/measure.rb +16 -6
  18. data/lib/measures/urban_geometry_creation_zoning/measure.xml +27 -9
  19. data/lib/urbanopt-geojson.rb +16 -6
  20. data/lib/urbanopt/geojson.rb +16 -6
  21. data/lib/urbanopt/geojson/building.rb +16 -6
  22. data/lib/urbanopt/geojson/derived_extension.rb +16 -6
  23. data/lib/urbanopt/geojson/district_system.rb +16 -6
  24. data/lib/urbanopt/geojson/feature.rb +24 -11
  25. data/lib/urbanopt/geojson/geo_file.rb +16 -6
  26. data/lib/urbanopt/geojson/helper.rb +52 -42
  27. data/lib/urbanopt/geojson/logging.rb +16 -6
  28. data/lib/urbanopt/geojson/mapper_classes.rb +16 -6
  29. data/lib/urbanopt/geojson/model.rb +16 -6
  30. data/lib/urbanopt/geojson/region.rb +16 -6
  31. data/lib/urbanopt/geojson/scale_area.rb +16 -6
  32. data/lib/urbanopt/geojson/schema/building_properties.json +8 -7
  33. data/lib/urbanopt/geojson/schema/electrical_connector_properties.json +23 -14
  34. data/lib/urbanopt/geojson/schema/site_properties.json +8 -0
  35. data/lib/urbanopt/geojson/schema/thermal_connector_properties.json +1 -1
  36. data/lib/urbanopt/geojson/schema/thermal_junction_properties.json +1 -1
  37. data/lib/urbanopt/geojson/update_areas.rb +16 -6
  38. data/lib/urbanopt/geojson/validate_geojson.rb +16 -6
  39. data/lib/urbanopt/geojson/version.rb +17 -7
  40. data/lib/urbanopt/geojson/zoning.rb +16 -6
  41. data/urbanopt-geojson-gem.gemspec +3 -3
  42. metadata +9 -9
data/docs/package.json CHANGED
@@ -13,21 +13,26 @@
13
13
  "highlight.js": "^10.4.1",
14
14
  "json-schema-ref-parser": "^9.0.6",
15
15
  "json-schema-view-js": "git+https://git@github.com/bgschiller/json-schema-view-js.git",
16
- "vuepress": "^1.5.4",
16
+ "vuepress": "^1.8.2",
17
17
  "webpack-dev-middleware": "^3.6.0"
18
18
  },
19
19
  "devDependencies": {
20
20
  "braces": "^3.0.2",
21
+ "chokidar": "^3.5.1",
21
22
  "dot-prop": ">=5.1.1",
23
+ "fsevents": "^2.3.2",
22
24
  "gh-pages": "^3.1.0",
25
+ "ini": "^2.0.0",
26
+ "is-svg": "^4.3.1",
23
27
  "js-yaml": ">=3.13.1",
24
- "lodash": ">=4.17.19",
28
+ "lodash": ">=4.17.21",
25
29
  "lodash.template": ">=4.5.0",
26
30
  "minimist": ">=1.2.3",
27
31
  "mixin-deep": "^2.0.1",
28
32
  "serialize-javascript": "^5.0.1",
29
33
  "set-value": "^3.0.2",
30
- "yargs-parser": "^20.2.3",
31
- "ini": "^2.0.0"
34
+ "ssri": "^8.0.1",
35
+ "webpack": "^4.46.0",
36
+ "yargs-parser": "^20.2.3"
32
37
  }
33
38
  }
@@ -1,27 +1,37 @@
1
- URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
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
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
22
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
23
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
25
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
26
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
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,23 +1,33 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  # *********************************************************************************
4
- # URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
4
+ # URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
5
5
  # contributors. All rights reserved.
6
- #
6
+
7
7
  # Redistribution and use in source and binary forms, with or without modification,
8
8
  # are permitted provided that the following conditions are met:
9
- #
9
+
10
10
  # Redistributions of source code must retain the above copyright notice, this list
11
11
  # of conditions and the following disclaimer.
12
- #
12
+
13
13
  # Redistributions in binary form must reproduce the above copyright notice, this
14
14
  # list of conditions and the following disclaimer in the documentation and/or other
15
15
  # materials provided with the distribution.
16
- #
16
+
17
17
  # Neither the name of the copyright holder nor the names of its contributors may be
18
18
  # used to endorse or promote products derived from this software without specific
19
19
  # prior written permission.
20
- #
20
+
21
+ # Redistribution of this software, without modification, must refer to the software
22
+ # by the same designation. Redistribution of a modified version of this software
23
+ # (i) may not refer to the modified version by the same designation, or by any
24
+ # confusingly similar designation, and (ii) must refer to the underlying software
25
+ # originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
26
+ # the term “URBANopt”, or any confusingly similar designation may not be used to
27
+ # refer to any modified version of this software or any modified version of the
28
+ # underlying software originally provided by Alliance without the prior written
29
+ # consent of Alliance.
30
+
21
31
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
22
32
  # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
23
33
  # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>urban_geometry_creation</name>
5
5
  <uid>5ab85d6b-c9af-4361-8ab9-613ee99a5666</uid>
6
- <version_id>2e224aaa-0d77-486f-b8ef-c25121fabd91</version_id>
7
- <version_modified>20201208T232103Z</version_modified>
6
+ <version_id>9eeca0c7-ef9d-4829-aa2c-b2c138a963c1</version_id>
7
+ <version_modified>20210602T203055Z</version_modified>
8
8
  <xml_checksum>D254E772</xml_checksum>
9
9
  <class_name>UrbanGeometryCreation</class_name>
10
10
  <display_name>UrbanGeometryCreation</display_name>
@@ -116,23 +116,29 @@
116
116
  <usage_type>test</usage_type>
117
117
  <checksum>40290298</checksum>
118
118
  </file>
119
+ <file>
120
+ <filename>README.md</filename>
121
+ <filetype>md</filetype>
122
+ <usage_type>readme</usage_type>
123
+ <checksum>74F54DC5</checksum>
124
+ </file>
119
125
  <file>
120
126
  <filename>LICENSE.md</filename>
121
127
  <filetype>md</filetype>
122
128
  <usage_type>license</usage_type>
123
- <checksum>D8541540</checksum>
129
+ <checksum>03523BF4</checksum>
124
130
  </file>
125
131
  <file>
126
132
  <filename>shadowed_tests.rb</filename>
127
133
  <filetype>rb</filetype>
128
134
  <usage_type>test</usage_type>
129
- <checksum>F656F8DE</checksum>
135
+ <checksum>682820CD</checksum>
130
136
  </file>
131
137
  <file>
132
138
  <filename>urban_geometry_creation_test.rb</filename>
133
139
  <filetype>rb</filetype>
134
140
  <usage_type>test</usage_type>
135
- <checksum>B4A7376B</checksum>
141
+ <checksum>FD5181F7</checksum>
136
142
  </file>
137
143
  <file>
138
144
  <version>
@@ -143,13 +149,7 @@
143
149
  <filename>measure.rb</filename>
144
150
  <filetype>rb</filetype>
145
151
  <usage_type>script</usage_type>
146
- <checksum>791A977E</checksum>
147
- </file>
148
- <file>
149
- <filename>README.md</filename>
150
- <filetype>md</filetype>
151
- <usage_type>readme</usage_type>
152
- <checksum>74F54DC5</checksum>
152
+ <checksum>3667C98F</checksum>
153
153
  </file>
154
154
  </files>
155
155
  </measure>
@@ -1,27 +1,37 @@
1
- URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
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
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
22
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
23
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
25
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
26
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
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,23 +1,33 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  # *********************************************************************************
4
- # URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
4
+ # URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
5
5
  # contributors. All rights reserved.
6
- #
6
+
7
7
  # Redistribution and use in source and binary forms, with or without modification,
8
8
  # are permitted provided that the following conditions are met:
9
- #
9
+
10
10
  # Redistributions of source code must retain the above copyright notice, this list
11
11
  # of conditions and the following disclaimer.
12
- #
12
+
13
13
  # Redistributions in binary form must reproduce the above copyright notice, this
14
14
  # list of conditions and the following disclaimer in the documentation and/or other
15
15
  # materials provided with the distribution.
16
- #
16
+
17
17
  # Neither the name of the copyright holder nor the names of its contributors may be
18
18
  # used to endorse or promote products derived from this software without specific
19
19
  # prior written permission.
20
- #
20
+
21
+ # Redistribution of this software, without modification, must refer to the software
22
+ # by the same designation. Redistribution of a modified version of this software
23
+ # (i) may not refer to the modified version by the same designation, or by any
24
+ # confusingly similar designation, and (ii) must refer to the underlying software
25
+ # originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
26
+ # the term “URBANopt”, or any confusingly similar designation may not be used to
27
+ # refer to any modified version of this software or any modified version of the
28
+ # underlying software originally provided by Alliance without the prior written
29
+ # consent of Alliance.
30
+
21
31
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
22
32
  # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
23
33
  # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>urban_geometry_creation_zoning</name>
5
5
  <uid>96ea1317-76ac-4670-b51d-71ee3f4fdd65</uid>
6
- <version_id>0c0d1135-a50f-40c6-82fb-fc357e46dd02</version_id>
7
- <version_modified>20201208T232103Z</version_modified>
6
+ <version_id>c115c875-0e04-4ac9-990b-011811df23bb</version_id>
7
+ <version_modified>20210602T203056Z</version_modified>
8
8
  <xml_checksum>D254E772</xml_checksum>
9
9
  <class_name>UrbanGeometryCreationZoning</class_name>
10
10
  <display_name>UrbanGeometryCreationZoning</display_name>
@@ -97,11 +97,17 @@
97
97
  <usage_type>test</usage_type>
98
98
  <checksum>40290298</checksum>
99
99
  </file>
100
+ <file>
101
+ <filename>README.md</filename>
102
+ <filetype>md</filetype>
103
+ <usage_type>readme</usage_type>
104
+ <checksum>0458EE16</checksum>
105
+ </file>
100
106
  <file>
101
107
  <filename>LICENSE.md</filename>
102
108
  <filetype>md</filetype>
103
109
  <usage_type>license</usage_type>
104
- <checksum>D8541540</checksum>
110
+ <checksum>03523BF4</checksum>
105
111
  </file>
106
112
  <file>
107
113
  <version>
@@ -112,19 +118,31 @@
112
118
  <filename>measure.rb</filename>
113
119
  <filetype>rb</filetype>
114
120
  <usage_type>script</usage_type>
115
- <checksum>3E6D4653</checksum>
121
+ <checksum>290A59E6</checksum>
116
122
  </file>
117
123
  <file>
118
124
  <filename>urban_geometry_creation_zoning_test.rb</filename>
119
125
  <filetype>rb</filetype>
120
126
  <usage_type>test</usage_type>
121
- <checksum>D609CD4C</checksum>
127
+ <checksum>20775652</checksum>
122
128
  </file>
123
129
  <file>
124
- <filename>README.md</filename>
125
- <filetype>md</filetype>
126
- <usage_type>readme</usage_type>
127
- <checksum>0458EE16</checksum>
130
+ <filename>example_project_combined.json</filename>
131
+ <filetype>json</filetype>
132
+ <usage_type>test</usage_type>
133
+ <checksum>9BC47B41</checksum>
134
+ </file>
135
+ <file>
136
+ <filename>out.txt</filename>
137
+ <filetype>txt</filetype>
138
+ <usage_type>test</usage_type>
139
+ <checksum>7FAF05F3</checksum>
140
+ </file>
141
+ <file>
142
+ <filename>OV_Buildings_Update_090420_res_eui_test.json</filename>
143
+ <filetype>json</filetype>
144
+ <usage_type>test</usage_type>
145
+ <checksum>F611B1E8</checksum>
128
146
  </file>
129
147
  </files>
130
148
  </measure>
@@ -1,21 +1,31 @@
1
1
  # *********************************************************************************
2
- # URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
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.
@@ -1,21 +1,31 @@
1
1
  # *********************************************************************************
2
- # URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
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.
@@ -1,21 +1,31 @@
1
1
  # *********************************************************************************
2
- # URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
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.