urbanopt-geojson 0.2.0.pre2 → 0.2.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad031bd7b8b2d22974781fa200d6fc6c233c7cf
-  data.tar.gz: a6bab4394e0bf97c15e86bdc054c37420648c184
+  metadata.gz: 10a192e307d2e97310601a894c2eac28caba1061
+  data.tar.gz: 09a0ec17fbc7a1a5ee6101094dc6be6749d4fcee
 SHA512:
-  metadata.gz: d07f450de4bc75b28452c6d18e5ab4207139fab076a3298ec10b36e13d5eab6ac4dbc002a78dc59adb0dca4770ed4d402deaf3247905df8ae926dc7fc64444d2
-  data.tar.gz: 82905227028b1112170d0fe8f9d411af2ba5d275690178ce1d67178952752b13ede774242e115d39cf54260da7f6532e3a4cd23ab61e9b7ff447b9e351240272
+  metadata.gz: 9064d122b7786d2e3b0549f4d44015267dbbbde25935c13f5397a9b82758134df8b88659fd565ae45d9340bdf7ce473f055f7a3ed30bfc902f4677df4012b633
+  data.tar.gz: 7c4f7ffe616d5f33f22769ac9f8981db669e7b74afeb9d58a06fbd34bda8a5d47e3250c10a660a2c49e0a1ceceb04a01f8db34e8bd5cd5972a1ba1c922699bf8

data/lib/urbanopt/geojson/geo_file.rb

@@ -178,33 +178,34 @@ module URBANopt
       # [Parameters]
       # +feature+ - _Type:Hash_ - feature object.
       def merge_site_properties(feature)
-        site_origins = @geojson_file[:features].select {|f| f[:properties][:type] == 'Site Origin'}
-        if site_origins.size > 0
-          site_origin = site_origins[0]
-          # site origin found, do some merging
-          # this maps site properties to building/district system properties. 
-          add_props = [
-            {site: :surface_elevation, feature: :surface_elevation}, 
-            {site: :timesteps_per_hour, feature: :timesteps_per_hour},
-            {site: :begin_date, feature: :begin_date},
-            {site: :end_date, feature: :end_date},
-            {site: :cec_climate_zone, feature: :cec_climate_zone},
-            {site: :climate_zone, feature: :climate_zone},
-            {site: :default_template, feature: :template},
-            {site: :weather_filename, feature: :weather_filename},
-            {site: :tariff_filename, feature: :tariff_filename}
-          ]
+        project = {}
+        if @geojson_file.key?(:project)
+          project = @geojson_file[:project]
+        end
 
-          add_props.each do |prop|
-            if site_origin[:properties].key?(prop[:site]) and site_origin[:properties][prop[:site]]
-              # property exists in site
-              if !feature[:properties].key?(prop[:feature]) or feature[:properties][prop[:feature]].nil? or feature[:properties][prop[:feature]].empty?
-                # property does not exist in feature or is nil: add site property (don't overwrite)
-                feature[:properties][prop[:feature]] = site_origin[:properties][prop[:site]]
-              end
+        # this maps site properties to building/district system properties. 
+        add_props = [
+          {site: :surface_elevation, feature: :surface_elevation}, 
+          {site: :timesteps_per_hour, feature: :timesteps_per_hour},
+          {site: :begin_date, feature: :begin_date},
+          {site: :end_date, feature: :end_date},
+          {site: :cec_climate_zone, feature: :cec_climate_zone},
+          {site: :climate_zone, feature: :climate_zone},
+          {site: :default_template, feature: :template},
+          {site: :weather_filename, feature: :weather_filename},
+          {site: :tariff_filename, feature: :tariff_filename}
+        ]
+
+        add_props.each do |prop|
+          if project.key?(prop[:site]) and project[prop[:site]]
+            # property exists in site
+            if !feature[:properties].key?(prop[:feature]) or feature[:properties][prop[:feature]].nil? or feature[:properties][prop[:feature]].empty?
+              # property does not exist in feature or is nil: add site property (don't overwrite)
+              feature[:properties][prop[:feature]] = project[prop[:site]]
             end
           end
         end
+
         return feature
       end
 

data/lib/urbanopt/geojson/version.rb

@@ -30,6 +30,6 @@
 
 module URBANopt
   module GeoJSON
-    VERSION = '0.2.0.pre2'.freeze
+    VERSION = '0.2.0.pre3'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-geojson
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre2
+  version: 0.2.0.pre3
 platform: ruby
 authors:
 - Tanushree Charan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler