urbanopt-geojson 0.2.0.pre3 → 0.4.0

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

@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "http://json-schema.org/openstudio-urban-modeling/district_system_properties.json#",
-  "title": "URBANopt Electrical Line",
-  "description": "Schema for an URBANopt Electrical Line object",
+  "id": "http://json-schema.org/openstudio-urban-modeling/electrical_connector_properties.json#",
+  "title": "URBANopt Electrical Connector",
+  "description": "Schema for an URBANopt Electrical Connector object",
   "type": "object",
   "properties": {
     "id": {
@@ -17,7 +17,7 @@
       "description": "Type of feature.",
       "type": "string",
       "enum": [
-        "ElectricalLine"
+        "ElectricalConnector"
       ]
     },
     "source_name": {
@@ -46,7 +46,7 @@
       "description": "Total length (ft) of the line, generated on export.",
       "type": "number"
     },
-    "start_junction_id": {
+    "startJunctionId": {
       "description": "Id of the junction that this line starts at.",
       "type": "string"
     },
@@ -67,7 +67,7 @@
             "type": "string"
         }
     },
-    "end_junction_id": {
+    "endJunctionId": {
       "description": "Id of the junction that this line ends at.",
       "type": "string"
     },
@@ -79,8 +79,8 @@
     "type",
     "id",
     "connector_type",
-    "start_junction_id",
-    "end_junction_id"
+    "startJunctionId",
+    "endJunctionId"
   ],
   "additionalProperties": false,
   "definitions": {
@@ -88,7 +88,7 @@
       "description": "Type of electrical line",
       "type": "string",
       "enum": [
-        "Line"
+        "Wire"
       ]
     },
     "WireType": {

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "http://json-schema.org/openstudio-urban-modeling/district_system_properties.json#",
+  "id": "http://json-schema.org/openstudio-urban-modeling/electrical_junction_properties.json#",
   "title": "URBANopt Electrical Junction",
   "description": "Schema for an URBANopt Electrical Junction object",
   "type": "object",
@@ -35,11 +35,11 @@
     "connector_type": {
       "$ref": "#/definitions/ElectricalJunctionType"
     },
-    "building_id": {
+    "buildingId": {
       "description": "Id of building if this junction is inside a building.",
       "type": "string"
     },
-    "district_system_id": {
+    "DSId": {
       "description": "Id of district system if this junction is inside a district system.",
       "type": "string"
     },
@@ -49,8 +49,7 @@
   },
   "required": [
     "type",
-    "id",
-    "connector_type"
+    "id"
   ],
   "additionalProperties": false,
   "definitions": {

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "http://json-schema.org/openstudio-urban-modeling/district_system_properties.json#",
+  "id": "http://json-schema.org/openstudio-urban-modeling/thermal_connector_properties.json#",
   "title": "URBANopt Thermal Connector",
   "description": "Schema for an URBANopt Thermal Connector object",
   "type": "object",

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "http://json-schema.org/openstudio-urban-modeling/district_system_properties.json#",
+  "id": "http://json-schema.org/openstudio-urban-modeling/thermal_junction_properties.json#",
   "title": "URBANopt Thermal Junction",
   "description": "Schema for an URBANopt Thermal Junction object",
   "type": "object",

data/lib/urbanopt/geojson/update_areas.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -97,6 +97,6 @@ geojson[:features].each do |feature|
   # std::vector<Point3d> toLocalCartesian(const std::vector<PointLatLon>& points) const;
 end
 
-File.open(ARGV[0], 'w') do |file|
+File.open(ARGV[0], 'w') do |file| # rubocop:disable Lint/ShadowingOuterLocalVariable
   file << JSON.pretty_generate(geojson)
 end

data/lib/urbanopt/geojson/validate_geojson.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -133,7 +133,9 @@ Dir.glob('denver_district*.geojson').each do |p|
       end
 
       all_errors[p][-1].concat(errors)
+    # rubocop:disable Lint/RescueException
     rescue Exception => e
+      # rubocop:enable Lint/RescueException
       all_errors[p][-1] << "Error '#{e.message}' occurred: "
       all_errors[p][-1] << e.backtrace.to_s
     end

data/lib/urbanopt/geojson/version.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -30,6 +30,6 @@
 
 module URBANopt
   module GeoJSON
-    VERSION = '0.2.0.pre3'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/lib/urbanopt/geojson/workflows/building.osw.out

@@ -899,7 +899,7 @@
             "default_value": "Inferred",
             "choice_values": [
               "Inferred",
-              "Ideal Air Loads",
+              "VRF",
               "PTAC with hot water heat",
               "PTAC with gas coil heat",
               "PTAC with electric baseboard heat",
@@ -955,7 +955,7 @@
             ],
             "choice_display_names": [
               "Inferred",
-              "Ideal Air Loads",
+              "VRF",
               "PTAC with hot water heat",
               "PTAC with gas coil heat",
               "PTAC with electric baseboard heat",
@@ -1511,7 +1511,7 @@
             "default_value": "Inferred",
             "choice_values": [
               "Inferred",
-              "Ideal Air Loads",
+              "VRF",
               "PTAC with hot water heat",
               "PTAC with gas coil heat",
               "PTAC with electric baseboard heat",
@@ -1567,7 +1567,7 @@
             ],
             "choice_display_names": [
               "Inferred",
-              "Ideal Air Loads",
+              "VRF",
               "PTAC with hot water heat",
               "PTAC with gas coil heat",
               "PTAC with electric baseboard heat",

data/lib/urbanopt/geojson/zoning.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -41,7 +41,8 @@ module URBANopt
       # * +floor_print+ - _Type:Array_ - An instance of +OpenStudio::Point3dVector.new+ .
       # * +perimeter_depth+ - _Type:Float_ - Represents perimeter depth.
       # * +runner+ - _Type:String_ - Measure run's instance of +OpenStudio::Measure::OSRunner+ .
-      def self.divide_floor_print(floor_print, perimeter_depth, runner)
+      # * +scale+ - _Type:Boolean_ - Checks whether floor print is to be scaled. Default is false.
+      def self.divide_floor_print(floor_print, perimeter_depth, runner, scale = false)
         result = []
         t_inv = OpenStudio::Transformation.alignFace(floor_print)
         t = t_inv.inverse
@@ -86,21 +87,25 @@ module URBANopt
         if self_intersects
           runner.registerWarning('Self intersecting surface result, will not divide')
         end
-        result << t_inv * new_vertices
-        (0...n).each do |i|
-          perim_vertices = OpenStudio::Point3dVector.new
-          if i == (n - 1)
-            perim_vertices << vertices[i]
-            perim_vertices << vertices[0]
-            perim_vertices << new_vertices[0]
-            perim_vertices << new_vertices[i]
-          else
-            perim_vertices << vertices[i]
-            perim_vertices << vertices[i + 1]
-            perim_vertices << new_vertices[i + 1]
-            perim_vertices << new_vertices[i]
+        if scale == true
+          result = t_inv * new_vertices
+        else
+          result << t_inv * new_vertices
+          (0...n).each do |i|
+            perim_vertices = OpenStudio::Point3dVector.new
+            if i == (n - 1)
+              perim_vertices << vertices[i]
+              perim_vertices << vertices[0]
+              perim_vertices << new_vertices[0]
+              perim_vertices << new_vertices[i]
+            else
+              perim_vertices << vertices[i]
+              perim_vertices << vertices[i + 1]
+              perim_vertices << new_vertices[i + 1]
+              perim_vertices << new_vertices[i]
+            end
+            result << t_inv * perim_vertices
           end
-          result << t_inv * perim_vertices
         end
         return result
       end

data/urbanopt-geojson-gem.gemspec

@@ -9,34 +9,27 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Tanushree Charan', 'Nicholas Long', 'Dan Macumber']
   spec.email         = ['tanushree.charan@nrel.gov', 'nicholas.long@nrel.gov', 'daniel.macumber@nrel.gov']
 
-  spec.summary       = 'Library and measures to translate URBANopt GeoJSON format to OpenStudio'
+  spec.summary       = 'Translate URBANopt GeoJSON format to OpenStudio'
   spec.description   = 'Library and measures to translate URBANopt GeoJSON format to OpenStudio'
-  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
   spec.homepage      = 'https://github.com/urbanopt/urbanopt-geojson-gem'
+  spec.licenses      = 'Nonstandard'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|lib.measures.*tests|spec|features)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  # this is not working right now
-  # spec.required_ruby_version = '~> 2.2.4'
-  
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '12.3.1'
-  spec.add_development_dependency 'rspec', '3.7.0'
+  spec.required_ruby_version = '~> 2.5.0'
 
-  # lock the version of these dependencies due to using older version of Ruby.
-  spec.add_dependency 'public_suffix', '3.1.1'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.7'
 
-  # other dependencies
-  spec.add_dependency 'json-schema'
-  spec.add_dependency 'openstudio-extension', '~> 0.1.5'
-  spec.add_dependency 'urbanopt-core', '~> 0.1.0'
+  spec.add_runtime_dependency 'json-schema', '~> 2.8'
+  spec.add_runtime_dependency 'openstudio-extension', '~> 0.2.5'
+  spec.add_runtime_dependency 'urbanopt-core', '~> 0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-geojson
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre3
+  version: 0.4.0
 platform: ruby
 authors:
 - Tanushree Charan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,98 +18,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.7.0
-- !ruby/object:Gem::Dependency
-  name: public_suffix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: openstudio-extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: urbanopt-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.4.0
 description: Library and measures to translate URBANopt GeoJSON format to OpenStudio
 email:
 - tanushree.charan@nrel.gov
@@ -169,23 +155,17 @@ files:
 - docs/schemas/site-properties.md
 - docs/schemas/thermal-connector-properties.md
 - docs/schemas/thermal-junction-properties.md
-- lib/change_log.rb
 - lib/measures/.rubocop.yml
 - lib/measures/urban_geometry_creation/LICENSE.md
 - lib/measures/urban_geometry_creation/README.md
 - lib/measures/urban_geometry_creation/README.md.erb
 - lib/measures/urban_geometry_creation/measure.rb
 - lib/measures/urban_geometry_creation/measure.xml
-- lib/measures/urban_geometry_creation/tests/nrel_stm_footprints.geojson
-- lib/measures/urban_geometry_creation/tests/shadowed_tests.rb
-- lib/measures/urban_geometry_creation/tests/urban_geometry_creation_test.rb
 - lib/measures/urban_geometry_creation_zoning/LICENSE.md
 - lib/measures/urban_geometry_creation_zoning/README.md
 - lib/measures/urban_geometry_creation_zoning/README.md.erb
 - lib/measures/urban_geometry_creation_zoning/measure.rb
 - lib/measures/urban_geometry_creation_zoning/measure.xml
-- lib/measures/urban_geometry_creation_zoning/tests/nrel_stm_footprints.geojson
-- lib/measures/urban_geometry_creation_zoning/tests/urban_geometry_creation_zoning_test.rb
 - lib/urbanopt-geojson.rb
 - lib/urbanopt/geojson.rb
 - lib/urbanopt/geojson/building.rb
@@ -199,6 +179,7 @@ files:
 - lib/urbanopt/geojson/mapper_classes.rb
 - lib/urbanopt/geojson/model.rb
 - lib/urbanopt/geojson/region.rb
+- lib/urbanopt/geojson/scale_area.rb
 - lib/urbanopt/geojson/schema/building_properties.json
 - lib/urbanopt/geojson/schema/district_system_properties.json
 - lib/urbanopt/geojson/schema/electrical_connector_properties.json
@@ -219,7 +200,8 @@ files:
 - package-lock.json
 - urbanopt-geojson-gem.gemspec
 homepage: https://github.com/urbanopt/urbanopt-geojson-gem
-licenses: []
+licenses:
+- Nonstandard
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -227,18 +209,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Library and measures to translate URBANopt GeoJSON format to OpenStudio
+summary: Translate URBANopt GeoJSON format to OpenStudio
 test_files: []