Skip to content

Commit

Permalink
Merge branch 'feature/fix-flickr-gbif-urls' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
simaob committed Jul 27, 2015
2 parents 143f963 + 9485e75 commit 492429e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion app/controllers/flickr_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ def populate(response, q)
"seasonal" => photo['seasonal'] || 'Resident',
"origin" => photo['origin'] || 'Native',
"presence" => photo['presence'] || 'Extant',
"geocat_query" => CGI.unescape(q)
"geocat_query" => CGI.unescape(q),
"occurrenceDetails" => 'http://flickr.com/' + photo['owner'] + '/' + photo['id']
})
end
end
Expand Down
3 changes: 2 additions & 1 deletion app/controllers/gbif_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ def populate(response, q)
'geocat_removed' => false,
'geocat_kind' => 'gbif',
'geocat_alias' => CGI.unescape(q),
'geocat_query' => CGI.unescape(q)
'geocat_query' => CGI.unescape(q),
'occurrenceDetails' => 'http://gbif.org/occurrence/' + item['key'].to_s
})
end
end
Expand Down

0 comments on commit 492429e

Please sign in to comment.