Yes, the extra food bonus is omly applicable to cities next to river unless you go out of despotism.
I've not notice the granary one though, then again, that would make a already powerful trait even more so, imagine a extra food and + an easily bulit granary, settlers every 2 turns without...