pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[mapcss] Deprecate marking-sport-* types.

Browse source
This commit is contained in:
tatiana-yan 2020-01-20 19:19:44 +03:00 • committed by Maksim Andrianov
parent 0392cb0f5e
commit 9ab2168021
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/mapcss-mapping.csv
View file

@ -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;

Can't render this file because it has a wrong number of fields in line 93.

5
generator/generator_tests/osm_type_test.cpp
View file

@ -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"}}},