Heres an UI suggestion: Have a small icon  somewhere in the District description tooltips that showed which kind of district it is (farm, makers , research, common , garrison,  harbour, so on and so forth).

"But Bruno, I already know which District is which "

Yes, but the EQs would also have ter same icons, so you could know at a glance which district types they are for adjacency and infraestructure- related boni.

Also, we could reduce analysis paralisys by having the game calculate the current effect of your infraestructuresand showing it on its tooltip before you buy.  

I'm on mobile but once I come home I'll try to make some mockups

Mockup time