tf1_converter 0.6.2 → 0.7.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tf1_converter (0.6.2)
+    tf1_converter (0.7.0)
       builder (= 3.1.4)
       geo_swap (= 0.2.1)
       nokogiri (= 1.5.6)

data/README.md

@@ -12,6 +12,6 @@
     gem install tf1_converter
 
 
- 4) add a config file to a convenient location (see example/config.yml)
+ 4) add a config file to a convenient location (see example/config.csv)
 
  5) edit the config file in WordPad or similar, make sure the paths match where your files are.

data/example/config.csv

@@ -0,0 +1,55 @@
+The path of the directory where you are putting gpx files
+INPUT
+input
+
+The path of the directory where you are wanting the KML files
+OUTPUT
+output
+
+The full path of the directory where your icons are stored
+ICON_PATH
+c:\program files\gpx2kml\icon\tf_ge\
+
+START_PATH
+c:\program files\gpx2kml\test
+
+END_PATH
+c:\program files\gpx2kml\test
+
+Table of Icons (symbol/filename/meaning/custom_name)
+ICONS
+Custom 0,01.png,Search Start,icon_name_1
+Custom 1,02.png,Search Stop,icon_name_2
+Custom 2,03.png,Victim Detected,icon_name_3
+Custom 3,04.png,Victim Confirmed,icon_name_4
+Custom 4,05.png,Meaning 5,icon_name_5
+Custom 5,06.png,Meaning 6,icon_name_6
+Custom 6,07.png,Meaning 7,icon_name_7
+Custom 7,08.png,Meaning 8,icon_name_8
+Custom 8,09.png,Meaning 9,icon_name_9
+Custom 9,10.png,Meaning 10,icon_name_10
+Custom 10,11.png,Collection Point,icon_name_11
+Custom 11,12.png,Meaning 12,icon_name_12
+Custom 12,13.png,Command Post,icon_name_13
+Custom 13,14.png,Staging Area,icon_name_14
+Custom 14,15.png,Criminal Activity,icon_name_15
+Custom 15,16.png,Meaning 16,icon_name_16
+Custom 16,17.png,Water Level,icon_name_17
+Custom 17,18.png,Structure Damage / Safe,icon_name_18
+Custom 18,19.png,Meaning 19,icon_name_19
+Custom 19,20.png,Structure Not Safe,icon_name_20
+Custom 20,21.png,Extra 21,icon_name_21
+Custom 21,22.png,Extra 22,icon_name_22
+Custom 22,23.png,Extra 23,icon_name_23
+Residence,default.png,Default,icon_name_24
+
+Table of Colors (Name/KML Hex)
+COLORS
+DarkRed,f0000080
+Yellow,f000ffff
+Blue,f0ff0000
+Red,f01400ff
+Orange,f014b4ff
+Green,f000b414
+Purple,f0ff7878
+Pink,f0ff78f0

data/example/windowsconfig.csv

