diff options
| -rw-r--r-- | feature_list/feature_list.cpp | 6 | ||||
| -rw-r--r-- | storage/storage.cpp | 6 |
2 files changed, 3 insertions, 9 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); diff --git a/storage/storage.cpp b/storage/storage.cpp index eeef9ebd9b..0025700770 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -706,12 +706,6 @@ void Storage::LoadCountriesFile(string const & pathToCountriesFile, string const { m_dataDir = dataDir; - if (!m_dataDir.empty() && - !Platform::MkDirChecked(my::JoinFoldersToPath(GetPlatform().WritableDir(), m_dataDir))) - { - // MYTHROW(FileSystemException, ("Unable to find or create directory", m_dataDir)); - } - if (m_countries.IsEmpty()) { m_currentVersion = LoadCountriesFromFile(pathToCountriesFile, m_countries, |