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

[android] Implemented taxi types support for PP

Browse source
This commit is contained in:
Александр Зацепин 2017-06-30 14:58:47 +03:00 • committed by Arsentiy Milchakov
parent b961e5b104
commit 093ba87f6c
8 changed files with 67 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -552,8 +552,7 @@ uint64_t Framework::RequestTaxiProducts(JNIEnv * env, jobject policy, ms::LatLon
if (!taxiEngine)
return 0;
auto const topmostCountryIds = m_work.GetTopmostCountries(from);
return taxiEngine->GetAvailableProducts(from, to, topmostCountryIds, onSuccess, onError);
return taxiEngine->GetAvailableProducts(from, to, onSuccess, onError);
}
taxi::RideRequestLinks Framework::GetTaxiLinks(JNIEnv * env, jobject policy, taxi::Provider::Type type,

38
android/jni/com/mapswithme/maps/UserMarkHelper.cpp
View file

@ -39,21 +39,21 @@ 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,
double lon, string const & address, Metadata const & metadata,
string const & apiId, jobjectArray jbanners, bool isReachableByTaxi,
string const & apiId, jobjectArray jbanners, jintArray jTaxiTypes,
string const & bookingSearchUrl, jobject const & localAdInfo,
jobject const & routingPointInfo)
{
// public MapObject(@NonNull String mwmName, long mwmVersion, int featureIndex,
// @MapObjectType int mapObjectType, String title, @Nullable String secondaryTitle,
// String subtitle, String address, double lat, double lon, String apiId,
// @Nullable Banner[] banners, boolean reachableByTaxi,
// @Nullable Banner[] banners, @TaxiTapy int[] reachableByTaxiTypes,
// @Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo,
// @Nullable RoutePointInfo routePointInfo)
static jmethodID const ctorId =
jni::GetConstructorID(env, g_mapObjectClazz,
"(Ljava/lang/String;JIILjava/lang/String;Ljava/lang/"
"String;Ljava/lang/String;Ljava/lang/String;DDLjava/lang/"
"String;[Lcom/mapswithme/maps/ads/Banner;ZLjava/lang/String;"
"String;[Lcom/mapswithme/maps/ads/Banner;[ILjava/lang/String;"
"Lcom/mapswithme/maps/ads/LocalAdInfo;"
"Lcom/mapswithme/maps/routing/RoutePointInfo;)V");
@ -67,7 +67,7 @@ jobject CreateMapObject(JNIEnv * env, string const & mwmName, int64_t mwmVersion
jobject mapObject = env->NewObject(
g_mapObjectClazz, ctorId, jMwmName.get(), (jlong)mwmVersion, (jint)featureIndex,
mapObjectType, jTitle.get(), jSecondaryTitle.get(), jSubtitle.get(), jAddress.get(),
lat, lon, jApiId.get(), jbanners, isReachableByTaxi, jBookingSearchUrl.get(),
lat, lon, jApiId.get(), jbanners, jTaxiTypes, jBookingSearchUrl.get(),
localAdInfo, routingPointInfo);
InjectMetadata(env, g_mapObjectClazz, mapObject, metadata);
@ -80,6 +80,8 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
if (info.HasBanner())
jbanners.reset(ToBannersArray(env, info.GetBanners()));
jni::TScopedLocalIntArrayRef jTaxiTypes(env, ToReachableByTaxiProvidersArray(env, info.ReachableByTaxiProviders()));
jni::TScopedLocalRef localAdInfo(env, CreateLocalAdInfo(env, info));
jni::TScopedLocalRef routingPointInfo(env, nullptr);
@ -98,7 +100,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
jni::GetConstructorID(env, g_bookmarkClazz,
"(Ljava/lang/String;JIIILjava/lang/String;Ljava/"
"lang/String;Ljava/lang/String;"
"[Lcom/mapswithme/maps/ads/Banner;ZLjava/lang/String;"
"[Lcom/mapswithme/maps/ads/Banner;[ILjava/lang/String;"
"Lcom/mapswithme/maps/ads/LocalAdInfo;"
"Lcom/mapswithme/maps/routing/RoutePointInfo;)V");
@ -117,8 +119,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
info.GetID().m_index, static_cast<jint>(info.m_bac.m_categoryIndex),
static_cast<jint>(info.m_bac.m_bookmarkIndex), jName.get(), jTitle.get(),
jSecondaryTitle.get(), jbanners.get(),
!info.ReachableByTaxiProviders().empty(), jBookingSearchUrl.get(),
localAdInfo.get(), routingPointInfo.get());
jTaxiTypes.get(), jBookingSearchUrl.get(), localAdInfo.get(), routingPointInfo.get());
if (info.IsFeature())
InjectMetadata(env, g_mapObjectClazz, mapObject, info.GetMetadata());
return mapObject;
@ -136,8 +137,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
info.GetID().m_index, kMyPosition, info.GetTitle(),
info.GetSecondaryTitle(), info.GetSubtitle(), ll.lat, ll.lon,
address.FormatAddress(), {}, "", jbanners.get(),
!info.ReachableByTaxiProviders().empty(), info.GetBookingSearchUrl(),
localAdInfo.get(), routingPointInfo.get());
jTaxiTypes.get(), info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get());
}
if (info.HasApiUrl())
@ -146,16 +146,15 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
info.GetID().m_index, kApiPoint, info.GetTitle(),
info.GetSecondaryTitle(), info.GetSubtitle(), ll.lat, ll.lon,
address.FormatAddress(), info.GetMetadata(), info.GetApiUrl(),
jbanners.get(), !info.ReachableByTaxiProviders().empty(),
info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get());
jbanners.get(), jTaxiTypes.get(), info.GetBookingSearchUrl(),
localAdInfo.get(), routingPointInfo.get());
}
return CreateMapObject(env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(),
info.GetID().m_index, kPoi, info.GetTitle(), info.GetSecondaryTitle(),
info.GetSubtitle(), ll.lat, ll.lon, address.FormatAddress(),
info.IsFeature() ? info.GetMetadata() : Metadata(), "", jbanners.get(),
!info.ReachableByTaxiProviders().empty(), info.GetBookingSearchUrl(),
localAdInfo.get(), routingPointInfo.get());
jTaxiTypes.get(), info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get());
}
jobjectArray ToBannersArray(JNIEnv * env, vector<ads::Banner> const & banners)
@ -166,6 +165,19 @@ jobjectArray ToBannersArray(JNIEnv * env, vector<ads::Banner> const & banners)
});
}
jintArray ToReachableByTaxiProvidersArray(JNIEnv * env, vector<taxi::Provider::Type> const & types)
{
jintArray result = env->NewIntArray(types.size());
jint tmp[types.size()];
for (int i = 0; i < types.size(); i++)
tmp[i] = static_cast<jint>(types[i]);
env->SetIntArrayRegion(result, 0, types.size(), tmp);
return result;
}
jobject CreateLocalAdInfo(JNIEnv * env, place_page::Info const & info)
{
static jclass const localAdInfoClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/ads/LocalAdInfo");

2
android/jni/com/mapswithme/maps/UserMarkHelper.hpp
View file

@ -32,6 +32,8 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info);
jobjectArray ToBannersArray(JNIEnv * env, vector<ads::Banner> const & banners);
jintArray ToReachableByTaxiProvidersArray(JNIEnv * env, vector<taxi::Provider::Type> const & types);
jobject CreateLocalAdInfo(JNIEnv * env, place_page::Info const & info);
jobject CreateRoutePointInfo(JNIEnv * env, place_page::Info const & info);