@@ -0,0 +1,55 @@
+The path of the directory where you are putting gpx files
+INPUT
+c:\Documents and Settings\FEMA\TF1Converter\Input
+
+The path of the directory where you are wanting the KML files
+OUTPUT
+c:\Documents and Settings\FEMA\TF1Converter\Output
+
+The full path of the directory where your icons are stored
+ICON_PATH
+c:\program files\gpx2kml\icon\tf_ge\
+
+START_PATH
+c:\program files\gpx2kml\test
+
+END_PATH
+c:\program files\gpx2kml\test
+
+Table of Icons (symbol/filename/meaning/custom_name)
+ICONS
+Custom 0,01.png,Search Start,icon_name_1
+Custom 1,02.png,Search Stop,icon_name_2
+Custom 2,03.png,Victim Detected,icon_name_3
+Custom 3,04.png,Victim Confirmed,icon_name_4
+Custom 4,05.png,Meaning 5,icon_name_5
+Custom 5,06.png,Meaning 6,icon_name_6
+Custom 6,07.png,Meaning 7,icon_name_7
+Custom 7,08.png,Meaning 8,icon_name_8
+Custom 8,09.png,Meaning 9,icon_name_9
+Custom 9,10.png,Meaning 10,icon_name_10
+Custom 10,11.png,Collection Point,icon_name_11
+Custom 11,12.png,Meaning 12,icon_name_12
+Custom 12,13.png,Command Post,icon_name_13
+Custom 13,14.png,Staging Area,icon_name_14
+Custom 14,15.png,Criminal Activity,icon_name_15
+Custom 15,16.png,Meaning 16,icon_name_16
+Custom 16,17.png,Water Level,icon_name_17
+Custom 17,18.png,Structure Damage / Safe,icon_name_18
+Custom 18,19.png,Meaning 19,icon_name_19
+Custom 19,20.png,Structure Not Safe,icon_name_20
+Custom 20,21.png,Extra 21,icon_name_21
+Custom 21,22.png,Extra 22,icon_name_22
+Custom 22,23.png,Extra 23,icon_name_23
+Residence,default.png,Default,icon_name_24
+
+Table of Colors (Name/KML Hex)
+COLORS
+DarkRed,f0000080
+Yellow,f000ffff
+Blue,f0ff0000
+Red,f01400ff
+Orange,f014b4ff
+Green,f000b414
+Purple,f0ff7878
+Pink,f0ff78f0

data/harness.rb

@@ -9,5 +9,5 @@ require_relative './lib/tf1_converter'
 
 input = File.open('input/test.gpx', 'r')
 output = File.open('output/test.kml', 'w')
-TF1Converter::Config.load('example/config.yml')
+TF1Converter::Config.load('example/config.csv')
 TF1Converter::Translation.from(input).into(output)

data/lib/tf1_converter/config.rb

@@ -1,22 +1,57 @@
-require 'yaml'
+require 'csv'
 
 module TF1Converter
   class Config
 
     def self.load(path)
-      @config = YAML.load(File.open(path, 'r'))
+      last_key = nil
+      current_control = nil
+      CSV.read(path).each do |row|
+        if last_key == 'INPUT'
+          @input = row[0]
+        elsif last_key == 'OUTPUT'
+          @output = row[0]
+        elsif last_key == 'ICON_PATH'
+          @icon_path = row[0]
+        elsif last_key == 'START_PATH'
+          @start_path = row[0]
+        elsif last_key == 'END_PATH'
+          @end_path = row[0]
+        elsif last_key == 'ICONS'
+          @icons = {}
+          current_control = 'ICONS'
+        elsif last_key == 'COLORS'
+          @colors = {}
+          current_control = 'COLORS'
+        end
+
+        if current_control == 'ICONS'
+          if row.empty?
+            current_control = nil
+          else
+            @icons[row[0]] = {
+              'icon' => row[1],
+              'meaning' => row[2], 
+              'name' => row[3] 
+            }
+          end
+        elsif current_control == 'COLORS'
+          if row.empty?
+            current_control = nil
+          else
+            @colors[row[0]] = row[1]
+          end
+        end
+
+        last_key = row[0]
+      end
     end
 
     %w(icon_path start_path end_path icons colors input output).each do |name|
       define_singleton_method(name.to_sym) do
-        config[name]
+        instance_variable_get("@#{name}")
       end
     end
 
-    private
-    def self.config
-      raise "NO CONFIG LOADED" unless @config
-      @config['tf1_converter']
-    end
   end
-end
+end

data/lib/tf1_converter/version.rb

@@ -1,3 +1,3 @@
 module TF1Converter
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/lib/tf1_converter.rb

@@ -1,3 +1,3 @@
-require 'tf1_converter/config'
-require 'tf1_converter/version'
-require 'tf1_converter/translation'
+require_relative 'tf1_converter/config'
+require_relative 'tf1_converter/version'
+require_relative 'tf1_converter/translation'

