Changeset 6645 in josm for trunk/data/validator

Timestamp:

2014-01-06T18:40:17+01:00 (11 years ago)

Author:

simon04

Message:

see #9414 - MapCSS validator: some performance imrovements (pre-compile regular expressions, drop regular expressions for key presence checks)

Location:

trunk/data/validator

Files:

• combinations.mapcss (modified) (1 diff)
• deprecated.mapcss (modified) (1 diff)

trunk/data/validator/combinations.mapcss

@@ -71 +71 @@
 *[source:height                ][!height],
 *[source:lanes                 ][!lanes],
-*[/source:(addr:)?postcode/    ][!addr:postcode],
-*[/source:(addr:)?housenumber/ ][!addr:housenumber],
+*[source:postcode              ][!addr:postcode],
+*[source:housenumber           ][!addr:housenumber],
+*[source:addr:postcode         ][!addr:postcode],
+*[source:addr:housenumber      ][!addr:housenumber],
 *[source:addr                  ][!/^addr:/],
 *[source:maxspeed              ][!/^maxspeed:?/] {

trunk/data/validator/deprecated.mapcss

@@ -179 +179 @@
 
 /* from http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Deprecated_tags */
-*[/(day|date|hour)_(on|off)/][!restriction] {
+*[day_on][!restriction],
+*[day_off][!restriction],
+*[date_on][!restriction],
+*[date_off][!restriction],
+*[hour_on][!restriction],
+*[hour_off][!restriction] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "*:conditional";