urbanopt-geojson 0.5.3 → 0.6.4

data/docs/package.json

@@ -13,21 +13,26 @@
     "highlight.js": "^10.4.1",
     "json-schema-ref-parser": "^9.0.6",
     "json-schema-view-js": "git+https://git@github.com/bgschiller/json-schema-view-js.git",
-    "vuepress": "^1.5.4",
+    "vuepress": "^1.8.2",
     "webpack-dev-middleware": "^3.6.0"
   },
   "devDependencies": {
     "braces": "^3.0.2",
+    "chokidar": "^3.5.1",
     "dot-prop": ">=5.1.1",
+    "fsevents": "^2.3.2",
     "gh-pages": "^3.1.0",
+    "ini": "^2.0.0",
+    "is-svg": "^4.3.1",
     "js-yaml": ">=3.13.1",
-    "lodash": ">=4.17.19",
+    "lodash": ">=4.17.21",
     "lodash.template": ">=4.5.0",
     "minimist": ">=1.2.3",
     "mixin-deep": "^2.0.1",
     "serialize-javascript": "^5.0.1",
     "set-value": "^3.0.2",
-    "yargs-parser": "^20.2.3",
-    "ini": "^2.0.0"
+    "ssri": "^8.0.1",
+    "webpack": "^4.46.0",
+    "yargs-parser": "^20.2.3"
   }
 }

data/lib/measures/urban_geometry_creation/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>urban_geometry_creation</name>
   <uid>5ab85d6b-c9af-4361-8ab9-613ee99a5666</uid>
-  <version_id>2e224aaa-0d77-486f-b8ef-c25121fabd91</version_id>
-  <version_modified>20201208T232103Z</version_modified>
+  <version_id>9eeca0c7-ef9d-4829-aa2c-b2c138a963c1</version_id>
+  <version_modified>20210602T203055Z</version_modified>
   <xml_checksum>D254E772</xml_checksum>
   <class_name>UrbanGeometryCreation</class_name>
   <display_name>UrbanGeometryCreation</display_name>
@@ -116,23 +116,29 @@
       <usage_type>test</usage_type>
       <checksum>40290298</checksum>
     </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>74F54DC5</checksum>
+    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>D8541540</checksum>
+      <checksum>03523BF4</checksum>
     </file>
     <file>
       <filename>shadowed_tests.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>F656F8DE</checksum>
+      <checksum>682820CD</checksum>
     </file>
     <file>
       <filename>urban_geometry_creation_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>B4A7376B</checksum>
+      <checksum>FD5181F7</checksum>
     </file>
     <file>
       <version>
@@ -143,13 +149,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>791A977E</checksum>
-    </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>74F54DC5</checksum>
+      <checksum>3667C98F</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/urban_geometry_creation_zoning/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>urban_geometry_creation_zoning</name>
   <uid>96ea1317-76ac-4670-b51d-71ee3f4fdd65</uid>
-  <version_id>0c0d1135-a50f-40c6-82fb-fc357e46dd02</version_id>
-  <version_modified>20201208T232103Z</version_modified>
+  <version_id>c115c875-0e04-4ac9-990b-011811df23bb</version_id>
+  <version_modified>20210602T203056Z</version_modified>
   <xml_checksum>D254E772</xml_checksum>
   <class_name>UrbanGeometryCreationZoning</class_name>
   <display_name>UrbanGeometryCreationZoning</display_name>
@@ -97,11 +97,17 @@
       <usage_type>test</usage_type>
       <checksum>40290298</checksum>
     </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>0458EE16</checksum>
+    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>D8541540</checksum>
+      <checksum>03523BF4</checksum>
     </file>
     <file>
       <version>
@@ -112,19 +118,31 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>3E6D4653</checksum>
+      <checksum>290A59E6</checksum>
     </file>
     <file>
       <filename>urban_geometry_creation_zoning_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>D609CD4C</checksum>