7
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -10,6 +10,7 @@ import android.graphics.Rect;
import android.location.Location;
import android.os.Build;
import android.os.Bundle;
import android.os.Parcel;
import android.support.annotation.CallSuper;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -1482,10 +1483,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
final RoutePoint to = data.mPoints[1];
RoutingController.get().prepare(new MapObject("", 0L, 0, MapObject.API_POINT, from.mName,
"", "", "", from.mLat, from.mLon, "", null,
false, "", null, null),
null, "", null, null),
new MapObject("", 0L, 0, MapObject.API_POINT, to.mName,
"", "", "", to.mLat, to.mLon, "", null,
false, "", null, null));
null, "", null, null));
return true;
case ParsedUrlMwmRequest.RESULT_SEARCH:
final ParsedSearchRequest request = Framework.nativeGetParsedSearchRequest();
@ -2185,7 +2186,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
{
return new MapObject("", 0L, 0, MapObject.API_POINT, "",
"", "", "", lat, lon, "", null,
false, "", null, null);
null, "", null, null);
}
BuildRouteTask(double latTo, double lonTo)

5
android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java
View file

@ -11,6 +11,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.taxi.TaxiManager;
import com.mapswithme.util.Constants;
// TODO consider refactoring to remove hack with MapObject unmarshalling itself and Bookmark at the same time.
@ -28,12 +29,12 @@ public class Bookmark extends MapObject
public Bookmark(@NonNull String mwmName, long mwmVersion, int featureIndex,
@IntRange(from = 0) int categoryId, @IntRange(from = 0) int bookmarkId,
String title, @Nullable String secondaryTitle, @Nullable String objectTitle,
@Nullable Banner[] banners, boolean reachableByTaxi,
@Nullable Banner[] banners, @TaxiManager.TaxiType int[] reachableByTaxiTypes,
@Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo,
@Nullable RoutePointInfo routePointInfo)
{
super(mwmName, mwmVersion, featureIndex, BOOKMARK, title, secondaryTitle, "", "", 0, 0, "",
banners, reachableByTaxi, bookingSearchUrl, localAdInfo, routePointInfo);
banners, reachableByTaxiTypes, bookingSearchUrl, localAdInfo, routePointInfo);
mCategoryId = categoryId;
mBookmarkId = bookmarkId;

