ignore admin_level on capital=yes places

[jojo4u]

Fixes #2437.

[nebulon42]

Before #2473 you also have to update project.mml. See https://github.com/gravitystorm/openstreetmap-carto/blob/master/CONTRIBUTING.md#editing-layers for details.

To review this I will update my low zoom test data so this could take a bit.

[jojo4u]

I added project.mml, thanks for reminder.

Question: I have a branch which builds upon changes of the simplify-capitals branch of this PR: https://github.com/jojo4u/openstreetmap-carto/tree/more-capitals

• Should I do a PR to openstreetmap-carto/master which then includes the changes here and the additional ones?
• Should I do PR to another branch?
• Should I wait?

[kocio-pl]

I guess it depends on #2473, because it removes current MML file and replaces it with YAML data.

[nebulon42]

@jojo4u I would suggest to wait. I'm hoping to do the review this weekend. Of the other options also the first one would be an option.

[nebulon42]

I'm still seeing some capital=2 entries in the database (http://overpass-turbo.eu/s/ksN). At least one tagging mistake and some others legitimate. Especially interesting is Minsk (https://www.openstreetmap.org/node/26162465) which has been changed away from capital=yes.

Needing other maintainers opinion whether we might also want to include capital=2 as capital=yes might be ambiguous before merging.

[matthijsmelissen]

According to the wiki, admin_level=2 refers to country borders, and therefore capital=2 refers to a country capital, just like capital=yes. I don't see a difference between the two, and would be in favour of dropping support for one of them. Hopefully that would simplify the tagging situation, and also make life for other data consumers easier.

Montserrat and Torshavn either are or are not country capitals, having a special capital=2 tag for them doesn't help.

[nebulon42]

@math1985 currently we do not support both (only capital=yes), so you would say there is no need to include capital=2?

I would be slightly in favour of capital=2 as it is more clear, but the reality speaks against that. :)

[matthijsmelissen]

I agree that would be more logical tagging, but switching to capital=2 would also require most data consumers to switch, so I don't think that's ideal.

[nebulon42]

Merged manually, thanks.

[jojo4u]

The capital=2 was a test balloon by me for non-independent countries documented here: https://lists.openstreetmap.org/pipermail/tagging/2016-October/030343.html

For Minsk and Astana I added a changeset comment asking for explanation.
Jinotega was tagged wrong (is admin_level=4).