urbanopt-geojson 0.3.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80cfe0ae8967e2b541207fa35a636db0ed735ca897220bca8b3c7525c635ccae
-  data.tar.gz: 151a2efe67159078c82cc8cdf6edcaec39e777597c11aeb09f678c408b458370
+  metadata.gz: 6e6798cc023b7d6893b23456a49922b70556f19d44e47803ddb3a2fe3a967782
+  data.tar.gz: ec8f97ed21e8feba56666102e707e4dadbca85aa59542e2ea8b0388717da78f8
 SHA512:
-  metadata.gz: 1ee7f22be5bba1aa611dcface714342ec167bb54ad4670fb6d162bbf9da24c25026f033f68dd2641dd6651a3af93dbe736b36a6df84e46f3632c14ffe040691d
-  data.tar.gz: 1670592b66f9dc9d23bd7cfb09fbcf223712cf012cb0273ed619c4b8d1e65cc30a2046efaa6edf939bfeaf897fef8665b23300081e86ae3b87b69722ae17bd32
+  metadata.gz: 85d40a5da5cf509bccaaf8866a6d310fa9b60a6b70b16977855c053b18d349cc09d48acc234dca536a17a0804b43243c8f7d5e8c0185eef9c7f8dad59f791ff2
+  data.tar.gz: e6f8008e2700746b9772244126d3c5be242972ec825fd250d62ba70a47f285bf915f088ef63b5c1aa0587ad98345e97de501fe4cac51e37a65c5d4dd50eaea48

data/.github/pull_request_template.md

@@ -1,4 +1,4 @@
-### Addresses #[issue number here]
+### Resolves #[issue number here]
 
 ### Pull Request Description
 
@@ -9,5 +9,5 @@
 - [ ] Unit tests have been added or updated
 - [ ] Documentation has been modified appropriately
 - [ ] All ci tests pass (green)
