@@ -599,7 +599,7 @@ def node(self, data, tags):
599
599
except mapcss .RuleAbort : pass
600
600
if not match :
601
601
capture_tags = {}
602
- try : match = ((not set_abbrname ) and (mapcss ._tag_capture (capture_tags , 0 , tags , 'name' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'place' )) and (mapcss .regexp_test (mapcss ._value_capture (capture_tags , 2 , self .re_293c2706 ), mapcss ._tag_capture (capture_tags , 2 , tags , 'name' ))) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 3 , self .re_2f938f56 , '^(Adr|Anth?|Chr?|Corn|Fred|Hub|Jacq?|Joh|Jos|Mac|Nic|Ph|Th)\.' ), mapcss ._tag_capture (capture_tags , 3 , tags , 'name' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
602
+ try : match = ((not set_abbrname ) and (mapcss ._tag_capture (capture_tags , 0 , tags , 'name' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'place' )) and (mapcss .regexp_test (mapcss ._value_capture (capture_tags , 2 , self .re_293c2706 ), mapcss ._tag_capture (capture_tags , 2 , tags , 'name' ))) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 3 , self .re_2f938f56 , '^(Adr|Anth?|Chr?|Corn|Fred|Hub|Jacq?|Joh|Jos|Mac|Nic|Ph|Th)\\ .' ), mapcss ._tag_capture (capture_tags , 3 , tags , 'name' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
603
603
except mapcss .RuleAbort : pass
604
604
if match :
605
605
# set .abbrname
@@ -1479,11 +1479,11 @@ def way(self, data, tags, nds):
1479
1479
except mapcss .RuleAbort : pass
1480
1480
if not match :
1481
1481
capture_tags = {}
1482
- try : match = ((mapcss ._tag_capture (capture_tags , 0 , tags , 'highway' )) and (mapcss .list_contains (mapcss ._tag_capture (capture_tags , 1 , tags , 'traffic_sign:forward' ), mapcss ._value_capture (capture_tags , 1 , 'NL:C3' ))) and (mapcss ._tag_capture (capture_tags , 2 , tags , 'oneway' ) != mapcss ._value_const_capture (capture_tags , 2 , 'yes' , 'yes' )) and (mapcss .regexp_test (self .re_4d17a717 , mapcss .join_list ('' , mapcss .tag_regex (tags , self .re_3894ceb2 )))) and (mapcss ._tag_capture (capture_tags , 4 , tags , 'highway' ) != mapcss ._value_const_capture (capture_tags , 4 , 'construction' , 'construction' )) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 5 , self .re_1d478f9e , '\b NL:C0?2\b ' ), mapcss ._tag_capture (capture_tags , 5 , tags , 'traffic_sign:backward' ))))
1482
+ try : match = ((mapcss ._tag_capture (capture_tags , 0 , tags , 'highway' )) and (mapcss .list_contains (mapcss ._tag_capture (capture_tags , 1 , tags , 'traffic_sign:forward' ), mapcss ._value_capture (capture_tags , 1 , 'NL:C3' ))) and (mapcss ._tag_capture (capture_tags , 2 , tags , 'oneway' ) != mapcss ._value_const_capture (capture_tags , 2 , 'yes' , 'yes' )) and (mapcss .regexp_test (self .re_4d17a717 , mapcss .join_list ('' , mapcss .tag_regex (tags , self .re_3894ceb2 )))) and (mapcss ._tag_capture (capture_tags , 4 , tags , 'highway' ) != mapcss ._value_const_capture (capture_tags , 4 , 'construction' , 'construction' )) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 5 , self .re_1d478f9e , '\\ bNL:C0?2\ \ b' ), mapcss ._tag_capture (capture_tags , 5 , tags , 'traffic_sign:backward' ))))
1483
1483
except mapcss .RuleAbort : pass
1484
1484
if not match :
1485
1485
capture_tags = {}
1486
- try : match = ((mapcss ._tag_capture (capture_tags , 0 , tags , 'highway' )) and (mapcss .list_contains (mapcss ._tag_capture (capture_tags , 1 , tags , 'traffic_sign:forward' ), mapcss ._value_capture (capture_tags , 1 , 'NL:C03' ))) and (mapcss ._tag_capture (capture_tags , 2 , tags , 'oneway' ) != mapcss ._value_const_capture (capture_tags , 2 , 'yes' , 'yes' )) and (mapcss .regexp_test (self .re_4d17a717 , mapcss .join_list ('' , mapcss .tag_regex (tags , self .re_3894ceb2 )))) and (mapcss ._tag_capture (capture_tags , 4 , tags , 'highway' ) != mapcss ._value_const_capture (capture_tags , 4 , 'construction' , 'construction' )) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 5 , self .re_1d478f9e , '\b NL:C0?2\b ' ), mapcss ._tag_capture (capture_tags , 5 , tags , 'traffic_sign:backward' ))))
1486
+ try : match = ((mapcss ._tag_capture (capture_tags , 0 , tags , 'highway' )) and (mapcss .list_contains (mapcss ._tag_capture (capture_tags , 1 , tags , 'traffic_sign:forward' ), mapcss ._value_capture (capture_tags , 1 , 'NL:C03' ))) and (mapcss ._tag_capture (capture_tags , 2 , tags , 'oneway' ) != mapcss ._value_const_capture (capture_tags , 2 , 'yes' , 'yes' )) and (mapcss .regexp_test (self .re_4d17a717 , mapcss .join_list ('' , mapcss .tag_regex (tags , self .re_3894ceb2 )))) and (mapcss ._tag_capture (capture_tags , 4 , tags , 'highway' ) != mapcss ._value_const_capture (capture_tags , 4 , 'construction' , 'construction' )) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 5 , self .re_1d478f9e , '\\ bNL:C0?2\ \ b' ), mapcss ._tag_capture (capture_tags , 5 , tags , 'traffic_sign:backward' ))))
1487
1487
except mapcss .RuleAbort : pass
1488
1488
if not match :
1489
1489
capture_tags = {}
@@ -2046,11 +2046,11 @@ def way(self, data, tags, nds):
2046
2046
match = False
2047
2047
if not match :
2048
2048
capture_tags = {}
2049
- try : match = ((mapcss ._tag_capture (capture_tags , 0 , tags , 'highway' ) == mapcss ._value_capture (capture_tags , 0 , 'footway' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'cycleway' )) and (mapcss ._tag_capture (capture_tags , 2 , tags , 'cycleway' ) != mapcss ._value_const_capture (capture_tags , 2 , 'no' , 'no' )) and (mapcss ._tag_capture (capture_tags , 3 , tags , 'cycleway' ) != mapcss ._value_const_capture (capture_tags , 3 , 'lane' , 'lane' )) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 4 , self .re_7537ca1e , '\b NL:G0?7\b ' ), mapcss ._tag_capture (capture_tags , 4 , tags , 'traffic_sign' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
2049
+ try : match = ((mapcss ._tag_capture (capture_tags , 0 , tags , 'highway' ) == mapcss ._value_capture (capture_tags , 0 , 'footway' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'cycleway' )) and (mapcss ._tag_capture (capture_tags , 2 , tags , 'cycleway' ) != mapcss ._value_const_capture (capture_tags , 2 , 'no' , 'no' )) and (mapcss ._tag_capture (capture_tags , 3 , tags , 'cycleway' ) != mapcss ._value_const_capture (capture_tags , 3 , 'lane' , 'lane' )) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 4 , self .re_7537ca1e , '\\ bNL:G0?7\ \ b' ), mapcss ._tag_capture (capture_tags , 4 , tags , 'traffic_sign' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
2050
2050
except mapcss .RuleAbort : pass
2051
2051
if not match :
2052
2052
capture_tags = {}
2053
- try : match = ((mapcss ._tag_capture (capture_tags , 0 , tags , 'highway' ) == mapcss ._value_capture (capture_tags , 0 , 'footway' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'segregated' ) == mapcss ._value_capture (capture_tags , 1 , 'yes' )) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 2 , self .re_7537ca1e , '\b NL:G0?7\b ' ), mapcss ._tag_capture (capture_tags , 2 , tags , 'traffic_sign' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
2053
+ try : match = ((mapcss ._tag_capture (capture_tags , 0 , tags , 'highway' ) == mapcss ._value_capture (capture_tags , 0 , 'footway' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'segregated' ) == mapcss ._value_capture (capture_tags , 1 , 'yes' )) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 2 , self .re_7537ca1e , '\\ bNL:G0?7\ \ b' ), mapcss ._tag_capture (capture_tags , 2 , tags , 'traffic_sign' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
2054
2054
except mapcss .RuleAbort : pass
2055
2055
if match :
2056
2056
# group:tr("NL German style tagging")
@@ -2406,7 +2406,7 @@ def way(self, data, tags, nds):
2406
2406
match = False
2407
2407
if not match :
2408
2408
capture_tags = {}
2409
- try : match = ((mapcss ._tag_capture (capture_tags , 0 , tags , 'highway' ) == mapcss ._value_capture (capture_tags , 0 , 'cycleway' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'vehicle' ) == mapcss ._value_capture (capture_tags , 1 , 'no' )) and (not mapcss ._tag_capture (capture_tags , 2 , tags , 'bicycle' )) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 3 , self .re_5f649d1b , '\b NL:(C0?1|C0?9|C14|C15|D103|D104)\b ' ), mapcss ._tag_capture (capture_tags , 3 , tags , 'traffic_sign' ))) and (not mapcss ._tag_capture (capture_tags , 4 , tags , 'vehicle:conditional' )) and (not mapcss ._tag_capture (capture_tags , 5 , tags , 'bicycle:conditional' )) and (mapcss .inside (self .father .config .options , 'NL' )))
2409
+ try : match = ((mapcss ._tag_capture (capture_tags , 0 , tags , 'highway' ) == mapcss ._value_capture (capture_tags , 0 , 'cycleway' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'vehicle' ) == mapcss ._value_capture (capture_tags , 1 , 'no' )) and (not mapcss ._tag_capture (capture_tags , 2 , tags , 'bicycle' )) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 3 , self .re_5f649d1b , '\\ bNL:(C0?1|C0?9|C14|C15|D103|D104)\ \ b' ), mapcss ._tag_capture (capture_tags , 3 , tags , 'traffic_sign' ))) and (not mapcss ._tag_capture (capture_tags , 4 , tags , 'vehicle:conditional' )) and (not mapcss ._tag_capture (capture_tags , 5 , tags , 'bicycle:conditional' )) and (mapcss .inside (self .father .config .options , 'NL' )))
2410
2410
except mapcss .RuleAbort : pass
2411
2411
if match :
2412
2412
# group:tr("NL unusual values")
@@ -2540,7 +2540,7 @@ def way(self, data, tags, nds):
2540
2540
except mapcss .RuleAbort : pass
2541
2541
if not match :
2542
2542
capture_tags = {}
2543
- try : match = ((not set_abbrname ) and (mapcss ._tag_capture (capture_tags , 0 , tags , 'name' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'highway' )) and (mapcss .regexp_test (mapcss ._value_capture (capture_tags , 2 , self .re_293c2706 ), mapcss ._tag_capture (capture_tags , 2 , tags , 'name' ))) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 3 , self .re_2f938f56 , '^(Adr|Anth?|Chr?|Corn|Fred|Hub|Jacq?|Joh|Jos|Mac|Nic|Ph|Th)\.' ), mapcss ._tag_capture (capture_tags , 3 , tags , 'name' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
2543
+ try : match = ((not set_abbrname ) and (mapcss ._tag_capture (capture_tags , 0 , tags , 'name' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'highway' )) and (mapcss .regexp_test (mapcss ._value_capture (capture_tags , 2 , self .re_293c2706 ), mapcss ._tag_capture (capture_tags , 2 , tags , 'name' ))) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 3 , self .re_2f938f56 , '^(Adr|Anth?|Chr?|Corn|Fred|Hub|Jacq?|Joh|Jos|Mac|Nic|Ph|Th)\\ .' ), mapcss ._tag_capture (capture_tags , 3 , tags , 'name' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
2544
2544
except mapcss .RuleAbort : pass
2545
2545
if match :
2546
2546
# set .abbrname
@@ -2564,7 +2564,7 @@ def way(self, data, tags, nds):
2564
2564
except mapcss .RuleAbort : pass
2565
2565
if not match :
2566
2566
capture_tags = {}
2567
- try : match = ((not set_abbrname ) and (mapcss ._tag_capture (capture_tags , 0 , tags , 'name' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'place' )) and (mapcss .regexp_test (mapcss ._value_capture (capture_tags , 2 , self .re_293c2706 ), mapcss ._tag_capture (capture_tags , 2 , tags , 'name' ))) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 3 , self .re_2f938f56 , '^(Adr|Anth?|Chr?|Corn|Fred|Hub|Jacq?|Joh|Jos|Mac|Nic|Ph|Th)\.' ), mapcss ._tag_capture (capture_tags , 3 , tags , 'name' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
2567
+ try : match = ((not set_abbrname ) and (mapcss ._tag_capture (capture_tags , 0 , tags , 'name' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'place' )) and (mapcss .regexp_test (mapcss ._value_capture (capture_tags , 2 , self .re_293c2706 ), mapcss ._tag_capture (capture_tags , 2 , tags , 'name' ))) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 3 , self .re_2f938f56 , '^(Adr|Anth?|Chr?|Corn|Fred|Hub|Jacq?|Joh|Jos|Mac|Nic|Ph|Th)\\ .' ), mapcss ._tag_capture (capture_tags , 3 , tags , 'name' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
2568
2568
except mapcss .RuleAbort : pass
2569
2569
if match :
2570
2570
# set .abbrname
@@ -3400,7 +3400,7 @@ def relation(self, data, tags, members):
3400
3400
except mapcss .RuleAbort : pass
3401
3401
if not match :
3402
3402
capture_tags = {}
3403
- try : match = ((not set_abbrname ) and (mapcss ._tag_capture (capture_tags , 0 , tags , 'name' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'place' )) and (mapcss .regexp_test (mapcss ._value_capture (capture_tags , 2 , self .re_293c2706 ), mapcss ._tag_capture (capture_tags , 2 , tags , 'name' ))) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 3 , self .re_2f938f56 , '^(Adr|Anth?|Chr?|Corn|Fred|Hub|Jacq?|Joh|Jos|Mac|Nic|Ph|Th)\.' ), mapcss ._tag_capture (capture_tags , 3 , tags , 'name' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
3403
+ try : match = ((not set_abbrname ) and (mapcss ._tag_capture (capture_tags , 0 , tags , 'name' )) and (mapcss ._tag_capture (capture_tags , 1 , tags , 'place' )) and (mapcss .regexp_test (mapcss ._value_capture (capture_tags , 2 , self .re_293c2706 ), mapcss ._tag_capture (capture_tags , 2 , tags , 'name' ))) and (not mapcss .regexp_test (mapcss ._value_const_capture (capture_tags , 3 , self .re_2f938f56 , '^(Adr|Anth?|Chr?|Corn|Fred|Hub|Jacq?|Joh|Jos|Mac|Nic|Ph|Th)\\ .' ), mapcss ._tag_capture (capture_tags , 3 , tags , 'name' ))) and (mapcss .inside (self .father .config .options , 'NL' )))
3404
3404
except mapcss .RuleAbort : pass
3405
3405
if match :
3406
3406
# set .abbrname
0 commit comments