urbanopt-geojson 0.11.2 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 566987c365d84a289682ac42258d4feddbb68bfc24525179cb963ace27a71017
4
- data.tar.gz: a647418e27a8a0a92813646811e79183dcbe6d2ef24384dde7d2ab00ddf557a7
3
+ metadata.gz: 598a86cd6ea379dcc630e4728a308ca6d543acaf1d06f64df8681d3aec2e8dbe
4
+ data.tar.gz: 7828a7da042ee0094f7361bd3ce38c7564a4bdccc1a24a9690a720b65df2122a
5
5
  SHA512:
6
- metadata.gz: 01f0c79e94c2fb950319e44d2a68d3b23124bc5007c7748957ded2744a46361dbafc52fb9ce81b4ec19061734fae6c5626ffabbc60633a2a876e431549737717
7
- data.tar.gz: 48bcaf433af03988fde0448c70ee707e572ab008f1c4bf5608c6e29c8d2795a65b5a204b7b32495abcec63e510e35f55d2c88738ad34d3e7e7fd04b8bed9ea86
6
+ metadata.gz: f1216daf8552b6973230763fb5d8fbfb12eaa31c30143af8220fb2945d673c2e76e26075c15710b188c88fc8c7d3ecbed1206a711a9c7659c6e60d2f06682582
7
+ data.tar.gz: 8ae72ca2e05eb23c3f1bf31018ba272bc2839e10290c2ea21bc44b35aacc66f98496879f93f91cc04bff7a7e22ec63b3897db194f909a6716d3a1771243acf3c
@@ -1,13 +1,12 @@
1
1
  name: Geojson-gem CI
2
2
 
3
3
  on:
4
- # push:
4
+ workflow_dispatch:
5
+ push:
5
6
  schedule:
6
7
  # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
7
8
  # 5 am UTC (11pm MDT the day before) every weekday night in MDT
8
9
  - cron: '21 5 * * 2-6'
9
- pull_request:
10
- types: [review_requested]
11
10
 
12
11
  env:
13
12
  # This env var should enforce develop branch of all dependencies
@@ -18,7 +17,7 @@ jobs:
18
17
  weeknight-tests:
19
18
  runs-on: ubuntu-latest
20
19
  container:
21
- image: docker://nrel/openstudio:3.7.0
20
+ image: docker://nrel/openstudio:3.9.0
22
21
  steps:
23
22
  - uses: actions/checkout@v4
24
23
  - name: set git config options
@@ -28,11 +27,14 @@ jobs:
28
27
  - name: Update gems
29
28
  run: |
30
29
  ruby --version
30
+ bundle install
31
31
  bundle update
32
32
  - name: List OpenStudio measures
33
33
  run: bundle exec rake openstudio:list_measures
34
34
  - name: Update OpenStudio measures
35
- run: bundle exec rake openstudio:update_measures
35
+ run: |
36
+ bundle install
37
+ bundle exec rake openstudio:update_measures
36
38
  - name: Test OpenStudio measures
37
39
  run: bundle exec rake openstudio:test_with_openstudio
38
40
  - name: Run Rspec
data/.gitignore CHANGED
@@ -5,6 +5,7 @@
5
5
  /gems
6
6
  /_yardoc/
7
7
  /coverage/
8
+ .coverage
8
9
  /doc/
9
10
  /pkg/
10
11
  /spec/reports/
data/.rakeTasks CHANGED
@@ -1,7 +1,7 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <Settings><!--This file was automatically generated by Ruby plugin.
3
- You are allowed to:
3
+ You are allowed to:
4
4
  1. Remove rake task
5
5
  2. Add existing rake tasks
6
6
  To add existing rake tasks automatically delete this file and reload the project.
7
- --><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>
7
+ --><RakeGroup description="" fullCmd="" taskId="rake" /></Settings>
data/CHANGELOG.md CHANGED
@@ -1,13 +1,22 @@
1
1
  # URBANopt GeoJSON Gem
2
2
 
3
+ ## Version 1.0.0
4
+
5
+ ## Exciting new features 🎉
6
+
7
+ * Upgrade to OpenStudio 3.9 and Ruby 3.2.2 by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/279
8
+
9
+ **Full Changelog**: https://github.com/urbanopt/urbanopt-geojson-gem/compare/v0.11.2...v1.0.0
10
+
3
11
  ## Version 0.11.2
12
+
4
13
  * Allow null for some optional fields by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/273
