Skip to content

Commit b5595ae

Browse files
kfleminkflemin
authored
Merge pull request #151 from urbanopt/develop
Prep Version 0.5.3
2 parents f071cf7 + e06d6e3 commit b5595ae

29 files changed

+482
-243
lines changed

‎CHANGELOG.md

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

3+
## Version 0.5.3
4+
5+
Date Range: 02/13/21 - 04/01/21
6+
7+
- Fixed [#142]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/142 ), Update copyrights for 2021
8+
- Fixed [#146]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/146 ), Fix longitude, latitude input when calculating the feature center (long,lat).
9+
- Fixed [#148]( https://github.com/urbanopt/urbanopt-geojson-gem/issues/148 ), remove comments in json schema element descriptions
10+
311
## Version 0.5.2
412

513
Date Range: 12/10/20 - 02/12/21

‎LICENSE.md

+29-17
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,39 @@
1-
URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
1+
# License
2+
3+
URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
24
contributors. All rights reserved.
35

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,
57
are permitted provided that the following conditions are met:
68

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
810
of conditions and the following disclaimer.
911

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
1214
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
1618
prior written permission.
1719

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
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
2739
OF THE POSSIBILITY OF SUCH DAMAGE.

‎Rakefile

+16-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,31 @@
11
# *********************************************************************************
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
33
# contributors. All rights reserved.
4-
#
4+
55
# Redistribution and use in source and binary forms, with or without modification,
66
# are permitted provided that the following conditions are met:
7-
#
7+
88
# Redistributions of source code must retain the above copyright notice, this list
99
# of conditions and the following disclaimer.
10-
#
10+
1111
# Redistributions in binary form must reproduce the above copyright notice, this
1212
# list of conditions and the following disclaimer in the documentation and/or other
1313
# materials provided with the distribution.
14-
#
14+
1515
# Neither the name of the copyright holder nor the names of its contributors may be
1616
# used to endorse or promote products derived from this software without specific
1717
# 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+
1929
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2030
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2131
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

‎doc_templates/LICENSE.md

+27-17
Original file line numberDiff line numberDiff line change
@@ -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
22
contributors. All rights reserved.
33

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,
55
are permitted provided that the following conditions are met:
66

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
88
of conditions and the following disclaimer.
99

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
1212
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
1616
prior written permission.
1717

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
2737
OF THE POSSIBILITY OF SUCH DAMAGE.

‎doc_templates/copyright_erb.txt

+40-30
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
11
<%
2-
# *********************************************************************************
3-
# URBANopt (tm), Copyright (c) 2019-2020, 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-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
21-
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
22-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
23-
# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
24-
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
25-
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26-
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
27-
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
28-
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
29-
# OF THE POSSIBILITY OF SUCH DAMAGE.
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+
%>

‎doc_templates/copyright_ruby.txt

+17-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,31 @@
11
# *********************************************************************************
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
33
# contributors. All rights reserved.
4-
#
4+
55
# Redistribution and use in source and binary forms, with or without modification,
66
# are permitted provided that the following conditions are met:
7-
#
7+
88
# Redistributions of source code must retain the above copyright notice, this list
99
# of conditions and the following disclaimer.
10-
#
10+
1111
# Redistributions in binary form must reproduce the above copyright notice, this
1212
# list of conditions and the following disclaimer in the documentation and/or other
1313
# materials provided with the distribution.
14-
#
14+
1515
# Neither the name of the copyright holder nor the names of its contributors may be
1616
# used to endorse or promote products derived from this software without specific
1717
# 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+
1929
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2030
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2131
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -26,4 +36,4 @@
2636
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
2737
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
2838
# OF THE POSSIBILITY OF SUCH DAMAGE.
29-
# *********************************************************************************
39+
# *********************************************************************************

‎docs/package-lock.json

+15-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)