From 66024ce102ab02f66cc29055e4c2c85693e72073 Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Wed, 13 Nov 2019 18:39:02 +0300 Subject: [PATCH] [generator] Remove unused extract_addr tool previously used to enrich poi address for b2b reverse geocoder. --- generator/CMakeLists.txt | 1 - generator/extract_addr/CMakeLists.txt | 40 ------- generator/extract_addr/extract_addr.cpp | 101 ------------------ .../generator.xcodeproj/project.pbxproj | 4 - 4 files changed, 146 deletions(-) delete mode 100644 generator/extract_addr/CMakeLists.txt delete mode 100644 generator/extract_addr/extract_addr.cpp diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt index c95ab60b37..5045ca60a3 100644 --- a/generator/CMakeLists.txt +++ b/generator/CMakeLists.txt @@ -244,6 +244,5 @@ omim_add_test_subdirectory(generator_integration_tests) add_subdirectory(generator_tool) add_subdirectory(complex_generator) add_subdirectory(booking_quality_check) -add_subdirectory(extract_addr) add_subdirectory(feature_segments_checker) add_subdirectory(srtm_coverage_checker) diff --git a/generator/extract_addr/CMakeLists.txt b/generator/extract_addr/CMakeLists.txt deleted file mode 100644 index 454d439776..0000000000 --- a/generator/extract_addr/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -project(extract_addr) - -include_directories( - ${OMIM_ROOT}/3party/jansson/src -) - -set( - SRC - extract_addr.cpp -) - -omim_add_executable(${PROJECT_NAME} ${SRC}) - -omim_link_libraries( - ${PROJECT_NAME} - generator - search - routing - traffic - routing_common - indexer - editor - geometry - platform - coding - base - minizip - jansson - pugixml - stats_client - opening_hours - succinct - oauthcpp - expat - protobuf - icu - ${LIBZ} -) - -link_qt5_core(${PROJECT_NAME}) diff --git a/generator/extract_addr/extract_addr.cpp b/generator/extract_addr/extract_addr.cpp deleted file mode 100644 index 6d03f94155..0000000000 --- a/generator/extract_addr/extract_addr.cpp +++ /dev/null @@ -1,101 +0,0 @@ -#include "generator/feature_builder.hpp" - -#include "indexer/classificator.hpp" -#include "indexer/classificator_loader.hpp" -#include "indexer/feature_data.hpp" -#include "indexer/ftypes_matcher.hpp" - -#include "geometry/mercator.hpp" - -#include "platform/platform.hpp" - -#include "base/string_utils.hpp" - -#include "3party/jansson/myjansson.hpp" - -#include -#include -#include -#include -#include - -using namespace feature; - -constexpr int32_t kRoundDigits = 1e6; - -std::string GetReadableType(FeatureBuilder const & f) -{ - auto const isPoiOrBuilding = [](uint32_t type) { - auto const & poiChecker = ftypes::IsPoiChecker::Instance(); - auto const & buildingChecker = ftypes::IsBuildingChecker::Instance(); - return poiChecker(type) || buildingChecker(type); - }; - - std::string result; - auto const & types = f.GetTypes(); - auto const it = std::find_if(std::begin(types), std::end(types), isPoiOrBuilding); - if (it != std::end(types)) - result = classif().GetReadableObjectName(*it); - - return result; -} - -void PrintFeature(FeatureBuilder const & fb, uint64_t) -{ - std::string const & category = GetReadableType(fb); - std::string const & name = fb.GetName(); - std::string const & street = fb.GetParams().GetStreet(); - std::string const & house = fb.GetParams().house.Get(); - bool const isPOI = - !name.empty() && !category.empty() && category.find("building") == std::string::npos; - - if ((house.empty() && !isPOI) || fb.GetGeomType() == GeomType::Line) - return; - - auto const center = mercator::ToLatLon(fb.GetKeyPoint()); - auto coordinates = base::NewJSONArray(); - ToJSONArray(*coordinates, std::round(center.m_lon * kRoundDigits) / kRoundDigits); - ToJSONArray(*coordinates, std::round(center.m_lat * kRoundDigits) / kRoundDigits); - auto geometry = base::NewJSONObject(); - ToJSONObject(*geometry, "type", "Point"); - ToJSONObject(*geometry, "coordinates", coordinates); - - auto properties = base::NewJSONObject(); - ToJSONObject(*properties, "id", fb.GetMostGenericOsmId().GetEncodedId()); - if (!name.empty() && !category.empty() && category != "building-address") - { - ToJSONObject(*properties, "name", name); - ToJSONObject(*properties, "tags", category); - } - auto address = base::NewJSONObject(); - if (!street.empty()) - ToJSONObject(*address, "street", street); - if (!house.empty()) - ToJSONObject(*address, "building", house); - ToJSONObject(*properties, "address", address); - - auto feature = base::NewJSONObject(); - ToJSONObject(*feature, "type", "Feature"); - ToJSONObject(*feature, "geometry", geometry); - ToJSONObject(*feature, "properties", properties); - - std::cout << base::DumpToString(feature, JSON_COMPACT | JSON_REAL_PRECISION(9 /* precision */)) << std::endl; -} - -int main(int argc, char * argv[]) -{ - if (argc <= 1) - { - LOG(LERROR, ("Usage:", argc == 1 ? argv[0] : "extract_addr", " []")); - return 1; - } - - Platform & pl = GetPlatform(); - if (argc > 2) - pl.SetResourceDir(argv[2]); - classificator::Load(); - - ForEachFromDatRawFormat(argv[1], PrintFeature); - - return 0; -} diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj index dbaa497c0d..12e570099c 100644 --- a/xcode/generator/generator.xcodeproj/project.pbxproj +++ b/xcode/generator/generator.xcodeproj/project.pbxproj @@ -147,7 +147,6 @@ 56037E56219AF97200C2193D /* filter_elements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56037E4B219AF97100C2193D /* filter_elements.cpp */; }; 5631B64F219B0C6D009F47D4 /* geo_objects.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5631B64D219B0C6D009F47D4 /* geo_objects.hpp */; }; 5631B650219B0C6D009F47D4 /* geo_objects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5631B64E219B0C6D009F47D4 /* geo_objects.cpp */; }; - 5631B652219B0C82009F47D4 /* extract_addr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5631B651219B0C82009F47D4 /* extract_addr.cpp */; }; 56829A462134222300A09A28 /* city_roads_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56829A422134222100A09A28 /* city_roads_generator.hpp */; }; 56829A482134222300A09A28 /* city_roads_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56829A442134222300A09A28 /* city_roads_generator.cpp */; }; 568762601F6A9B18002C22A6 /* transit_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5687625E1F6A9B18002C22A6 /* transit_generator.cpp */; }; @@ -433,7 +432,6 @@ 56037E4B219AF97100C2193D /* filter_elements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filter_elements.cpp; sourceTree = ""; }; 5631B64D219B0C6D009F47D4 /* geo_objects.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = geo_objects.hpp; path = geo_objects/geo_objects.hpp; sourceTree = ""; }; 5631B64E219B0C6D009F47D4 /* geo_objects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = geo_objects.cpp; path = geo_objects/geo_objects.cpp; sourceTree = ""; }; - 5631B651219B0C82009F47D4 /* extract_addr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = extract_addr.cpp; path = extract_addr/extract_addr.cpp; sourceTree = ""; }; 56829A422134222100A09A28 /* city_roads_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = city_roads_generator.hpp; sourceTree = ""; }; 56829A442134222300A09A28 /* city_roads_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = city_roads_generator.cpp; sourceTree = ""; }; 5687625E1F6A9B18002C22A6 /* transit_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transit_generator.cpp; sourceTree = ""; }; @@ -742,7 +740,6 @@ 56A1B7A521A82C3E00246F8C /* maxspeeds_collector.hpp */, 56A1B7AA21A82C3F00246F8C /* maxspeeds_parser.cpp */, 56A1B7A621A82C3E00246F8C /* maxspeeds_parser.hpp */, - 5631B651219B0C82009F47D4 /* extract_addr.cpp */, 5631B64E219B0C6D009F47D4 /* geo_objects.cpp */, 5631B64D219B0C6D009F47D4 /* geo_objects.hpp */, 56A6C3D8219B0BDA00A52855 /* collector_region_info.cpp */, @@ -1221,7 +1218,6 @@ 40492BCB2021DC53008E093A /* locality_sorter.cpp in Sources */, 4032E722225D151D00D33617 /* emitter_coastline.cpp in Sources */, 4032E726225D151D00D33617 /* relation_tags_enricher.cpp in Sources */, - 5631B652219B0C82009F47D4 /* extract_addr.cpp in Sources */, 675340691A3F2A7400A0A8C3 /* feature_builder.cpp in Sources */, 395784E223030DA800F2CC07 /* place_points_integrator.cpp in Sources */, 677E2A171CAACC5F001DC42A /* towns_dumper.cpp in Sources */,