bike
/
BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity
Browse Source

Fixes for orgs-json

development
Godwin 11 years ago
parent
73b0893b71
commit
546f1d4cbd
1 changed files with 9 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      app/controllers/organizations_controller.rb

16
app/controllers/organizations_controller.rb
View File

@ -1,4 +1,5 @@
include ApplicationHelper include ApplicationHelper
require 'uri'
class OrganizationsController < ApplicationController class OrganizationsController < ApplicationController
before_action :set_organization, only: [:show, :edit, :update, :destroy] before_action :set_organization, only: [:show, :edit, :update, :destroy]
@ -100,13 +101,14 @@ class OrganizationsController < ApplicationController
countries[location.country.downcase][:territories][location.territory.downcase] = country.subregions.coded(location.territory) countries[location.country.downcase][:territories][location.territory.downcase] = country.subregions.coded(location.territory)
end end
territory = countries[location.country.downcase][:territories][location.territory.downcase] territory = countries[location.country.downcase][:territories][location.territory.downcase]
if !orgs[location.country.downcase][location.territory.downcase].has_key?(location.territory.downcase) city = URI.encode(location.city.downcase.gsub(/\s/, '-'))
orgs[location.country.downcase][location.territory.downcase][location.city.downcase] = Hash.new if !orgs[location.country.downcase][location.territory.downcase].has_key?(city)
orgs[location.country.downcase][location.territory.downcase][location.city.downcase][:latitude] = location.latitude orgs[location.country.downcase][location.territory.downcase][city] = Hash.new
orgs[location.country.downcase][location.territory.downcase][location.city.downcase][:longitude] = location.longitude orgs[location.country.downcase][location.territory.downcase][city][:latitude] = location.latitude
orgs[location.country.downcase][location.territory.downcase][location.city.downcase][:count] = 0 orgs[location.country.downcase][location.territory.downcase][city][:longitude] = location.longitude
orgs[location.country.downcase][location.territory.downcase][city][:count] = 0
end end
orgs[location.country.downcase][location.territory.downcase][location.city.downcase][orgs[location.country.downcase][location.territory.downcase][location.city.downcase][:count]] = { orgs[location.country.downcase][location.territory.downcase][city][orgs[location.country.downcase][location.territory.downcase][city][:count]] = {
:title => org.name, :title => org.name,
:id => org.id, :id => org.id,
:logo => org.avatar.url(:thumb), :logo => org.avatar.url(:thumb),
@ -126,7 +128,7 @@ class OrganizationsController < ApplicationController
:url => url_for(org), :url => url_for(org),
:order => order :order => order
} }
orgs[location.country.downcase][location.territory.downcase][location.city.downcase][:count] += 1 orgs[location.country.downcase][location.territory.downcase][city][:count] += 1
order += 1 order += 1
} }
render :json => orgs.to_json render :json => orgs.to_json

Write Preview
Loading…
Cancel
Save