+      <checksum>20775652</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>0458EE16</checksum>
+      <filename>example_project_combined.json</filename>
+      <filetype>json</filetype>
+      <usage_type>test</usage_type>
+      <checksum>9BC47B41</checksum>
+    </file>
+    <file>
+      <filename>out.txt</filename>
+      <filetype>txt</filetype>
+      <usage_type>test</usage_type>
+      <checksum>7FAF05F3</checksum>
+    </file>
+    <file>
+      <filename>OV_Buildings_Update_090420_res_eui_test.json</filename>
+      <filetype>json</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F611B1E8</checksum>
     </file>
   </files>
 </measure>

data/lib/urbanopt/geojson/feature.rb

@@ -261,10 +261,12 @@ module URBANopt
       end
 
       ##
-      # Used to determine the centroid for the feature's coordinates.
+      # Used to determine the centroid for the feature's geojson coordinates.
       #
       # [Parameters]
       # * +vertices+ - The first set polygon vertices in the array of feature coordinates.
+      # [Returns]
+      # Returns Feature centroid coordinates [long, lat]
       def find_feature_center(vertices)
         number_of_locations = vertices.length
 
@@ -288,8 +290,9 @@ module URBANopt
         central_square_root = Math.sqrt(x * x + y * y)
         central_latitude = Math.atan2(z, central_square_root)
 
-        [central_latitude * 180 / Math::PI,
-         central_longitude * 180 / Math::PI]
+        [central_longitude * 180 / Math::PI,
+          central_latitude * 180 / Math::PI]
+         
       end
 
       private

data/lib/urbanopt/geojson/helper.rb

@@ -308,8 +308,11 @@ module URBANopt
             # find the polygon of the other_building by passing it to the get_multi_polygons method
             other_building_points = building.other_points(other_building, other_height, origin_lat_lon, runner, zoning)
             shadowed = URBANopt::GeoJSON::Helper.is_shadowed(feature_points, other_building_points, origin_lat_lon)
+            if shadowed
+              runner.registerInfo("Feature #{other_building[:properties][:id]} is acting as shading object for #{building.id}")
+            end
             next unless shadowed
-            new_building = building.create_other_building(:space_per_building, model, origin_lat_lon, runner, zoning, other_building)
+            new_building = building.create_other_building(:space_per_building, model, origin_lat_lon, runner, zoning, 0, other_building)
             if new_building.nil? || new_building.empty?
               runner.registerWarning("Failed to create spaces for other building '#{name}'")
             end
@@ -331,23 +334,27 @@ module URBANopt
       # * +origin_lat_lon+ _Type:Float_ - An instance of OpenStudio::PointLatLon indicating the origin's
       #   latitude and longitude.
       def self.is_shadowed(potentially_shaded, potential_shader, origin_lat_lon)
-        all_pairs = []
+        # not using origin_lat_lon but have not removed it yet
+        min_distance = nil
+        min_pair = nil
         potentially_shaded.each do |building_point|
           potential_shader.each do |other_building_point|
             vector = other_building_point - building_point
-            all_pairs << {
-              building_point: building_point,
-              other_building_point: other_building_point,
-              vector: vector,
-              distance: vector.length
-            }
+            distance = Math.sqrt(vector.x * vector.x + vector.y * vector.y)
+            if min_distance.nil? || distance < min_distance
+              min_distance = distance
+              min_pair = {
+                building_point: building_point,
+                other_building_point: other_building_point,
+                vector: vector,
+                distance: vector.length
+              }
+            end
           end
         end
-        all_pairs.sort! { |x, y| x[:distance] <=> y[:distance] }
-        all_pairs.each do |pair|
-          if is_shaded(pair[:building_point], pair[:other_building_point], origin_lat_lon)
-            return true
-          end
+
+        if is_shaded(min_pair[:building_point], min_pair[:other_building_point], origin_lat_lon)
+          return true
         end
         return false
       end