data/spec/lib/tf1_converter/translation_spec.rb

@@ -14,12 +14,13 @@ module TF1Converter
 
     let(:local_dir) { File.dirname(__FILE__) }
     let(:path) { File.expand_path('../../fixtures', local_dir) }
+    let(:config_file) { File.expand_path('../../../example/config.csv', local_dir) }
 
     it "translates a file correctly" do
       input = File.open("#{path}/test.gpx", 'r')
       output = File.open("#{path}/test.kml", 'w')
       expected = File.open("#{path}/expected.kml", 'r')
-      TF1Converter::Config.load(File.expand_path('../../../example/config.yml', local_dir))
+      TF1Converter::Config.load(config_file)
       TF1Converter::Translation.from(input).into(output)
 
       result = File.open("#{path}/test.kml", 'r')
@@ -29,7 +30,7 @@ module TF1Converter
     it 'translates a tracks-only file' do
       input = File.open("#{path}/ftwood2.gpx", 'r')
       output = File.open("#{path}/ftwood2.kml", 'w')
-      TF1Converter::Config.load(File.expand_path('../../../example/config.yml', local_dir))
+      TF1Converter::Config.load(config_file)
       #should not raise error
       TF1Converter::Translation.from(input).into(output)
     end
@@ -37,7 +38,7 @@ module TF1Converter
     it 'translates waypoints by name' do
       input = File.open("#{path}/waypoint-by-name.gpx", 'r')
       output = File.open("#{path}/waypoint-by-name.kml", 'w')
-      TF1Converter::Config.load(File.expand_path('../../../example/config.yml', local_dir))
+      TF1Converter::Config.load(config_file)
       TF1Converter::Translation.from(input).into(output)
       result = File.open("#{path}/waypoint-by-name.kml", 'r')
       result.read.should_not =~ /default\.png/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tf1_converter
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -154,8 +154,8 @@ files:
 - README.md
 - Rakefile
 - bin/tf1convert
-- example/config.yml
-- example/windowsconfig.yml
+- example/config.csv
+- example/windowsconfig.csv
 - harness.rb
 - input/test.gpx
 - lib/tf1_converter.rb
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1230242393901042739
+      hash: 2030161569308600368
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1230242393901042739
+      hash: 2030161569308600368
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/example/config.yml

@@ -1,39 +0,0 @@
-tf1_converter:
-  input: input
-  output: output
-  icon_path: c:\program files\gpx2kml\icon\tf_ge\
-  start_path: c:\program files\gpx2kml\test
-  end_path: c:\program files\gpx2kml\test
-  icons: { Custom 0: { icon: 01.png, meaning: Search Start, name: icon_name_1 },
-           Custom 1: { icon: 02.png, meaning: Search Stop, name: icon_name_2 },
-           Custom 2: { icon: 03.png, meaning: Victim Detected, name: icon_name_3},
-           Custom 3: { icon: 04.png, meaning: Victim Confirmed, name: icon_name_4},
-           Custom 4: { icon: 05.png, meaning: Meaning 5, name: icon_name_5},
-           Custom 5: { icon: 06.png, meaning: Meaning 6, name: icon_name_6},
-           Custom 6: { icon: 07.png, meaning: Meaning 7, name: icon_name_7},
-           Custom 7: { icon: 08.png, meaning: Meaning 8, name: icon_name_8},
-           Custom 8: { icon: 09.png, meaning: Meaning 9, name: icon_name_9},
-           Custom 9: { icon: 10.png, meaning: Meaning 10, name: icon_name_10},
-           Custom 10: { icon: 11.png, meaning: Collection Point , name: icon_name_11},
-           Custom 11: { icon: 12.png, meaning: Meaning 12, name: icon_name_12},
-           Custom 12: { icon: 13.png, meaning: Command Post, name: icon_name_13 },
-           Custom 13: { icon: 14.png, meaning: Staging Area, name: icon_name_14 },
-           Custom 14: { icon: 15.png, meaning: Criminal Activity, name: icon_name_15 },
-           Custom 15: { icon: 16.png, meaning: Meaning 16, name: icon_name_16 },
-           Custom 16: { icon: 17.png, meaning: Water Level, name: icon_name_17 },
-           Custom 17: { icon: 18.png, meaning: Structure Damage / Safe, name: icon_name_18 },
-           Custom 18: { icon: 19.png, meaning: Meaning 19, name: icon_name_19 },
-           Custom 19: { icon: 20.png, meaning: Structure Not Safe, name: icon_name_20 },
-           Custom 20: { icon: 21.png, meaning: Extra 21, name: icon_name_21 },
-           Custom 21: { icon: 22.png, meaning: Extra 22, name: icon_name_22 },
-           Custom 22: { icon: 23.png, meaning: Extra 23, name: icon_name_23 },
-           Residence: { icon: default.png, meaning: Default, name: icon_name_24 } }
-  colors: { DarkRed: f0000080,
-            Yellow: f000ffff,
-            Blue: f0ff0000,
-            Red: f01400ff,
-            Orange: f014b4ff,
-            Green: f000b414,
-            Purple: f0ff7878,
-            Pink: f0ff78f0 }
-