38
android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
View file

@ -10,6 +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 java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@ -49,7 +50,8 @@ public class MapObject implements Parcelable
private String mApiId;
@Nullable
private List<Banner> mBanners;
private boolean mReachableByTaxi;
@Nullable
private List<Integer> mReachableByTaxiTypes;
@Nullable
private String mBookingSearchUrl;
@Nullable
@ -60,19 +62,19 @@ public class MapObject implements Parcelable
public MapObject(@NonNull String mwmName, long mwmVersion, int featureIndex,
@MapObjectType int mapObjectType, String title, @Nullable String secondaryTitle,
String subtitle, String address, double lat, double lon, String apiId,
@Nullable Banner[] banners, boolean reachableByTaxi,
@Nullable Banner[] banners, @TaxiManager.TaxiType int[] types,
@Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo,
@Nullable RoutePointInfo routePointInfo)
{
this(mwmName, mwmVersion, featureIndex, mapObjectType, title, secondaryTitle,
subtitle, address, lat, lon, new Metadata(), apiId, banners,
reachableByTaxi, bookingSearchUrl, localAdInfo, routePointInfo);
types, bookingSearchUrl, localAdInfo, routePointInfo);
}
public MapObject(@NonNull String mwmName, long mwmVersion, int featureIndex,
@MapObjectType int mapObjectType, String title, @Nullable String secondaryTitle,
String subtitle, String address, double lat, double lon, Metadata metadata,
String apiId, @Nullable Banner[] banners, boolean reachableByTaxi,
String apiId, @Nullable Banner[] banners, @TaxiManager.TaxiType int[] taxiTypes,
@Nullable String bookingSearchUrl, @Nullable LocalAdInfo localAdInfo,
@Nullable RoutePointInfo routePointInfo)
{
@ -88,12 +90,17 @@ public class MapObject implements Parcelable
mLon = lon;
mMetadata = metadata;
mApiId = apiId;
mReachableByTaxi = reachableByTaxi;
mBookingSearchUrl = bookingSearchUrl;
mLocalAdInfo = localAdInfo;
mRoutePointInfo = routePointInfo;
if (banners != null)
mBanners = new ArrayList<>(Arrays.asList(banners));
if (taxiTypes != null)
{
mReachableByTaxiTypes = new ArrayList<>();
for (int type: taxiTypes)
mReachableByTaxiTypes.add(type);
}
}
protected MapObject(@MapObjectType int type, Parcel source)
@ -112,21 +119,31 @@ public class MapObject implements Parcelable
(Metadata) source.readParcelable(Metadata.class.getClassLoader()),
source.readString(), // ApiId;
null, // mBanners
source.readByte() != 0, // ReachableByTaxi
null, // mReachableByTaxiTypes
source.readString(), // BookingSearchUrl
(LocalAdInfo) source.readParcelable(LocalAdInfo.class.getClassLoader()), // LocalAdInfo
(RoutePointInfo) source.readParcelable(RoutePointInfo.class.getClassLoader())); // RoutePointInfo
mBanners = readBanners(source);
mReachableByTaxiTypes = readTaxiTypes(source);
}
@Nullable
private List<Banner> readBanners(Parcel source)
private List<Banner> readBanners(@NonNull Parcel source)
{
List<Banner> banners = new ArrayList<>();
source.readTypedList(banners, Banner.CREATOR);
return banners.isEmpty() ? null : banners;
}
@NonNull
private List<Integer> readTaxiTypes(@NonNull Parcel source)
{
List<Integer> types = new ArrayList<>();
source.readList(types, Integer.class.getClassLoader());
return types;
}
/**
* If you override {@link #equals(Object)} it is also required to override {@link #hashCode()}.
* MapObject does not participate in any sets or other collections that need {@code hashCode()}.
@ -198,9 +215,10 @@ public class MapObject implements Parcelable
return mBanners;
}
public boolean isReachableByTaxi()
@Nullable
public List<Integer> getReachableByTaxiTypes()
{
return mReachableByTaxi;
return mReachableByTaxiTypes;
}
public void setLat(double lat)
@ -310,11 +328,11 @@ public class MapObject implements Parcelable
dest.writeDouble(mLon);
dest.writeParcelable(mMetadata, 0);
dest.writeString(mApiId);
dest.writeByte((byte) (mReachableByTaxi ? 1 : 0));
dest.writeString(mBookingSearchUrl);
dest.writeParcelable(mLocalAdInfo, 0);
dest.writeParcelable(mRoutePointInfo, 0);
dest.writeTypedList(mBanners);
dest.writeList(mReachableByTaxiTypes);
}
@Override

2
android/src/com/mapswithme/maps/location/LocationHelper.java
View file

@ -216,7 +216,7 @@ public enum LocationHelper
if (mMyPosition == null)
mMyPosition = new MapObject("", 0L, 0, MapObject.MY_POSITION, "", "", "", "",
mSavedLocation.getLatitude(), mSavedLocation.getLongitude(), "",
null, false, "", null, null);
null, null, "", null, null);
return mMyPosition;
}

4
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -1304,7 +1304,7 @@ public class PlacePageView extends RelativeLayout
refreshMetadataOrHide(mapObject.getMetadata(Metadata.MetadataType.FMD_FLATS), mEntrance, mTvEntrance);
refreshOpeningHours(mapObject);
boolean showTaxiOffer = mapObject.isReachableByTaxi() &&
boolean showTaxiOffer = mapObject.getReachableByTaxiTypes() != null &&
LocationHelper.INSTANCE.getMyPosition() != null &&
ConnectionState.isConnected();
@ -1329,6 +1329,8 @@ public class PlacePageView extends RelativeLayout
}
}
private void hideHotelViews()
{
UiUtils.hide(mHotelDescription, mHotelFacilities, mHotelGallery, mHotelNearby,