Skip to content

Commit c7e9659

Browse files
kfleminkflemin
authored
Merge pull request #123 from urbanopt/develop
Version 0.4.0
2 parents 610e30a + c19b119 commit c7e9659

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+6460
-7488
lines changed

‎CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# URBANopt GeoJSON Gem
22

3+
## Version 0.4.0
4+
Date Rage 08/08/20 - 09/25/20
5+
6+
Accepted Pull Requests: 11
7+
- Fixed [#92]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/92 ), Adds scaling for building footprint using building area
8+
- Fixed [#96]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/96 ), Add residential template type enums
9+
- Fixed [#110]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/110 ), Bump prismjs from 1.16.0 to 1.21.0 in /docs
10+
- Fixed [#111]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/111 ), Bump serialize-javascript from 2.1.2 to 3.1.0 in /docs
11+
- Fixed [#113]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/113 ), switch Line to Wire on connector_type
12+
- Fixed [#114]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/114 ), Add residential template type enums, 2
13+
- Fixed [#116]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/116 ), adding tm symbol
14+
- Fixed [#117]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/117 ), Dbot
15+
- Fixed [#119]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/119 ), Create bar workflow
16+
- Fixed [#120]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/120 ), Require number of stories for residential
17+
- Fixed [#121]( https://github.com/urbanopt/urbanopt-geojson-gem/pull/121 ), update urbanopt-geojson-gem.gemspec to use urbanopt-core 0.4.0
18+
319
## Version 0.3.1
420
Date Range 06/05/20 - 08/07/20
521

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Version 1.0
44

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.
5+
The URBANopt<sup>&trade;</sup> 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.
66

77
The contribution process for URBANopt is composed of three steps:
88

‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
1+
URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
22
contributors. All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

‎RDOC_MAIN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### [back to main docs](../)
44

5-
The URBANopt GeoJSON Gem has been developed by restructuring methods extracted from the
5+
The URBANopt<sup>&trade;</sup> GeoJSON Gem has been developed by restructuring methods extracted from the
66
[urban_geometry_creation](https://github.com/NREL/openstudio-urban-measures/tree/develop/measures/urban_geometry_creation)
77
and
88
[urban_geometry_creation_zoning.](https://github.com/NREL/openstudio-urban-measures/tree/develop/measures/urban_geometry_creation_zoning)

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# URBANopt GeoJSON Gem
22

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.
3+
Library and measures to translate URBANopt<sup>&trade;</sup> GeoJSON format to OpenStudio. See the [developer documentation](https://urbanopt.github.io/urbanopt-geojson-gem/) for more details.
44

55
## Installation
66

‎Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# *********************************************************************************
2-
# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
2+
# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
33
# contributors. All rights reserved.
44
#
55
# Redistribution and use in source and binary forms, with or without modification,

‎doc_templates/LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
1+
URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
22
contributors. All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

‎doc_templates/copyright_erb.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%
22
# *********************************************************************************
3-
# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
3+
# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
44
# contributors. All rights reserved.
55
#
66
# Redistribution and use in source and binary forms, with or without modification,

‎doc_templates/copyright_js.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/* @preserve
2-
* URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
2+
* URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
33
* Use of this source code is governed by the BSD 3-Clause license.
44
*/

‎doc_templates/copyright_ruby.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# *********************************************************************************
2-
# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
2+
# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
33
# contributors. All rights reserved.
44
#
55
# Redistribution and use in source and binary forms, with or without modification,

‎docs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### <StaticLink href="rdoc/">Rdocs</StaticLink>
44

5-
The URBANopt GeoJSON Gem is an OpenStudio Extension Gem with functionality to translate
5+
The URBANopt<sup>&trade;</sup> GeoJSON Gem is an OpenStudio Extension Gem with functionality to translate
66
information in a GeoJSON format to energy model inputs. GeoJSON is a commonly used
77
format for describing geospatial data related to the built environment.
88

0 commit comments

Comments
 (0)