diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 0d1af1f094..60dbb47e4c 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -733,7 +733,7 @@ sport|skiing;732; tourism|museum;733; tourism|guest_house;734; tourism|motel;735; -boundary|administrative|4|state;[boundary=administrative][admin_level=4][border_type=state];;name;int_name;736; +boundary|administrative|4|state;[boundary=administrative][admin_level=4][border_type=state];x;name;int_name;736;boundary|administrative|4 place|state|USA;[place=state][addr:country=US],[place=state][is_in=USA],[place=state][is_in:country=USA],[place=state][is_in:country_code=us];;name;int_name;737; building|address;[addr:housenumber][addr:street];;addr:housenumber;name;738; amenity|parking|no-access;[amenity=parking][access=no];;name;int_name;739; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 6e7205cf4b..5f7614e2fc 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -3901,10 +3901,6 @@ ref = type.boundary.administrative zh-Hans = 4级行政区域界线 - [type.boundary.administrative.4.state] - ref = type.boundary.administrative - zh-Hans = 4级州省界线 - [type.boundary.administrative.5] ref = type.boundary.administrative zh-Hans = 5级行政区域界线 diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 06d0f613d1..d25480c792 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -1946,7 +1946,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke) {{"amenity"}, {{"amenity", "any_value"}}}, {{"boundary", "administrative", "2"}, {{"boundary", "administrative"}, {"admin_level", "2"}}}, {{"boundary", "administrative", "3"}, {{"boundary", "administrative"}, {"admin_level", "3"}}}, - {{"boundary", "administrative", "4", "state"}, {{"boundary", "administrative"}, {"admin_level", "4"}, {"border_type", "state"}}}, {{"boundary", "administrative", "4"}, {{"boundary", "administrative"}, {"admin_level", "4"}}}, {{"building", "garage"}, {{"building", "garage"}}}, {{"building", "garage"}, {{"building", "yes"}, {"garage", "any_value"}}},