Geonames records have extra, duplicate, label components

[orangejulius]

Our current admin layer lookup mapping tells admin layers to be looked up in all admin layers above that of the record, but also including that of the layers themselves. So, for example, locality records from Geonames will be annotated with a locality record from Who's on First.

It used to be that our label generating system required this. However, now it's actually detrimental: when the name from Geonames does not exactly match the name from WOF, the label contains duplicate sections. Here are some examples:

People's Republic of China, China
City of Detroit, Detroit, MI
New York City, New York, NY, USA

We also appear to not handle localadmin level records very well, because they aren't explicitly configured in the layer mapping. So, for example:

City of New York, Brooklyn, New York, NY USA

[dianashk]

Do we have corresponding acceptance tests for this issue?

[orangejulius]

Good idea, we should add some. Fixing pelias/api#569 would help creating those acceptance tests though

[orangejulius]

We do have acceptance-tests, pelias/acceptance-tests#259 covers these cases

[dianashk]

All fixed except China.

[trescube]

Potential solution: check label generation to see if country can be special-cased to just use name