Cleanup resort tagging change

[nvkelso]

In #2016 we migrated tourism=resort to leisure=resort but sometimes that's combined with tourism=theme_park so we need to:

• Make sure we're testing the right thing
• Do we need to change the order of operations between those to filters in the YAML

======================================================================
FAIL: test_tourism (integration-test.440-zoos-and-other-attractions-tourism.ZoosAndOtherAttractionsTourism)
AssertionError: Did not find feature including properties {'kind': 'theme_park', 'id': -1228099} (because layer 'pois' was empty)