-- [ ] An [ISSUE](https://github.com/urbanopt/urbanopt-geojson-gem/issues) has been created that this is addressing. Issues will get added to the Change Log when the change_log.rb script is run.
+- [ ] An [issue](https://github.com/urbanopt/urbanopt-geojson-gem/issues) has been created (which will be used for the changelog)
 - [ ] This branch is up-to-date with develop

data/CHANGELOG.md

@@ -1,5 +1,49 @@
 # URBANopt GeoJSON Gem
- 
+
+## Version 0.5.3
+
+Date Range: 02/13/21 - 04/01/21
+
+- Fixed [#142]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/142 ), Update copyrights for 2021
+- Fixed [#146]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/146 ), Fix longitude, latitude input when calculating the feature center (long,lat).
+- Fixed [#148]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/148 ), remove comments in json schema element descriptions
+
+## Version 0.5.2
+
+Date Range: 12/10/20 - 02/12/21
+
+- Fixed [#140]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/140 ), Add fields associated to EV charging to building properties schema.
+
+## Version 0.5.1
+
+ Date Range: 12/02/20 - 12/09/20
+
+- Fixed [#131]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/131 ), OpenStudio 3.1.0 support
+- Fixed [#135]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/135 ), simplify dependencies
+
+## Version 0.5.0
+Date Range 09/26/20 - 12/02/20
+
+- Fixed [#124]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/124 ), DOCUMENTATION: Add docs on scaling for building footprint using building area
+- Fixed [#126]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/126 ), [BUG] setting timesteps_per_hour in a feature throws an error
+- Fixed [#131]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/131 ), OpenStudio 3.1.0 support
+
+## Version 0.4.0
+Date Range 08/08/20 - 09/25/20
+
+Accepted Pull Requests: 11
+- Fixed [#92]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/92 ), Adds scaling for building footprint using building area
+- Fixed [#96]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/96 ), Add residential template type enums
+- Fixed [#110]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/110 ), Bump prismjs from 1.16.0 to 1.21.0 in /docs
+- Fixed [#111]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/111 ), Bump serialize-javascript from 2.1.2 to 3.1.0 in /docs
+- Fixed [#113]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/113 ), switch Line to Wire on connector_type
+- Fixed [#114]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/114 ), Add residential template type enums, 2
+- Fixed [#116]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/116 ), adding tm symbol
+- Fixed [#117]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/117 ), Dbot
+- Fixed [#119]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/119 ), Create bar workflow
+- Fixed [#120]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/120 ), Require number of stories for residential
+- Fixed [#121]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/121 ), update urbanopt-geojson-gem.gemspec to use urbanopt-core 0.4.0
+
 ## Version 0.3.1
 Date Range 06/05/20 - 08/07/20
 
@@ -20,7 +64,7 @@ Date Range 3/25/20 - 06/04/20
 
 Updating to use with OpenStudio 3.0 and Ruby 2.5
 
-Accepted Pull Requests: 
+Accepted Pull Requests:
 - Fixed [#60]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/60 ), HPXML-based workflow for residential buildings
 - Fixed [#83]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/83 ), Add new system types to building properties schema
 - Fixed [#84]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/84 ), Updated system types with OpenStudio
@@ -61,6 +105,6 @@ error
 - Fixed [#78]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/78 ), 0.2.0.pre2
 - Fixed [#80]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/80 ), look for site features in project key instead of Site Origin feature
 
-## Version 0.1.0 
+## Version 0.1.0
 
-* Initial release of the URBANopt GeoJSON Gem
+* Initial release of the URBANopt GeoJSON Gem

data/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Version 1.0
 
-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.
+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.
 
 The contribution process for URBANopt is composed of three steps:
 

data/LICENSE.md

@@ -1,27 +1,39 @@
-URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
+# License
+
+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, 
+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 
+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 
+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 
+
+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.
 
-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 
+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.

data/RDOC_MAIN.md

@@ -2,53 +2,57 @@
 
 ### [back to main docs](../)
 
-The URBANopt GeoJSON Gem has been developed by restructuring methods extracted from the
+The URBANopt™ GeoJSON Gem has been developed by restructuring methods extracted from the
 [urban_geometry_creation](https://github.com/NREL/openstudio-urban-measures/tree/develop/measures/urban_geometry_creation)
 and
 [urban_geometry_creation_zoning.](https://github.com/NREL/openstudio-urban-measures/tree/develop/measures/urban_geometry_creation_zoning)
 
-The +urban_geometry_creation+ measure can be used to create an OpenStudio Model for a
+The `urban_geometry_creation` measure can be used to create an OpenStudio Model for a
 building feature from the feature file and create the surrounding buildings that are shading the
 building feature as shading objects.
-The arguments used in the measure are the +GeoJSON File+, +Feature ID+ of the building and +Surrounding Buildings+. The
-Surrounding Buildings argument takes two possible choices - None or Shading Only. The None choice
+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
+`surrounding_buildings` argument takes two possible choices - None or Shading Only. The None choice
 would create no other buildings adjacent to the building feature while the Shading Only option
-determines what other buildings are shading the building feature and creates them as OpenStudio Shading Surfaces.
+determines what other buildings are shading the building feature and creates them as OpenStudio
+Shading Surfaces. The `scale_footprint_area_by_floor_area` is an optional argument that is set to
+false by default. When set to true, the building footprint area is calculated from the
+floor_area/number_of_stories for the building in the GeoJSON file and this footprint area is used to
+scale the building coordinates and create the building.
 
-The +urban_geometry_creation_zoning+ measure has the same capabilities as the
-+urban_geometry_creation+ measure, however it also creates core and perimeter zones for the spaces
-in the OpenStudio Model. It takes in the same arguments as the +urban_geometry_creation+ measure. 
+The `urban_geometry_creation_zoning` measure has the same capabilities as the
+`urban_geometry_creation` measure, however it also creates core and perimeter zones for the spaces
+in the OpenStudio Model. It takes in the `geojson_file`, `feature_id` of the building,
+`surrounding_buildings` as arguments.
 
 The main components of the gem are:
 
-- geojson.rb : Base gem file that imports all modules and classes. 
+- geojson.rb : Base gem file that imports all modules and classes.
 - extension.rb : The extension class inherits from OpenStudio::Extension::Extension, and
-  overrides the following methods as needed -
+  overrides the following methods as needed
     - _measures_dir_
     - _files_dir_
     - _doc_templates_dir_
-- Gemfile and .gemspec : Describe the extension dependencies on other gems. 
-- Classes and Modules within +lib/urbanopt/geojson+ -
-
+- Gemfile and .gemspec : Describe the extension dependencies on other gems.
+- Classes and Modules within `lib/urbanopt/geojson`
 
     *Modules that do not require instances for calling the methods:*
 
     - URBANopt::GeoJSON::Helper : Contains methods extracted from the two measures to
-      perform utility-like tasks like - +is_shaded+ and +is_shadowed+.
+      perform utility-like tasks like - `is_shaded` and `is_shadowed`.
     - URBANopt::GeoJSON::Zoning : Contains methods extracted from
-      +urban_geometry_creation_zoning+ .
+      `urban_geometry_creation_zoning`.
     - URBANopt::GeoJSON::Model : Contains methods that perform tasks on an instance of
-      +OpenStudio::Model::Model+. 
+      `OpenStudio::Model::Model`.
 
     *Classes and subclasses that contain instance-dependant methods and private methods
     that perform tasks on the given feature.*
 
-    - URBANopt::GeoJSON::GeoFile : Contains a +get_feature+ method that returns an
+    - URBANopt::GeoJSON::GeoFile : Contains a `get_feature` method that returns an
       instance of a Feature Subclass for the the feature type. Also contains methods to validate the GeoJSON
-      file against the GeoJSON schema. 
-    - URBANopt::GeoJSON::Feature : Contains methods to return +feature+ +id+ , +name+ ,
-      +multiple+ +polygons+ +coordinates+ which are inherited by classes for all feature types.
+      file against the GeoJSON schema.
+    - URBANopt::GeoJSON::Feature : Contains methods to return `feature id` , `name` ,
+      `multiple polygons coordinates` which are inherited by classes for all feature types.
     - URBANopt::GeoJSON::Building : A subclass of Feature, contains class methods that
-      are specific to handling features of the Building type. 
+      are specific to handling features of the Building type.
     - URBANopt::GeoJSON::DistrictSystem : A subclass of Feature, contains class methods
-      that are specific to handling features of District System type. *Note: This subclass does not contain any methods yet*. 
+      that are specific to handling features of District System type. *Note: This subclass does not contain any methods yet*.

data/README.md

@@ -1,6 +1,6 @@
 # URBANopt GeoJSON Gem
 
-Library and measures to translate URBANopt GeoJSON format to OpenStudio. See the [developer documentation](https://urbanopt.github.io/urbanopt-geojson-gem/) for more details.
+Library and measures to translate URBANopt™ GeoJSON format to OpenStudio. See the [developer documentation](https://urbanopt.github.io/urbanopt-geojson-gem/) for more details.
 
 ## Installation
 
@@ -12,7 +12,7 @@ gem 'urbanopt-geojson'
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 

data/Rakefile

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

data/doc_templates/LICENSE.md

@@ -1,27 +1,37 @@
-URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
+URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
 contributors. All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, 
+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 
+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 
+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 
+
+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.
 
-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 
+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.

data/doc_templates/copyright_erb.txt

@@ -1,31 +1,41 @@
 <%
-  # *********************************************************************************
-  # URBANopt, Copyright (c) 2019-2020, 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.
-  #
-  # 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 (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.
+# *********************************************************************************
+%>

data/doc_templates/copyright_js.txt

@@ -1,4 +1,4 @@
 /* @preserve
- * URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
+ * URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
  * Use of this source code is governed by the BSD 3-Clause license.
 */

data/doc_templates/copyright_ruby.txt

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