diff options
| author | vvvv <vvvv@ydb.tech> | 2023-07-31 20:07:26 +0300 |
|---|---|---|
| committer | vvvv <vvvv@ydb.tech> | 2023-07-31 20:07:26 +0300 |
| commit | f9e4743508b7930e884714cc99985ac45f84ed98 (patch) | |
| tree | a1290261a4915a6f607e110e2cc27aee4c205f85 /library/cpp/reverse_geocoder | |
| parent | 5cf9beeab3ea847da0b6c414fcb5faa9cb041317 (diff) | |
| download | ydb-f9e4743508b7930e884714cc99985ac45f84ed98.tar.gz | |
Use UDFs from YDB
Diffstat (limited to 'library/cpp/reverse_geocoder')
65 files changed, 0 insertions, 2456 deletions
diff --git a/library/cpp/reverse_geocoder/CMakeLists.txt b/library/cpp/reverse_geocoder/CMakeLists.txt deleted file mode 100644 index 621e95fdb23..00000000000 --- a/library/cpp/reverse_geocoder/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -add_subdirectory(core) -add_subdirectory(library) -add_subdirectory(proto) diff --git a/library/cpp/reverse_geocoder/core/CMakeLists.darwin-x86_64.txt b/library/cpp/reverse_geocoder/core/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index 17f6e79c963..00000000000 --- a/library/cpp/reverse_geocoder/core/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,35 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(cpp-reverse_geocoder-core) -target_link_libraries(cpp-reverse_geocoder-core PUBLIC - contrib-libs-cxxsupp - yutil - cpp-reverse_geocoder-library - cpp-reverse_geocoder-proto - cpp-digest-crc32c -) -target_sources(cpp-reverse_geocoder-core PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/area_box.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/bbox.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/common.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/edge.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/reverse_geocoder.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/kv.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/location.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/part.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/point.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/polygon.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/region.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/debug.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/def.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/geo_data.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/map.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/proxy.cpp -) diff --git a/library/cpp/reverse_geocoder/core/CMakeLists.linux-aarch64.txt b/library/cpp/reverse_geocoder/core/CMakeLists.linux-aarch64.txt deleted file mode 100644 index 02361a0a1a2..00000000000 --- a/library/cpp/reverse_geocoder/core/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,36 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(cpp-reverse_geocoder-core) -target_link_libraries(cpp-reverse_geocoder-core PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil - cpp-reverse_geocoder-library - cpp-reverse_geocoder-proto - cpp-digest-crc32c -) -target_sources(cpp-reverse_geocoder-core PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/area_box.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/bbox.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/common.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/edge.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/reverse_geocoder.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/kv.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/location.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/part.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/point.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/polygon.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/region.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/debug.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/def.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/geo_data.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/map.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/proxy.cpp -) diff --git a/library/cpp/reverse_geocoder/core/CMakeLists.linux-x86_64.txt b/library/cpp/reverse_geocoder/core/CMakeLists.linux-x86_64.txt deleted file mode 100644 index 02361a0a1a2..00000000000 --- a/library/cpp/reverse_geocoder/core/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,36 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(cpp-reverse_geocoder-core) -target_link_libraries(cpp-reverse_geocoder-core PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil - cpp-reverse_geocoder-library - cpp-reverse_geocoder-proto - cpp-digest-crc32c -) -target_sources(cpp-reverse_geocoder-core PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/area_box.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/bbox.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/common.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/edge.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/reverse_geocoder.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/kv.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/location.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/part.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/point.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/polygon.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/region.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/debug.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/def.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/geo_data.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/map.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/proxy.cpp -) diff --git a/library/cpp/reverse_geocoder/core/CMakeLists.txt b/library/cpp/reverse_geocoder/core/CMakeLists.txt deleted file mode 100644 index f8b31df0c11..00000000000 --- a/library/cpp/reverse_geocoder/core/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -endif() diff --git a/library/cpp/reverse_geocoder/core/CMakeLists.windows-x86_64.txt b/library/cpp/reverse_geocoder/core/CMakeLists.windows-x86_64.txt deleted file mode 100644 index 17f6e79c963..00000000000 --- a/library/cpp/reverse_geocoder/core/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,35 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(cpp-reverse_geocoder-core) -target_link_libraries(cpp-reverse_geocoder-core PUBLIC - contrib-libs-cxxsupp - yutil - cpp-reverse_geocoder-library - cpp-reverse_geocoder-proto - cpp-digest-crc32c -) -target_sources(cpp-reverse_geocoder-core PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/area_box.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/bbox.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/common.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/edge.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/reverse_geocoder.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/kv.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/location.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/part.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/point.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/polygon.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/region.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/debug.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/def.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/geo_data.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/map.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/core/geo_data/proxy.cpp -) diff --git a/library/cpp/reverse_geocoder/core/area_box.cpp b/library/cpp/reverse_geocoder/core/area_box.cpp deleted file mode 100644 index 67038fe4f8b..00000000000 --- a/library/cpp/reverse_geocoder/core/area_box.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "area_box.h" - -using namespace NReverseGeocoder; - -TRef NReverseGeocoder::LookupAreaBox(const TPoint& point) { - const TRef boxX = (point.X - NAreaBox::LowerX) / NAreaBox::DeltaX; - const TRef boxY = (point.Y - NAreaBox::LowerY) / NAreaBox::DeltaY; - return boxX * NAreaBox::NumberY + boxY; -} diff --git a/library/cpp/reverse_geocoder/core/area_box.h b/library/cpp/reverse_geocoder/core/area_box.h deleted file mode 100644 index 1077a65feff..00000000000 --- a/library/cpp/reverse_geocoder/core/area_box.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include "common.h" -#include "point.h" - -namespace NReverseGeocoder { - namespace NAreaBox { - const TCoordinate LowerX = ToCoordinate(-180.0); - const TCoordinate UpperX = ToCoordinate(180.0); - const TCoordinate LowerY = ToCoordinate(-90.0); - const TCoordinate UpperY = ToCoordinate(90.0); - const TCoordinate DeltaX = ToCoordinate(0.1); - const TCoordinate DeltaY = ToCoordinate(0.1); - const TCoordinate NumberX = (UpperX - LowerX) / DeltaX; - const TCoordinate NumberY = (UpperY - LowerY) / DeltaY; - const TCoordinate Number = NumberX * NumberY; - - } - - // Area of geo territory. Variable PolygonRefsOffset refers to the polygons lying inside this - // area. Geo map is divided into equal bounding boxes from (NAreaBox::LowerX, NAreaBox::LowerY) - // to (NAreaBox::UpperX, NAreaBox::UpperY) with DeltaX and DeltaY sizes. Logic of filling is in - // generator. - struct Y_PACKED TAreaBox { - TNumber PolygonRefsOffset; - TNumber PolygonRefsNumber; - }; - - static_assert(sizeof(TAreaBox) == 8, "NReverseGeocoder::TAreaBox size mismatch"); - - // Determine in wich area box in geoData is point. - TRef LookupAreaBox(const TPoint& point); - -} diff --git a/library/cpp/reverse_geocoder/core/bbox.cpp b/library/cpp/reverse_geocoder/core/bbox.cpp deleted file mode 100644 index aa4258ac224..00000000000 --- a/library/cpp/reverse_geocoder/core/bbox.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "bbox.h" diff --git a/library/cpp/reverse_geocoder/core/bbox.h b/library/cpp/reverse_geocoder/core/bbox.h deleted file mode 100644 index e8b6e00aa33..00000000000 --- a/library/cpp/reverse_geocoder/core/bbox.h +++ /dev/null @@ -1,66 +0,0 @@ -#pragma once - -#include "common.h" -#include "point.h" - -#include <util/generic/utility.h> - -namespace NReverseGeocoder { - struct Y_PACKED TBoundingBox { - TCoordinate X1; - TCoordinate Y1; - TCoordinate X2; - TCoordinate Y2; - - TBoundingBox() - : X1(0) - , Y1(0) - , X2(0) - , Y2(0) - { - } - - TBoundingBox(TCoordinate x1, TCoordinate y1, TCoordinate x2, TCoordinate y2) - : X1(x1) - , Y1(y1) - , X2(x2) - , Y2(y2) - { - } - - TBoundingBox(const TPoint* points, TNumber number) { - Init(); - for (TNumber i = 0; i < number; ++i) - Relax(points[i]); - } - - void Init() { - X1 = ToCoordinate(180.0); - Y1 = ToCoordinate(90.0); - X2 = ToCoordinate(-180.0); - Y2 = ToCoordinate(-90.0); - } - - void Relax(const TPoint& p) { - X1 = Min(X1, p.X); - Y1 = Min(Y1, p.Y); - X2 = Max(X2, p.X); - Y2 = Max(Y2, p.Y); - } - - bool HasIntersection(const TBoundingBox& r) const { - if (X1 > r.X2 || X2 < r.X1 || Y1 > r.Y2 || Y2 < r.Y1) - return false; - return true; - } - - bool Contains(const TPoint& p) const { - if (p.X < X1 || p.X > X2 || p.Y < Y1 || p.Y > Y2) - return false; - return true; - } - }; - - static_assert(sizeof(TBoundingBox) == 16, "NReverseGeocoder::TBoundingBox size mismatch"); - -} diff --git a/library/cpp/reverse_geocoder/core/common.cpp b/library/cpp/reverse_geocoder/core/common.cpp deleted file mode 100644 index 67c02a20a02..00000000000 --- a/library/cpp/reverse_geocoder/core/common.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "common.h" diff --git a/library/cpp/reverse_geocoder/core/common.h b/library/cpp/reverse_geocoder/core/common.h deleted file mode 100644 index 090407ffd9a..00000000000 --- a/library/cpp/reverse_geocoder/core/common.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include <util/system/compiler.h> -#include <util/system/types.h> - -namespace NReverseGeocoder { - using TCoordinate = i32; - using TGeoId = ui64; - using TNumber = ui32; - using TRef = ui32; - using TSquare = i64; - using TVersion = ui64; - - const double EARTH_RADIUS = 6371000.0; - - inline TCoordinate ToCoordinate(double x) { - return x * 1e6; - } - - inline double ToDouble(TCoordinate x) { - return x / 1e6; - } - -} diff --git a/library/cpp/reverse_geocoder/core/edge.cpp b/library/cpp/reverse_geocoder/core/edge.cpp deleted file mode 100644 index 86c6ab85351..00000000000 --- a/library/cpp/reverse_geocoder/core/edge.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "edge.h" diff --git a/library/cpp/reverse_geocoder/core/edge.h b/library/cpp/reverse_geocoder/core/edge.h deleted file mode 100644 index 9d209288574..00000000000 --- a/library/cpp/reverse_geocoder/core/edge.h +++ /dev/null @@ -1,101 +0,0 @@ -#pragma once - -#include "common.h" -#include "point.h" - -#include <util/generic/utility.h> -#include <util/system/yassert.h> - -namespace NReverseGeocoder { - // TEdge is a type, which represent polygon edge, Beg/End refers on begin/End edge points in - // geographical data. - struct Y_PACKED TEdge { - TRef Beg; - TRef End; - - TEdge() - : Beg(0) - , End(0) - { - } - - TEdge(const TRef& a, const TRef& b) - : Beg(a) - , End(b) - { - } - - bool operator==(const TEdge& e) const { - return Beg == e.Beg && End == e.End; - } - - bool operator!=(const TEdge& e) const { - return Beg != e.Beg || End != e.End; - } - - bool operator<(const TEdge& e) const { - return Beg < e.Beg || (Beg == e.Beg && End < e.End); - } - - // Checks that current edge is lying lower then other edge. Both edges must have a common X - // values, otherwise the behavior is undefined. - bool Lower(const TEdge& e, const TPoint* points) const { - if (*this == e) - return false; - - const TPoint& a1 = points[Beg]; - const TPoint& a2 = points[End]; - const TPoint& b1 = points[e.Beg]; - const TPoint& b2 = points[e.End]; - - Y_ASSERT(a1.X <= a2.X && b1.X <= b2.X); - - if (a1 == b1) { - return (a2 - a1).Cross(b2 - a1) > 0; - } else if (a2 == b2) { - return (a1 - b1).Cross(b2 - b1) > 0; - } else if (b1.X >= a1.X && b1.X <= a2.X) { - return (a2 - a1).Cross(b1 - a1) > 0; - } else if (b2.X >= a1.X && b2.X <= a2.X) { - return (a2 - a1).Cross(b2 - a1) > 0; - } else if (a1.X >= b1.X && a1.X <= b2.X) { - return (a1 - b1).Cross(b2 - b1) > 0; - } else if (a2.X >= b1.X && a2.X <= b2.X) { - return (a2 - b1).Cross(b2 - b1) > 0; - } else { - return false; - } - } - - // Checks that current edge lying lower then given point. Edge and point must have a common X - // values, otherwise the behavior is undefined. - bool Lower(const TPoint& p, const TPoint* points) const { - if (Contains(p, points)) - return false; - - TPoint a = points[Beg]; - TPoint b = points[End]; - - if (a.X > b.X) - DoSwap(a, b); - - return (b - a).Cross(p - a) > 0; - } - - bool Contains(const TPoint& p, const TPoint* points) const { - TPoint a = points[Beg]; - TPoint b = points[End]; - - if (a.X > b.X) - DoSwap(a, b); - - if (p.X < a.X || p.X > b.X) - return false; - - return (b - a).Cross(p - a) == 0; - } - }; - - static_assert(sizeof(TEdge) == 8, "NReverseGeocoder::TEdge size mismatch"); - -} diff --git a/library/cpp/reverse_geocoder/core/geo_data/debug.cpp b/library/cpp/reverse_geocoder/core/geo_data/debug.cpp deleted file mode 100644 index 4db0534b227..00000000000 --- a/library/cpp/reverse_geocoder/core/geo_data/debug.cpp +++ /dev/null @@ -1,74 +0,0 @@ -#include "debug.h" - -#include <library/cpp/reverse_geocoder/library/log.h> -#include <library/cpp/reverse_geocoder/library/memory.h> - -using namespace NReverseGeocoder; -using namespace NGeoData; - -size_t NReverseGeocoder::NGeoData::Space(const IGeoData& g) { - size_t space = 0; - -#define GEO_BASE_DEF_VAR(TVar, Var) \ - space += sizeof(TVar); - -#define GEO_BASE_DEF_ARR(TArr, Arr) \ - space += sizeof(TNumber) + sizeof(TArr) * g.Arr##Number(); - - GEO_BASE_DEF_GEO_DATA - -#undef GEO_BASE_DEF_VAR -#undef GEO_BASE_DEF_ARR - - return space; -} - -template <typename TArr> -static float ArraySpace(TNumber number) { - return number * sizeof(TArr) * 1.0 / MB; -} - -void NReverseGeocoder::NGeoData::Show(IOutputStream& out, const IGeoData& g) { - out << "GeoData = " << NGeoData::Space(g) * 1.0 / GB << " GB" << '\n'; - -#define GEO_BASE_DEF_VAR(TVar, Var) \ - out << " GeoData." << #Var << " = " << (unsigned long long)g.Var() << '\n'; - -#define GEO_BASE_DEF_ARR(TArr, Arr) \ - out << " GeoData." << #Arr << " = " \ - << g.Arr##Number() << " x " << sizeof(TArr) << " = " \ - << ArraySpace<TArr>(g.Arr##Number()) << " MB" \ - << '\n'; - - GEO_BASE_DEF_GEO_DATA - -#undef GEO_BASE_DEF_VAR -#undef GEO_BASE_DEF_ARR -} - -template <typename TArr> -static bool Equals(const TArr* a, const TArr* b, size_t count) { - return !memcmp(a, b, sizeof(TArr) * count); -} - -bool NReverseGeocoder::NGeoData::Equals(const IGeoData& a, const IGeoData& b) { -#define GEO_BASE_DEF_VAR(TVar, Var) \ - if (a.Var() != b.Var()) { \ - LogError(#Var " not equal"); \ - return false; \ - } - -#define GEO_BASE_DEF_ARR(TArr, Arr) \ - GEO_BASE_DEF_VAR(TNumber, Arr##Number); \ - if (!::Equals(a.Arr(), b.Arr(), a.Arr##Number())) { \ - LogError(#Arr " not equal"); \ - return false; \ - } - - GEO_BASE_DEF_GEO_DATA - -#undef GEO_BASE_DEF_VAR -#undef GEO_BASE_DEF_ARR - - return true; -} diff --git a/library/cpp/reverse_geocoder/core/geo_data/debug.h b/library/cpp/reverse_geocoder/core/geo_data/debug.h deleted file mode 100644 index e7a4d9029c0..00000000000 --- a/library/cpp/reverse_geocoder/core/geo_data/debug.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "geo_data.h" - -#include <util/stream/output.h> - -namespace NReverseGeocoder { - namespace NGeoData { - size_t Space(const IGeoData& g); - - void Show(IOutputStream& out, const IGeoData& g); - - bool Equals(const IGeoData& a, const IGeoData& b); - - } -} diff --git a/library/cpp/reverse_geocoder/core/geo_data/def.cpp b/library/cpp/reverse_geocoder/core/geo_data/def.cpp deleted file mode 100644 index bb9f760d735..00000000000 --- a/library/cpp/reverse_geocoder/core/geo_data/def.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "def.h" diff --git a/library/cpp/reverse_geocoder/core/geo_data/def.h b/library/cpp/reverse_geocoder/core/geo_data/def.h deleted file mode 100644 index d3e331d8733..00000000000 --- a/library/cpp/reverse_geocoder/core/geo_data/def.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include <library/cpp/reverse_geocoder/core/area_box.h> -#include <library/cpp/reverse_geocoder/core/common.h> -#include <library/cpp/reverse_geocoder/core/edge.h> -#include <library/cpp/reverse_geocoder/core/kv.h> -#include <library/cpp/reverse_geocoder/core/part.h> -#include <library/cpp/reverse_geocoder/core/point.h> -#include <library/cpp/reverse_geocoder/core/polygon.h> -#include <library/cpp/reverse_geocoder/core/region.h> - -namespace NReverseGeocoder { - const TVersion GEO_DATA_VERSION_0 = 0; - const TVersion GEO_DATA_VERSION_1 = 1; - - const TVersion GEO_DATA_CURRENT_VERSION = GEO_DATA_VERSION_1; - -// Geographical data definition. This define need for reflection in map/unmap, show, etc. -#define GEO_BASE_DEF_GEO_DATA \ - GEO_BASE_DEF_VAR(TVersion, Version); \ - GEO_BASE_DEF_ARR(TPoint, Points); \ - GEO_BASE_DEF_ARR(TEdge, Edges); \ - GEO_BASE_DEF_ARR(TRef, EdgeRefs); \ - GEO_BASE_DEF_ARR(TPart, Parts); \ - GEO_BASE_DEF_ARR(TPolygon, Polygons); \ - GEO_BASE_DEF_ARR(TRef, PolygonRefs); \ - GEO_BASE_DEF_ARR(TAreaBox, Boxes); \ - GEO_BASE_DEF_ARR(char, Blobs); \ - GEO_BASE_DEF_ARR(TKv, Kvs); \ - GEO_BASE_DEF_ARR(TRegion, Regions); \ - GEO_BASE_DEF_ARR(TRawPolygon, RawPolygons); \ - GEO_BASE_DEF_ARR(TRef, RawEdgeRefs); \ - // #define GEO_BASE_DEF_GEO_DATA - -} diff --git a/library/cpp/reverse_geocoder/core/geo_data/geo_data.cpp b/library/cpp/reverse_geocoder/core/geo_data/geo_data.cpp deleted file mode 100644 index be3310b2912..00000000000 --- a/library/cpp/reverse_geocoder/core/geo_data/geo_data.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "geo_data.h" diff --git a/library/cpp/reverse_geocoder/core/geo_data/geo_data.h b/library/cpp/reverse_geocoder/core/geo_data/geo_data.h deleted file mode 100644 index 7cb76bcddc3..00000000000 --- a/library/cpp/reverse_geocoder/core/geo_data/geo_data.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "def.h" - -namespace NReverseGeocoder { - class IGeoData { -#define GEO_BASE_DEF_VAR(TVar, Var) \ - virtual const TVar& Var() const = 0; - -#define GEO_BASE_DEF_ARR(TArr, Arr) \ - virtual const TArr* Arr() const = 0; \ - virtual TNumber Arr##Number() const = 0; - - public: - GEO_BASE_DEF_GEO_DATA - -#undef GEO_BASE_DEF_VAR -#undef GEO_BASE_DEF_ARR - - virtual ~IGeoData() { - } - }; - -} diff --git a/library/cpp/reverse_geocoder/core/geo_data/map.cpp b/library/cpp/reverse_geocoder/core/geo_data/map.cpp deleted file mode 100644 index 312f7d7cb0b..00000000000 --- a/library/cpp/reverse_geocoder/core/geo_data/map.cpp +++ /dev/null @@ -1,203 +0,0 @@ -#include "map.h" - -#include <library/cpp/reverse_geocoder/library/log.h> -#include <library/cpp/reverse_geocoder/library/system.h> -#include <library/cpp/reverse_geocoder/proto/geo_data.pb.h> - -#include <library/cpp/digest/crc32c/crc32c.h> - -#include <util/generic/algorithm.h> -#include <util/generic/buffer.h> -#include <util/generic/vector.h> -#include <util/network/address.h> -#include <util/system/filemap.h> -#include <util/system/unaligned_mem.h> - -using namespace NReverseGeocoder; - -static const TNumber CRC_SIZE = 3; - -void NReverseGeocoder::TGeoDataMap::Init() { -#define GEO_BASE_DEF_VAR(TVar, Var) \ - Var##_ = TVar(); - -#define GEO_BASE_DEF_ARR(TArr, Arr) \ - Arr##_ = nullptr; \ - Arr##Number_ = 0; - - GEO_BASE_DEF_GEO_DATA - -#undef GEO_BASE_DEF_VAR -#undef GEO_BASE_DEF_ARR -} - -NReverseGeocoder::TGeoDataMap::TGeoDataMap() - : Data_(nullptr) - , Size_(0) -{ - Init(); -} - -static bool CheckMemoryConsistency(const NProto::TGeoData& g) { - TVector<std::pair<intptr_t, intptr_t>> segments; - -#define GEO_BASE_DEF_VAR(TVar, Var) \ - // undef - -#define GEO_BASE_DEF_ARR(TArr, Arr) \ - if (g.Get##Arr##Number() > 0) { \ - intptr_t const beg = g.Get##Arr(); \ - intptr_t const end = g.Get##Arr() + g.Get##Arr##Number() * sizeof(TArr); \ - segments.emplace_back(beg, end); \ - } - - GEO_BASE_DEF_GEO_DATA - -#undef GEO_BASE_DEF_VAR -#undef GEO_BASE_DEF_ARR - - Sort(segments.begin(), segments.end()); - - for (size_t i = 0; i + 1 < segments.size(); ++i) - if (segments[i].second > segments[i + 1].first) - return false; - - return true; -} - -void NReverseGeocoder::TGeoDataMap::Remap() { - Init(); - - if (!Data_) - return; - - const ui64 headerSize = ntohl(ReadUnaligned<ui64>(Data_)); - - NProto::TGeoData header; - if (!header.ParseFromArray(Data_ + sizeof(ui64), headerSize)) - ythrow yexception() << "Unable parse geoData header"; - - if (header.GetMagic() != SYSTEM_ENDIAN_FLAG) - ythrow yexception() << "Different endianness in geoData and host"; - - if (!CheckMemoryConsistency(header)) - ythrow yexception() << "Memory is not consistent!"; - -#define GEO_BASE_DEF_VAR(TVar, Var) \ - Var##_ = header.Get##Var(); - -#define GEO_BASE_DEF_ARR(TArr, Arr) \ - GEO_BASE_DEF_VAR(TNumber, Arr##Number); \ - if (Arr##Number() > 0) { \ - const intptr_t offset = header.Get##Arr(); \ - Arr##_ = (TArr*)(((intptr_t)Data_) + offset); \ - const ui32 hash = Crc32c(Arr##_, std::min(Arr##Number_, CRC_SIZE) * sizeof(TArr)); \ - if (hash != header.Get##Arr##Crc32()) \ - ythrow yexception() << "Wrong crc32 for " << #Arr; \ - } - - GEO_BASE_DEF_GEO_DATA - -#undef GEO_BASE_DEF_VAR -#undef GEO_BASE_DEF_ARR - - if (Version() != GEO_DATA_CURRENT_VERSION) - ythrow yexception() << "Unable use version " << Version() - << "(current version is " << GEO_DATA_CURRENT_VERSION << ")"; -} - -static size_t HeaderSize() { - NProto::TGeoData header; - header.SetMagic(std::numeric_limits<decltype(header.GetMagic())>::max()); - -#define GEO_BASE_DEF_VAR(TVar, Var) \ - header.Set##Var(std::numeric_limits<decltype(header.Get##Var())>::max()); - -#define GEO_BASE_DEF_ARR(TArr, Arr) \ - GEO_BASE_DEF_VAR(TNumber, Arr##Number); \ - header.Set##Arr(std::numeric_limits<decltype(header.Get##Arr())>::max()); \ - header.Set##Arr##Crc32(std::numeric_limits<decltype(header.Get##Arr##Crc32())>::max()); - - GEO_BASE_DEF_GEO_DATA - -#undef GEO_BASE_DEF_VAR -#undef GEO_BASE_DEF_ARR - - return header.ByteSize(); -} - -static const char* Serialize(const IGeoData& g, TBlockAllocator* allocator, size_t* size) { - size_t const preAllocatedSize = allocator->TotalAllocatedSize(); - char* data = (char*)allocator->Allocate(HeaderSize() + sizeof(ui64)); - - NProto::TGeoData header; - header.SetMagic(SYSTEM_ENDIAN_FLAG); - -#define GEO_BASE_DEF_VAR(TVar, Var) \ - header.Set##Var(g.Var()); - -#define GEO_BASE_DEF_ARR(TArr, Arr) \ - GEO_BASE_DEF_VAR(TNumber, Arr##Number); \ - if (g.Arr##Number() > 0) { \ - TArr* arr = (TArr*)allocator->Allocate(sizeof(TArr) * g.Arr##Number()); \ - memcpy(arr, g.Arr(), sizeof(TArr) * g.Arr##Number()); \ - header.Set##Arr((ui64)(((intptr_t)arr) - ((intptr_t)data))); \ - header.Set##Arr##Crc32(Crc32c(arr, std::min(g.Arr##Number(), CRC_SIZE) * sizeof(TArr))); \ - }; - - GEO_BASE_DEF_GEO_DATA - -#undef GEO_BASE_DEF_VAR -#undef GEO_BASE_DEF_ARR - - const auto str = header.SerializeAsString(); - WriteUnaligned<ui64>(data, (ui64)htonl(str.size())); - memcpy(data + sizeof(ui64), str.data(), str.size()); - - if (size) - *size = allocator->TotalAllocatedSize() - preAllocatedSize; - - return data; -} - -static size_t TotalByteSize(const IGeoData& g) { - size_t total_size = TBlockAllocator::AllocateSize(HeaderSize() + sizeof(ui64)); - -#define GEO_BASE_DEF_VAR(TVar, Var) \ - // undef - -#define GEO_BASE_DEF_ARR(TArr, Arr) \ - total_size += TBlockAllocator::AllocateSize(sizeof(TArr) * g.Arr##Number()); - - GEO_BASE_DEF_GEO_DATA - -#undef GEO_BASE_DEF_VAR -#undef GEO_BASE_DEF_ARR - - return total_size; -} - -NReverseGeocoder::TGeoDataMap::TGeoDataMap(const IGeoData& geoData, TBlockAllocator* allocator) - : TGeoDataMap() -{ - Data_ = Serialize(geoData, allocator, &Size_); - Remap(); -} - -void NReverseGeocoder::TGeoDataMap::SerializeToFile(const TString& path, const IGeoData& data) { - TBlob data_blob = SerializeToBlob(data); - - TFile file(path, CreateAlways | RdWr); - file.Write(data_blob.Data(), data_blob.Length()); -} - -TBlob NReverseGeocoder::TGeoDataMap::SerializeToBlob(const IGeoData& data) { - TBuffer buf; - buf.Resize(TotalByteSize(data)); - memset(buf.data(), 0, buf.size()); - - TBlockAllocator allocator(buf.Data(), buf.Size()); - TGeoDataMap(data, &allocator); - - return TBlob::FromBuffer(buf); -} diff --git a/library/cpp/reverse_geocoder/core/geo_data/map.h b/library/cpp/reverse_geocoder/core/geo_data/map.h deleted file mode 100644 index e466bd912e7..00000000000 --- a/library/cpp/reverse_geocoder/core/geo_data/map.h +++ /dev/null @@ -1,89 +0,0 @@ -#pragma once - -#include "geo_data.h" - -#include <library/cpp/reverse_geocoder/library/block_allocator.h> - -#include <util/memory/blob.h> - -namespace NReverseGeocoder { - class TGeoDataMap: public IGeoData, public TNonCopyable { -#define GEO_BASE_DEF_VAR(TVar, Var) \ -public: \ - const TVar& Var() const override { \ - return Var##_; \ - } \ - \ -private: \ - TVar Var##_; - -#define GEO_BASE_DEF_ARR(TArr, Arr) \ -public: \ - const TArr* Arr() const override { \ - return Arr##_; \ - } \ - TNumber Arr##Number() const override { \ - return Arr##Number_; \ - } \ - \ -private: \ - TNumber Arr##Number_; \ - const TArr* Arr##_; - - GEO_BASE_DEF_GEO_DATA - -#undef GEO_BASE_DEF_VAR -#undef GEO_BASE_DEF_ARR - - public: - TGeoDataMap(); - - static void SerializeToFile(const TString& path, const IGeoData& data); - - static TBlob SerializeToBlob(const IGeoData& data); - - TGeoDataMap(const IGeoData& data, TBlockAllocator* allocator); - - TGeoDataMap(const char* data, size_t size) - : TGeoDataMap() - { - Data_ = data; - Size_ = size; - Remap(); - } - - TGeoDataMap(TGeoDataMap&& dat) - : TGeoDataMap() - { - DoSwap(Data_, dat.Data_); - DoSwap(Size_, dat.Size_); - Remap(); - dat.Remap(); - } - - TGeoDataMap& operator=(TGeoDataMap&& dat) { - DoSwap(Data_, dat.Data_); - DoSwap(Size_, dat.Size_); - Remap(); - dat.Remap(); - return *this; - } - - const char* Data() const { - return Data_; - } - - size_t Size() const { - return Size_; - } - - private: - void Init(); - - void Remap(); - - const char* Data_; - size_t Size_; - }; - -} diff --git a/library/cpp/reverse_geocoder/core/geo_data/proxy.cpp b/library/cpp/reverse_geocoder/core/geo_data/proxy.cpp deleted file mode 100644 index 5ff2d13783e..00000000000 --- a/library/cpp/reverse_geocoder/core/geo_data/proxy.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "proxy.h" diff --git a/library/cpp/reverse_geocoder/core/geo_data/proxy.h b/library/cpp/reverse_geocoder/core/geo_data/proxy.h deleted file mode 100644 index fecb9fc7cff..00000000000 --- a/library/cpp/reverse_geocoder/core/geo_data/proxy.h +++ /dev/null @@ -1,68 +0,0 @@ -#pragma once - -#include "geo_data.h" -#include "map.h" - -#include <util/generic/ptr.h> -#include <util/system/filemap.h> - -namespace NReverseGeocoder { - class IGeoDataProxy { - public: - virtual const IGeoData* GeoData() const = 0; - - virtual ~IGeoDataProxy() { - } - }; - - using TGeoDataProxyPtr = THolder<IGeoDataProxy>; - - class TGeoDataMapProxy: public IGeoDataProxy, public TNonCopyable { - public: - explicit TGeoDataMapProxy(const char* path) - : MemFile_(path) - { - MemFile_.Map(0, MemFile_.Length()); - GeoData_ = TGeoDataMap((const char*)MemFile_.Ptr(), MemFile_.MappedSize()); - } - - const IGeoData* GeoData() const override { - return &GeoData_; - } - - private: - TFileMap MemFile_; - TGeoDataMap GeoData_; - }; - - class TGeoDataWrapper: public IGeoDataProxy, public TNonCopyable { - public: - explicit TGeoDataWrapper(const IGeoData& g) - : GeoData_(&g) - { - } - - const IGeoData* GeoData() const override { - return GeoData_; - } - - private: - const IGeoData* GeoData_; - }; - - class TGeoDataRawProxy: public IGeoDataProxy, public TNonCopyable { - public: - TGeoDataRawProxy(const char* data, size_t dataSize) - : GeoData_(data, dataSize) - { - } - - const IGeoData* GeoData() const override { - return &GeoData_; - } - - private: - TGeoDataMap GeoData_; - }; - -} diff --git a/library/cpp/reverse_geocoder/core/kv.cpp b/library/cpp/reverse_geocoder/core/kv.cpp deleted file mode 100644 index a48e9c947ec..00000000000 --- a/library/cpp/reverse_geocoder/core/kv.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "kv.h" diff --git a/library/cpp/reverse_geocoder/core/kv.h b/library/cpp/reverse_geocoder/core/kv.h deleted file mode 100644 index 639c21de524..00000000000 --- a/library/cpp/reverse_geocoder/core/kv.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "common.h" - -namespace NReverseGeocoder { - // k and v is offsets on blobs in geographical data blobs array. See geo_data.h - // for details. - struct TKv { - TNumber K; - TNumber V; - }; - -} diff --git a/library/cpp/reverse_geocoder/core/location.cpp b/library/cpp/reverse_geocoder/core/location.cpp deleted file mode 100644 index b2d2f54d120..00000000000 --- a/library/cpp/reverse_geocoder/core/location.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "location.h" diff --git a/library/cpp/reverse_geocoder/core/location.h b/library/cpp/reverse_geocoder/core/location.h deleted file mode 100644 index 5aa31986847..00000000000 --- a/library/cpp/reverse_geocoder/core/location.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -namespace NReverseGeocoder { - struct TLocation { - double Lon; - double Lat; - - TLocation() - : Lon(0) - , Lat(0) - { - } - - TLocation(double lon, double lat) - : Lon(lon) - , Lat(lat) - { - } - }; - -} diff --git a/library/cpp/reverse_geocoder/core/part.cpp b/library/cpp/reverse_geocoder/core/part.cpp deleted file mode 100644 index c973d2171ae..00000000000 --- a/library/cpp/reverse_geocoder/core/part.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "part.h" - -#include <library/cpp/reverse_geocoder/library/unaligned_iter.h> - -#include <util/generic/algorithm.h> - -using namespace NReverseGeocoder; - -bool NReverseGeocoder::TPart::Contains(const TPoint& point, TNumber edgeRefsNumber, const TRef* edgeRefs, - const TEdge* edges, const TPoint* points) const { - auto edgeRefsBegin = UnalignedIter(edgeRefs) + EdgeRefsOffset; - auto edgeRefsEnd = edgeRefsBegin + edgeRefsNumber; - - // Find lower bound edge, which lying below given point. - auto cmp = [&](const TRef& e, const TPoint& p) { - return edges[e].Lower(p, points); - }; - - auto edgeRef = LowerBound(edgeRefsBegin, edgeRefsEnd, point, cmp); - - if (edgeRef == edgeRefsEnd) - return false; - - if (edges[*edgeRef].Contains(point, points)) - return true; - - // If the point is inside of the polygon then it will intersect the edge an odd number of times. - return (edgeRef - edgeRefsBegin) % 2 == 1; -} diff --git a/library/cpp/reverse_geocoder/core/part.h b/library/cpp/reverse_geocoder/core/part.h deleted file mode 100644 index 9b24fee96f7..00000000000 --- a/library/cpp/reverse_geocoder/core/part.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "common.h" -#include "edge.h" -#include "point.h" - -namespace NReverseGeocoder { - // TPart contains version of persistent scanline. Parts lying in geofraphical data parts array, - // ordered by Coordinate for each polygon. Variable EdgeRefsOffset refers on EdgeRefs array for - // this part. For optimal usage of memory, part does not contain "EdgeRefsNumber" variable, because - // it's can be computed as parts[i + 1].EdgeRefsOffset - parts[i].EdgeRefsOffset for every part - // in geographical data. Especially for this, added fake part into IGeoData with correct - // EdgeRefsOffset. Refs in EdgeRefs are in increasing order for each part. It is necessary to - // quickly determine how many edges is under the point. See generator/ for details. - struct Y_PACKED TPart { - TCoordinate Coordinate; - TNumber EdgeRefsOffset; - - // Checks point lying under odd numbers of edges or on edge. - bool Contains(const TPoint& point, TNumber edgeRefsNumber, const TRef* edgeRefs, - const TEdge* edges, const TPoint* points) const; - }; - - static_assert(sizeof(TPart) == 8, "NReverseGeocoder::TPart size mismatch"); - -} diff --git a/library/cpp/reverse_geocoder/core/point.cpp b/library/cpp/reverse_geocoder/core/point.cpp deleted file mode 100644 index 396e27e5961..00000000000 --- a/library/cpp/reverse_geocoder/core/point.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "point.h" diff --git a/library/cpp/reverse_geocoder/core/point.h b/library/cpp/reverse_geocoder/core/point.h deleted file mode 100644 index 75f1dfc1b45..00000000000 --- a/library/cpp/reverse_geocoder/core/point.h +++ /dev/null @@ -1,52 +0,0 @@ -#pragma once - -#include "common.h" -#include "location.h" - -namespace NReverseGeocoder { - struct Y_PACKED TPoint { - TCoordinate X; - TCoordinate Y; - - TPoint() - : X(0) - , Y(0) - { - } - - TPoint(const TCoordinate& x1, const TCoordinate& y1) - : X(x1) - , Y(y1) - { - } - - explicit TPoint(const TLocation& l) - : X(ToCoordinate(l.Lon)) - , Y(ToCoordinate(l.Lat)) - { - } - - TPoint operator-(const TPoint& p) const { - return TPoint(X - p.X, Y - p.Y); - } - - bool operator==(const TPoint& b) const { - return X == b.X && Y == b.Y; - } - - bool operator!=(const TPoint& b) const { - return X != b.X || Y != b.Y; - } - - bool operator<(const TPoint& b) const { - return X < b.X || (X == b.X && Y < b.Y); - } - - TSquare Cross(const TPoint& p) const { - return 1ll * X * p.Y - 1ll * Y * p.X; - } - }; - - static_assert(sizeof(TPoint) == 8, "NReverseGeocoder::TPoint size mismatch"); - -} diff --git a/library/cpp/reverse_geocoder/core/polygon.cpp b/library/cpp/reverse_geocoder/core/polygon.cpp deleted file mode 100644 index 2baac2d229b..00000000000 --- a/library/cpp/reverse_geocoder/core/polygon.cpp +++ /dev/null @@ -1,91 +0,0 @@ -#include "polygon.h" - -#include <util/generic/algorithm.h> - -using namespace NReverseGeocoder; - -static bool Check(const TPart* part, const TPoint& point, const TRef* edgeRefs, - const TEdge* edges, const TPoint* points) { - const TNumber edgeRefsNumber = (part + 1)->EdgeRefsOffset - part->EdgeRefsOffset; - return part->Contains(point, edgeRefsNumber, edgeRefs, edges, points); -} - -bool NReverseGeocoder::TPolygon::Contains(const TPoint& point, const TPart* parts, const TRef* edgeRefs, - const TEdge* edges, const TPoint* points) const { - if (!Bbox.Contains(point)) - return false; - - parts += PartsOffset; - const TPart* partsEnd = parts + PartsNumber; - - // Find lower bound part, which can contains given point. - const TPart* part = LowerBound(parts, partsEnd, point, [&](const TPart& a, const TPoint& b) { - return a.Coordinate < b.X; - }); - - if (part->Coordinate > point.X) { - if (part == parts) - return false; - --part; - } - - if (point.X < part->Coordinate || point.X > (part + 1)->Coordinate) - return false; - - if (point.X == part->Coordinate) - if (part != parts && Check(part - 1, point, edgeRefs, edges, points)) - return true; - - return Check(part, point, edgeRefs, edges, points); -} - -bool NReverseGeocoder::TPolygonBase::Better(const TPolygonBase& p, const TRegion* regions, - TNumber regionsNumber) const { - if (Square < p.Square) - return true; - - if (Square == p.Square) { - const TRegion* begin = regions; - const TRegion* end = regions + regionsNumber; - - const TRegion* r1 = LowerBound(begin, end, TGeoId(RegionId)); - const TRegion* r2 = LowerBound(begin, end, TGeoId(p.RegionId)); - - if (r1 == end || r1->RegionId != RegionId) - return false; - - if (r2 == end || r2->RegionId != p.RegionId) - return false; - - return r1->Better(*r2); - } - - return false; -} - -bool NReverseGeocoder::TRawPolygon::Contains(const TPoint& point, const TRef* edgeRefs, const TEdge* edges, - const TPoint* points) const { - if (!Bbox.Contains(point)) - return false; - - edgeRefs += EdgeRefsOffset; - - TNumber intersections = 0; - for (TNumber i = 0; i < EdgeRefsNumber; ++i) { - const TEdge& e = edges[edgeRefs[i]]; - - if (e.Contains(point, points)) - return true; - - TPoint a = points[e.Beg]; - TPoint b = points[e.End]; - - if (a.X > b.X) - DoSwap(a, b); - - if (a.X < point.X && b.X >= point.X && e.Lower(point, points)) - ++intersections; - } - - return intersections % 2 == 1; -} diff --git a/library/cpp/reverse_geocoder/core/polygon.h b/library/cpp/reverse_geocoder/core/polygon.h deleted file mode 100644 index 065bba1e388..00000000000 --- a/library/cpp/reverse_geocoder/core/polygon.h +++ /dev/null @@ -1,73 +0,0 @@ -#pragma once - -#include "bbox.h" -#include "common.h" -#include "edge.h" -#include "part.h" -#include "point.h" -#include "region.h" - -namespace NReverseGeocoder { -#pragma pack(push, 1) - - struct TPolygonBase { - enum EType { - TYPE_UNKNOWN = 0, - TYPE_INNER = 1, - TYPE_OUTER = 2, - }; - - // If TYPE_INNER and polygon contains given point, this means that region with RegionId - // does not contains point. - EType Type; - - ui32 Unused1; - - // Geographical data indetifiers. - TGeoId RegionId; - TGeoId PolygonId; - - // Rectangle in which lies that polygon. - TBoundingBox Bbox; - - // Square of polygon. Need for determine which polygon is better. See better member function. - TSquare Square; - - // Total points number of given polygon. - TNumber PointsNumber; - - // Check that this polygon better then given polygon, which means that this polygons lying - // deeper then given in polygons hierarchy. - bool Better(const TPolygonBase& p, const TRegion* regions, TNumber regionsNumber) const; - }; - - // Polygon is a representation of persistent scanline data structure. - struct TPolygon: public TPolygonBase { - // Versions of persistent scanline. - TNumber PartsOffset; - TNumber PartsNumber; - ui32 Unused2; - - // Fast point in polygon test using persistent scanline. You can see how this data structure - // generated in generator/. - bool Contains(const TPoint& point, const TPart* parts, const TRef* edgeRefs, - const TEdge* edges, const TPoint* points) const; - }; - - static_assert(sizeof(TPolygon) == 64, "NReverseGeocoder::TPolygon size mismatch"); - - // Raw polygon is a polygon representation for slow tests. - struct TRawPolygon: public TPolygonBase { - // Raw polygon edge refs. - TNumber EdgeRefsOffset; - TNumber EdgeRefsNumber; - ui32 Unused2; - - bool Contains(const TPoint& point, const TRef* edgeRefs, const TEdge* edges, - const TPoint* points) const; - }; - - static_assert(sizeof(TRawPolygon) == 64, "NReverseGeocoder::TRawPolygon size mismatch"); - -#pragma pack(pop) -} diff --git a/library/cpp/reverse_geocoder/core/region.cpp b/library/cpp/reverse_geocoder/core/region.cpp deleted file mode 100644 index 62b4acd0a14..00000000000 --- a/library/cpp/reverse_geocoder/core/region.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "region.h" diff --git a/library/cpp/reverse_geocoder/core/region.h b/library/cpp/reverse_geocoder/core/region.h deleted file mode 100644 index 4b010c71030..00000000000 --- a/library/cpp/reverse_geocoder/core/region.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include "common.h" - -namespace NReverseGeocoder { - struct Y_PACKED TRegion { - TGeoId RegionId; - TNumber KvsOffset; - TNumber KvsNumber; - TSquare Square; - TNumber PolygonsNumber; - ui32 Unused; - - bool operator==(const TRegion& r) const { - return RegionId == r.RegionId; - } - - bool operator<(const TRegion& r) const { - return RegionId < r.RegionId; - } - - bool operator<(const TGeoId& r) const { - return RegionId < r; - } - - friend bool operator<(const TGeoId& regionId, const TRegion& r) { - return regionId < r.RegionId; - } - - bool Better(const TRegion& r) const { - return Square < r.Square; - } - }; - - static_assert(sizeof(TRegion) == 32, "NReverseGeocoder::TRegion size mismatch"); - -} diff --git a/library/cpp/reverse_geocoder/core/reverse_geocoder.cpp b/library/cpp/reverse_geocoder/core/reverse_geocoder.cpp deleted file mode 100644 index d73e4f2648c..00000000000 --- a/library/cpp/reverse_geocoder/core/reverse_geocoder.cpp +++ /dev/null @@ -1,182 +0,0 @@ -#include "reverse_geocoder.h" -#include "geo_data/geo_data.h" - -#include <library/cpp/reverse_geocoder/library/unaligned_iter.h> - -#include <util/generic/algorithm.h> -#include <util/system/unaligned_mem.h> - -using namespace NReverseGeocoder; - -static bool PolygonContains(const TPolygon& p, const TPoint& point, const IGeoData& geoData) { - const TPart* parts = geoData.Parts(); - const TRef* edgeRefs = geoData.EdgeRefs(); - const TEdge* edges = geoData.Edges(); - const TPoint* points = geoData.Points(); - return p.Contains(point, parts, edgeRefs, edges, points); -} - -template <typename TAnswer> -static void UpdateAnswer(const TAnswer** answer, const TAnswer& polygon, - const IGeoData& geoData) { - if (!*answer) { - *answer = &polygon; - } else { - const TRegion* regions = geoData.Regions(); - const TNumber regionsNumber = geoData.RegionsNumber(); - if (!(*answer)->Better(polygon, regions, regionsNumber)) - *answer = &polygon; - } -} - -static void SortDebug(TReverseGeocoder::TDebug* debug, const IGeoData& geoData) { - const TRegion* regions = geoData.Regions(); - const TNumber regionsNumber = geoData.RegionsNumber(); - - auto cmp = [&](const TGeoId& a, const TGeoId& b) { - const TRegion* r1 = LowerBound(regions, regions + regionsNumber, a); - const TRegion* r2 = LowerBound(regions, regions + regionsNumber, b); - return r1->Better(*r2); - }; - - Sort(debug->begin(), debug->end(), cmp); -} - -TGeoId NReverseGeocoder::TReverseGeocoder::Lookup(const TLocation& location, TDebug* debug) const { - const IGeoData& geoData = *GeoDataProxy_->GeoData(); - - if (debug) - debug->clear(); - - const TPoint point(location); - const TRef boxRef = LookupAreaBox(point); - - if (boxRef >= geoData.BoxesNumber()) - return UNKNOWN_GEO_ID; - - const TNumber refsOffset = geoData.Boxes()[boxRef].PolygonRefsOffset; - const TNumber refsNumber = geoData.Boxes()[boxRef].PolygonRefsNumber; - - const TPolygon* answer = nullptr; - - const TPolygon* p = geoData.Polygons(); - const auto refsBegin = UnalignedIter(geoData.PolygonRefs()) + refsOffset; - const auto refsEnd = refsBegin + refsNumber; - - for (auto iterL = refsBegin, iterR = refsBegin; iterL < refsEnd; iterL = iterR) { - iterR = iterL + 1; - - if (PolygonContains(p[*iterL], point, geoData)) { - if (p[*iterL].Type == TPolygon::TYPE_INNER) { - // All polygons with same RegionId must be skipped if polygon is inner. - // In geoData small inner polygons stored before big outer polygons. - while (iterR < refsEnd && p[*iterL].RegionId == p[*iterR].RegionId) - ++iterR; - - } else { - UpdateAnswer(&answer, p[*iterL], geoData); - - if (debug) - debug->push_back(p[*iterL].RegionId); - - while (iterR < refsEnd && p[*iterL].RegionId == p[*iterR].RegionId) - ++iterR; - } - } - } - - if (debug) - SortDebug(debug, geoData); - - return answer ? answer->RegionId : UNKNOWN_GEO_ID; -} - -TGeoId NReverseGeocoder::TReverseGeocoder::RawLookup(const TLocation& location, TDebug* debug) const { - const IGeoData& geoData = *GeoDataProxy_->GeoData(); - - if (debug) - debug->clear(); - - const TPoint point(location); - - const TRawPolygon* borders = geoData.RawPolygons(); - const TNumber bordersNumber = geoData.RawPolygonsNumber(); - - const TRawPolygon* answer = nullptr; - - TNumber i = 0; - while (i < bordersNumber) { - if (borders[i].Contains(point, geoData.RawEdgeRefs(), geoData.Edges(), geoData.Points())) { - if (borders[i].Type == TRawPolygon::TYPE_INNER) { - TNumber j = i + 1; - while (j < bordersNumber && borders[i].RegionId == borders[j].RegionId) - ++j; - - i = j; - - } else { - UpdateAnswer(&answer, borders[i], geoData); - - if (debug) - debug->push_back(borders[i].RegionId); - - TNumber j = i + 1; - while (j < bordersNumber && borders[i].RegionId == borders[j].RegionId) - ++j; - - i = j; - } - } else { - ++i; - } - } - - if (debug) - SortDebug(debug, geoData); - - return answer ? answer->RegionId : UNKNOWN_GEO_ID; -} - -bool NReverseGeocoder::TReverseGeocoder::EachKv(TGeoId regionId, TKvCallback callback) const { - const IGeoData& g = *GeoDataProxy_->GeoData(); - - const TRegion* begin = g.Regions(); - const TRegion* end = begin + g.RegionsNumber(); - - const TRegion* region = LowerBound(begin, end, regionId); - - if (region == end || region->RegionId != regionId) - return false; - - const TKv* kvs = g.Kvs() + region->KvsOffset; - const char* blobs = g.Blobs(); - - for (TNumber i = 0; i < region->KvsNumber; ++i) { - const char* k = blobs + kvs[i].K; - const char* v = blobs + kvs[i].V; - callback(k, v); - } - - return true; -} - -void NReverseGeocoder::TReverseGeocoder::EachPolygon(TPolygonCallback callback) const { - const IGeoData& g = *GeoDataProxy_->GeoData(); - - for (TNumber i = 0; i < g.PolygonsNumber(); ++i) - callback(g.Polygons()[i]); -} - -void NReverseGeocoder::TReverseGeocoder::EachPart(const TPolygon& polygon, TPartCallback callback) const { - const IGeoData& g = *GeoDataProxy_->GeoData(); - - const TNumber partsOffset = polygon.PartsOffset; - const TNumber partsNumber = polygon.PartsNumber; - - for (TNumber i = partsOffset; i < partsOffset + partsNumber; ++i) { - const TPart& part = g.Parts()[i]; - const TPart& npart = g.Parts()[i + 1]; - const TNumber edgeRefsNumber = npart.EdgeRefsOffset - part.EdgeRefsOffset; - callback(part, edgeRefsNumber); - } -} diff --git a/library/cpp/reverse_geocoder/core/reverse_geocoder.h b/library/cpp/reverse_geocoder/core/reverse_geocoder.h deleted file mode 100644 index c74eddb40e0..00000000000 --- a/library/cpp/reverse_geocoder/core/reverse_geocoder.h +++ /dev/null @@ -1,73 +0,0 @@ -#pragma once - -#include "common.h" -#include "geo_data/geo_data.h" -#include "geo_data/proxy.h" - -#include <util/generic/noncopyable.h> -#include <util/generic/vector.h> - -#include <functional> - -namespace NReverseGeocoder { - const TGeoId UNKNOWN_GEO_ID = static_cast<TGeoId>(-1); - - // NOTE: Be careful! It's work fine and fast on real world dataset. - // But in theory it's can spent O(n^2) memory (on real world dataset it's just 6n). - // Point in polygon test will be O(log n) always. Memory spent will be O(n) in future! - class TReverseGeocoder: public TNonCopyable { - public: - using TDebug = TVector<TGeoId>; - using TKvCallback = std::function<void(const char*, const char*)>; - using TPolygonCallback = std::function<void(const TPolygon&)>; - using TPartCallback = std::function<void(const TPart&, TNumber)>; - - TReverseGeocoder() - : GeoDataProxy_() - { - } - - TReverseGeocoder(TReverseGeocoder&& g) - : GeoDataProxy_() - { - DoSwap(GeoDataProxy_, g.GeoDataProxy_); - } - - TReverseGeocoder& operator=(TReverseGeocoder&& g) { - DoSwap(GeoDataProxy_, g.GeoDataProxy_); - return *this; - } - - explicit TReverseGeocoder(const char* path) - : GeoDataProxy_(new TGeoDataMapProxy(path)) - { - } - - explicit TReverseGeocoder(const IGeoData& geoData) - : GeoDataProxy_(new TGeoDataWrapper(geoData)) - { - } - - TReverseGeocoder(const char* data, size_t dataSize) - : GeoDataProxy_(new TGeoDataRawProxy(data, dataSize)) - { - } - - TGeoId Lookup(const TLocation& location, TDebug* debug = nullptr) const; - - TGeoId RawLookup(const TLocation& location, TDebug* debug = nullptr) const; - - bool EachKv(TGeoId regionId, TKvCallback callback) const; - - void EachPolygon(TPolygonCallback callback) const; - - void EachPart(const TPolygon& polygon, TPartCallback callback) const; - - const IGeoData& GeoData() const { - return *GeoDataProxy_->GeoData(); - } - - private: - TGeoDataProxyPtr GeoDataProxy_; - }; -} diff --git a/library/cpp/reverse_geocoder/core/ya.make b/library/cpp/reverse_geocoder/core/ya.make deleted file mode 100644 index 9f7dc674649..00000000000 --- a/library/cpp/reverse_geocoder/core/ya.make +++ /dev/null @@ -1,28 +0,0 @@ -LIBRARY() - -PEERDIR( - library/cpp/reverse_geocoder/library - library/cpp/reverse_geocoder/proto - library/cpp/digest/crc32c -) - -SRCS( - area_box.cpp - bbox.cpp - common.cpp - edge.cpp - reverse_geocoder.cpp - kv.cpp - location.cpp - part.cpp - point.cpp - polygon.cpp - region.cpp - geo_data/debug.cpp - geo_data/def.cpp - geo_data/geo_data.cpp - geo_data/map.cpp - geo_data/proxy.cpp -) - -END() diff --git a/library/cpp/reverse_geocoder/library/CMakeLists.darwin-x86_64.txt b/library/cpp/reverse_geocoder/library/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index f82b4b8cd18..00000000000 --- a/library/cpp/reverse_geocoder/library/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,21 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(cpp-reverse_geocoder-library) -target_link_libraries(cpp-reverse_geocoder-library PUBLIC - contrib-libs-cxxsupp - yutil -) -target_sources(cpp-reverse_geocoder-library PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/block_allocator.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/fs.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/log.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/pool_allocator.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/unaligned_iter.cpp -) diff --git a/library/cpp/reverse_geocoder/library/CMakeLists.linux-aarch64.txt b/library/cpp/reverse_geocoder/library/CMakeLists.linux-aarch64.txt deleted file mode 100644 index 4b45fce452e..00000000000 --- a/library/cpp/reverse_geocoder/library/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,22 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(cpp-reverse_geocoder-library) -target_link_libraries(cpp-reverse_geocoder-library PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil -) -target_sources(cpp-reverse_geocoder-library PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/block_allocator.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/fs.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/log.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/pool_allocator.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/unaligned_iter.cpp -) diff --git a/library/cpp/reverse_geocoder/library/CMakeLists.linux-x86_64.txt b/library/cpp/reverse_geocoder/library/CMakeLists.linux-x86_64.txt deleted file mode 100644 index 4b45fce452e..00000000000 --- a/library/cpp/reverse_geocoder/library/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,22 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(cpp-reverse_geocoder-library) -target_link_libraries(cpp-reverse_geocoder-library PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil -) -target_sources(cpp-reverse_geocoder-library PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/block_allocator.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/fs.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/log.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/pool_allocator.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/unaligned_iter.cpp -) diff --git a/library/cpp/reverse_geocoder/library/CMakeLists.txt b/library/cpp/reverse_geocoder/library/CMakeLists.txt deleted file mode 100644 index f8b31df0c11..00000000000 --- a/library/cpp/reverse_geocoder/library/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -endif() diff --git a/library/cpp/reverse_geocoder/library/CMakeLists.windows-x86_64.txt b/library/cpp/reverse_geocoder/library/CMakeLists.windows-x86_64.txt deleted file mode 100644 index f82b4b8cd18..00000000000 --- a/library/cpp/reverse_geocoder/library/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,21 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(cpp-reverse_geocoder-library) -target_link_libraries(cpp-reverse_geocoder-library PUBLIC - contrib-libs-cxxsupp - yutil -) -target_sources(cpp-reverse_geocoder-library PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/block_allocator.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/fs.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/log.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/pool_allocator.cpp - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/library/unaligned_iter.cpp -) diff --git a/library/cpp/reverse_geocoder/library/block_allocator.cpp b/library/cpp/reverse_geocoder/library/block_allocator.cpp deleted file mode 100644 index 56f61dc566d..00000000000 --- a/library/cpp/reverse_geocoder/library/block_allocator.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include "block_allocator.h" - -using namespace NReverseGeocoder; - -static size_t const MEMORY_IS_USED_FLAG = ~0ull; -static size_t const SIZEOF_SIZE = AlignMemory(sizeof(size_t)); - -void* NReverseGeocoder::TBlockAllocator::Allocate(size_t number) { - number = AlignMemory(number); - if (BytesAllocated_ + number + SIZEOF_SIZE > BytesLimit_) - ythrow yexception() << "Unable allocate memory"; - char* begin = ((char*)Data_) + BytesAllocated_; - char* end = begin + number; - *((size_t*)end) = MEMORY_IS_USED_FLAG; - BytesAllocated_ += number + SIZEOF_SIZE; - return begin; -} - -size_t NReverseGeocoder::TBlockAllocator::AllocateSize(size_t number) { - return AlignMemory(number) + SIZEOF_SIZE; -} - -static void RelaxBlock(char* begin, size_t* number) { - while (*number > 0) { - char* ptr = begin + *number - SIZEOF_SIZE; - if (*((size_t*)ptr) == MEMORY_IS_USED_FLAG) - return; - *number -= *((size_t*)ptr) + SIZEOF_SIZE; - } -} - -void NReverseGeocoder::TBlockAllocator::Deallocate(void* ptr, size_t number) { - number = AlignMemory(number); - char* begin = (char*)ptr; - char* end = begin + number; - if (*((size_t*)end) != MEMORY_IS_USED_FLAG) - ythrow yexception() << "Trying to deallocate not allocated pointer " << ptr; - *((size_t*)end) = number; - RelaxBlock((char*)Data_, &BytesAllocated_); -} diff --git a/library/cpp/reverse_geocoder/library/block_allocator.h b/library/cpp/reverse_geocoder/library/block_allocator.h deleted file mode 100644 index 1189d6b25c6..00000000000 --- a/library/cpp/reverse_geocoder/library/block_allocator.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include "memory.h" - -#include <util/generic/yexception.h> - -namespace NReverseGeocoder { - class TBlockAllocator: public TNonCopyable { - public: - TBlockAllocator() - : Data_(nullptr) - , BytesAllocated_(0) - , BytesLimit_(0) - { - } - - TBlockAllocator(void* data, size_t bytesLimit) - : Data_(data) - , BytesAllocated_(0) - , BytesLimit_(bytesLimit) - { - } - - TBlockAllocator(TBlockAllocator&& a) - : TBlockAllocator() - { - DoSwap(Data_, a.Data_); - DoSwap(BytesAllocated_, a.BytesAllocated_); - DoSwap(BytesLimit_, a.BytesLimit_); - } - - TBlockAllocator& operator=(TBlockAllocator&& a) { - DoSwap(Data_, a.Data_); - DoSwap(BytesAllocated_, a.BytesAllocated_); - DoSwap(BytesLimit_, a.BytesLimit_); - return *this; - } - - virtual ~TBlockAllocator() { - } - - virtual void* Allocate(size_t number); - - static size_t AllocateSize(size_t number); - - virtual void Deallocate(void* ptr, size_t number); - - size_t TotalAllocatedSize() const { - return BytesAllocated_; - } - - void Setup(void* data, size_t bytesLimit) { - Data_ = data; - BytesLimit_ = bytesLimit; - BytesAllocated_ = 0; - } - - private: - void* Data_; - size_t BytesAllocated_; - size_t BytesLimit_; - }; - -} diff --git a/library/cpp/reverse_geocoder/library/fs.cpp b/library/cpp/reverse_geocoder/library/fs.cpp deleted file mode 100644 index 98c3b9ef817..00000000000 --- a/library/cpp/reverse_geocoder/library/fs.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "fs.h" - -#include <util/folder/dirut.h> -#include <util/string/split.h> - -namespace NReverseGeocoder { - TVector<TString> GetDataFilesList(const char* input) { - if (IsDir(input)) { - return GetFileListInDirectory<TVector<TString>>(input); - } - - TVector<TString> result; - for (const auto& partIt : StringSplitter(input).Split(',')) { - result.push_back(TString(partIt.Token())); - } - return result; - } -} diff --git a/library/cpp/reverse_geocoder/library/fs.h b/library/cpp/reverse_geocoder/library/fs.h deleted file mode 100644 index 4435f960c80..00000000000 --- a/library/cpp/reverse_geocoder/library/fs.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include <util/folder/iterator.h> -#include <util/string/vector.h> - -namespace NReverseGeocoder { - template <typename Cont> - Cont GetFileListInDirectory(const char* dirName) { - TDirIterator dirIt(dirName, TDirIterator::TOptions(FTS_LOGICAL)); - Cont dirContent; - for (auto file = dirIt.begin(); file != dirIt.end(); ++file) { - if (strcmp(file->fts_path, dirName)) - dirContent.push_back(file->fts_path); - } - return dirContent; - } - - TVector<TString> GetDataFilesList(const char* input); -} diff --git a/library/cpp/reverse_geocoder/library/log.cpp b/library/cpp/reverse_geocoder/library/log.cpp deleted file mode 100644 index 44e6ddf2872..00000000000 --- a/library/cpp/reverse_geocoder/library/log.cpp +++ /dev/null @@ -1,111 +0,0 @@ -#include "log.h" - -#include <util/datetime/systime.h> -#include <util/generic/yexception.h> -#include <util/system/guard.h> -#include <util/system/mutex.h> - -using namespace NReverseGeocoder; - -static size_t const TIMESTAMP_LIMIT = 32; - -class TLogger { -public: - static TLogger& Inst() { - static TLogger logger; - return logger; - } - - void Setup(IOutputStream& out, ELogLevel level) { - Out_ = &out; - Level_ = level; - } - - void Write(ELogLevel level, const char* message) { - if (level <= Level_) { - TGuard<TMutex> Lock(Lock_); - Out_->Write(message, strlen(message)); - } - } - - IOutputStream& OutputStream() const { - return *Out_; - } - - ELogLevel Level() const { - return Level_; - } - -private: - TLogger() - : Out_() - , Level_(LOG_LEVEL_DISABLE) - { - } - - IOutputStream* Out_; - ELogLevel Level_; - TMutex Lock_; -}; - -ELogLevel NReverseGeocoder::LogLevel() { - return TLogger::Inst().Level(); -} - -void NReverseGeocoder::LogSetup(IOutputStream& out, ELogLevel level) { - TLogger::Inst().Setup(out, level); -} - -IOutputStream& NReverseGeocoder::LogOutputStream() { - return TLogger::Inst().OutputStream(); -} - -static const char* T(char* buffer) { - struct timeval timeVal; - gettimeofday(&timeVal, nullptr); - - struct tm timeInfo; - const time_t sec = timeVal.tv_sec; - localtime_r(&sec, &timeInfo); - - snprintf(buffer, TIMESTAMP_LIMIT, "%02d:%02d:%02d.%06d", - timeInfo.tm_hour, timeInfo.tm_min, timeInfo.tm_sec, (int)timeVal.tv_usec); - - return buffer; -} - -void NReverseGeocoder::LogWrite(ELogLevel level, const char* message) { - if (level > LogLevel()) - return; - - static const char* A[LOG_LEVEL_COUNT] = { - "", // LOG_LEVEL_DISABLE - "\033[90m", // LOG_LEVEL_ERROR - "\033[90m", // LOG_LEVEL_WARNING - "\033[90m", // LOG_LEVEL_INFO - "\033[90m", // LOG_LEVEL_DEBUG - }; - - static const char* B[LOG_LEVEL_COUNT] = { - "", // LOG_LEVEL_DISABLE - "\033[31;1mError\033[0m", // LOG_LEVEL_ERROR - "\033[33;1mWarn\033[0m", // LOG_LEVEL_WARNING - "\033[32;1mInfo\033[0m", // LOG_LEVEL_INFO - "Debug", // LOG_LEVEL_DEBUG - }; - - static const char* C[LOG_LEVEL_COUNT] = { - "", // LOG_LEVEL_DISABLE - "\n", // LOG_LEVEL_ERROR - "\n", // LOG_LEVEL_WARNING - "\n", // LOG_LEVEL_INFO - "\033[0m\n", // LOG_LEVEL_DEBUG - }; - - char buffer[LOG_MESSAGE_LIMIT], tbuffer[TIMESTAMP_LIMIT]; - // Ignore logger snprintf errors. - snprintf(buffer, LOG_MESSAGE_LIMIT, "%s(%s) %s: %s%s", - A[level], T(tbuffer), B[level], message, C[level]); - - TLogger::Inst().Write(level, buffer); -} diff --git a/library/cpp/reverse_geocoder/library/log.h b/library/cpp/reverse_geocoder/library/log.h deleted file mode 100644 index 44cb0cefcf8..00000000000 --- a/library/cpp/reverse_geocoder/library/log.h +++ /dev/null @@ -1,65 +0,0 @@ -#pragma once - -#include <util/generic/yexception.h> -#include <util/stream/output.h> - -#include <cstdio> - -namespace NReverseGeocoder { - size_t const LOG_MESSAGE_LIMIT = 1024; - - enum ELogLevel { - LOG_LEVEL_DISABLE = 0, - LOG_LEVEL_ERROR, - LOG_LEVEL_WARNING, - LOG_LEVEL_INFO, - LOG_LEVEL_DEBUG, - LOG_LEVEL_COUNT - }; - - // Init logger. Setup OutputStream and logger level. - void LogSetup(IOutputStream& out, ELogLevel level); - - // Write log message with colors, level and current time. - // Example: - // (13:24:11.123456) Info: Good job! - // (13:24:11.323456) Warn: Ooops :( - // (13:24:22.456789) Error: Hello, world! - void LogWrite(ELogLevel level, const char* message); - - // Log output file descriptor. - IOutputStream& LogOutputStream(); - - // Current log level. - ELogLevel LogLevel(); - - template <typename... TArgs> - void LogWrite(ELogLevel level, const char* fmt, TArgs... args) { - if (level <= LogLevel()) { - char buffer[LOG_MESSAGE_LIMIT]; - // Ignore logger snprintf errors. - snprintf(buffer, LOG_MESSAGE_LIMIT, fmt, std::forward<TArgs>(args)...); - LogWrite(level, buffer); - } - } - - template <typename... TArgs> - void LogError(TArgs... args) { - LogWrite(LOG_LEVEL_ERROR, std::forward<TArgs>(args)...); - } - - template <typename... TArgs> - void LogWarning(TArgs... args) { - LogWrite(LOG_LEVEL_WARNING, std::forward<TArgs>(args)...); - } - - template <typename... TArgs> - void LogInfo(TArgs... args) { - LogWrite(LOG_LEVEL_INFO, std::forward<TArgs>(args)...); - } - - template <typename... TArgs> - void LogDebug(TArgs... args) { - LogWrite(LOG_LEVEL_DEBUG, std::forward<TArgs>(args)...); - } -} diff --git a/library/cpp/reverse_geocoder/library/memory.h b/library/cpp/reverse_geocoder/library/memory.h deleted file mode 100644 index ecbe8bcd660..00000000000 --- a/library/cpp/reverse_geocoder/library/memory.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include <util/system/types.h> - -namespace NReverseGeocoder { - constexpr ui64 B = 1ull; - constexpr ui64 KB = 1024 * B; - constexpr ui64 MB = 1024 * KB; - constexpr ui64 GB = 1024 * MB; - - constexpr size_t MEMORY_ALIGNMENT = 16ull; - - inline unsigned long long AlignMemory(unsigned long long x) { - if (x % MEMORY_ALIGNMENT == 0) - return x; - return x + MEMORY_ALIGNMENT - x % MEMORY_ALIGNMENT; - } - - inline bool IsAlignedMemory(void* ptr) { - return ((uintptr_t)ptr) % MEMORY_ALIGNMENT == 0; - } - -} diff --git a/library/cpp/reverse_geocoder/library/pool_allocator.cpp b/library/cpp/reverse_geocoder/library/pool_allocator.cpp deleted file mode 100644 index 0d841f7db0f..00000000000 --- a/library/cpp/reverse_geocoder/library/pool_allocator.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "memory.h" -#include "pool_allocator.h" - -#include <util/generic/yexception.h> - -using namespace NReverseGeocoder; - -NReverseGeocoder::TPoolAllocator::TPoolAllocator(size_t poolSize) { - Ptr_ = new char[poolSize]; - Size_ = poolSize; - Setup(Ptr_, Size_); -} - -NReverseGeocoder::TPoolAllocator::~TPoolAllocator() { - if (Ptr_) - delete[] Ptr_; -} diff --git a/library/cpp/reverse_geocoder/library/pool_allocator.h b/library/cpp/reverse_geocoder/library/pool_allocator.h deleted file mode 100644 index f98bbcd3c1e..00000000000 --- a/library/cpp/reverse_geocoder/library/pool_allocator.h +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include "block_allocator.h" - -#include <util/generic/utility.h> -#include <util/generic/noncopyable.h> - -namespace NReverseGeocoder { - class TPoolAllocator: public TBlockAllocator { - public: - TPoolAllocator() - : Ptr_(nullptr) - , Size_(0) - { - } - - TPoolAllocator(TPoolAllocator&& a) - : TBlockAllocator(std::forward<TBlockAllocator>(a)) - , Ptr_(nullptr) - , Size_(0) - { - DoSwap(Ptr_, a.Ptr_); - DoSwap(Size_, a.Size_); - } - - TPoolAllocator& operator=(TPoolAllocator&& a) { - TBlockAllocator::operator=(std::forward<TBlockAllocator>(a)); - DoSwap(Ptr_, a.Ptr_); - DoSwap(Size_, a.Size_); - return *this; - } - - explicit TPoolAllocator(size_t poolSize); - - ~TPoolAllocator() override; - - private: - char* Ptr_; - size_t Size_; - }; - -} diff --git a/library/cpp/reverse_geocoder/library/system.h b/library/cpp/reverse_geocoder/library/system.h deleted file mode 100644 index 499fb2bd919..00000000000 --- a/library/cpp/reverse_geocoder/library/system.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define SYSTEM_ENDIAN_FLAG (htonl(337)) diff --git a/library/cpp/reverse_geocoder/library/unaligned_iter.cpp b/library/cpp/reverse_geocoder/library/unaligned_iter.cpp deleted file mode 100644 index 0322b677dcf..00000000000 --- a/library/cpp/reverse_geocoder/library/unaligned_iter.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "unaligned_iter.h" diff --git a/library/cpp/reverse_geocoder/library/unaligned_iter.h b/library/cpp/reverse_geocoder/library/unaligned_iter.h deleted file mode 100644 index 827a3e2fd2e..00000000000 --- a/library/cpp/reverse_geocoder/library/unaligned_iter.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include <util/system/unaligned_mem.h> -#include <iterator> - -namespace NReverseGeocoder { - /** - * Random-access iterator over a read-only memory range - * of trivially copyable items that may be not aligned properly. - * - * When dereferencing, a copy of item is returned, not a reference. - * Be sure that sizeof(T) is small enough. - * - * Iterator is useful for LowerBound/UpperBound STL algorithms. - */ - template <class T> - class TUnalignedIter: public std::iterator<std::random_access_iterator_tag, T> { - public: - using TSelf = TUnalignedIter<T>; - - explicit TUnalignedIter(const T* ptr) - : Ptr(ptr) - { - } - - T operator*() const { - return ReadUnaligned<T>(Ptr); - } - - bool operator==(TSelf other) const { - return Ptr == other.Ptr; - } - - bool operator<(TSelf other) const { - return Ptr < other.Ptr; - } - - TSelf operator+(ptrdiff_t delta) const { - return TSelf{Ptr + delta}; - } - - ptrdiff_t operator-(TSelf other) const { - return Ptr - other.Ptr; - } - - TSelf& operator+=(ptrdiff_t delta) { - Ptr += delta; - return *this; - } - - TSelf& operator++() { - ++Ptr; - return *this; - } - - private: - const T* Ptr; - }; - - template <class T> - TUnalignedIter<T> UnalignedIter(const T* ptr) { - return TUnalignedIter<T>(ptr); - } -} diff --git a/library/cpp/reverse_geocoder/library/ya.make b/library/cpp/reverse_geocoder/library/ya.make deleted file mode 100644 index ec2eb205a81..00000000000 --- a/library/cpp/reverse_geocoder/library/ya.make +++ /dev/null @@ -1,11 +0,0 @@ -LIBRARY() - -SRCS( - block_allocator.cpp - fs.cpp - log.cpp - pool_allocator.cpp - unaligned_iter.cpp -) - -END() diff --git a/library/cpp/reverse_geocoder/proto/CMakeLists.darwin-x86_64.txt b/library/cpp/reverse_geocoder/proto/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index 8d1df0fdf8b..00000000000 --- a/library/cpp/reverse_geocoder/proto/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,56 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) - -add_library(cpp-reverse_geocoder-proto) -target_link_libraries(cpp-reverse_geocoder-proto PUBLIC - contrib-libs-cxxsupp - yutil - contrib-libs-protobuf -) -target_proto_messages(cpp-reverse_geocoder-proto PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/proto/geo_data.proto - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/proto/region.proto -) -target_proto_addincls(cpp-reverse_geocoder-proto - ./ - ${CMAKE_SOURCE_DIR}/ - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src -) -target_proto_outs(cpp-reverse_geocoder-proto - --cpp_out=${CMAKE_BINARY_DIR}/ - --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ -) diff --git a/library/cpp/reverse_geocoder/proto/CMakeLists.linux-aarch64.txt b/library/cpp/reverse_geocoder/proto/CMakeLists.linux-aarch64.txt deleted file mode 100644 index b53c1692ee6..00000000000 --- a/library/cpp/reverse_geocoder/proto/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,57 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) - -add_library(cpp-reverse_geocoder-proto) -target_link_libraries(cpp-reverse_geocoder-proto PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil - contrib-libs-protobuf -) -target_proto_messages(cpp-reverse_geocoder-proto PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/proto/geo_data.proto - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/proto/region.proto -) -target_proto_addincls(cpp-reverse_geocoder-proto - ./ - ${CMAKE_SOURCE_DIR}/ - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src -) -target_proto_outs(cpp-reverse_geocoder-proto - --cpp_out=${CMAKE_BINARY_DIR}/ - --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ -) diff --git a/library/cpp/reverse_geocoder/proto/CMakeLists.linux-x86_64.txt b/library/cpp/reverse_geocoder/proto/CMakeLists.linux-x86_64.txt deleted file mode 100644 index b53c1692ee6..00000000000 --- a/library/cpp/reverse_geocoder/proto/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,57 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) - -add_library(cpp-reverse_geocoder-proto) -target_link_libraries(cpp-reverse_geocoder-proto PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil - contrib-libs-protobuf -) -target_proto_messages(cpp-reverse_geocoder-proto PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/proto/geo_data.proto - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/proto/region.proto -) -target_proto_addincls(cpp-reverse_geocoder-proto - ./ - ${CMAKE_SOURCE_DIR}/ - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src -) -target_proto_outs(cpp-reverse_geocoder-proto - --cpp_out=${CMAKE_BINARY_DIR}/ - --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ -) diff --git a/library/cpp/reverse_geocoder/proto/CMakeLists.txt b/library/cpp/reverse_geocoder/proto/CMakeLists.txt deleted file mode 100644 index f8b31df0c11..00000000000 --- a/library/cpp/reverse_geocoder/proto/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -endif() diff --git a/library/cpp/reverse_geocoder/proto/CMakeLists.windows-x86_64.txt b/library/cpp/reverse_geocoder/proto/CMakeLists.windows-x86_64.txt deleted file mode 100644 index 8d1df0fdf8b..00000000000 --- a/library/cpp/reverse_geocoder/proto/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,56 +0,0 @@ - -# This file was generated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) -get_built_tool_path( - TOOL_protoc_bin - TOOL_protoc_dependency - contrib/tools/protoc/bin - protoc -) -get_built_tool_path( - TOOL_cpp_styleguide_bin - TOOL_cpp_styleguide_dependency - contrib/tools/protoc/plugins/cpp_styleguide - cpp_styleguide -) - -add_library(cpp-reverse_geocoder-proto) -target_link_libraries(cpp-reverse_geocoder-proto PUBLIC - contrib-libs-cxxsupp - yutil - contrib-libs-protobuf -) -target_proto_messages(cpp-reverse_geocoder-proto PRIVATE - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/proto/geo_data.proto - ${CMAKE_SOURCE_DIR}/library/cpp/reverse_geocoder/proto/region.proto -) -target_proto_addincls(cpp-reverse_geocoder-proto - ./ - ${CMAKE_SOURCE_DIR}/ - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src -) -target_proto_outs(cpp-reverse_geocoder-proto - --cpp_out=${CMAKE_BINARY_DIR}/ - --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ -) diff --git a/library/cpp/reverse_geocoder/proto/geo_data.proto b/library/cpp/reverse_geocoder/proto/geo_data.proto deleted file mode 100644 index 00ecb48bec8..00000000000 --- a/library/cpp/reverse_geocoder/proto/geo_data.proto +++ /dev/null @@ -1,42 +0,0 @@ -package NReverseGeocoder.NProto; - -message TGeoData { - required uint64 Magic = 1; - required uint64 Version = 2; - optional uint64 Points = 3; - optional uint64 PointsNumber = 4; - optional uint64 PointsCrc32 = 5; - optional uint64 Edges = 6; - optional uint64 EdgesNumber = 7; - optional uint64 EdgesCrc32 = 8; - optional uint64 EdgeRefs = 9; - optional uint64 EdgeRefsNumber = 10; - optional uint64 EdgeRefsCrc32 = 11; - optional uint64 Parts = 12; - optional uint64 PartsNumber = 13; - optional uint64 PartsCrc32 = 14; - optional uint64 Polygons = 15; - optional uint64 PolygonsNumber = 16; - optional uint64 PolygonsCrc32 = 17; - optional uint64 PolygonRefs = 18; - optional uint64 PolygonRefsNumber = 19; - optional uint64 PolygonRefsCrc32 = 20; - optional uint64 Boxes = 21; - optional uint64 BoxesNumber = 22; - optional uint64 BoxesCrc32 = 23; - optional uint64 Blobs = 24; - optional uint64 BlobsNumber = 25; - optional uint64 BlobsCrc32 = 26; - optional uint64 Kvs = 27; - optional uint64 KvsNumber = 28; - optional uint64 KvsCrc32 = 29; - optional uint64 Regions = 30; - optional uint64 RegionsNumber = 31; - optional uint64 RegionsCrc32 = 32; - optional uint64 RawPolygons = 33; - optional uint64 RawPolygonsNumber = 34; - optional uint64 RawPolygonsCrc32 = 35; - optional uint64 RawEdgeRefs = 36; - optional uint64 RawEdgeRefsNumber = 37; - optional uint64 RawEdgeRefsCrc32 = 38; -}; diff --git a/library/cpp/reverse_geocoder/proto/region.proto b/library/cpp/reverse_geocoder/proto/region.proto deleted file mode 100644 index b7823316282..00000000000 --- a/library/cpp/reverse_geocoder/proto/region.proto +++ /dev/null @@ -1,32 +0,0 @@ -package NReverseGeocoder.NProto; - -message TLocation { - required double Lat = 1; - required double Lon = 2; -} - -message TPolygon { - required uint64 PolygonId = 1; - repeated TLocation Locations = 2; - - enum EType { - TYPE_UNKNOWN = 0; - TYPE_INNER = 1; - TYPE_OUTER = 2; - } - - required EType Type = 3; -} - -message TKv { - required string K = 1; - required string V = 2; -} - -message TRegion { - required uint64 RegionId = 1; - optional uint64 ParentId = 2; - repeated TPolygon Polygons = 3; - repeated TKv Kvs = 4; - repeated string Blobs = 5; -} diff --git a/library/cpp/reverse_geocoder/proto/ya.make b/library/cpp/reverse_geocoder/proto/ya.make deleted file mode 100644 index b6f71562104..00000000000 --- a/library/cpp/reverse_geocoder/proto/ya.make +++ /dev/null @@ -1,10 +0,0 @@ -PROTO_LIBRARY() - -SRCS( - geo_data.proto - region.proto -) - -EXCLUDE_TAGS(GO_PROTO) - -END() |