Route color

app/controllers/api/v1/route_stop_patterns_controller.rb

@@ -55,6 +55,7 @@ def index
           properties[:stop_pattern] = entity.stop_pattern
           properties[:is_generated] = entity.is_generated
           properties[:is_modified] = entity.is_modified
+          properties[:color] = entity.route.color
         }
         render json: Geojson.from_entity_collection(@rsps, &append)
       end

app/controllers/api/v1/routes_controller.rb

@@ -36,6 +36,9 @@ def index
     if params[:bbox].present?
       @routes = @routes.stop_within_bbox(params[:bbox])
     end
+    if params[:color].present?
+      @routes = @routes.where(color: params[:color])
+    end
 
     @routes = @routes.includes{[
       operator,
@@ -54,7 +57,7 @@ def index
           params[:offset],
           params[:per_page],
           params[:total],
-          params.slice(:identifier, :identifier_starts_with, :operatedBy, :vehicle_type, :bbox, :onestop_id, :tag_key, :tag_value)
+          params.slice(:identifier, :identifier_starts_with, :operatedBy, :color, :vehicle_type, :bbox, :onestop_id, :tag_key, :tag_value)
         )
       end
       format.geojson do

app/models/json_schemas/route.json

@@ -14,6 +14,7 @@
     },
     "name": { "type": "string" },
     "tags": { "type": "object" },
+    "color": { "type": "string" },
     "vehicleType": {
       "type": ["string", "integer"],
       "format": "vehicle-type"

app/models/route.rb

@@ -14,6 +14,7 @@
 #  geometry                           :geography({:srid geometry, 4326
 #  identifiers                        :string           default([]), is an Array
 #  vehicle_type                       :integer
+#  color                              :string
 #
 # Indexes
 #
@@ -131,6 +132,16 @@ def before_destroy_making_history(changeset, old_model)
   belongs_to :operator
 
   validates :name, presence: true
+  validate :validate_color_attr
+
+  def validate_color_attr
+    errors.add(:color, "invalid color") unless Route.color_valid?(self.color)
+  end
+
+  def self.color_valid?(color)
+    return true if color.to_s.empty?
+    !!(/^[0-9A-F]{6}$/.match(color))
+  end
 
   scope :operated_by, -> (model_or_onestop_id) {
     if model_or_onestop_id.is_a?(Operator)
@@ -171,12 +182,12 @@ def self.from_gtfs(entity, attrs={})
       onestop_id: onestop_id.to_s,
       vehicle_type: entity.route_type.to_i
     )
+    route.color = entity.route_color.upcase if entity.route_color && Route.color_valid?(entity.route_color.upcase)
     # Copy over GTFS attributes to tags
     route.tags ||= {}
     route.tags[:route_long_name] = entity.route_long_name
     route.tags[:route_desc] = entity.route_desc
     route.tags[:route_url] = entity.route_url
-    route.tags[:route_color] = entity.route_color
     route.tags[:route_text_color] = entity.route_text_color
     route
   end

app/serializers/route_serializer.rb

@@ -14,6 +14,7 @@
 #  geometry                           :geography({:srid geometry, 4326
 #  identifiers                        :string           default([]), is an Array
 #  vehicle_type                       :integer
+#  color                              :string
 #
 # Indexes
 #
@@ -31,6 +32,7 @@ class RouteSerializer < CurrentEntitySerializer
              :name,
              :vehicle_type,
              :geometry,
+             :color,
              :tags,
              :operated_by_onestop_id,
              :operated_by_name,

app/serializers/route_stop_pattern_serializer.rb

@@ -32,6 +32,7 @@ class RouteStopPatternSerializer < CurrentEntitySerializer
              :route_onestop_id,
              :stop_pattern,
              :geometry,
+             :color,
              :is_generated,
              :is_modified,
              :created_at,
@@ -41,4 +42,8 @@ class RouteStopPatternSerializer < CurrentEntitySerializer
    def route_onestop_id
      object.route.onestop_id
    end
+
+   def color
+     object.route.color
+   end
 end

app/services/gtfs_graph.rb

@@ -410,6 +410,7 @@ def make_change_route(entity)
     {
       onestopId: entity.onestop_id,
       name: entity.name,
+      color: entity.color,
       identifiedBy: entity.identified_by.uniq,
       operatedBy: entity.operator.onestop_id,
       vehicleType: entity.vehicle_type,

db/migrate/20160301214615_add_color_to_routes.rb

@@ -0,0 +1,6 @@
+class AddColorToRoutes < ActiveRecord::Migration
+  def change
+    add_column :current_routes, :color, :string
+    add_column :old_routes, :color, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160219230742) do
+ActiveRecord::Schema.define(version: 20160301214615) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -157,6 +157,7 @@
     t.geography "geometry",                           limit: {:srid=>4326, :type=>"geometry", :geographic=>true}
     t.string    "identifiers",                                                                                    default: [], array: true
     t.integer   "vehicle_type"
+    t.string    "color"
   end
 
   add_index "current_routes", ["created_or_updated_in_changeset_id"], name: "c_route_cu_in_changeset", using: :btree
@@ -453,6 +454,7 @@
     t.geography "geometry",                           limit: {:srid=>4326, :type=>"geometry", :geographic=>true}
     t.string    "identifiers",                                                                                    default: [], array: true
     t.integer   "vehicle_type"
+    t.string    "color"
   end
 
   add_index "old_routes", ["created_or_updated_in_changeset_id"], name: "o_route_cu_in_changeset", using: :btree