Fix assert

frodrigo · frodrigo · commit 7a222089fbc5 · 2018-03-04T12:07:33.000+01:00
diff --git a/transport.validator.mapcss b/transport.validator.mapcss
@@ -41,42 +41,42 @@ relation.pt_route[!public_transport:version],
 relation.pt_route_master[!public_transport:version]
 {
 	throwError: "Jungle : La version est manquante (ajouter un tag public_transport:version)";
-	assertNoMatch: "relation type=route public_transport:version=1";
-	assertMatch: "relation type=route";
+	assertNoMatch: "relation type=route route=bus public_transport:version=1";
+	assertMatch: "relation type=route route=bus";
 }
 
 relation.pt_route[!network],
 relation.pt_route_master[!network]
 {
 	throwError: "Jungle : Le réseau est manquant (ajouter un tag network)";
-	assertNoMatch: "relation type=route network=BiBiBus";
-	assertMatch: "relation type=route";
+	assertNoMatch: "relation type=route route=bus network=BiBiBus";
+	assertMatch: "relation type=route route=bus";
 }
 
 relation.pt_route[!operator],
 relation.pt_route_master[!operator]
 {
 	throwError: "Jungle : L'opérateur est manquant (ajouter un tag operator)";
-	assertNoMatch: "relation type=route operator=BiBiBus";
-	assertMatch: "relation type=route";
+	assertNoMatch: "relation type=route route=bus operator=BiBiBus";
+	assertMatch: "relation type=route route=bus";
 }
 
 relation.pt_route[!ref],
 relation.pt_route_master[!ref]
 {
 	throwError: "Jungle : Le numéro de ligne est manquant (ajouter un tag ref)";
-	assertNoMatch: "relation type=route ref=3";
-	assertMatch: "relation type=route";
+	assertNoMatch: "relation type=route route=bus ref=3";
+	assertMatch: "relation type=route route=bus";
 }
 
 relation.pt_route[!from],
 relation.pt_route[!to]
 {
 	throwError: "Jungle : L'origine/destination est manquante (ajouter les tags from/to)";
-	assertNoMatch: "relation type=route from=A to=B";
-	assertMatch: "relation type=route from=A";
-	assertMatch: "relation type=route to=B";
-	assertMatch: "relation type=route";
+	assertNoMatch: "relation type=route route=bus from=A to=B";
+	assertMatch: "relation type=route route=bus from=A";
+	assertMatch: "relation type=route route=bus to=B";
+	assertMatch: "relation type=route route=bus";
 }
 
 relation.pt_route["fixme:relation"="order members"]

Original file line number	Diff line number	Diff line change
`@@ -41,42 +41,42 @@ relation.pt_route[!public_transport:version],`
`41`	`41`	`relation.pt_route_master[!public_transport:version]`
`42`	`42`	`{`
`43`	`43`	`throwError: "Jungle : La version est manquante (ajouter un tag public_transport:version)";`
`44`		`- assertNoMatch: "relation type=route public_transport:version=1";`
`45`		`- assertMatch: "relation type=route";`
	`44`	`+ assertNoMatch: "relation type=route route=bus public_transport:version=1";`
	`45`	`+ assertMatch: "relation type=route route=bus";`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`relation.pt_route[!network],`
`49`	`49`	`relation.pt_route_master[!network]`
`50`	`50`	`{`
`51`	`51`	`throwError: "Jungle : Le réseau est manquant (ajouter un tag network)";`
`52`		`- assertNoMatch: "relation type=route network=BiBiBus";`
`53`		`- assertMatch: "relation type=route";`
	`52`	`+ assertNoMatch: "relation type=route route=bus network=BiBiBus";`
	`53`	`+ assertMatch: "relation type=route route=bus";`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`relation.pt_route[!operator],`
`57`	`57`	`relation.pt_route_master[!operator]`
`58`	`58`	`{`
`59`	`59`	`throwError: "Jungle : L'opérateur est manquant (ajouter un tag operator)";`
`60`		`- assertNoMatch: "relation type=route operator=BiBiBus";`
`61`		`- assertMatch: "relation type=route";`
	`60`	`+ assertNoMatch: "relation type=route route=bus operator=BiBiBus";`
	`61`	`+ assertMatch: "relation type=route route=bus";`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`relation.pt_route[!ref],`
`65`	`65`	`relation.pt_route_master[!ref]`
`66`	`66`	`{`
`67`	`67`	`throwError: "Jungle : Le numéro de ligne est manquant (ajouter un tag ref)";`
`68`		`- assertNoMatch: "relation type=route ref=3";`
`69`		`- assertMatch: "relation type=route";`
	`68`	`+ assertNoMatch: "relation type=route route=bus ref=3";`
	`69`	`+ assertMatch: "relation type=route route=bus";`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`relation.pt_route[!from],`
`73`	`73`	`relation.pt_route[!to]`
`74`	`74`	`{`
`75`	`75`	`throwError: "Jungle : L'origine/destination est manquante (ajouter les tags from/to)";`
`76`		`- assertNoMatch: "relation type=route from=A to=B";`
`77`		`- assertMatch: "relation type=route from=A";`
`78`		`- assertMatch: "relation type=route to=B";`
`79`		`- assertMatch: "relation type=route";`
	`76`	`+ assertNoMatch: "relation type=route route=bus from=A to=B";`
	`77`	`+ assertMatch: "relation type=route route=bus from=A";`
	`78`	`+ assertMatch: "relation type=route route=bus to=B";`
	`79`	`+ assertMatch: "relation type=route route=bus";`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`relation.pt_route["fixme:relation"="order members"]`