5
14
  * Added UO-ResStock connection variable to the site properties schema by @rawadelkontar in https://github.com/urbanopt/urbanopt-geojson-gem/pull/270
6
15
 
7
-
8
16
  **Full Changelog**: https://github.com/urbanopt/urbanopt-geojson-gem/compare/v0.11.1...v0.11.2
9
17
 
10
18
  ## Version 0.11.1
19
+
11
20
  Date Range: 01/09/24
12
21
 
13
22
  * downgrade json-schema to 2.7 by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/267
@@ -15,6 +24,7 @@ Date Range: 01/09/24
15
24
  **Full Changelog**: https://github.com/urbanopt/urbanopt-geojson-gem/compare/v0.11.0...v0.11.1
16
25
 
17
26
  ## Version 0.11.0
27
+
18
28
  Date Range: 7/19/23 - 01/09/24
19
29
 
20
30
  * Remove jenkins by @vtnate in https://github.com/urbanopt/urbanopt-geojson-gem/pull/260
data/Gemfile CHANGED
@@ -11,19 +11,15 @@ gemspec
11
11
  # checkout the latest version (develop) from github.
12
12
  allow_local = ENV['FAVOR_LOCAL_GEMS']
13
13
 
14
- # pin this dependency to avoid unicode_normalize error
15
- gem 'addressable', '2.8.1'
16
- # pin this dependency to avoid using racc dependency (which has native extensions)
17
- gem 'parser', '3.2.2.2'
18
-
14
+ # gem 'openstudio-extension', '~> 0.8.2'
19
15
  # if allow_local && File.exist?('../openstudio-extension-gem')
20
16
  # gem 'openstudio-extension', path: '../openstudio-extension-gem'
21
17
  # elsif allow_local
22
18
  # gem 'openstudio-extension', github: 'NREL/openstudio-extension-gem', branch: 'develop'
23
19
  # end
24
20
 
25
- if allow_local && File.exist?('../urbanopt-core-gem')
26
- gem 'urbanopt-core', path: '../urbanopt-core-gem'
27
- elsif allow_local
28
- gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
29
- end
21
+ # if allow_local && File.exist?('../urbanopt-core-gem')
22
+ # gem 'urbanopt-core', path: '../urbanopt-core-gem'
23
+ # elsif allow_local
24
+ # gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'master'
25
+ # end
data/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
1
+ URBANopt (tm), Copyright (c) 2019-2025, Alliance for Sustainable Energy, LLC, and other
2
2
  contributors. All rights reserved.
3
3
 
4
4
  Redistribution and use in source and binary forms, with or without modification,
@@ -1,4 +1,4 @@
1
- URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
1
+ URBANopt (tm), Copyright (c) 2019-2025, Alliance for Sustainable Energy, LLC, and other
2
2
  contributors. All rights reserved.
3
3
 
4
4
  Redistribution and use in source and binary forms, with or without modification,
@@ -2,13 +2,13 @@
2
2
 
3
3
  ###### (Automatically generated documentation)
4
4
 
5
- # UrbanGeometryCreation
5
+ #
6
6
 
7
7
  ## Description
8
- This measure reads an URBANopt GeoJSON and creates geometry for a particular building. Surrounding buildings are included as shading structures.
8
+
9
9
 
10
10
  ## Modeler Description
11
- This measure takes in the GeoJSON file, the feature_id of the building and the surrounding buildings as arguments and add has methods to create space types and add default construction sets.
11
+
12
12
 
13
13
  ## Measure Type
14
14
  ModelMeasure
@@ -19,38 +19,8 @@ ModelMeasure
19
19
  ## Arguments
20
20
 
21
21
 
22
- ### GeoJSON File
23
- GeoJSON File.
24
- **Name:** geojson_file,
25
- **Type:** String,
26
- **Units:** ,
27
- **Required:** true,
28
- **Model Dependent:** false
29
-
30
- ### Feature ID
31
- Feature ID.
32
- **Name:** feature_id,
33
- **Type:** String,
34
- **Units:** ,
35
- **Required:** true,
36
- **Model Dependent:** false
37
-
38
- ### Surrounding Buildings
39
- Select which surrounding buildings to include.
40
- **Name:** surrounding_buildings,
41
- **Type:** Choice,
42
- **Units:** ,
43
- **Required:** true,
44
- **Model Dependent:** false
45
-
46
- ### Scale Footprint Area by the Floor Area
47
- If true, the footprint area from GeoJSON will be scaled by the floor_area provided by the user in URBANopt.
48
- **Name:** scale_footprint_area_by_floor_area,
49
- **Type:** Boolean,
50
- **Units:** ,
51
- **Required:** false,
52
- **Model Dependent:** false
53
22
 
