add map snippets
alphabetize properly, fix tests
Merge pull request #2492 from geraldarthur/master

Add map snippets