urbanopt-geojson 0.6.2 → 0.6.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4bd8a5ec0c2b452cb276dc44a156ad9888571e20f0db13347a14b7c50a5a8610
4
- data.tar.gz: '022686678075db47feb84f3b2b6d5de6022921aa78f2f9b4a954ccaa426ffd29'
3
+ metadata.gz: a080ab6680d77a34bab213f6d52c936b7d162945e71fb8be3c47d4358a860144
4
+ data.tar.gz: bd90db523f6309d48f18c4e78c0d168c364f4f50e5b62d5fe1a444516e747b02
5
5
  SHA512:
6
- metadata.gz: 801e7ecf2ffa72c5294620d75ba612e9aa445a58cd33d0c16ce2ad41c0c3f52a6c0b7544572ff66da4a43adf7457da9661e6823836dfca04c874d00176ce109a
7
- data.tar.gz: a61df95d514a2ee57623c6a7117a83aa09f10c230f64b94c77e74bf58313a36c521c4cb913e93312ead26b0938122f3fc077f147d79e01cded631c8af4e1bf5b
6
+ metadata.gz: 103e1557ba2a0273bcb28ecade033c6f02cf39c743e67a259e6e353b29603fad12701186d2e0823a9dd7b6dab6d373d1d31a319d82c9b3f9b43b1ed2a9dce97a
7
+ data.tar.gz: 6ebf362e50ecac223f381fd730ed3a18479c005b74546b65c5ab3b2c24793e178d3343e68aba32eaa56feb568eb5b6ed43b537d0f0bc29491d34a614e628e4fd
data/.rubocop.yml CHANGED
@@ -3,8 +3,7 @@ AllCops:
3
3
  - gems/**/*
4
4
  - measures/**/*
5
5
  - spec/files/**/measures/**/*
6
-
6
+ require: rubocop-performance
7
7
 
8
8
  inherit_from:
9
- - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
10
-
9
+ - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml
data/CHANGELOG.md CHANGED
@@ -1,5 +1,16 @@
1
1
  # URBANopt GeoJSON Gem
2
2
 