data/example/windowsconfig.yml

@@ -1,32 +0,0 @@
-tf1_converter:
-  input: c:\Documents and Settings\FEMA\TF1Converter\Input
-  output: c:\Documents and Settings\FEMA\TF1Converter\Output
-  icon_path: c:\Program Files\GPX2KML\icon\tf_ge\
-  start_path: c:\Program Files\GPX2KML\test
-  end_path: c:\Program Files\GPX2KML\test
-  icons: { Custom 0: { icon: 01.png, meaning: Search Start, name: name1 },
-           Custom 1: { icon: 02.png, meaning: Search Stop, name: name2},
-           Custom 2: { icon: 03.png, meaning: Victim Detected, name: name3},
-         Custom 3: { icon: 04.png, meaning: Victim Confirmed, name: name4},
-	       Custom 4: { icon: 05.png, meaning: Meaning 5, name: name5},
-	       Custom 5: { icon: 06.png, meaning: Meaning 6, name: name6},
-	       Custom 6: { icon: 07.png, meaning: Meaning 7, name: name7},
-	       Custom 7: { icon: 08.png, meaning: Meaning 8, name: name8},
-	       Custom 8: { icon: 09.png, meaning: Meaning 9, name: name9},
-	       Custom 9: { icon: 10.png, meaning: Meaning 10, name: name10},
-	       Custom 10: { icon: 11.png, meaning: Collection Point, name: name11 },
-	       Custom 11: { icon: 12.png, meaning: Meaning 12, name: name12},
-	       Custom 12: { icon: 13.png, meaning: Command Post, name: name13 },
-	       Custom 13: { icon: 14.png, meaning: Staging Area, name: name14},
-	       Custom 14: { icon: 15.png, meaning: Criminal Activity, name: name15 },
-	       Custom 15: { icon: 16.png, meaning: Meaning 16, name: name16},
-	       Custom 16: { icon: 17.png, meaning: Water Level, name: name17},
-	       Custom 17: { icon: 18.png, meaning: Structure Damage / Safe, name: name18 },
-	       Custom 18: { icon: 19.png, meaning: Meaning 19, name: name19},
-	       Custom 19: { icon: 20.png, meaning: Structure Not Safe, name: name20 },
-	       Custom 20: { icon: 21.png, meaning: Extra 21, name: name21 },
-	       Custom 21: { icon: 22.png, meaning: Extra 22, name: name22 },
-	       Custom 22: { icon: 23.png, meaning: Extra 23, name: name23},
-	       Residence: { icon: default.png, meaning: Default, name: name24 } }
-  colors: { DarkRed: f0000080,
-            Yellow: f000ffff }