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

Merge branch 'r3.9'

Browse source
This commit is contained in:
Vitaliy 2021-02-03 18:39:07 +02:00
commit 9ef1ad13c5
3 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,6 +101,14 @@ public class MapillaryPlugin extends OsmandPlugin {
return app.getString(R.string.mapillary);
}
@Override
public boolean init(@NonNull OsmandApplication app, Activity activity) {
if (activity instanceof MapActivity) {
mapActivity = (MapActivity) activity;
}
return true;
}
@Override
public void registerLayers(MapActivity activity) {
createLayers();

23
OsmAnd/src/net/osmand/plus/openplacereviews/OpenPlaceReviewsPlugin.java
View file

@ -1,5 +1,6 @@
package net.osmand.plus.openplacereviews;
import android.app.Activity;
import android.graphics.drawable.Drawable;
import androidx.annotation.NonNull;
@ -45,7 +46,6 @@ public class OpenPlaceReviewsPlugin extends OsmandPlugin {
return ID;
}
@Override
public String getName() {
return app.getString(R.string.open_place_reviews);
@ -88,8 +88,8 @@ public class OpenPlaceReviewsPlugin extends OsmandPlugin {
@Override
protected List<ImageCard> getContextMenuImageCards(@NonNull Map<String, String> params,
@Nullable Map<String, String> additionalParams,
@Nullable GetImageCardsListener listener) {
@Nullable Map<String, String> additionalParams,
@Nullable GetImageCardsListener listener) {
List<ImageCard> imageCards = new ArrayList<>();
if (mapActivity != null) {
Object object = mapActivity.getMapLayers().getContextMenuLayer().getSelectedObject();
@ -111,6 +111,15 @@ public class OpenPlaceReviewsPlugin extends OsmandPlugin {
return imageCards;
}
@Override
protected ImageCard createContextMenuImageCard(@NonNull JSONObject imageObject) {
ImageCard imageCard = null;
if (mapActivity != null && imageObject != JSONObject.NULL) {
imageCard = createCardOpr(mapActivity, imageObject);
}
return imageCard;
}
private void getPicturesForPlace(List<ImageCard> result, String response) {
try {
if (!Algorithms.isEmpty(response)) {
@ -171,6 +180,14 @@ public class OpenPlaceReviewsPlugin extends OsmandPlugin {
return arr;
}
@Override
public boolean init(@NonNull OsmandApplication app, Activity activity) {
if (activity instanceof MapActivity) {
mapActivity = (MapActivity) activity;
}
return true;
}
@Override
public void disable(OsmandApplication app) {
if (app.getSettings().OPR_USE_DEV_URL.get()) {

9
OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPlugin.java
View file

@ -1,5 +1,6 @@
package net.osmand.plus.wikipedia;
import android.app.Activity;
import android.content.Intent;
import android.view.View;
import android.widget.ArrayAdapter;
@ -106,6 +107,14 @@ public class WikipediaPlugin extends OsmandPlugin {
this.mapActivity = null;
}
@Override
public boolean init(@NonNull OsmandApplication app, Activity activity) {
if (activity instanceof MapActivity) {
mapActivity = (MapActivity) activity;
}
return true;
}
@Override
protected void registerLayerContextMenuActions(OsmandMapTileView mapView,
ContextMenuAdapter adapter,