gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[generator] Add isolines features.

Browse source
This commit is contained in:
Daria Volvenkova 2020-01-27 20:36:37 +03:00
parent 302597d3dd
commit 1035f5b3db
15 changed files with 169 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/CMakeLists.txt
View file

@ -112,6 +112,8 @@ set(
intermediate_data.cpp
intermediate_data.hpp
intermediate_elements.hpp
isolines_generator.cpp
isolines_generator.hpp
maxspeeds_builder.cpp
maxspeeds_builder.hpp
maxspeeds_collector.cpp

35
generator/final_processor_intermediate_mwm.cpp
View file

@ -4,6 +4,7 @@
#include "generator/booking_dataset.hpp"
#include "generator/complex_loader.hpp"
#include "generator/feature_merger.hpp"
#include "generator/isolines_generator.hpp"
#include "generator/mini_roundabout_transformer.hpp"
#include "generator/node_mixer.hpp"
#include "generator/osm2type.hpp"
@ -126,6 +127,11 @@ std::string GetCountryNameFromTmpMwmPath(std::string filename)
return filename;
}
{
strings::ReplaceLast(filename, DATA_FILE_EXTENSION_TMP, "");
return filename;
}
bool FilenameIsCountry(std::string const & filename, AffiliationInterface const & affiliation)
{
return affiliation.HasCountryByName(GetCountryNameFromTmpMwmPath(filename));
@ -273,10 +279,12 @@ bool FinalProcessorIntermediateMwmInterface::operator!=(
CountryFinalProcessor::CountryFinalProcessor(std::string const & borderPath,
std::string const & temporaryMwmPath,
std::string const & isolinesPath,
bool haveBordersForWholeWorld, size_t threadsCount)
: FinalProcessorIntermediateMwmInterface(FinalProcessorPriority::CountriesOrWorld)
, m_borderPath(borderPath)
, m_temporaryMwmPath(temporaryMwmPath)
, m_isolinesPath(isolinesPath)
, m_haveBordersForWholeWorld(haveBordersForWholeWorld)
, m_threadsCount(threadsCount)
{
@ -340,7 +348,8 @@ void CountryFinalProcessor::Process()
ProcessRoundabouts();
if (!m_fakeNodesFilename.empty())
AddFakeNodes();
if (!m_isolinesPath.empty())
AddIsolines();
Finish();
}
@ -409,6 +418,30 @@ void CountryFinalProcessor::ProcessRoundabouts()
}
}
void CountryFinalProcessor::AddIsolines()
{
IsolineFeaturesGenerator isolineFeaturesGenerator(m_isolinesPath);
auto const affiliation = CountriesFilesIndexAffiliation(m_borderPath, m_haveBordersForWholeWorld);
{
ThreadPool pool(m_threadsCount);
ForEachCountry(m_temporaryMwmPath, [&](auto const & filename) {
pool.SubmitWork([&, filename]() {
if (!FilenameIsCountry(filename, affiliation))
return;
auto const countryName = GetCountryNameFromTmpMwmPath(filename);
std::vector<feature::FeatureBuilder> fbs;
isolineFeaturesGenerator.GenerateIsolines(countryName, fbs);
auto const fullPath = base::JoinPath(m_temporaryMwmPath, filename);
FeatureBuilderWriter<MaxAccuracy> writer(fullPath, FileWriter::Op::OP_APPEND);
for (auto const & fb : fbs)
writer.Write(fb);
});
});
}
}
void CountryFinalProcessor::ProcessRoutingCityBoundaries()
{
CHECK(

9
generator/final_processor_intermediate_mwm.hpp
View file

@ -47,9 +47,10 @@ protected:
class CountryFinalProcessor : public FinalProcessorIntermediateMwmInterface
{
public:
explicit CountryFinalProcessor(std::string const & borderPath,
std::string const & temporaryMwmPath,
bool haveBordersForWholeWorld, size_t threadsCount);
CountryFinalProcessor(std::string const & borderPath,
std::string const & temporaryMwmPath,
std::string const & isolinesPath,
bool haveBordersForWholeWorld, size_t threadsCount);
void SetBooking(std::string const & filename);
void SetCitiesAreas(std::string const & filename);
@ -72,11 +73,13 @@ private:
void ProcessCities();
void ProcessCoastline();
void ProcessRoundabouts();
void AddIsolines();
void AddFakeNodes();
void Finish();
std::string m_borderPath;
std::string m_temporaryMwmPath;
std::string m_isolinesPath;
std::string m_citiesAreasTmpFilename;
std::string m_citiesBoundariesFilename;
std::string m_hotelsFilename;

3
generator/generate_info.hpp
View file

@ -37,6 +37,9 @@ struct GenerateInfo
// Directory for all intermediate files.
std::string m_intermediateDir;
// Directory with isolines files.
std::string m_isolinesDir;
// Current generated file name if --output option is defined.
std::string m_fileName;

3
generator/generator_tool/generator_tool.cpp
View file

@ -129,6 +129,8 @@ DEFINE_string(
nodes_list_path, "",
"Path to file containing list of node ids we need to add to locality index. May be empty.");
DEFINE_string(isolines_path, "",
"Path to isolines directory. If set, adds isolines linear features.");
// Routing.
DEFINE_bool(make_routing_index, false, "Make sections with the routing information.");
DEFINE_bool(make_cross_mwm, false,
@ -259,6 +261,7 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
genInfo.m_fileName = FLAGS_output;
genInfo.m_idToWikidataFilename = FLAGS_idToWikidata;
genInfo.m_complexHierarchyFilename = FLAGS_complex_hierarchy_data;
genInfo.m_isolinesDir = FLAGS_isolines_path;
// Use merged style.
GetStyleReader().SetCurrentStyle(MapStyleMerged);

68
generator/isolines_generator.cpp Normal file
View file

@ -0,0 +1,68 @@
#include "generator/isolines_generator.hpp"
#include "topography_generator/isolines_utils.hpp"
#include "topography_generator/utils/contours_serdes.hpp"
#include "indexer/classificator.hpp"
namespace generator
{
namespace
{
std::string GetIsolineType(topography_generator::Altitude altitude)
{
static std::vector<int> const altClasses = {1000, 500, 100, 50, 10};
ASSERT(std::is_sorted(altClasses.cbegin(), altClasses.cend(), std::greater<int>()), ());
std::string const kPrefix = "step_";
if (altitude == 0)
return kPrefix + strings::to_string(altClasses.back());
for (auto altStep : altClasses)
{
if (altitude % altStep == 0)
return kPrefix + strings::to_string(altStep);
}
return "";
}
} // namespace
IsolineFeaturesGenerator::IsolineFeaturesGenerator(std::string const & isolinesDir)
: m_isolinesDir(isolinesDir)
{}
void IsolineFeaturesGenerator::GenerateIsolines(std::string const & countryName,
std::vector<feature::FeatureBuilder> & fbs) const
{
auto const isolinesPath = topography_generator::GetIsolinesFilePath(countryName,
m_isolinesDir);
topography_generator::Contours<topography_generator::Altitude> countryIsolines;
if (!topography_generator::LoadContours(isolinesPath, countryIsolines))
return;
for (auto const & levelIsolines : countryIsolines.m_contours)
{
auto const altitude = levelIsolines.first;
auto const isolineName = strings::to_string(altitude);
auto const isolineType = GetIsolineType(altitude);
if (isolineType.empty())
{
LOG(LWARNING, ("Skip unsupported altitudes level", altitude, "in", countryName));
continue;
}
auto const type = classif().GetTypeByPath({"isoline", isolineType});
for (auto const & isoline : levelIsolines.second)
{
feature::FeatureBuilder fb;
fb.SetLinear();
for (auto const & pt : isoline)
fb.AddPoint(pt);
fb.AddType(type);
fb.AddName("default", isolineName);
fbs.emplace_back(std::move(fb));
}
}
}
} // namespace generator

20
generator/isolines_generator.hpp Normal file
View file

@ -0,0 +1,20 @@
#pragma once
#include "generator/feature_builder.hpp"
#include <string>
namespace generator
{
class IsolineFeaturesGenerator
{
public:
explicit IsolineFeaturesGenerator(std::string const & isolinesDir);
void GenerateIsolines(std::string const & countryName,
std::vector<feature::FeatureBuilder> & fbs) const;
private:
std::string m_isolinesDir;
};
} // namespace generator

1
generator/raw_generator.cpp
View file

@ -111,6 +111,7 @@ RawGenerator::FinalProcessorPtr RawGenerator::CreateCountryFinalProcessor(bool a
{
auto finalProcessor =
make_shared<CountryFinalProcessor>(m_genInfo.m_targetDir, m_genInfo.m_tmpDir,
m_genInfo.m_isolinesDir,
m_genInfo.m_haveBordersForWholeWorld, m_threadsCount);
finalProcessor->SetBooking(m_genInfo.m_bookingDataFilename);
finalProcessor->SetCitiesAreas(m_genInfo.GetIntermediateFileName(CITIES_AREAS_TMP_FILENAME));

5
tools/python/maps_generator/generator/env.py
View file

@ -309,6 +309,11 @@ class PathProvider:
@staticmethod
def srtm_path() -> AnyStr:
return settings.SRTM_PATH
@staticmethod
def isolines_path() -> AnyStr:
return settings.ISOLINES_PATH
@staticmethod
def borders_path() -> AnyStr:

1
tools/python/maps_generator/generator/gen_tool.py
View file

@ -56,6 +56,7 @@ class GenTool:
"ids_without_addresses": str,
"idToWikidata": str,
"intermediate_data_path": str,
"isolines_path": str,
"nodes_list_path": str,
"node_storage": str,
"osm_file_name": str,

2
tools/python/maps_generator/generator/settings.py
View file

@ -108,6 +108,7 @@ FOOD_TRANSLATIONS_URL = ""
UK_POSTCODES_URL = ""
US_POSTCODES_URL = ""
SRTM_PATH = ""
ISOLINES_PATH = ""
# Stats section:
STATS_TYPES_CONFIG = ""
@ -130,6 +131,7 @@ OSM_TOOLS_CC_FLAGS = [
CPU_COUNT = multiprocessing.cpu_count()
# Planet and coasts:
ISOLINES_PATH = _get_opt_path(config, "External", "ISOLINES_PATH", ISOLINES_PATH)
PLANET_O5M = os.path.join(MAIN_OUT_PATH, PLANET + ".o5m")
PLANET_PBF = os.path.join(MAIN_OUT_PATH, PLANET + ".osm.pbf")
PLANET_COASTS_GEOM_URL = os.path.join(PLANET_COASTS_URL, "latest_coasts.geom")

1
tools/python/maps_generator/var/etc/map_generator.ini.default
View file

@ -38,6 +38,7 @@ SUBWAY_URL: http://osm-subway.maps.me/mapsme/latest.json
# UK_POSTCODES_URL:
# US_POSTCODES_URL:
# SRTM_PATH:
# ISOLINES_PATH:
[Stats]
STATS_TYPES_CONFIG: ${Developer:OMIM_PATH}/tools/python/maps_generator/var/etc/stats_types_config.txt

1
topography_generator/CMakeLists.txt
View file

@ -10,7 +10,6 @@ set(
filters_impl.hpp
generator.cpp
generator.hpp
isolines_utils.cpp
isolines_utils.hpp
main.cpp
marching_squares/contours_builder.cpp

29
topography_generator/isolines_utils.cpp
View file

@ -1,29 +0,0 @@
#include "topography_generator/isolines_utils.hpp"
#include "generator/srtm_parser.hpp"
#include "storage/storage_defines.hpp"
#include "base/file_name_utils.hpp"
namespace topography_generator
{
std::string const kIsolinesExt = ".isolines";
std::string GetIsolinesTileBase(int bottomLat, int leftLon)
{
auto const centerPoint = ms::LatLon(bottomLat + 0.5, leftLon + 0.5);
return generator::SrtmTile::GetBase(centerPoint);
}
std::string GetIsolinesFilePath(int bottomLat, int leftLon, std::string const & dir)
{
auto const fileName = GetIsolinesTileBase(bottomLat, leftLon);
return base::JoinPath(dir, fileName + kIsolinesExt);
}
std::string GetIsolinesFilePath(storage::CountryId const & countryId, std::string const & dir)
{
return base::JoinPath(dir, countryId + kIsolinesExt);
}
} // namespace topography_generator

26
topography_generator/isolines_utils.hpp
View file

@ -1,7 +1,12 @@
#pragma once
#include "generator/srtm_parser.hpp"
#include "storage/storage_defines.hpp"
#include "indexer/feature_altitude.hpp"
#include "base/file_name_utils.hpp"
#include <string>
namespace topography_generator
@ -9,7 +14,22 @@ namespace topography_generator
using Altitude = feature::TAltitude;
Altitude constexpr kInvalidAltitude = feature::kInvalidAltitude;
std::string GetIsolinesTileBase(int bottomLat, int leftLon);
std::string GetIsolinesFilePath(int bottomLat, int leftLon, std::string const & dir);
std::string GetIsolinesFilePath(std::string const & countryId, std::string const & dir);
constexpr char const * const kIsolinesExt = ".isolines";
inline std::string GetIsolinesTileBase(int bottomLat, int leftLon)
{
auto const centerPoint = ms::LatLon(bottomLat + 0.5, leftLon + 0.5);
return generator::SrtmTile::GetBase(centerPoint);
}
inline std::string GetIsolinesFilePath(int bottomLat, int leftLon, std::string const & dir)
{
auto const fileName = GetIsolinesTileBase(bottomLat, leftLon);
return base::JoinPath(dir, fileName + kIsolinesExt);
}
inline std::string GetIsolinesFilePath(storage::CountryId const & countryId, std::string const & dir)
{
return base::JoinPath(dir, countryId + kIsolinesExt);
}
} // namespace topography_generator