Nope, it is shared between the dork and the geek, and specifically leaves out the one of the three that I heard is actually obsessive.
Same with the fringe interests -- your chart says two out of three, and I have heard the third only.
I do agree it is very difficult to actually agree on any sane terminology and it is mostly whatever anyone feels like it should mean at any given time.
