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

Merge pull request #5185 from syershov/MAPSME-3513

Browse source 
Correct retrieval countryId for place page
This commit is contained in:
Ilya Zverev 2017-01-13 19:24:25 +04:00 • committed by GitHub
commit 54559fdbeb
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
map/framework.cpp
View file

@ -806,6 +806,7 @@ void Framework::FillFeatureInfo(FeatureID const & fid, place_page::Info & info)
{
size_t const level = isState ? 1 : 0;
TCountriesVec countries;
info.m_countryId = m_infoGetter->GetRegionCountryId(info.GetMercator());
GetStorage().GetTopmostNodesFor(info.m_countryId, countries, level);
if (countries.size() == 1)
info.m_countryId = countries.front();
@ -2148,7 +2149,9 @@ void Framework::OnTapEvent(TapEvent const & tapEvent)
GetPlatform().GetMarketingService().SendMarketingEvent(marketing::kPlacepageHotelBook, {{"provider", "booking.com"}});
}
info.m_countryId = m_infoGetter->GetRegionCountryId(info.GetMercator());
if (info.m_countryId.empty())
info.m_countryId = m_infoGetter->GetRegionCountryId(info.GetMercator());
ActivateMapSelection(true, selection, info);
}
else

8
xcode/storage/storage.xcodeproj/project.pbxproj
View file

@ -57,7 +57,6 @@
678338DC1C72460700FD6263 /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FC1C63884300DC9603 /* countries.txt */; };
678338DD1C72460700FD6263 /* drules_proto_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FD1C63884300DC9603 /* drules_proto_clear.bin */; };
678338DE1C72460700FD6263 /* drules_proto_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FE1C63884300DC9603 /* drules_proto_dark.bin */; };
678338DF1C72460700FD6263 /* drules_proto_legacy.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FF1C63884300DC9603 /* drules_proto_legacy.bin */; };
678338E01C72460700FD6263 /* drules_proto-bw.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84001C63884300DC9603 /* drules_proto-bw.bin */; };
678338E11C72460700FD6263 /* drules_proto.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84011C63884300DC9603 /* drules_proto.bin */; };
678338E21C72460700FD6263 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C84021C63884300DC9603 /* patterns.txt */; };
@ -69,7 +68,6 @@
67AF4A011BC579DD0048B1ED /* country_info_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67AF49FF1BC579DD0048B1ED /* country_info_getter.hpp */; };
67BE1DC51CD2180D00572709 /* downloading_policy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BE1DC31CD2180D00572709 /* downloading_policy.cpp */; };
67BE1DC61CD2180D00572709 /* downloading_policy.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BE1DC41CD2180D00572709 /* downloading_policy.hpp */; };
67CCFA911CBD1628007FC750 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 67CCFA901CBD1628007FC750 /* Images.xcassets */; };
67F90B6F1C6A277900CD458E /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FD71C60BA9900EDE56A /* testingmain.cpp */; };
67F90B701C6A277900CD458E /* country_info_getter_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FC31C60BA8A00EDE56A /* country_info_getter_test.cpp */; };
67F90B711C6A277900CD458E /* fake_map_files_downloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FC41C60BA8A00EDE56A /* fake_map_files_downloader.cpp */; };
@ -152,7 +150,6 @@
67F90BF81C6A2B3100CD458E /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FC1C63884300DC9603 /* countries.txt */; };
67F90BF91C6A2B3100CD458E /* drules_proto_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FD1C63884300DC9603 /* drules_proto_clear.bin */; };
67F90BFA1C6A2B3100CD458E /* drules_proto_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FE1C63884300DC9603 /* drules_proto_dark.bin */; };
67F90BFB1C6A2B3100CD458E /* drules_proto_legacy.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FF1C63884300DC9603 /* drules_proto_legacy.bin */; };
67F90BFC1C6A2B3100CD458E /* drules_proto-bw.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84001C63884300DC9603 /* drules_proto-bw.bin */; };
67F90BFD1C6A2B3100CD458E /* drules_proto.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84011C63884300DC9603 /* drules_proto.bin */; };
67F90BFE1C6A2B3100CD458E /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C84021C63884300DC9603 /* patterns.txt */; };
@ -266,7 +263,6 @@
67AF49FF1BC579DD0048B1ED /* country_info_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_info_getter.hpp; sourceTree = "<group>"; };
67BE1DC31CD2180D00572709 /* downloading_policy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downloading_policy.cpp; sourceTree = "<group>"; };
67BE1DC41CD2180D00572709 /* downloading_policy.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = downloading_policy.hpp; sourceTree = "<group>"; };
67CCFA901CBD1628007FC750 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ../../iphone/Maps/Images.xcassets; sourceTree = SOURCE_ROOT; };
67F90B581C6A275B00CD458E /* storage_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = storage_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
67F90BB61C6A29F700CD458E /* storage_integration_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = storage_integration_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@ -392,7 +388,6 @@
67247FCA1C60BA8A00EDE56A /* task_runner.hpp */,
67247FCB1C60BA8A00EDE56A /* test_map_files_downloader.cpp */,
67247FCC1C60BA8A00EDE56A /* test_map_files_downloader.hpp */,
67CCFA901CBD1628007FC750 /* Images.xcassets */,
);
name = storage_tests;
path = ../../storage/storage_tests;
@ -671,9 +666,7 @@
671182D51C7F0D6500CB8177 /* packed_polygons_obsolete.bin in Resources */,
678338DA1C72460700FD6263 /* classificator.txt in Resources */,
671182D31C7F0D5D00CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
678338DF1C72460700FD6263 /* drules_proto_legacy.bin in Resources */,
678338E01C72460700FD6263 /* drules_proto-bw.bin in Resources */,
67CCFA911CBD1628007FC750 /* Images.xcassets in Resources */,
678338DC1C72460700FD6263 /* countries.txt in Resources */,
678338D91C72460700FD6263 /* categories.txt in Resources */,
678338E21C72460700FD6263 /* patterns.txt in Resources */,
@ -699,7 +692,6 @@
671182D21C7F0D5D00CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
67F90BF91C6A2B3100CD458E /* drules_proto_clear.bin in Resources */,
67F90BFA1C6A2B3100CD458E /* drules_proto_dark.bin in Resources */,
67F90BFB1C6A2B3100CD458E /* drules_proto_legacy.bin in Resources */,
67F90BFC1C6A2B3100CD458E /* drules_proto-bw.bin in Resources */,
67F90BFD1C6A2B3100CD458E /* drules_proto.bin in Resources */,
67F90BFE1C6A2B3100CD458E /* patterns.txt in Resources */,