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

Updated borders-from-osm generator with any tag from command line support

Browse source
This commit is contained in:
Alex Zolotarev 2011-04-27 10:59:20 +02:00 • committed by Alex Zolotarev
parent a15b78f547
commit f94f493aa5
4 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
generator/borders_generator.cpp
View file

@ -55,7 +55,9 @@ namespace osm
}
};
void GenerateBordersFromOsm(string const & osmFile, string const & outFile)
void GenerateBordersFromOsm(string const & tagAndOptValue,
string const & osmFile,
string const & outFile)
{
OsmRawData osmData;
{
@ -66,10 +68,22 @@ namespace osm
CHECK(ParseXML(source, parser), ("Invalid XML"));
}
// extract search tag key and value
size_t const delimeterPos = tagAndOptValue.find('=');
string const searchKey = tagAndOptValue.substr(0, delimeterPos);
string searchValue;
if (delimeterPos != string::npos)
searchValue = tagAndOptValue.substr(delimeterPos + 1, string::npos);
// find country borders relation
OsmIds relationIds = osmData.RelationsByKey("ISO3166-1");
CHECK(!relationIds.empty(), ("No relation with key 'ISO3166-1' found"));
CHECK_EQUAL(relationIds.size(), 1, ("More than one relation with key 'ISO3166-1' found"));
OsmIds relationIds;
if (searchValue.empty())
relationIds = osmData.RelationsByKey(searchKey);
else
relationIds = osmData.RelationsByTag(OsmTag(searchKey, searchValue));
CHECK(!relationIds.empty(), ("No relation found with tag", searchKey, searchValue));
CHECK_EQUAL(relationIds.size(), 1, ("Found more than one relation with tag",
searchKey, searchValue));
OsmRelation countryRelation = osmData.RelationById(relationIds[0]);

3
generator/borders_generator.hpp
View file

@ -8,7 +8,8 @@
namespace osm
{
void GenerateBordersFromOsm(string const & osmFile, string const & outFile);
void GenerateBordersFromOsm(string const & tagAndOptValue, string const & osmFile,
string const & outFile);
/// @return false if borderFile can't be opened
bool LoadBorders(string const & borderFile, vector<m2::RegionD> & outBorders);
}

8
generator/generator_tests/osm_parser_test.cpp
View file

@ -191,11 +191,17 @@ UNIT_TEST(BordersGenerator)
f.Write(gOsmXml, ARRAY_SIZE(gOsmXml) - 1); // -1 to skip last zero
}
GenerateBordersFromOsm(inputFile, outputFile);
GenerateBordersFromOsm("ISO3166-1", inputFile, outputFile);
vector<m2::RegionD> borders;
LoadBorders(outputFile, borders);
TEST_EQUAL(borders.size(), 2, ());
GenerateBordersFromOsm("admin_level=4", inputFile, outputFile);
borders.clear();
LoadBorders(outputFile, borders);
TEST_EQUAL(borders.size(), 1, ());
FileWriter::DeleteFileX(inputFile);
FileWriter::DeleteFileX(outputFile);
}

11
generator/generator_tool/generator_tool.cpp
View file

@ -52,8 +52,9 @@ DEFINE_int32(generate_world_scale, -1, "If specified, features for zoomlevels [0
DEFINE_bool(split_by_polygons, false, "Use kml shape files to split planet by regions and countries");
DEFINE_int32(simplify_countries_level, -1, "If positive, simplifies country polygons. Recommended values [10..15]");
DEFINE_bool(merge_coastlines, false, "If defined, tries to merge coastlines when renerating World file");
DEFINE_bool(generate_borders, false,
"Create binary country .borders file for osm xml file given in 'output' parameter");
DEFINE_string(generate_borders, "",
"Create binary country .borders file for osm xml file given in 'output' parameter,"
"specify tag name and optional value: ISO3166-1 or admin_level=4");
string AddSlashIfNeeded(string const & str)
{
@ -196,11 +197,13 @@ int main(int argc, char ** argv)
update::GenerateFilesList(path);
}
if (FLAGS_generate_borders)
if (!FLAGS_generate_borders.empty())
{
if (!FLAGS_output.empty())
{
osm::GenerateBordersFromOsm(path + FLAGS_output + ".osm", path + FLAGS_output + ".borders");
osm::GenerateBordersFromOsm(FLAGS_generate_borders,
path + FLAGS_output + ".osm",
path + FLAGS_output + ".borders");
}
else
{