From b5e1974edc7f470a34b40708d11f5df1264331dd Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Thu, 9 Jun 2022 16:22:00 +0300 Subject: [PATCH] [classifier] Added more craft=* types. Signed-off-by: Viktor Govako --- data/categories.txt | 22 ++++++++++++++- data/editor.config | 23 ++++++++++++++- data/mapcss-mapping.csv | 14 +++++----- data/replaced_tags.txt | 2 ++ data/strings/types_strings.txt | 28 +++++++++++++++++++ generator/generator_tests/osm_type_test.cpp | 7 +++++ .../search_integration_tests/smoke_test.cpp | 7 +++-- 7 files changed, 92 insertions(+), 11 deletions(-) diff --git a/data/categories.txt b/data/categories.txt index 2ca778537e..fc9a2bff48 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -1767,7 +1767,7 @@ el:Κατάστημα πληροφορικής sk:Obchod s výpočtovou technikou fa:فروشگاه کامپیوتر -shop-confectionery|@food +shop-confectionery|craft-confectionery en:4Sweets|4confectionery|candies|candy store|U+1F36C|U+1F36D|cake shop|sweetshop|tuck shop|pastry|candy shop|cake shop en-AU:Lollies|Candy ru:4Кондитерская|кондитерские изделия|сладости|торты|десерты|пирожные @@ -7085,6 +7085,14 @@ sk:Mobilný operátor fa:اپراتور تلفن همراه mr:दूरसंचार कंपनी +craft-beekeeper +en:Beekeeper +ru:Пчеловод + +craft-blacksmith +en:Blacksmith +ru:Кузнец + craft-brewery en:Craft brewery|4Brewery|brew house|beer|beer bar|craft beer ru:5Пивоварня|пивзавод|производство пива|пивоваренный завод @@ -7190,6 +7198,14 @@ sk:4Elektrikár fa:برق کار mr:इलेक्ट्रिशियन|विद्युत कामगार +craft-electronics_repair +en:Electronics repair +ru:Ремонт электроники + +craft-handicraft +en:Handicraft +ru:Декоратор + craft-metal_construction en:5Metal Worker ru:5Металлоконструкции|кузнец @@ -7296,6 +7312,10 @@ sk:Oprava obuvy fa:کفاش mr:चांभार +craft-winery +en:4Winery|Wine +ru:4Винодельня|Вино + craft-tailor en:4Tailor|clothes alteration|alterations ru:4Ателье|портной|4ремонт одежды|швейная мастерская|5пошив одежды diff --git a/data/editor.config b/data/editor.config index e0cd8a9f6d..23f3775e57 100644 --- a/data/editor.config +++ b/data/editor.config @@ -370,18 +370,33 @@ + + + + + + + + + + + + + + + @@ -391,18 +406,24 @@ - + + + + + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 0d49ee05d1..9907852950 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -952,9 +952,9 @@ man_made|embankment;952; amenity|ferry_terminal;953; amenity;[amenity];;name;int_name;954; shop|furniture;955; -deprecated|deprecated;956;x +craft|winery;956; waterway|waterfall;957; -deprecated|deprecated;958;x +craft|electronics_repair;958; amenity|casino;960; amenity|brothel;961; place|neighbourhood;[place=neighbourhood],[place=quarter];;name;int_name;962; @@ -983,7 +983,7 @@ internet_access;[internet_access];;name;int_name;984; internet_access|wlan;985; amenity|waste_disposal;986; amenity|bbq;987; -deprecated|deprecated;988;x +craft|sawmill;988; route|ferry|motorcar;[route=ferry][motorcar];x;name;int_name;989;route|ferry junction|roundabout;990; highway|speed_camera;991; @@ -1056,16 +1056,16 @@ shop|photo;1057; shop|travel_agency;[shop=travel_agency],[office=travel_agent];;name;int_name;1058; highway|elevator;1059; shop|outdoor;1060; -deprecated|deprecated;1061;x -deprecated|deprecated;1062;x +craft|confectionery;1061; +craft|handicraft;1062; shop|dry_cleaning;1063; shop|tyres;1064; -deprecated|deprecated;1065;x +craft|beekeeper;1065; amenity|car_wash;1066; amenity|veterinary;1067; amenity|charging_station;1068; amenity|childcare;1069; -deprecated|deprecated;1070;x +craft|blacksmith;1070; amenity|bicycle_parking;1071; amenity|community_centre;1072; amenity|courthouse;1073; diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 219a518818..fa5cd21288 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -73,6 +73,8 @@ cliff=yes : natural=cliff office=notary : office=lawyer office=administrative : office=government +craft=dressmaker : craft=tailor + cycleway=opposite_lane : oneway:bicycle=no power=transformer : power=substation diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index b8c8ef87ea..a0c7556586 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -4812,6 +4812,14 @@ uk = Майстерня zh-Hans = 工艺作坊 + [type.craft.beekeeper] + en = beekeeper + ru = Пчеловод + + [type.craft.blacksmith] + en = Blacksmith + ru = Кузнец + [type.craft.brewery] en = Craft Brewery ar = مصنع جعة @@ -4880,6 +4888,10 @@ zh-Hans = 木匠 zh-Hant = 木工 + [type.craft.confectionery] + en = Confectionery + ru = Кондитер + [type.craft.electrician] en = Electrician ar = كهربائي @@ -4913,6 +4925,10 @@ zh-Hans = 电工 zh-Hant = 電工 + [type.craft.electronics_repair] + en = Electronics repair + ru = Ремонт электроники + [type.craft.gardener] en = Gardener ar = مهندس مناظر @@ -4947,6 +4963,10 @@ zh-Hans = 园艺工 zh-Hant = 園藝師 + [type.craft.handicraft] + en = Handicraft + ru = Декоративный мастер + [type.craft.hvac] en = Hvac ar = تكييف @@ -5115,6 +5135,10 @@ zh-Hans = 管道工 zh-Hant = 水管工人 + [type.craft.sawmill] + en = Sawmill + ru = Лесопилка + [type.craft.shoemaker] en = Shoe Repair ar = تصليح الاحذية @@ -5149,6 +5173,10 @@ zh-Hans = 鞋匠 zh-Hant = 修鞋工 + [type.craft.winery] + en = Winery + ru = Винодельня + [type.craft.tailor] en = Tailor ar = خياط diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 240e70af19..dfa17790da 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -1663,17 +1663,24 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"building", "has_parts"}, {"building", "train_station"}, {"cemetery", "grave"}, + {"craft", "beekeeper"}, + {"craft", "blacksmith"}, {"craft", "brewery"}, {"craft", "carpenter"}, + {"craft", "confectionery"}, {"craft", "electrician"}, + {"craft", "electronics_repair"}, {"craft", "gardener"}, + {"craft", "handicraft"}, {"craft", "hvac"}, {"craft", "metal_construction"}, {"craft", "painter"}, {"craft", "photographer"}, {"craft", "plumber"}, + {"craft", "sawmill"}, {"craft", "shoemaker"}, {"craft", "tailor"}, + {"craft", "winery"}, {"cuisine", "african"}, {"cuisine", "american"}, {"cuisine", "arab"}, diff --git a/search/search_integration_tests/smoke_test.cpp b/search/search_integration_tests/smoke_test.cpp index a62a19f255..cf187cde85 100644 --- a/search/search_integration_tests/smoke_test.cpp +++ b/search/search_integration_tests/smoke_test.cpp @@ -117,8 +117,11 @@ UNIT_CLASS_TEST(SmokeTest, Smoke) SetViewport(m2::RectD(m2::PointD(0, 0), m2::PointD(100, 100))); { - Rules rules = {ExactMatch(id, wineShop)}; - TEST(ResultsMatch("wine ", rules), ()); + Rules rules = {ExactMatch(id, tequilaShop)}; + /// @todo Passing "wine" will interpret request as "categorial" only + /// (see IsCategorialRequest() after adding craft-winery category). + /// Should avoid this strange logic in search core and pass "categorial" request flag via input SearchParams. + TEST(ResultsMatch("tequila ", rules), ()); } {