Remove Chouette::AreaType class

3 files changed, 7 insertions, 116 deletions

diff --git a/app/models/chouette/area_type.rb b/app/models/chouette/area_type.rb
deleted file mode 100644
index af614dc55..000000000
--- a/app/models/chouette/area_type.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-class Chouette::AreaType < ActiveSupport::StringInquirer
-
-  def initialize(text_code, numerical_code)
-    super text_code.to_s
-    @numerical_code = numerical_code
-  end
-
-  def self.new(text_code, numerical_code = nil)
-    if text_code and numerical_code
-      super
-    elsif self === text_code 
-      text_code
-    else
-      if Fixnum === text_code
-        text_code, numerical_code = definitions.rassoc(text_code)
-      else
-        text_code, numerical_code = definitions.assoc(text_code.to_s)
-      end
-
-      super text_code, numerical_code
-    end
-  end
-
-  def to_i
-    @numerical_code
-  end
-
-  def inspect
-    "#{to_s}/#{to_i}"
-  end
-
-  def name
-    if (to_s == 'itl') 
-      to_s.upcase
-    else
-      camelize
-    end
-  end
-
-  @@definitions = [
-    ["boarding_position", 0],
-    ["quay", 1],
-    ["commercial_stop_point", 2],
-    ["stop_place", 3],
-    ["itl", 4]
-  ]
-  cattr_reader :definitions
-
-  @@all = nil
-  def self.all
-    @@all ||= definitions.collect do |text_code, numerical_code|
-      new(text_code, numerical_code)
-    end
-  end
-
-end
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index 2427d1694..72bfdf274 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -206,7 +206,7 @@ class Chouette::StopArea < Chouette::ActiveRecord
   end
 
   def stop_area_type
-    area_type && Chouette::AreaType.new(area_type.underscore)
+    area_type
   end
 
   def stop_area_type=(stop_area_type)
@@ -216,12 +216,12 @@ class Chouette::StopArea < Chouette::ActiveRecord
     end
   end
 
-  @@stop_area_types = nil
-  def self.stop_area_types
-    @@stop_area_types ||= Chouette::AreaType.all.select do |stop_area_type|
-      stop_area_type.to_i >= 0
-    end
-  end
+  # @@stop_area_types = nil
+  # def self.stop_area_types
+  #   @@stop_area_types ||= Chouette::AreaType.all.select do |stop_area_type|
+  #     stop_area_type.to_i >= 0
+  #   end
+  # end
 
   def children_ids=(children_ids)
     children = children_ids.split(',').uniq
diff --git a/spec/models/chouette/area_type_spec.rb b/spec/models/chouette/area_type_spec.rb
deleted file mode 100644
index 14902416b..000000000
--- a/spec/models/chouette/area_type_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require 'spec_helper'
-
-describe Chouette::AreaType, :type => :model do
-  
-  def mode(text_code = "test", numerical_code = nil)
-    numerical_code ||= 1 if text_code == "test"
-    Chouette::AreaType.new(text_code, numerical_code)
-  end
-
-  describe "#to_i" do
-    
-    it "should return numerical code" do
-      expect(mode("test", 1).to_i).to eq(1)
-    end
-
-  end
-
-  it "should return true to #test? when text code is 'test'" do
-    expect(mode("test")).to be_test
-  end
-
-  it "should be equal when text codes are identical" do
-    expect(mode("test",1)).to eq(mode("test", 2))
-  end
-
-  describe ".new" do
-
-    it "should find numerical code from text code" do
-      expect(mode("boarding_position").to_i).to eq(0)
-    end
-
-    it "should find text code from numerical code" do
-      expect(mode(0)).to eq("boarding_position")
-    end
-
-    it "should accept another mode" do
-      expect(Chouette::AreaType.new(mode("test"))).to eq(mode("test"))
-    end
-    
-  end
-
-
-  describe ".all" do
-    
-    Chouette::AreaType.definitions.each do |text_code, numerical_code|
-      it "should include a AreaType #{text_code}" do
-        expect(Chouette::AreaType.all).to include(Chouette::AreaType.new(text_code))
-      end
-    end
-
-  end
-
-end