54
23
 
24
+ This measure does not have any user arguments
55
25
 
56
26
 
@@ -1,10 +1,11 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
3
  <schema_version>3.1</schema_version>
4
+ <error>Failed to infer measure name from '/Users/nmoore/github/urbanopt-geojson-gem/lib/measures/urban_geometry_creation/measure.rb'</error>
4
5
  <name>urban_geometry_creation</name>
5
6
  <uid>5ab85d6b-c9af-4361-8ab9-613ee99a5666</uid>
6
- <version_id>114e5a3f-0e66-47f2-aa96-299f71b4ef0f</version_id>
7
- <version_modified>2024-06-25T21:15:26Z</version_modified>
7
+ <version_id>048231f4-ba53-4506-b922-35f13d8b806e</version_id>
8
+ <version_modified>2024-11-13T17:45:33Z</version_modified>
8
9
  <xml_checksum>D254E772</xml_checksum>
9
10
  <class_name>UrbanGeometryCreation</class_name>
10
11
  <display_name>UrbanGeometryCreation</display_name>
@@ -114,7 +115,7 @@
114
115
  <filename>README.md</filename>
115
116
  <filetype>md</filetype>
116
117
  <usage_type>readme</usage_type>
117
- <checksum>AA2D38B0</checksum>
118
+ <checksum>0B68E96D</checksum>
118
119
  </file>
119
120
  <file>
120
121
  <filename>README.md.erb</filename>
@@ -131,7 +132,7 @@
131
132
  <filename>measure.rb</filename>
132
133
  <filetype>rb</filetype>
133
134
  <usage_type>script</usage_type>
134
- <checksum>5D490083</checksum>
135
+ <checksum>D58B8040</checksum>
135
136
  </file>
136
137
  <file>
137
138
  <filename>nrel_stm_footprints.geojson</filename>
@@ -2,10 +2,10 @@
2
2
 
3
3
  ###### (Automatically generated documentation)
4
4
 
5
- # UrbanGeometryCreationZoning
5
+ #
6
6
 
7
7
  ## Description
8
- This measure reads an URBANopt GeoJSON and creates geometry with zoning for a particular building. Surrounding buildings are included as shading structures.
8
+
9
9
 
10
10
  ## Modeler Description
11
11
 
@@ -19,30 +19,8 @@ ModelMeasure
19
19
  ## Arguments
20
20
 
21
21
 
22
- ### GeoJSON File
23
- GeoJSON File.
24
- **Name:** geojson_file,
25
- **Type:** String,
26
- **Units:** ,
27
- **Required:** true,
28
- **Model Dependent:** false
29
-
30
- ### Feature ID
31
- Feature ID.
32
- **Name:** feature_id,
33
- **Type:** String,
34
- **Units:** ,
35
- **Required:** true,
36
- **Model Dependent:** false
37
-
38
- ### Surrounding Buildings
39
- Select which surrounding buildings to include.
40
- **Name:** surrounding_buildings,
41
- **Type:** Choice,
42
- **Units:** ,
43
- **Required:** true,
44
- **Model Dependent:** false
45
22
 
46
23
 
24
+ This measure does not have any user arguments
47
25
 
48
26
 
@@ -1,10 +1,11 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
3
  <schema_version>3.1</schema_version>
4
+ <error>Failed to infer measure name from '/Users/nmoore/github/urbanopt-geojson-gem/lib/measures/urban_geometry_creation_zoning/measure.rb'</error>
4
5
  <name>urban_geometry_creation_zoning</name>
5
6
  <uid>96ea1317-76ac-4670-b51d-71ee3f4fdd65</uid>
6
- <version_id>8b2f1d05-725a-4f06-bcac-1fb685f12f89</version_id>
7
- <version_modified>2024-06-25T21:15:28Z</version_modified>
7
+ <version_id>f4e83153-b29e-4154-9ed0-7062896e7448</version_id>
8
+ <version_modified>2024-11-14T16:53:21Z</version_modified>
8
9
  <xml_checksum>D254E772</xml_checksum>