3
+ ## Version 0.6.3
4
+ Date Range: 05/07/21 - 7/1/21
5
+
6
+ - Fixed [#178](https://github.com/urbanopt/urbanopt-geojson-gem/issues/178), Remove NREL ZNE Ready
7
+ 2017 template from schema
8
+ - Fixed [#176](https://github.com/urbanopt/urbanopt-geojson-gem/issues/176), Update rubocop configs to v4
9
+ - Fixed [#173](https://github.com/urbanopt/urbanopt-geojson-gem/issues/173), Add necessary fields
10
+ for RNM-US analysis
11
+ - Fixed [#169](https://github.com/urbanopt/urbanopt-geojson-gem/issues/169), Adjacent buildings not being created as shading objects
12
+
13
+
3
14
  ## Version 0.6.2
4
15
  Date Range: 04/30/21 - 05/06/21
5
16
 
data/LICENSE.md CHANGED
@@ -1,5 +1,3 @@
1
- # License
2
-
3
1
  URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
4
2
  contributors. All rights reserved.
5
3
 
@@ -2901,15 +2901,27 @@
2901
2901
  }
2902
2902
  },
2903
2903
  "browserslist": {
2904
- "version": "4.16.3",
2905
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
2906
- "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
2904
+ "version": "4.16.6",
2905
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
2906
+ "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
2907
2907
  "requires": {
2908
- "caniuse-lite": "^1.0.30001181",
2909
- "colorette": "^1.2.1",
2910
- "electron-to-chromium": "^1.3.649",
2908
+ "caniuse-lite": "^1.0.30001219",
2909
+ "colorette": "^1.2.2",
2910
+ "electron-to-chromium": "^1.3.723",
2911
2911
  "escalade": "^3.1.1",
2912
- "node-releases": "^1.1.70"
2912
+ "node-releases": "^1.1.71"
2913
+ },
2914
+ "dependencies": {
2915
+ "caniuse-lite": {
2916
+ "version": "1.0.30001228",
2917
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
2918
+ "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A=="
2919
+ },
2920
+ "electron-to-chromium": {
2921
+ "version": "1.3.737",
2922
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.737.tgz",
2923
+ "integrity": "sha512-P/B84AgUSQXaum7a8m11HUsYL8tj9h/Pt5f7Hg7Ty6bm5DxlFq+e5+ouHUoNQMsKDJ7u4yGfI8mOErCmSH9wyg=="
2924
+ }
2913
2925
  }
2914
2926
  },
2915
2927
  "buffer": {
@@ -4312,9 +4324,9 @@
4312
4324
  "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
4313
4325
  },
4314
4326
  "dns-packet": {
4315
- "version": "1.3.1",
4316
- "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
4317
- "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
4327
+ "version": "1.3.4",
4328
+ "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
4329
+ "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
4318
4330
  "requires": {
4319
4331
  "ip": "^1.1.0",
4320
4332
  "safe-buffer": "^5.0.1"
@@ -4448,11 +4460,6 @@
4448
4460
  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
4449
4461
  "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
4450
4462
  },
4451
- "electron-to-chromium": {
4452
- "version": "1.3.708",
4453
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.708.tgz",
4454
- "integrity": "sha512-+A8ggYZ5riOLMcVAuzHx6bforaPzaiLnW1QOMD2SlMYQVi7QQTyQ/WrlZoebIH9ikmgr+tLJGpNITFFCUiQcPw=="
4455
- },
4456
4463
  "elliptic": {
4457
4464
  "version": "6.5.4",
4458
4465
  "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
@@ -6492,9 +6499,9 @@
6492
6499
  }
6493
6500
  },
6494
6501
  "lodash": {
6495
- "version": "4.17.20",
6496
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
6497
- "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
6502
+ "version": "4.17.21",
6503
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
6504
+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
6498
6505
  },
6499
6506
  "lodash._reinterpolate": {
6500
6507
  "version": "3.0.0",
@@ -7550,9 +7557,9 @@
7550
7557
  "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
7551
7558
  },
7552
7559
  "postcss": {
7553
- "version": "7.0.35",
7554
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
7555
- "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
7560
+ "version": "7.0.36",
7561
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
7562
+ "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
7556
7563
  "requires": {
7557
7564
  "chalk": "^2.4.2",
7558
7565
  "source-map": "^0.6.1",
@@ -11014,9 +11021,9 @@
11014
11021
  }
11015
11022
  },
11016
11023
  "ws": {
11017
- "version": "6.2.1",
11018
- "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
11019
- "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
11024
+ "version": "6.2.2",
11025
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
11026
+ "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
11020
11027
  "requires": {
11021
11028
  "async-limiter": "~1.0.0"
11022
11029
  }
data/docs/package.json CHANGED
@@ -25,7 +25,7 @@
25
25
  "ini": "^2.0.0",
26
26
  "is-svg": "^4.3.1",
27
27
  "js-yaml": ">=3.13.1",
28
- "lodash": ">=4.17.19",
28
+ "lodash": ">=4.17.21",
29
29
  "lodash.template": ">=4.5.0",
30
30
  "minimist": ">=1.2.3",
31
31
  "mixin-deep": "^2.0.1",
@@ -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>
@@ -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>
@@ -334,23 +334,27 @@ module URBANopt
334
334
  # * +origin_lat_lon+ _Type:Float_ - An instance of OpenStudio::PointLatLon indicating the origin's
335
335
  # latitude and longitude.
336
336
  def self.is_shadowed(potentially_shaded, potential_shader, origin_lat_lon)
337
- all_pairs = []
337
+ # not using origin_lat_lon but have not removed it yet
338
+ min_distance = nil
339
+ min_pair = nil
338
340
  potentially_shaded.each do |building_point|
339
341
  potential_shader.each do |other_building_point|
340
342
  vector = other_building_point - building_point
341
- all_pairs << {
342
- building_point: building_point,
343
- other_building_point: other_building_point,
344
- vector: vector,
345
- distance: vector.length
346
- }
343
+ distance = Math.sqrt(vector.x * vector.x + vector.y * vector.y)
344
+ if min_distance.nil? || distance < min_distance
345
+ min_distance = distance
346
+ min_pair = {
347
+ building_point: building_point,
348
+ other_building_point: other_building_point,
349
+ vector: vector,
350
+ distance: vector.length
351
+ }
352
+ end
347
353
  end
348
354
  end
349
- all_pairs.sort! { |x, y| x[:distance] <=> y[:distance] }
350
- all_pairs.each do |pair|
351
- if is_shaded(pair[:building_point], pair[:other_building_point], origin_lat_lon)
352
- return true
353
- end
355
+
356
+ if is_shaded(min_pair[:building_point], min_pair[:other_building_point], origin_lat_lon)
357
+ return true
354
358
  end
355
359
  return false
356
360
  end
@@ -364,34 +368,27 @@ module URBANopt
364
368
  # * +origin_lat_lon+ - _Type:Float_ - An instance of +OpenStudio::PointLatLon+ indicating the
365
369
  # origin's latitude and longitude.
366
370
  def self.is_shaded(building_point, other_building_point, origin_lat_lon)
371
+ # not using origin_lat_lon but have not removed it yet
367
372
  vector = other_building_point - building_point
368
- height = vector.z
369
373
  distance = Math.sqrt(vector.x * vector.x + vector.y * vector.y)
370
374
  if distance < 1
371
375
  return true
372
376
  end
373
- hour_angle_rad = Math.atan2(-vector.x, -vector.y)
374
- hour_angle = OpenStudio.radToDeg(hour_angle_rad)
375
- latitude_rad = OpenStudio.degToRad(origin_lat_lon.lat)
376
- result = false
377
- (-24..24).each do |declination|
378
- declination_rad = OpenStudio.degToRad(declination)
379
- zenith_angle_rad = Math.acos(Math.sin(latitude_rad) * Math.sin(declination_rad) + Math.cos(latitude_rad) * Math.cos(declination_rad) * Math.cos(hour_angle_rad))
380
- zenith_angle = OpenStudio.radToDeg(zenith_angle_rad)
381
- elevation_angle = 90 - zenith_angle
382
- apparent_angle_rad = Math.atan2(height, distance)
383
- apparent_angle = OpenStudio.radToDeg(apparent_angle_rad)
384
- if elevation_angle > 0 && elevation_angle < apparent_angle
385
- result = true
386
- break
387
- end
377
+ elevation_angle = 2.5 #not sure of best value maybe allow as project level argument
378
+ height = vector.z
379
+ apparent_angle_rad = Math.atan2(height, distance)
380
+ apparent_angle = OpenStudio.radToDeg(apparent_angle_rad)
381
+ if elevation_angle < apparent_angle
382
+ result = true
383
+ else
384
+ result = false
388
385
  end
389
386
  return result
390
387
  end
391
388
 
392
- class << self
393
- private :is_shaded
389
+ class << self
390
+ private :is_shaded
391
+ end
392
+ end
393
+ end
394
394
  end
395
- end
396
- end
397
- end
@@ -1,21 +1,21 @@
1
1
  # *********************************************************************************
2
- # URBANopt (tm), Copyright (c) 2019-2021, 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
19
  # Redistribution of this software, without modification, must refer to the software
20
20
  # by the same designation. Redistribution of a modified version of this software
21
21
  # (i) may not refer to the modified version by the same designation, or by any
@@ -25,7 +25,7 @@
25
25
  # refer to any modified version of this software or any modified version of the
26
26
  # underlying software originally provided by Alliance without the prior written
27
27
  # consent of Alliance.
28
- #
28
+
29
29
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30
30
  # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31
31
  # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -1,21 +1,21 @@
1
1
  # *********************************************************************************
2
- # URBANopt (tm), Copyright (c) 2019-2021, 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
19
  # Redistribution of this software, without modification, must refer to the software
20
20
  # by the same designation. Redistribution of a modified version of this software
21
21
  # (i) may not refer to the modified version by the same designation, or by any
@@ -25,7 +25,7 @@
25
25
  # refer to any modified version of this software or any modified version of the
26
26
  # underlying software originally provided by Alliance without the prior written
27
27
  # consent of Alliance.
28
- #
28
+
29
29
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30
30
  # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31
31
  # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -1,21 +1,21 @@
1
1
  # *********************************************************************************
2
- # URBANopt (tm), Copyright (c) 2019-2021, 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
19
  # Redistribution of this software, without modification, must refer to the software
20
20
  # by the same designation. Redistribution of a modified version of this software
21
21
  # (i) may not refer to the modified version by the same designation, or by any
@@ -25,7 +25,7 @@
25
25
  # refer to any modified version of this software or any modified version of the
26
26
  # underlying software originally provided by Alliance without the prior written
27
27
  # consent of Alliance.
28
- #
28
+
29
29
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30
30
  # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31
31
  # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -537,9 +537,8 @@
537
537
  "90.1-2007",
538
538
  "90.1-2010",
539
539
  "90.1-2013",
540
- "90.1-2016",
541
- "90.1-2019",
542
- "NREL ZNE Ready 2017",
540
+ "90.1-2016",
541
+ "90.1-2019",
543
542
  "DEER Pre-1975",
544
543
  "DEER 1985",
545
544
  "DEER 1996",
@@ -75,6 +75,14 @@
75
75
  "description": "Name of utility tariff file in IDF or URDB format.",
76
76
  "type": "string"
77
77
  },
78
+ "underground_cables_ratio": {
79
+ "description": "Ratio of overall cables that are underground vs. overhead for RNM analysis.",
80
+ "type": "number"
81
+ },
82
+ "only_lv_consumers": {
83
+ "description": "If true, only low voltage consumers will be considered in the RNM analysis.",
84
+ "type": "boolean"
85
+ },
78
86
  "user_data": {
79
87
  "description": "Arbitrary user data"
80
88
  }
@@ -1,21 +1,21 @@
1
1
  # *********************************************************************************
2
- # URBANopt (tm), Copyright (c) 2019-2021, 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
19
  # Redistribution of this software, without modification, must refer to the software
20
20
  # by the same designation. Redistribution of a modified version of this software
21
21
  # (i) may not refer to the modified version by the same designation, or by any
@@ -25,7 +25,7 @@
25
25
  # refer to any modified version of this software or any modified version of the
26
26
  # underlying software originally provided by Alliance without the prior written
27
27
  # consent of Alliance.
28
- #
28
+
29
29
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30
30
  # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31
31
  # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -1,21 +1,21 @@
1
1
  # *********************************************************************************
2
- # URBANopt (tm), Copyright (c) 2019-2021, 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
19
  # Redistribution of this software, without modification, must refer to the software
20
20
  # by the same designation. Redistribution of a modified version of this software
21
21
  # (i) may not refer to the modified version by the same designation, or by any
@@ -25,7 +25,7 @@
25
25
  # refer to any modified version of this software or any modified version of the
26
26
  # underlying software originally provided by Alliance without the prior written
27
27
  # consent of Alliance.
28
- #
28
+
29
29
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30
30
  # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31
31
  # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -1,21 +1,21 @@
1
1
  # *********************************************************************************
2
- # URBANopt (tm), Copyright (c) 2019-2021, 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
19
  # Redistribution of this software, without modification, must refer to the software
20
20
  # by the same designation. Redistribution of a modified version of this software
21
21
  # (i) may not refer to the modified version by the same designation, or by any
@@ -25,7 +25,7 @@
25
25
  # refer to any modified version of this software or any modified version of the
26
26
  # underlying software originally provided by Alliance without the prior written
27
27
  # consent of Alliance.
28
- #
28
+
29
29
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30
30
  # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31
31
  # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -40,6 +40,6 @@
40
40
 
41
41
  module URBANopt
42
42
  module GeoJSON
43
- VERSION = '0.6.2'.freeze
43
+ VERSION = '0.6.3'.freeze
44
44
  end
45
45
  end
@@ -1,21 +1,21 @@
1
1
  # *********************************************************************************
2
- # URBANopt (tm), Copyright (c) 2019-2021, 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
19
  # Redistribution of this software, without modification, must refer to the software
20
20
  # by the same designation. Redistribution of a modified version of this software
21
21
  # (i) may not refer to the modified version by the same designation, or by any
@@ -25,7 +25,7 @@
25
25
  # refer to any modified version of this software or any modified version of the
26
26
  # underlying software originally provided by Alliance without the prior written
27
27
  # consent of Alliance.
28
- #
28
+
29
29
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30
30
  # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31
31
  # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
30
30
  spec.add_development_dependency 'rspec', '~> 3.7'
31
31
 
32
32
  spec.add_runtime_dependency 'json-schema', '~> 2.8'
33
- spec.add_runtime_dependency 'urbanopt-core', '~> 0.6.0'
33
+ spec.add_runtime_dependency 'urbanopt-core', '~> 0.6.1'
34
34
  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.6.2
4
+ version: 0.6.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tanushree Charan
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: exe
12
12
  cert_chain: []
13
- date: 2021-05-06 00:00:00.000000000 Z
13
+ date: 2021-07-01 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: bundler
@@ -74,14 +74,14 @@ dependencies:
74
74
  requirements:
75
75
  - - "~>"
76
76
  - !ruby/object:Gem::Version
77
- version: 0.6.0
77
+ version: 0.6.1
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
82
  - - "~>"
83
83
  - !ruby/object:Gem::Version
84
- version: 0.6.0
84
+ version: 0.6.1
85
85
  description: Library and measures to translate URBANopt GeoJSON format to OpenStudio
86
86
  email:
87
87
  - tanushree.charan@nrel.gov