urbanopt-geojson 0.10.0 → 0.11.0

data/lib/measures/urban_geometry_creation/README.md

@@ -43,7 +43,7 @@ Select which surrounding buildings to include.
 **Required:** true,
 **Model Dependent:** false
 
-### Scale Footprint Area by the Floor Area?
+### Scale Footprint Area by the Floor Area
 If true, the footprint area from GeoJSON will be scaled by the floor_area provided by the user in URBANopt.
 **Name:** scale_footprint_area_by_floor_area,
 **Type:** Boolean,

data/lib/measures/urban_geometry_creation/measure.rb

@@ -51,8 +51,8 @@ class UrbanGeometryCreation < OpenStudio::Measure::ModelMeasure
     surrounding_buildings.setDefaultValue('ShadingOnly')
     args << surrounding_buildings
     # not a required argument
-    scale_footprint_area_by_floor_area = OpenStudio::Ruleset::OSArgument.makeBoolArgument('scale_footprint_area_by_floor_area', false)
-    scale_footprint_area_by_floor_area.setDisplayName('Scale Footprint Area by the Floor Area?')
+    scale_footprint_area_by_floor_area = OpenStudio::Measure::OSArgument.makeBoolArgument('scale_footprint_area_by_floor_area', false)
+    scale_footprint_area_by_floor_area.setDisplayName('Scale Footprint Area by the Floor Area')
     scale_footprint_area_by_floor_area.setDescription('If true, the footprint area from GeoJSON will be scaled by the floor_area provided by the user in URBANopt.')
     scale_footprint_area_by_floor_area.setDefaultValue(false)
     args << scale_footprint_area_by_floor_area

data/lib/measures/urban_geometry_creation/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>urban_geometry_creation</name>
   <uid>5ab85d6b-c9af-4361-8ab9-613ee99a5666</uid>
-  <version_id>7f03040a-cc98-4c54-ae40-f33db7f534b7</version_id>
-  <version_modified>2023-07-06T15:57:24Z</version_modified>
+  <version_id>583499fb-4275-4787-9168-e3383dca0fc6</version_id>
+  <version_modified>2023-11-20T17:10:01Z</version_modified>
   <xml_checksum>D254E772</xml_checksum>
   <class_name>UrbanGeometryCreation</class_name>
   <display_name>UrbanGeometryCreation</display_name>
@@ -48,7 +48,7 @@
     </argument>
     <argument>
       <name>scale_footprint_area_by_floor_area</name>
-      <display_name>Scale Footprint Area by the Floor Area?</display_name>
+      <display_name>Scale Footprint Area by the Floor Area</display_name>
       <description>If true, the footprint area from GeoJSON will be scaled by the floor_area provided by the user in URBANopt.</description>
       <type>Boolean</type>
       <required>false</required>
@@ -114,7 +114,7 @@
       <filename>README.md</filename>
       <filetype>md</filetype>
       <usage_type>readme</usage_type>
-      <checksum>74F54DC5</checksum>
+      <checksum>AA2D38B0</checksum>
     </file>
     <file>
       <filename>README.md.erb</filename>
@@ -131,7 +131,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>4B36EB4E</checksum>
+      <checksum>5D490083</checksum>
     </file>
     <file>
       <filename>nrel_stm_footprints.geojson</filename>
@@ -143,13 +143,13 @@
       <filename>shadowed_tests.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>1AD96F0B</checksum>
+      <checksum>6F2F2CA8</checksum>
     </file>
     <file>
       <filename>urban_geometry_creation_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>CA11D7FF</checksum>
+      <checksum>81FF63D2</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/urban_geometry_creation_zoning/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>urban_geometry_creation_zoning</name>
   <uid>96ea1317-76ac-4670-b51d-71ee3f4fdd65</uid>
-  <version_id>c1c0bf6d-92a2-4a69-9446-e3ebf392c376</version_id>
-  <version_modified>2023-07-06T15:57:24Z</version_modified>
+  <version_id>4d47bb3f-6e49-4309-a4e0-5f2c3748b947</version_id>
+  <version_modified>2023-11-20T17:10:01Z</version_modified>
   <xml_checksum>D254E772</xml_checksum>
   <class_name>UrbanGeometryCreationZoning</class_name>
   <display_name>UrbanGeometryCreationZoning</display_name>
@@ -136,7 +136,7 @@
       <filename>urban_geometry_creation_zoning_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>5C631B7A</checksum>
+      <checksum>FC65E7CE</checksum>
     </file>
   </files>
 </measure>

data/lib/urbanopt/geojson/geo_file.rb

@@ -84,7 +84,8 @@ module URBANopt
                 raise('No name found for Building Feature')
               end
               if feature[:properties][:number_of_stories].nil?
-                @@logger.warn("Number of stories is required to calculate shading using the UrbanGeometryCreation measure...ignoring #{feature[:properties][:id]} in shading calculations")
+                @@logger.warn("Number of stories is required to calculate shading using the UrbanGeometryCreation measure.\n" \
+                  "Not validating #{feature[:properties][:id]} against schema and ignoring in shading calculations")
               end
               feature[:additionalProperties] = true
             # In case hpxml_directory present check for fewer properties
@@ -95,6 +96,8 @@ module URBANopt
               if feature[:properties][:name].nil?
                 raise('No name found for Building Feature')
               end
+              @@logger.warn("OS-HPXML files may not conform to schema, which is usually ok.\n" \
+                "Not validating #{feature[:properties][:id]} against schema")
             # Else validate for all required properties in the schema
             else
               errors = validate(@@building_schema, properties)

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

@@ -59,7 +59,7 @@
       "$ref": "#/definitions/TemperatureType"
     },
     "flow_direction": {
-      "description": "Charcterization of connector, relative to the central plant",
+      "description": "Characterization of connector, relative to the central plant",
       "$ref": "#/definitions/FlowDirection"
     },
     "user_data": {
@@ -67,12 +67,10 @@
     }
   },
   "required": [
+    "id",
     "type",
-    "connector_type",
     "startJunctionId",
-    "endJunctionId",
-    "fluid_temperature_type",
-    "flow_direction"
+    "endJunctionId"
   ],
   "additionalProperties": false,
   "definitions": {

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

@@ -60,9 +60,8 @@
     }
   },
   "required": [
-    "type",
-    "junction_type",
-    "connection_type"
+    "id",
+    "type"
   ],
   "additionalProperties": false,
   "definitions": {

data/lib/urbanopt/geojson/version.rb

@@ -5,6 +5,6 @@
 
 module URBANopt
   module GeoJSON
-    VERSION = '0.10.0'.freeze
+    VERSION = '0.11.0'.freeze
   end
 end