diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index a49f0b1556..6bdf86a541 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -910,11 +910,11 @@ railway|station|subway|violet;[railway=station][transport=subway][colour=violet] railway|subway|grey;[railway=subway][colour=grey];;name;int_name;910; railway|station|subway|grey;[railway=station][transport=subway][colour=grey],[railway=station][station=subway][colour=grey];;name;int_name;911; historic|ship;912; -marking|sport;[marking=sport][!colour];;name;int_name;913; -marking|sport|white;[marking=sport][colour=white];;name;int_name;914; -marking|sport|red;[marking=sport][colour=red];;name;int_name;915; -marking|sport|black;[marking=sport][colour=black];;name;int_name;916; -marking|sport|blue;[marking=sport][colour=blue];;name;int_name;917; +marking|sport;[marking=sport][!colour];x;name;int_name;913; +marking|sport|white;[marking=sport][colour=white];x;name;int_name;914; +marking|sport|red;[marking=sport][colour=red];x;name;int_name;915; +marking|sport|black;[marking=sport][colour=black];x;name;int_name;916; +marking|sport|blue;[marking=sport][colour=blue];x;name;int_name;917; shop|mall;918; shop|doityourself;919; place|sea;920; diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 710b63656b..cd99cd860f 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -1585,11 +1585,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke) // {{"landuse", "residential", "rural"}, {{"landuse", "residential"}, {"residential", "rural"}}}, // {{"landuse", "residential", "urban"}, {{"landuse", "residential"}, {"residential", "urban"}}}, // {{"man_made", "pipeline", "overground"}, {{"man_made", "pipeline"}, {"location", "overground"}}}, - // {{"marking", "sport", "black"}, {{"marking", "sport"}, {"colour", "black"}}}, - // {{"marking", "sport", "blue"}, {{"marking", "sport"}, {"colour", "blue"}}}, - // {{"marking", "sport", "red"}, {{"marking", "sport"}, {"colour", "red"}}}, - // {{"marking", "sport", "white"}, {{"marking", "sport"}, {"colour", "white"}}}, - // {{"marking", "sport"}, {{"marking", "sport"}}}, // {{"railway", "incline", "bridge"}, {{"railway", "incline"}, {"bridge", "any_value"}}}, // {{"railway", "incline", "tunnel"}, {{"railway", "incline"}, {"tunnel", "any_value"}}}, // {{"railway", "siding", "bridge"}, {{"railway", "siding"}, {"bridge", "any_value"}}},