Ticket #17371: combinationmapcss.patch

File combinationmapcss.patch, 3.0 KB (added by abalosc1, 7 years ago)

updated to include some combinations from osmose checks

  • data/validator/combinations.mapcss 

    From b4d6bbe41117ad0d7a660989ba7c1462b8a68219 Mon Sep 17 00:00:00 2001
From: Clarisse Abalos <samantha.abalos@digitalglobe.com>
Date: Fri, 22 Feb 2019 14:05:53 -0500
Subject: [PATCH 1/2] add keepright combinations

---
 data/validator/combinations.mapcss | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index b53ffc0..f9b123c 100644
    a b relation[route=ski][!piste:type][type=route],  
    130130*[aeroway=terminal][!building],
    131131*[power=generator][!generator:source],
    132132*[amenity=social_facility][!social_facility],
    133 *[amenity=place_of_worship][!religion] {
     133*[amenity=place_of_worship][!religion],
     134*[amenity=place_of_worship][!denomination] {
    134135  throwWarning: tr("{0} without {1}", "{0.tag}", "{1.key}");
    135136  group: tr("missing tag");
    136137}
    … … way[highway][lanes][!lanes:forward][!lanes:backward][oneway!=yes][oneway!=-1][ju  
    531532/* #15774 */
    532533node[emergency=fire_hydrant][fire_hydrant:count][fire_hydrant:count!=1] {
    533534  throwOther: tr("{0} together with {1}. Tag each hydrant separately.", "{0.tag}", "{1.tag}");
    534 }
    535  No newline at end of file
     535}
     536
     537/* Keep Right Point of interest without name - 110 */
     538
     539*[!name][amenity=place_of_worship],
     540*[!name][amenity=pub],
     541*[!name][amenity=restaurant],
     542*[!name][amenity=school],
     543*[!name][amenity=university],
     544*[!name][amenity=hospital],
     545*[!name][amenity=library],
     546*[!name][amenity=theatre],
     547*[!name][amenity=courthouse],
     548*[!name][amenity=bank],
     549*[!name][amenity=cinema],
     550*[!name][amenity=pharmacy],
     551*[!name][amenity=cafe],
     552*[!name][amenity=fast_food],
     553*[!name][amenity=fuel] {
     554    throwWarning: "{1.tag} without {0.key}";
     555    group: tr("missing tag");
     556}
     557
     558*[!operator][amenity=bank],
     559*[!operator][amenity=cinema],
     560*[!operator][amenity=pharmacy],
     561*[!operator][amenity=cafe],
     562*[!operator][amenity=fast_food],
     563*[!operator][amenity=fuel] {
     564    throwWarning: "{1.tag} without {0.key}";
     565    group: tr("missing tag");
     566}

  • data/validator/combinations.mapcss 

    -- 
2.7.4


From d9635a55b41d6825c1f0943ed44932f5e9134ae1 Mon Sep 17 00:00:00 2001
From: Clarisse Abalos <samantha.abalos@digitalglobe.com>
Date: Fri, 22 Feb 2019 15:18:07 -0500
Subject: [PATCH 2/2] add osmose combos

---
 data/validator/combinations.mapcss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index f9b123c..2e1d2cd 100644
    a b node[emergency=fire_hydrant][fire_hydrant:count][fire_hydrant:count!=1] {  
    550550*[!name][amenity=pharmacy],
    551551*[!name][amenity=cafe],
    552552*[!name][amenity=fast_food],
    553 *[!name][amenity=fuel] {
     553*[!name][amenity=fuel],
     554*[!name][place],
     555*[!ele][natural=peak],
     556*[!ele][mountain_pass=yes] {
    554557    throwWarning: "{1.tag} without {0.key}";
    555558    group: tr("missing tag");
    556559}