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

[classifier] Fixed type translations.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2021-10-17 07:46:17 +01:00
parent d2966cdd88
commit de2a55c943
6 changed files with 255 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/mapcss-mapping.csv
View file

@ -326,7 +326,7 @@ amenity|grave_yard|christian;[amenity=grave_yard][religion=christian];;name;int_
highway|trunk|tunnel;[highway=trunk][tunnel?];;name;int_name;326;
highway|steps|tunnel;[highway=steps][tunnel?];;name;int_name;327;
amenity|car_sharing;328;
sport|football;329;
sport|football;329;sport|soccer
highway|steps|bridge;[highway=steps][bridge?];;name;int_name;330;
highway|track|tunnel;[highway=track][tunnel?];;name;int_name;331;
highway|pedestrian|tunnel;[highway=pedestrian][tunnel?];;name;int_name;332;
@ -539,7 +539,7 @@ deprecated|deprecated;538;x
railway|funicular|tunnel;[railway=funicular][tunnel?];;name;int_name;539;
barrier|cycle_barrier;540;
deprecated|deprecated;541;x
amenity|speed_trap;542;
amenity|speed_trap;542;highway|speed_camera
area:highway|track;543;
area:highway|primary;544;
power|line|underground;[power=line][location=underground];;name;int_name;545;
@ -858,7 +858,7 @@ deprecated|deprecated;857;x
deprecated|deprecated;858;x
deprecated|deprecated;859;x
deprecated|deprecated;860;x
natural|salt_pond;861;
natural|salt_pond;861;landuse|salt_pond
deprecated|deprecated;862;x
railway|incline|bridge;[railway=incline][bridge?];;name;int_name;863;
railway|siding|tunnel;[railway=siding][tunnel?];;name;int_name;864;

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

435
data/strings/types_strings.txt
View file

File diff suppressed because it is too large Load diff

3
data/styles/clear/include/Basemap.mapcss
View file

@ -131,7 +131,6 @@ line[waterway=drain],
area[natural=lake],
area[natural=pond],
area[natural=water],
area[natural=salt_pond],
area[waterway=dock],
area[waterway=riverbank],
area[landuse=salt_pond],
@ -340,7 +339,6 @@ area|z10-[leisure=beach_resort],
area|z0-[natural=lake],
area|z0-[natural=pond],
area|z0-[natural=water],
area|z0-[natural=salt_pond],
area|z0-[landuse=salt_pond],
area|z0-[waterway=dock],
area|z0-[waterway=riverbank],
@ -366,7 +364,6 @@ line|z16-[waterway=lock],
area|z0-[natural=lake],
area|z0-[natural=pond],
area|z0-[natural=water],
area|z0-[natural=salt_pond],
area|z0-[landuse=salt_pond],
area|z0-[waterway=dock],
area|z0-[waterway=riverbank],

3
data/styles/clear/include/Icons.mapcss
View file

@ -1854,9 +1854,6 @@ area|z17-[leisure=golf_course]
node|z17-[sport=soccer],
area|z17-[sport=soccer]
{icon-image: soccer-m.svg;icon-min-distance: 10;}
node|z17-[sport=football],
area|z17-[sport=football]
{icon-image: soccer-m.svg;icon-min-distance: 10;}
node|z17-[sport=tennis]
{icon-image: tennis-m.svg;icon-min-distance: 10;}
node|z17-[leisure=skiing]

3
data/styles/vehicle/include/Basemap.mapcss
View file

@ -121,7 +121,6 @@ line[waterway=drain],
area[natural=lake],
area[natural=pond],
area[natural=water],
area[natural=salt_pond],
area[waterway=dock],
area[waterway=riverbank],
area[landuse=salt_pond],
@ -317,7 +316,6 @@ area|z10-[leisure=beach_resort],
area|z0-[natural=lake],
area|z0-[natural=pond],
area|z0-[natural=water],
area|z0-[natural=salt_pond],
area|z0-[landuse=salt_pond],
area|z0-[waterway=dock],
area|z0-[waterway=riverbank],
@ -339,7 +337,6 @@ line|z16-[waterway=lock],
area|z0-[natural=lake],
area|z0-[natural=pond],
area|z0-[natural=water],
area|z0-[natural=salt_pond],
area|z0-[landuse=salt_pond],
area|z0-[waterway=dock],
area|z0-[waterway=riverbank],

4
generator/generator_tests/osm_type_test.cpp
View file

@ -1,3 +1,4 @@
#include "testing/testing.hpp"
#include "generator/generator_tests/types_helper.hpp"
@ -1420,7 +1421,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
{"amenity", "school"},
{"amenity", "shelter"},
{"amenity", "shower"},
{"amenity", "speed_trap"},
{"amenity", "taxi"},
{"amenity", "telephone"},
{"amenity", "theatre"},
@ -1674,7 +1674,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
{"natural", "peak"},
{"natural", "pond"},
{"natural", "rock"},
{"natural", "salt_pond"},
{"natural", "scrub"},
{"natural", "spring"},
{"natural", "volcano"},
@ -1839,7 +1838,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
{"sport", "curling"},
{"sport", "diving"},
{"sport", "equestrian"},
{"sport", "football"},
{"sport", "gymnastics"},
{"sport", "handball"},
{"sport", "multi"},