organicmaps/travelguide
Archived
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

[android] Set default MWM scale to 11 and fix title name.

Browse source
This commit is contained in:
vng 2013-08-13 20:03:39 +03:00
parent 0c698e6c45
commit b10bdc004f
4 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
3rdparty/android-mwm/src/com/mapswithme/maps/api/MapsWithMeApi.java vendored
View file

@ -99,6 +99,18 @@ public final class MapsWithMeApi
showPointsOnMap(caller, title, -1, pendingIntent, points);
}
public static void showMapsWithMeUrl(Activity caller, PendingIntent pendingIntent, double zoomLevel, String url)
{
final Uri uri = Uri.parse(url);
final String latlon[] = uri.getQueryParameter("ll").split(",");
final double lat = Double.parseDouble(latlon[0]);
final double lon = Double.parseDouble(latlon[1]);
final String name = uri.getQueryParameter("n");
final String id = uri.getQueryParameter("id");
showPointsOnMap(caller, name, zoomLevel, pendingIntent, new MWMPoint(lat, lon, name, id));
}
/**
* Detects if any version (Lite, Pro) of MapsWithMe, which supports
* API calls are installed on the device.

1
android/res/values/strings.xml
View file

@ -11,5 +11,6 @@
<string name="retry">Retry</string>
<string name="about">About</string>
<string name="use_mobile_net">Downoload via mobile network</string>
<string name="mwm_pins">Search Results</string>
</resources>

20
android/src/com/guidewithme/ArticleInfoDetailFragment.java
View file

@ -22,10 +22,9 @@ import com.guidewithme.article.ArticleInfo;
import com.guidewithme.article.ArticlePathFinder;
import com.guidewithme.article.ObbPathFinder;
import com.guidewithme.cpp.Storage;
import com.guidewithme.util.Utils;
import com.mapswithme.maps.api.MWMPoint;
import com.mapswithme.maps.api.MapsWithMeApi;
import com.guidewithme.uk.R;
import com.guidewithme.util.Utils;
import com.mapswithme.maps.api.MapsWithMeApi;
/**
* A fragment representing a single ArticleInfo detail screen. This fragment is
@ -131,7 +130,7 @@ public class ArticleInfoDetailFragment extends Fragment
{
super.onPageStarted(view, url, favicon);
Utils.fadeOut(getActivity(), mWebView);
Utils.fadeIn(getActivity() ,mProgressContainer);
Utils.fadeIn(getActivity(), mProgressContainer);
if (URLUtil.isFileUrl(url) && url.endsWith(".html"))
{
@ -154,16 +153,11 @@ public class ArticleInfoDetailFragment extends Fragment
}
else if (url.startsWith("mapswithme://"))
{
final Uri uri = Uri.parse(url);
final String latlon = uri.getQueryParameter("ll");
final double lat = Double.parseDouble(latlon.split(",")[0]);
final double lon = Double.parseDouble(latlon.split(",")[1]);
final String name = uri.getQueryParameter("n");
final String id = uri.getQueryParameter("id");
final PendingIntent pi = ArticleInfoListActivity.createPendingIntent(getActivity());
final MWMPoint point = new MWMPoint(lat, lon, name, id);
MapsWithMeApi.showPointsOnMap(getActivity(), name, pi, point);
// TODO: Decided to use 11 as default scale, but MapsWithMe has bug with scales,
// so do pass 13 as a compromise.
MapsWithMeApi.showMapsWithMeUrl(getActivity(), pi, 13, url);
return true;
}

2
android/src/com/guidewithme/ArticleInfoListFragment.java
View file

@ -352,7 +352,7 @@ public class ArticleInfoListFragment extends ListFragment
return;
MapsWithMeApi.showPointsOnMap
(getActivity(), "Hello, my articles!",
(getActivity(), getString(R.string.mwm_pins),
ArticleInfoListActivity.createPendingIntent(getActivity()),
points.toArray(new MWMPoint[points.size()]));
}