diff --git a/generator/generator.pro b/generator/generator.pro index 670623d63c..f26643384d 100644 --- a/generator/generator.pro +++ b/generator/generator.pro @@ -18,7 +18,6 @@ SOURCES += \ feature_generator.cpp \ feature_sorter.cpp \ update_generator.cpp \ - grid_generator.cpp \ statistics.cpp \ osm2type.cpp \ classif_routine.cpp \ @@ -39,7 +38,6 @@ HEADERS += \ data_cache_file.hpp \ feature_sorter.hpp \ update_generator.hpp \ - grid_generator.hpp \ statistics.hpp \ polygonizer.hpp \ world_map_generator.hpp \ diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp index 9e2a922876..6245a3d2ae 100644 --- a/generator/generator_tool/generator_tool.cpp +++ b/generator/generator_tool/generator_tool.cpp @@ -3,7 +3,6 @@ #include "../feature_sorter.hpp" #include "../update_generator.hpp" #include "../feature_bucketer.hpp" -#include "../grid_generator.hpp" #include "../statistics.hpp" #include "../classif_routine.hpp" #include "../borders_generator.hpp" @@ -40,7 +39,6 @@ DEFINE_bool(generate_features, false, "2nd pass - generate intermediate features DEFINE_bool(generate_geometry, false, "3rd pass - split and simplify geometry and triangles for features"); DEFINE_bool(generate_index, false, "4rd pass - generate index"); DEFINE_bool(generate_search_index, false, "5th pass - generate search index"); -DEFINE_bool(generate_grid, false, "Generate grid for given bucketing_level"); DEFINE_bool(calc_statistics, false, "Calculate feature statistics for specified mwm bucket files"); DEFINE_bool(use_light_nodes, false, "If true, use temporary vector of nodes, instead of huge temp file"); @@ -97,11 +95,6 @@ int main(int argc, char ** argv) classificator::GenerateAndWrite(path); } - if (FLAGS_generate_grid) - { - grid::GenerateGridToStdout(FLAGS_bucketing_level); - } - // Generating intermediate files if (FLAGS_preprocess_xml) { diff --git a/generator/grid_generator.cpp b/generator/grid_generator.cpp deleted file mode 100644 index b3f3e9ade2..0000000000 --- a/generator/grid_generator.cpp +++ /dev/null @@ -1,192 +0,0 @@ -#include "grid_generator.hpp" - -#include "../base/logging.hpp" - -#include "../indexer/cell_id.hpp" -#include "../indexer/mercator.hpp" - -// tags used for grid drawing -#define GRIDKEY "mapswithme" -#define GRIDVALUE "grid" -#define CAPTIONKEY "place" -#define CAPTIONVALUE "country" - -namespace grid -{ - static size_t const MIN_GRID_LEVEL = 1; - static size_t const MAX_GRID_LEVEL = 10; - - template - string MercatorPointToCellIdString(double x, double y, size_t bucketingLevel) - { - TCellId id = CellIdConverter::ToCellId(x, y); - return id.ToString().substr(0, bucketingLevel); - } - - void GenerateGridToStdout(size_t bucketingLevel) - { - if (bucketingLevel < MIN_GRID_LEVEL || bucketingLevel > MAX_GRID_LEVEL) - { - LOG(LERROR, ("Bucketing level", bucketingLevel, "for grid is not within valid range [", MIN_GRID_LEVEL, "..", MAX_GRID_LEVEL, "]")); - return; - } - - size_t const COUNT = 2 << (bucketingLevel - 1); - double const STEPX = (MercatorBounds::maxX - MercatorBounds::minX) / COUNT; - double const STEPY = (MercatorBounds::maxY - MercatorBounds::minY) / COUNT; - - cout << - "\n" - "\n" - " \n"; - - // generate nodes and ways - size_t nodeID = 1; - size_t wayID = 1; - for (double y = MercatorBounds::minY; y <= MercatorBounds::maxY; y += STEPY) - { - size_t const firstID = nodeID; - cout << - " \n"; - size_t const secondID = nodeID; - cout << - " \n"; - cout << - " \n" - " \n" - " \n" - " \n" - " \n" - " \n"; - } - for (double x = MercatorBounds::minX; x <= MercatorBounds::maxX; x += STEPX) - { - size_t const firstID = nodeID; - cout << - " \n"; - size_t const secondID = nodeID; - cout << - " \n"; - cout << - " \n" - " \n" - " \n" - " \n" - " \n" - " \n"; - } - - // generate nodes with captions - for (size_t y = 0; y <= COUNT - 1; ++y) - { - for (size_t x = 0; x <= COUNT - 1; ++x) - { - double const mercY = MercatorBounds::minY + y * STEPY + STEPY / 2; - double const mercX = MercatorBounds::minX + x * STEPX + STEPX / 2; - string const title = MercatorPointToCellIdString >(mercX, mercY, bucketingLevel); - cout << - " \n"; - cout << - " \n"; - cout << - " \n"; - cout << - " \n"; - } - } - cout << - "\n"; - } - -/* void GenerateGridToStdout(size_t bucketingLevel) - { - if (bucketingLevel < MIN_GRID_LEVEL || bucketingLevel > MAX_GRID_LEVEL) - { - LOG(LERROR, ("Bucketing level", bucketingLevel, "for grid is not within valid range [", MIN_GRID_LEVEL, "..", MAX_GRID_LEVEL, "]")); - return; - } - - size_t const COUNT = 2 << (bucketingLevel - 1); - double const STEPX = (MercatorBounds::maxX - MercatorBounds::minX) / COUNT; - double const STEPY = (MercatorBounds::maxY - MercatorBounds::minY) / COUNT; - - cout << - "\n" - "\n" - " \n"; - - // generate nodes - size_t nodeID = 1; - for (double y = MercatorBounds::minY; y <= MercatorBounds::maxY; y += STEPY) - { - for (double x = MercatorBounds::minX; x <= MercatorBounds::maxX; x += STEPX) - { - cout << - " \n"; - } - } - // generate squares and captions - size_t wayID = 1; - for (size_t y = 0; y <= COUNT - 1; ++y) - { - for (size_t x = 0; x <= COUNT - 1; ++x) - { - size_t const first = x + y * (COUNT + 1) + 1; - size_t const second = first + 1; - size_t const third = second + COUNT + 1; - size_t const fourth = third - 1; - string title = CellStringFromXYLevel(x, y, bucketingLevel); - ++nodeID; - cout << - " \n"; - cout << - " \n"; - cout << - " \n"; - cout << - " \n"; - - cout << - " \n" - " \n" - " \n" - " \n" - " \n" - " \n" - " \n" - " \n" - " \n" - " \n"; - } - } - cout << - "\n"; - }*/ -} diff --git a/generator/grid_generator.hpp b/generator/grid_generator.hpp deleted file mode 100644 index a1bdc31e45..0000000000 --- a/generator/grid_generator.hpp +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#include "../std/iostream.hpp" - -namespace grid -{ - void GenerateGridToStdout(size_t bucketingLevel); -}