[master] Fix for custom markers with identical latitude and longitude.

Our current data source often has POIs with identical latitude and longitude.  This patch prevents conflicts adding or removing markers with the same position but different icons.