Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-05-08 12:02:11 +02:00
commit ee104ed933
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/WebImageMenu.java
View file

@ -18,6 +18,7 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.mapillary.MapillaryLayer;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.util.Algorithms;
public class WebImageMenu {
@ -30,6 +31,9 @@ public class WebImageMenu {
private static final String KEY_WEB_IMAGE_MENU_TITLE = "key_web_image_menu_title";
private static final String KEY_WEB_IMAGE_MENU_DESCRIPTION = "key_web_image_menu_description";
private static final String MAPILLARY_VIEWER_URL_TEMPLATE =
"https://osmand.net/api/mapillary/photo-viewer.php?photo_id=";
private WebImageType type;
private String viewerUrl;
private LatLon latLon;
@ -212,10 +216,15 @@ public class WebImageMenu {
}
@JavascriptInterface
public void onNodeChanged(double latitude, double longitude, double ca) {
public void onNodeChanged(double latitude, double longitude, double ca, String key) {
LatLon latLon = null;
if (!Double.isNaN(latitude) && !Double.isNaN(longitude)) {
latLon = new LatLon(latitude, longitude);
WebImageMenu.this.latLon = latLon;
WebImageMenu.this.ca = ca;
if (!Algorithms.isEmpty(key)) {
WebImageMenu.this.viewerUrl = MAPILLARY_VIEWER_URL_TEMPLATE + key;
}
}
setImageLocation(latLon, ca, false);
}

1
OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
View file

@ -258,6 +258,7 @@ public class MapillaryPlugin extends OsmandPlugin {
dismiss();
}
});
showWidget(showWidget);
return view;
}