One possible (short-term?) solution could be to allow a map to have its pins show the icon for the type of information that the pin is connected to (where a pin contains a link).
This would allow creature pins to be differentiated from location pins (assuming each has their own linked topic).
An alternative would be to allow labels to appear on the pins directly
|