@@ -361,34 +368,27 @@ module URBANopt
       # * +origin_lat_lon+ - _Type:Float_ - An instance of +OpenStudio::PointLatLon+ indicating the
       #   origin's latitude and longitude.
       def self.is_shaded(building_point, other_building_point, origin_lat_lon)
+        # not using origin_lat_lon but have not removed it yet
         vector = other_building_point - building_point
-        height = vector.z
         distance = Math.sqrt(vector.x * vector.x + vector.y * vector.y)
         if distance < 1
           return true
         end
-        hour_angle_rad = Math.atan2(-vector.x, -vector.y)
-        hour_angle = OpenStudio.radToDeg(hour_angle_rad)
-        latitude_rad = OpenStudio.degToRad(origin_lat_lon.lat)
-        result = false
-        (-24..24).each do |declination|
-          declination_rad = OpenStudio.degToRad(declination)
-          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))
-          zenith_angle = OpenStudio.radToDeg(zenith_angle_rad)
-          elevation_angle = 90 - zenith_angle
-          apparent_angle_rad = Math.atan2(height, distance)
-          apparent_angle = OpenStudio.radToDeg(apparent_angle_rad)
-          if elevation_angle > 0 && elevation_angle < apparent_angle
-            result = true
-            break
-          end
+        elevation_angle = 2.5 #not sure of best value maybe allow as project level argument
+        height = vector.z
+        apparent_angle_rad = Math.atan2(height, distance)
+        apparent_angle = OpenStudio.radToDeg(apparent_angle_rad)
+        if elevation_angle < apparent_angle
+          result = true
+        else
+          result = false
         end
         return result
       end
 
-      class << self
-        private :is_shaded
+            class << self
+              private :is_shaded
+            end
+          end
+        end
       end
-    end
-  end
-end

data/lib/urbanopt/geojson/model.rb

@@ -1,21 +1,31 @@
 # *********************************************************************************
-# URBANopt (tm), 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/lib/urbanopt/geojson/region.rb

@@ -1,21 +1,31 @@
 # *********************************************************************************
-# URBANopt (tm), 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/lib/urbanopt/geojson/scale_area.rb

@@ -1,21 +1,31 @@
 # *********************************************************************************
-# URBANopt (tm), 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/lib/urbanopt/geojson/schema/building_properties.json

@@ -537,7 +537,8 @@
         "90.1-2007",
         "90.1-2010",
         "90.1-2013",
-        "NREL ZNE Ready 2017",
+    	"90.1-2016",
+	"90.1-2019",
         "DEER Pre-1975",
         "DEER 1985",
         "DEER 1996",

data/lib/urbanopt/geojson/schema/district_system_properties.json

@@ -130,6 +130,8 @@
         "Transformer--100KVA PM",
         "Transformer--150KVA PM",
         "Transformer--300KVA PM",
+        "Transformer--500KVA PM",
+        "Transformer--750KVA PM",
         "Waste Heat Source--Hot Water",
         "Waste Heat Source--Ambient Water"
       ]

data/lib/urbanopt/geojson/schema/electrical_connector_properties.json

@@ -219,7 +219,10 @@
         "UG AL 1000kcmil A",
         "UG AL 1000kcmil B",
         "UG AL 1000kcmil C",
-        "UG AL 1000kcmil N"
+        "UG AL 1000kcmil N",
+        "UG AL 1000mcm A",
+        "UG AL 1000mcm B",
+        "UG AL 1000mcm C"
       ]
     }
   }

data/lib/urbanopt/geojson/schema/site_properties.json

@@ -75,6 +75,14 @@
       "description": "Name of utility tariff file in IDF or URDB format.",
       "type": "string"
     },
+    "underground_cables_ratio": {
+      "description": "Ratio of overall cables that are underground vs. overhead for RNM analysis.",
+      "type": "number"
+    },
+    "only_lv_consumers": {
+      "description": "If true, only low voltage consumers will be considered in the RNM analysis.",
+      "type": "boolean"
+    },
     "user_data": {
       "description": "Arbitrary user data"
     }