diff options
| author | Ilya Zverev <zverik@textual.ru> | 2018-03-14 18:43:52 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2018-03-14 23:54:51 +0300 |
| commit | 1212b2f7db04f04c89ae7ad7a4950f9b4e9e156f (patch) | |
| tree | 239c934b4cdad3b381fc3ca78d20a49c8279b9bf /feature_list/feature_list.cpp | |
| parent | d847da0ef068028628462621204647a257c24158 (diff) | |
[feature_list] Use correct wikipedia url
Diffstat (limited to 'feature_list/feature_list.cpp')
| -rw-r--r-- | feature_list/feature_list.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/feature_list/feature_list.cpp b/feature_list/feature_list.cpp index 82bc2ffdb3..c7aad2866a 100644 --- a/feature_list/feature_list.cpp +++ b/feature_list/feature_list.cpp @@ -242,7 +242,7 @@ public: } } string const & phone = f.GetMetadata().Get(feature::Metadata::FMD_PHONE_NUMBER); - string const & website = f.GetMetadata().Get(feature::Metadata::FMD_WEBSITE); + string const & website = f.GetMetadata().GetWikiURL(); string cuisine = f.GetMetadata().Get(feature::Metadata::FMD_CUISINE); replace(cuisine.begin(), cuisine.end(), ';', ','); string const & stars = f.GetMetadata().Get(feature::Metadata::FMD_STARS); @@ -311,7 +311,7 @@ int main(int argc, char ** argv) if (argc > 2) { pl.SetResourceDir(argv[2]); - countriesFile = my::JoinFoldersToPath(argv[2], COUNTRIES_FILE); + countriesFile = my::JoinPath(argv[2], COUNTRIES_FILE); } storage::Storage storage(countriesFile, argv[1]); @@ -347,7 +347,7 @@ int main(int argc, char ** argv) if (argc > 3 && !strings::StartsWith(mwmInfo->GetCountryName() + DATA_FILE_EXTENSION, argv[3])) continue; LOG(LINFO, ("Processing", mwmInfo->GetCountryName())); - string osmToFeatureFile = my::JoinFoldersToPath( + string osmToFeatureFile = my::JoinPath( argv[1], mwmInfo->GetCountryName() + DATA_FILE_EXTENSION + OSM2FEATURE_FILE_EXTENSION); map<uint32_t, osm::Id> featureIdToOsmId; ParseFeatureIdToOsmIdMapping(osmToFeatureFile, featureIdToOsmId); |