diff --git a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp index 77d03a2445..34cce48b66 100644 --- a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp +++ b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp @@ -43,6 +43,22 @@ jobject CreateRating(JNIEnv * env, std::string const & name) return env->NewObject(g_ratingClazz, ratingCtorId, nameRef.get(), place_page::kIncorrectRating); } +jobject CreateHotelType(JNIEnv * env, place_page::Info const & info) +{ + if (!info.GetHotelType()) + return nullptr; + + static jclass const hotelTypeClass = + jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/HotelsFilter$HotelType"); + static jmethodID const hotelTypeCtorId = + jni::GetConstructorID(env, hotelTypeClass, "(ILjava/lang/String;)V"); + + auto const tag = ftypes::IsHotelChecker::GetHotelTypeTag(info.GetHotelType().get()); + return env->NewObject(hotelTypeClass, hotelTypeCtorId, + static_cast(info.GetHotelType().get()), + jni::ToJavaString(env, tag)); +} + jobject CreateMapObject(JNIEnv * env, string const & mwmName, int64_t mwmVersion, uint32_t featureIndex, int mapObjectType, string const & title, string const & secondaryTitle, string const & subtitle, double lat, @@ -50,22 +66,26 @@ jobject CreateMapObject(JNIEnv * env, string const & mwmName, int64_t mwmVersion string const & apiId, jobjectArray jbanners, jintArray jTaxiTypes, string const & bookingSearchUrl, jobject const & localAdInfo, jobject const & routingPointInfo, bool isExtendedView, bool shouldShowUGC, - bool canBeRated, bool canBeReviewed, jobjectArray jratings) + bool canBeRated, bool canBeReviewed, jobjectArray jratings, + jobject const & hotelType) { - // public MapObject(@NonNull FeatureId featureId, - // @MapObjectType int mapObjectType, String title, @Nullable String - // secondaryTitle, - // String subtitle, String address, double lat, double lon, String apiId, - // @Nullable Banner[] banners, int[] reachableByTaxiTypes, - // @Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo, - // @Nullable RoutePointInfo routePointInfo) + // public MapObject(@NonNull FeatureId featureId, @MapObjectType int mapObjectType, String title, + // @Nullable String secondaryTitle, String subtitle, String address, + // double lat, double lon, String apiId, @Nullable Banner[] banners, + // @Nullable int[] types, @Nullable String bookingSearchUrl, + // @Nullable LocalAdInfo localAdInfo, @Nullable RoutePointInfo routePointInfo, + // boolean isExtendedView, boolean shouldShowUGC, boolean canBeRated, + // boolean canBeReviewed, @Nullable UGC.Rating[] ratings, + // @Nullable HotelsFilter.HotelType hotelType) static jmethodID const ctorId = jni::GetConstructorID( env, g_mapObjectClazz, "(Lcom/mapswithme/maps/bookmarks/data/FeatureId;ILjava/lang/String;Ljava/lang/" "String;Ljava/lang/String;Ljava/lang/String;DDLjava/lang/" "String;[Lcom/mapswithme/maps/ads/Banner;[ILjava/lang/String;" "Lcom/mapswithme/maps/ads/LocalAdInfo;" - "Lcom/mapswithme/maps/routing/RoutePointInfo;ZZZZ[Lcom/mapswithme/maps/ugc/UGC$Rating;)V"); + "Lcom/mapswithme/maps/routing/RoutePointInfo;ZZZZ[Lcom/mapswithme/maps/ugc/UGC$Rating;" + "Lcom/mapswithme/maps/search/HotelsFilter$HotelType;)V"); + //public FeatureId(@NonNull String mwmName, long mwmVersion, int featureIndex) static jmethodID const featureCtorId = jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V"); @@ -86,7 +106,7 @@ jobject CreateMapObject(JNIEnv * env, string const & mwmName, int64_t mwmVersion jbanners, jTaxiTypes, jBookingSearchUrl.get(), localAdInfo, routingPointInfo, static_cast(isExtendedView), static_cast(shouldShowUGC), static_cast(canBeRated), static_cast(canBeReviewed), - jratings); + jratings, hotelType); InjectMetadata(env, g_mapObjectClazz, mapObject, metadata); return mapObject; @@ -108,21 +128,27 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) if (info.IsRoutePoint()) routingPointInfo.reset(CreateRoutePointInfo(env, info)); + jni::TScopedLocalRef hotelType(env, CreateHotelType(env, info)); + if (info.IsBookmark()) { - // public Bookmark(@NonNull FeatureId featureId, - // @IntRange(from = 0) long categoryId, @IntRange(from = 0) long bookmarkId, - // String title, @Nullable String secondaryTitle, @Nullable String objectTitle, - // @Nullable Banner[] banners, boolean reachableByTaxi, - // @Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo, - // @Nullable RoutePointInfo routePointInfo) + // public Bookmark(@NonNull FeatureId featureId, @IntRange(from = 0) long categoryId, + // @IntRange(from = 0) long bookmarkId, String title, @Nullable String secondaryTitle, + // @Nullable String subtitle, @Nullable String address, @Nullable Banner[] banners, + // @Nullable int[] reachableByTaxiTypes, @Nullable String bookingSearchUrl, + // @Nullable LocalAdInfo localAdInfo, @Nullable RoutePointInfo routePointInfo, + // boolean isExtendedView, boolean shouldShowUGC, boolean canBeRated, + // boolean canBeReviewed, @Nullable UGC.Rating[] ratings, + // @Nullable HotelsFilter.HotelType hotelType) static jmethodID const ctorId = jni::GetConstructorID(env, g_bookmarkClazz, "(Lcom/mapswithme/maps/bookmarks/data/FeatureId;JJLjava/lang/String;" "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" "[Lcom/mapswithme/maps/ads/Banner;[ILjava/lang/String;" "Lcom/mapswithme/maps/ads/LocalAdInfo;" - "Lcom/mapswithme/maps/routing/RoutePointInfo;ZZZZ[Lcom/mapswithme/maps/ugc/UGC$Rating;)V"); + "Lcom/mapswithme/maps/routing/RoutePointInfo;" + "ZZZZ[Lcom/mapswithme/maps/ugc/UGC$Rating;" + "Lcom/mapswithme/maps/search/HotelsFilter$HotelType;)V"); // public FeatureId(@NonNull String mwmName, long mwmVersion, int featureIndex) static jmethodID const featureCtorId = jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V"); @@ -146,7 +172,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) static_cast(bookmarkId), jTitle.get(), jSecondaryTitle.get(), jSubtitle.get(), jAddress.get(), jbanners.get(), jTaxiTypes.get(), jBookingSearchUrl.get(), localAdInfo.get(), routingPointInfo.get(), info.IsPreviewExtended(), info.ShouldShowUGC(), - info.CanBeRated(), info.CanBeReviewed(), jratings.get()); + info.CanBeRated(), info.CanBeReviewed(), jratings.get(), hotelType.get()); if (info.IsFeature()) InjectMetadata(env, g_mapObjectClazz, mapObject, info.GetMetadata()); @@ -164,7 +190,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) info.GetAddress(), {}, "", jbanners.get(), jTaxiTypes.get(), info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get(), info.IsPreviewExtended(), info.ShouldShowUGC(), info.CanBeRated(), - info.CanBeReviewed(), jratings.get()); + info.CanBeReviewed(), jratings.get(), hotelType.get()); } if (info.HasApiUrl()) @@ -174,7 +200,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) kApiPoint, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.lat, ll.lon, info.GetAddress(), info.GetMetadata(), info.GetApiUrl(), jbanners.get(), jTaxiTypes.get(), info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get(), info.IsPreviewExtended(), - info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(), jratings.get()); + info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(), jratings.get(), hotelType.get()); } return CreateMapObject( @@ -183,7 +209,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) info.GetAddress(), info.IsFeature() ? info.GetMetadata() : Metadata(), "", jbanners.get(), jTaxiTypes.get(), info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get(), info.IsPreviewExtended(), info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(), - jratings.get()); + jratings.get(), hotelType.get()); } jobjectArray ToBannersArray(JNIEnv * env, vector const & banners) diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java index 4f1c2f09c8..7cc6d4ecae 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java @@ -10,6 +10,7 @@ import com.mapswithme.maps.Framework; import com.mapswithme.maps.ads.Banner; import com.mapswithme.maps.ads.LocalAdInfo; import com.mapswithme.maps.routing.RoutePointInfo; +import com.mapswithme.maps.search.HotelsFilter; import com.mapswithme.maps.taxi.TaxiManager; import com.mapswithme.maps.ugc.UGC; import com.mapswithme.util.Constants; @@ -30,11 +31,12 @@ public class Bookmark extends MapObject @Nullable int[] reachableByTaxiTypes, @Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo, @Nullable RoutePointInfo routePointInfo, boolean isExtendedView, boolean shouldShowUGC, boolean canBeRated, - boolean canBeReviewed, @Nullable UGC.Rating[] ratings) + boolean canBeReviewed, @Nullable UGC.Rating[] ratings, + @Nullable HotelsFilter.HotelType hotelType) { super(featureId, BOOKMARK, title, secondaryTitle, subtitle, address, 0, 0, "", banners, reachableByTaxiTypes, bookingSearchUrl, localAdInfo, routePointInfo, - isExtendedView, shouldShowUGC, canBeRated, canBeReviewed, ratings); + isExtendedView, shouldShowUGC, canBeRated, canBeReviewed, ratings, hotelType); mCategoryId = categoryId; mBookmarkId = bookmarkId; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java index fd0aa9f11c..459b0110dd 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java @@ -10,7 +10,7 @@ import android.text.TextUtils; import com.mapswithme.maps.ads.Banner; import com.mapswithme.maps.ads.LocalAdInfo; import com.mapswithme.maps.routing.RoutePointInfo; -import com.mapswithme.maps.taxi.TaxiManager; +import com.mapswithme.maps.search.HotelsFilter; import com.mapswithme.maps.taxi.TaxiType; import com.mapswithme.maps.ugc.UGC; @@ -66,6 +66,8 @@ public class MapObject implements Parcelable private boolean mCanBeReviewed; @Nullable private ArrayList mRatings; + @Nullable + private HotelsFilter.HotelType mHotelType; public MapObject(@NonNull FeatureId featureId, @MapObjectType int mapObjectType, String title, @Nullable String secondaryTitle, String subtitle, String address, @@ -73,12 +75,13 @@ public class MapObject implements Parcelable @Nullable int[] types, @Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo, @Nullable RoutePointInfo routePointInfo, boolean isExtendedView, boolean shouldShowUGC, boolean canBeRated, - boolean canBeReviewed, @Nullable UGC.Rating[] ratings) + boolean canBeReviewed, @Nullable UGC.Rating[] ratings, + @Nullable HotelsFilter.HotelType hotelType) { this(featureId, mapObjectType, title, secondaryTitle, subtitle, address, lat, lon, new Metadata(), apiId, banners, types, bookingSearchUrl, localAdInfo, routePointInfo, isExtendedView, shouldShowUGC, - canBeRated, canBeReviewed, ratings); + canBeRated, canBeReviewed, ratings, hotelType); } public MapObject(@NonNull FeatureId featureId, @MapObjectType int mapObjectType, @@ -88,7 +91,7 @@ public class MapObject implements Parcelable @Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo, @Nullable RoutePointInfo routePointInfo, boolean isExtendedView, boolean shouldShowUGC, boolean canBeRated, boolean canBeReviewed, - @Nullable UGC.Rating[] ratings) + @Nullable UGC.Rating[] ratings, @Nullable HotelsFilter.HotelType hotelType) { mFeatureId = featureId; mMapObjectType = mapObjectType; @@ -117,6 +120,7 @@ public class MapObject implements Parcelable } if (ratings != null) mRatings = new ArrayList<>(Arrays.asList(ratings)); + mHotelType = hotelType; } protected MapObject(@MapObjectType int type, Parcel source) @@ -141,7 +145,8 @@ public class MapObject implements Parcelable source.readInt() == 1, // mShouldShowUGC source.readInt() == 1, // mCanBeRated; source.readInt() == 1, // mCanBeReviewed - null); // mRatings + null, // mRatings + source.readParcelable(HotelsFilter.HotelType.class.getClassLoader())); // mHotelType mBanners = readBanners(source); mReachableByTaxiTypes = readTaxiTypes(source); @@ -156,7 +161,7 @@ public class MapObject implements Parcelable "", subtitle, "", lat, lon, "", null, null, "", null, null, false /* isExtendedView */, false /* shouldShowUGC */, false /* canBeRated */, false /* canBeReviewed */, - null /* ratings */); + null /* ratings */, null /* mHotelType */); } @Nullable @@ -372,6 +377,12 @@ public class MapObject implements Parcelable return mFeatureId; } + @Nullable + public HotelsFilter.HotelType getHotelType() + { + return mHotelType; + } + private static MapObject readFromParcel(Parcel source) { @MapObjectType int type = source.readInt(); @@ -409,6 +420,7 @@ public class MapObject implements Parcelable dest.writeInt(mShouldShowUGC ? 1 : 0); dest.writeInt(mCanBeRated ? 1 : 0); dest.writeInt(mCanBeReviewed ? 1 : 0); + dest.writeParcelable(mHotelType, 0); dest.writeTypedList(mBanners); dest.writeList(mReachableByTaxiTypes); dest.writeTypedList(mRatings); diff --git a/android/src/com/mapswithme/maps/search/HotelsFilter.java b/android/src/com/mapswithme/maps/search/HotelsFilter.java index 6e6c57e962..9ae392c619 100644 --- a/android/src/com/mapswithme/maps/search/HotelsFilter.java +++ b/android/src/com/mapswithme/maps/search/HotelsFilter.java @@ -243,7 +243,7 @@ public class HotelsFilter implements Parcelable } }; - static class HotelType implements Parcelable + public static class HotelType implements Parcelable { final int mType; @NonNull diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index adb270641b..aea2917de9 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -321,6 +321,26 @@ unsigned IsHotelChecker::GetHotelTypesMask(FeatureType const & ft) const return mask; } +boost::optional IsHotelChecker::GetHotelType(FeatureType const & ft) const +{ + feature::TypesHolder types(ft); + buffer_vector sortedTypes(types.begin(), types.end()); + sort(sortedTypes.begin(), sortedTypes.end()); + + size_t i = 0; + size_t j = 0; + while (i < sortedTypes.size() && j < m_sortedTypes.size()) + { + if (sortedTypes[i] < m_sortedTypes[j].first) + ++i; + else if (sortedTypes[i] > m_sortedTypes[j].first) + ++j; + else + return m_sortedTypes[j].second; + } + return {}; +} + // static char const * IsHotelChecker::GetHotelTypeTag(Type type) { diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp index 15152ef2f5..c7b37c2f69 100644 --- a/indexer/ftypes_matcher.hpp +++ b/indexer/ftypes_matcher.hpp @@ -12,6 +12,8 @@ #include "std/utility.hpp" #include "std/vector.hpp" +#include + namespace feature { class TypesHolder; } class FeatureType; @@ -173,6 +175,8 @@ public: unsigned GetHotelTypesMask(FeatureType const & ft) const; + boost::optional GetHotelType(FeatureType const & ft) const; + DECLARE_CHECKER_INSTANCE(IsHotelChecker); private: IsHotelChecker(); diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp index 5c597d40a5..2480f3f095 100644 --- a/map/place_page_info.cpp +++ b/map/place_page_info.cpp @@ -91,6 +91,8 @@ void Info::SetFromFeatureType(FeatureType const & ft) m_uiSubtitle = FormatSubtitle(false /* withType */); m_uiAddress = m_address; } + + m_hotelType = ftypes::IsHotelChecker::Instance().GetHotelType(ft); } string Info::FormatSubtitle(bool withType) const diff --git a/map/place_page_info.hpp b/map/place_page_info.hpp index 2b1d4fca1e..d813761b27 100644 --- a/map/place_page_info.hpp +++ b/map/place_page_info.hpp @@ -12,6 +12,7 @@ #include "indexer/feature_data.hpp" #include "indexer/feature_meta.hpp" +#include "indexer/ftypes_matcher.hpp" #include "indexer/map_object.hpp" #include "indexer/osm_editor.hpp" @@ -209,6 +210,8 @@ public: void SetMercator(m2::PointD const & mercator) { m_mercator = mercator; } std::vector GetRawTypes() const { return m_types.ToObjectNames(); } + boost::optional GetHotelType() const { return m_hotelType; } + private: std::string FormatSubtitle(bool withType) const; void GetPrefferedNames(std::string & primaryName, std::string & secondaryName) const; @@ -292,6 +295,8 @@ private: std::string m_partnerName; feature::TypesHolder m_sortedTypes; + + boost::optional m_hotelType; }; namespace rating diff --git a/partners_api/ads_base.cpp b/partners_api/ads_base.cpp index a6f97c11de..e04a43857e 100644 --- a/partners_api/ads_base.cpp +++ b/partners_api/ads_base.cpp @@ -9,7 +9,18 @@ namespace ads { -Container::Container() { AppendExcludedTypes({{"sponsored", "booking"}}); } +Container::Container() +{ + AppendExcludedTypes({{"sponsored", "booking"}, + {"tourism", "hotel"}, + {"tourism", "apartment"}, + {"tourism", "camp_site"}, + {"tourism", "chalet"}, + {"tourism", "guest_house"}, + {"tourism", "hostel"}, + {"tourism", "motel"}, + {"tourism", "resort"}}); +} void Container::AppendEntry(std::initializer_list> && types, std::string const & id) diff --git a/partners_api/mopub_ads.cpp b/partners_api/mopub_ads.cpp index e407df5830..ae147a5b77 100644 --- a/partners_api/mopub_ads.cpp +++ b/partners_api/mopub_ads.cpp @@ -38,12 +38,6 @@ Mopub::Mopub() {"amenity", "pub"}, {"shop"}, // shops {"amenity", "marketplace"}, - {"tourism", "hotel"}, // hotels - {"tourism", "hostel"}, - {"tourism", "motel"}, - {"tourism", "apartment"}, - {"tourism", "resort"}, - {"tourism", "chalet"}, {"tourism", "zoo"}, // sights {"tourism", "artwork"}, {"tourism", "information"}, @@ -79,7 +73,7 @@ Mopub::Mopub() {"amenity", "hospital"}, {"amenity", "pharmacy"}, {"amenity", "veterinary"}, - {"amenity", "bank"}, // finansial + {"amenity", "bank"}, // financial {"amenity", "atm"}, {"amenity", "bureau_de_change"}}, kNonTourismPlacementId); diff --git a/partners_api/rb_ads.cpp b/partners_api/rb_ads.cpp index 419ffb336f..3052e20b48 100644 --- a/partners_api/rb_ads.cpp +++ b/partners_api/rb_ads.cpp @@ -6,7 +6,6 @@ auto const kFoodPlacementId = "1"; auto const kShopsPlacementId = "2"; auto const kCityTransportPlacementId = "13"; auto const kGlobalTransportPlacementId = "12"; -auto const kHotelsPlacementId = "4"; auto const kSightsPlacementId = "5"; auto const kLargeToponymsPlacementId = "6"; auto const kHealthPlacementId = "7"; @@ -59,15 +58,7 @@ Rb::Rb() {"man_made", "pier"}}, kGlobalTransportPlacementId); - AppendEntry({{"tourism", "hotel"}, - {"tourism", "hostel"}, - {"tourism", "motel"}, - {"tourism", "apartment"}, - {"tourism", "resort"}}, - kHotelsPlacementId); - - AppendEntry({{"tourism", "chalet"}, - {"tourism", "zoo"}, + AppendEntry({{"tourism", "zoo"}, {"tourism", "artwork"}, {"tourism", "information"}, {"tourism", "attraction"},