9
10
  <class_name>UrbanGeometryCreationZoning</class_name>
10
11
  <display_name>UrbanGeometryCreationZoning</display_name>
@@ -95,7 +96,7 @@
95
96
  <filename>README.md</filename>
96
97
  <filetype>md</filetype>
97
98
  <usage_type>readme</usage_type>
98
- <checksum>0458EE16</checksum>
99
+ <checksum>0B68E96D</checksum>
99
100
  </file>
100
101
  <file>
101
102
  <filename>README.md.erb</filename>
@@ -112,7 +113,7 @@
112
113
  <filename>measure.rb</filename>
113
114
  <filetype>rb</filetype>
114
115
  <usage_type>script</usage_type>
115
- <checksum>5827BCFA</checksum>
116
+ <checksum>1EA1A74B</checksum>
116
117
  </file>
117
118
  <file>
118
119
  <filename>OV_Buildings_Update_090420_res_eui_test.json</filename>
@@ -136,7 +137,7 @@
136
137
  <filename>urban_geometry_creation_zoning_test.rb</filename>
137
138
  <filetype>rb</filetype>
138
139
  <usage_type>test</usage_type>
139
- <checksum>FC65E7CE</checksum>
140
+ <checksum>3B495B27</checksum>
140
141
  </file>
141
142
  </files>
142
143
  </measure>
@@ -47,10 +47,6 @@
47
47
  "description": "Presence of pump: true if present, false if absent",
48
48
  "type": "boolean"
49
49
  },
