urbanopt-cli 0.2.0.pre1 → 0.2.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88a9dd62f885c84b04844e60699f381066864569
-  data.tar.gz: b5c6b738b7c1c4e4434fb96cdaaeeb6baf89f0fa
+  metadata.gz: ca96f837d103dad09458b5ab9a71fdc856572d7d
+  data.tar.gz: 7dd3b0c50153c6a5ca9d857948d6c215c8730cfb
 SHA512:
-  metadata.gz: 7289fadd0b9669818d8a313ab7326914d21f374235211bc07af4d6c47bddb8c1c781cab3b2a3c3c49ecb4ad1ab53221b5ecf45f0670ec7d2ea2dd305c23e0fa2
-  data.tar.gz: ea34a0ceb6fa0cfa4b19ebecf1904718b021772f2b9f5ae5050af72ba282e64528f857ef4f0b8daba94b862c55325e2369d673c62be8da63ae3f7ec519425e61
+  metadata.gz: 1fe3e035b0a66367be25164ec350c6a735c534fcdef8ef0ea30fb6fab2bd089651d969587f8a2dafb50652f92cf51452608c4db33ab0a01c29c50358230a85f3
+  data.tar.gz: e1c5d9b3c523d38aca1f76a3e738966d1a08f8774d3f560efaac2af6137a1986e457b54816b50113fe2daeb4ad9a4e0422083c4acea10ea6aa315fed64f01eec

data/lib/uo_cli/version.rb

@@ -1,5 +1,5 @@
 module URBANopt
   module CLI
-  	VERSION = "0.2.0.pre1"
+  	VERSION = "0.2.0.pre2"
   end
 end

data/lib/uo_cli.rb

@@ -108,10 +108,12 @@ module URBANopt
     # +feature_file_path+:: _string_ Path to Feature File used to describe set of features in the district
     # 
     # FIXME: This only works when scenario_file and feature_file are in the project root directory
+    # This works when called with filename (from inside project directory) and with absolute filepaths
     # Also, feels a little weird that now I'm only using instance variables and not passing anything to this function. I guess it's ok?
     def self.run_func 
-        name = "#{@scenario_folder}"
         root_dir = File.dirname(File.absolute_path(@user_input[:scenario]))
+        scenario_basename = File.basename(File.absolute_path(@user_input[:scenario]))
+        name = File.basename(scenario_basename, File.extname(scenario_basename))
         run_dir = File.join(root_dir, 'run', name.downcase)
 
         if @feature_id
@@ -122,7 +124,7 @@ module URBANopt
             end
         end
 
-        csv_file = File.join(root_dir, @user_input[:scenario])
+        csv_file = File.join(root_dir, scenario_basename)
         featurefile = File.join(root_dir, @feature_name)
         mapper_files_dir = File.join(root_dir, "mappers")
         num_header_rows = 1
@@ -149,7 +151,10 @@ module URBANopt
             :headers => ["Feature Id","Feature Name","Mapper Class"]) do |csv|
                 feature_file_json[:features].each do |feature|
                     if feature_id == 'SKIP'
-                        csv << [feature[:properties][:id], feature[:properties][:name], "URBANopt::Scenario::#{mapper_name}Mapper"]
+                        # ensure that feature is a building
+                        if feature[:properties][:type] == "Building"
+                            csv << [feature[:properties][:id], feature[:properties][:name], "URBANopt::Scenario::#{mapper_name}Mapper"]
+                        end
                     elsif feature_id == feature[:properties][:id].to_i
                         csv << [feature[:properties][:id], feature[:properties][:name], "URBANopt::Scenario::#{mapper_name}Mapper"]
                     elsif

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre1
+  version: 0.2.0.pre2
 platform: ruby
 authors:
 - Nathan Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack