Context Navigation

data

Timestamp:

2026-10-17T11:02:01+02:00 (37 hours ago)

Author:

gaben

Message:

remove duplicated regex alternations in combinations and religion MapCSS validator rules

Location:

trunk/resources/data/validator

Files:

r19603	r19649
455	455
456	456	/* #9811, #11491, #12865, #14310 */
457		*[place][place!=farm][place!=plot][/^(addr:housenumber\|addr:housename\|addr:flats\|addr:conscriptionnumber\|addr:street\|addr:place\|addr:city\|addr:country\|addr:full\|addr:hamlet\|addr:suburb\|addr:subdistrict\|addr:district\|addr:province\|addr:state\|addr:interpolation\|addr:in~~terpolation\|addr:in~~clusion)$/],
	457	*[place][place!=farm][place!=plot][/^(addr:housenumber\|addr:housename\|addr:flats\|addr:conscriptionnumber\|addr:street\|addr:place\|addr:city\|addr:country\|addr:full\|addr:hamlet\|addr:suburb\|addr:subdistrict\|addr:district\|addr:province\|addr:state\|addr:interpolation\|addr:inclusion)$/],
458	458	/* addr:postcode is used together with place in some countries */
459	459	*[boundary][/^addr:/],

r14867	r19649
9	9	}
10	10
11		*[religion=christian][denomination][denomination !~ /^(anglican\|apostolic\|baptist\|catholic\|church_of_scotland\|christian_community\|christian_scientist\|coptic_orthodox\|czechoslovak_hussite\|dutch_reformed\|evangelical\|foursquare\|greek_catholic\|greek_orthodox\|iglesia_ni_cristo\|jehovahs_witness\|kabbalah\|karaite\|living_waters_church\|lutheran\|maronite\|mennonite\|methodist\|mormon\|new_apostolic\|nondenominational\|old_catholic\|orthodox\|pentecostal\|presbyterian\|protestant\|quaker\|reformed\|roman_catholic\|romanian_orthodox\|russian_orthodox\|salvation_army\|serbian_orthodox\|seventh_day_adventist\|spiritist\|united\|united_~~reformed\|united\|united_~~methodist\|united_reformed\|uniting)$/] {
	11	*[religion=christian][denomination][denomination !~ /^(anglican\|apostolic\|baptist\|catholic\|church_of_scotland\|christian_community\|christian_scientist\|coptic_orthodox\|czechoslovak_hussite\|dutch_reformed\|evangelical\|foursquare\|greek_catholic\|greek_orthodox\|iglesia_ni_cristo\|jehovahs_witness\|kabbalah\|karaite\|living_waters_church\|lutheran\|maronite\|mennonite\|methodist\|mormon\|new_apostolic\|nondenominational\|old_catholic\|orthodox\|pentecostal\|presbyterian\|protestant\|quaker\|reformed\|roman_catholic\|romanian_orthodox\|russian_orthodox\|salvation_army\|serbian_orthodox\|seventh_day_adventist\|spiritist\|united\|united_methodist\|united_reformed\|uniting)$/] {
12	12	throwOther: tr("unknown christian denomination");
13	13	assertMatch: "node religion=christian denomination=foobar";

Note: See TracChangeset for help on using the changeset viewer.