50
- "is_ghe_start_loop": {
51
- "description": "Determines whether this junction is present at the start of the loop for a Ground Heat Exchanger Network.",
52
- "type": "boolean"
53
- },
54
50
  "connection_type": {
55
51
  "description": "Characterize the connection as series or parallel",
56
52
  "$ref": "#/definitions/ThermalJunctionConnectionType"
@@ -5,6 +5,6 @@
5
5
 
6
6
  module URBANopt
7
7
  module GeoJSON
8
- VERSION = '0.11.2'.freeze
8
+ VERSION = '1.0.0'.freeze
9
9
  end
10
10
  end
@@ -22,14 +22,14 @@ Gem::Specification.new do |spec|
22
22
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
23
23
  spec.require_paths = ['lib']
24
24
 
25
- spec.required_ruby_version = '~> 2.7.0'
25
+ # We support exactly Ruby v3.2.2 because os-extension requires bundler==2.4.10 and that requires Ruby 3.2.2: https://stdgems.org/bundler/
26
+ # It would be nice to be able to use newer patches of Ruby 3.2, which would require os-extension to relax its dependency on bundler.
27
+ spec.required_ruby_version = '3.2.2'
26
28
 
27
- spec.add_development_dependency 'bundler', '>= 2.1.0'
28
- spec.add_development_dependency 'rake', '~> 13.0'
29
- spec.add_development_dependency 'rspec', '~> 3.9'
30
- spec.add_development_dependency 'simplecov', '~> 0.18.2'
31
- spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
29
+ spec.add_development_dependency 'rspec', '~> 3.13'
30
+ spec.add_development_dependency 'simplecov', '0.22.0'
31
+ spec.add_development_dependency 'simplecov-lcov', '0.8.0'
32
32
 
33
- spec.add_runtime_dependency 'json-schema', '~> 2.7'
34
- spec.add_runtime_dependency 'urbanopt-core', '~> 0.11.0'
33
+ spec.add_runtime_dependency 'json-schema', '~> 4.3.1'
34
+ spec.add_runtime_dependency 'urbanopt-core', '~> 1.0.0'
35
35
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: urbanopt-geojson
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.2
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tanushree Charan
@@ -10,76 +10,48 @@ authors:
10
10
  autorequire:
11
11
  bindir: exe
12
12
  cert_chain: []
13
- date: 2024-06-25 00:00:00.000000000 Z
13
+ date: 2025-01-22 00:00:00.000000000 Z
14
14
  dependencies:
15
- - !ruby/object:Gem::Dependency
16
- name: bundler
17
- requirement: !ruby/object:Gem::Requirement
18
- requirements:
19
- - - ">="
20
- - !ruby/object:Gem::Version
21
- version: 2.1.0
22
- type: :development
23
- prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
25
- requirements:
26
- - - ">="
27
- - !ruby/object:Gem::Version
28
- version: 2.1.0
29
- - !ruby/object:Gem::Dependency
30
- name: rake
31
- requirement: !ruby/object:Gem::Requirement
32
- requirements:
33
- - - "~>"
34
- - !ruby/object:Gem::Version
35
- version: '13.0'
36
- type: :development
37
- prerelease: false
38
- version_requirements: !ruby/object:Gem::Requirement
39
- requirements:
40
- - - "~>"
41
- - !ruby/object:Gem::Version
42
- version: '13.0'
43
15
  - !ruby/object:Gem::Dependency
44
16
  name: rspec
45
17
  requirement: !ruby/object:Gem::Requirement
46
18
  requirements:
47
19
  - - "~>"
48
20
  - !ruby/object:Gem::Version
49
- version: '3.9'
21
+ version: '3.13'
50
22
  type: :development
51
23
  prerelease: false
52
24
  version_requirements: !ruby/object:Gem::Requirement
53
25
  requirements:
54
26
  - - "~>"
55
27
  - !ruby/object:Gem::Version
56
- version: '3.9'
28
+ version: '3.13'
57
29
  - !ruby/object:Gem::Dependency
58
30
  name: simplecov
59
31
  requirement: !ruby/object:Gem::Requirement
60
32
  requirements:
61
- - - "~>"
33
+ - - '='
62
34
  - !ruby/object:Gem::Version
63
- version: 0.18.2
35
+ version: 0.22.0
64
36
  type: :development
65
37
  prerelease: false
66
38
  version_requirements: !ruby/object:Gem::Requirement
67
39
  requirements:
68
- - - "~>"
40
+ - - '='
69
41
  - !ruby/object:Gem::Version
70
- version: 0.18.2
42
+ version: 0.22.0
71
43
  - !ruby/object:Gem::Dependency
72
44
  name: simplecov-lcov
73
45
  requirement: !ruby/object:Gem::Requirement
74
46
  requirements:
75
- - - "~>"
47
+ - - '='
76
48
  - !ruby/object:Gem::Version
77
49
  version: 0.8.0
78
50
  type: :development
79
51
  prerelease: false
80
52
  version_requirements: !ruby/object:Gem::Requirement
81
53
  requirements:
82
- - - "~>"
54
+ - - '='
83
55
  - !ruby/object:Gem::Version
84
56
  version: 0.8.0
85
57
  - !ruby/object:Gem::Dependency
@@ -88,28 +60,28 @@ dependencies:
88
60
  requirements:
89
61
  - - "~>"
90
62
  - !ruby/object:Gem::Version
91
- version: '2.7'
63
+ version: 4.3.1
92
64
  type: :runtime
93
65
  prerelease: false
94
66
  version_requirements: !ruby/object:Gem::Requirement
95
67
  requirements:
96
68
  - - "~>"
97
69
  - !ruby/object:Gem::Version
98
- version: '2.7'
70
+ version: 4.3.1
99
71
  - !ruby/object:Gem::Dependency
100
72
  name: urbanopt-core
101
73
  requirement: !ruby/object:Gem::Requirement
102
74
  requirements:
103
75
  - - "~>"
104
76
  - !ruby/object:Gem::Version
105
- version: 0.11.0
77
+ version: 1.0.0
106
78
  type: :runtime
107
79
  prerelease: false
108
80
  version_requirements: !ruby/object:Gem::Requirement
109
81
  requirements:
110
82
  - - "~>"
111
83
  - !ruby/object:Gem::Version
112
- version: 0.11.0
84
+ version: 1.0.0
113
85
  description: Library and measures to translate URBANopt GeoJSON format to OpenStudio
114
86
  email:
115
87
  - tanushree.charan@nrel.gov
@@ -233,16 +205,16 @@ require_paths:
233
205
  - lib
234
206
  required_ruby_version: !ruby/object:Gem::Requirement
235
207
  requirements:
236
- - - "~>"
208
+ - - '='
237
209
  - !ruby/object:Gem::Version
238
- version: 2.7.0
210
+ version: 3.2.2
239
211
  required_rubygems_version: !ruby/object:Gem::Requirement
240
212
  requirements:
241
213
  - - ">="
242
214
  - !ruby/object:Gem::Version
243
215
  version: '0'
244
216
  requirements: []
245
- rubygems_version: 3.1.4
217
+ rubygems_version: 3.4.10
246
218
  signing_key:
247
219
  specification_version: 4
248
220
  summary: Translate URBANopt GeoJSON format to OpenStudio