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

Context menu: download from map in progress

Browse source
This commit is contained in:
Alexey Kulish 2015-11-02 16:57:12 +03:00
parent d337320a1c
commit be1e776d4a
3 changed files with 85 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
View file

@ -104,9 +104,6 @@ public class MapContextMenu extends MenuTitleController {
} }
} }
if (this.object != null) {
clearSelectedObject(this.object);
}
setSelectedObject(object); setSelectedObject(object);
if (pointDescription == null) { if (pointDescription == null) {
@ -171,6 +168,9 @@ public class MapContextMenu extends MenuTitleController {
} }
public void hide() { public void hide() {
if (this.object != null) {
clearSelectedObject(this.object);
}
if (mapPosition != 0) { if (mapPosition != 0) {
mapActivity.getMapView().setMapPosition(mapPosition); mapActivity.getMapView().setMapPosition(mapPosition);
mapPosition = 0; mapPosition = 0;

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WorldRegionMenuController.java
View file

@ -2,7 +2,6 @@ package net.osmand.plus.mapcontextmenu.controllers;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.Log;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
@ -11,9 +10,6 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.download.DownloadActivity; import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.download.DownloadResourceGroup;
import net.osmand.plus.download.DownloadResources;
import net.osmand.plus.download.IndexItem;
import net.osmand.plus.mapcontextmenu.MenuBuilder; import net.osmand.plus.mapcontextmenu.MenuBuilder;
import net.osmand.plus.mapcontextmenu.MenuController; import net.osmand.plus.mapcontextmenu.MenuController;

119
OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
View file

@ -1,24 +1,5 @@
package net.osmand.plus.views; package net.osmand.plus.views;
import java.io.IOException;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import net.osmand.IndexConstants;
import net.osmand.binary.BinaryMapDataObject;
import net.osmand.data.Amenity;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.data.RotatedTileBox;
import net.osmand.map.OsmandRegions;
import net.osmand.map.WorldRegion;
import net.osmand.plus.R;
import net.osmand.plus.resources.ResourceManager;
import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
@ -32,13 +13,37 @@ import android.text.TextPaint;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.WindowManager; import android.view.WindowManager;
public class DownloadedRegionsLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider { import net.osmand.IndexConstants;
import net.osmand.binary.BinaryMapDataObject;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.data.RotatedTileBox;
import net.osmand.map.OsmandRegions;
import net.osmand.map.WorldRegion;
import net.osmand.plus.R;
import net.osmand.plus.resources.ResourceManager;
import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider;
import net.osmand.plus.views.ContextMenuLayer.IContextMenuProviderSelection;
import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils;
import java.io.IOException;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMenuProvider, IContextMenuProviderSelection {
private static final int ZOOM_THRESHOLD = 2; private static final int ZOOM_THRESHOLD = 2;
private OsmandMapTileView view; private OsmandMapTileView view;
private Paint paint; private Paint paint;
private Paint paintSelected;
private Path path; private Path path;
private Path pathSelected;
private OsmandRegions osmandRegions; private OsmandRegions osmandRegions;
@ -46,6 +51,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements ContextMen
private ResourceManager rm; private ResourceManager rm;
private MapLayerData<List<BinaryMapDataObject>> data; private MapLayerData<List<BinaryMapDataObject>> data;
private List<BinaryMapDataObject> selectedObjects;
private static int ZOOM_TO_SHOW_MAP_NAMES = 6; private static int ZOOM_TO_SHOW_MAP_NAMES = 6;
private static int ZOOM_AFTER_BASEMAP = 12; private static int ZOOM_AFTER_BASEMAP = 12;
@ -64,6 +70,14 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements ContextMen
paint.setStrokeCap(Cap.ROUND); paint.setStrokeCap(Cap.ROUND);
paint.setStrokeJoin(Join.ROUND); paint.setStrokeJoin(Join.ROUND);
paintSelected = new Paint();
paintSelected.setStyle(Style.FILL_AND_STROKE);
paintSelected.setStrokeWidth(1);
paintSelected.setColor(Color.argb(100, 255, 143, 0));
paintSelected.setAntiAlias(true);
paintSelected.setStrokeCap(Cap.ROUND);
paintSelected.setStrokeJoin(Join.ROUND);
textPaint = new TextPaint(); textPaint = new TextPaint();
final WindowManager wmgr = (WindowManager) view.getApplication().getSystemService(Context.WINDOW_SERVICE); final WindowManager wmgr = (WindowManager) view.getApplication().getSystemService(Context.WINDOW_SERVICE);
DisplayMetrics dm = new DisplayMetrics(); DisplayMetrics dm = new DisplayMetrics();
@ -73,6 +87,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements ContextMen
textPaint.setTextAlign(Paint.Align.CENTER); textPaint.setTextAlign(Paint.Align.CENTER);
path = new Path(); path = new Path();
pathSelected = new Path();
data = new MapLayerData<List<BinaryMapDataObject>>() { data = new MapLayerData<List<BinaryMapDataObject>>() {
@Override @Override
@ -117,25 +132,42 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements ContextMen
} }
// draw objects // draw objects
final List<BinaryMapDataObject> currentObjects = data.results; final List<BinaryMapDataObject> currentObjects = data.results;
final List<BinaryMapDataObject> selectedObjects = this.selectedObjects;
if (zoom >= ZOOM_TO_SHOW_BORDERS_ST && zoom < ZOOM_TO_SHOW_BORDERS && osmandRegions.isInitialized() && if (zoom >= ZOOM_TO_SHOW_BORDERS_ST && zoom < ZOOM_TO_SHOW_BORDERS && osmandRegions.isInitialized() &&
currentObjects != null) { (currentObjects != null || selectedObjects != null)) {
path.reset(); if (currentObjects != null) {
for (BinaryMapDataObject o : currentObjects) { path.reset();
String downloadName = osmandRegions.getDownloadName(o); for (BinaryMapDataObject o : currentObjects) {
boolean downloaded = checkIfObjectDownloaded(downloadName); String downloadName = osmandRegions.getDownloadName(o);
if (!downloaded) { boolean downloaded = checkIfObjectDownloaded(downloadName);
continue; if (!downloaded) {
} continue;
double lat = MapUtils.get31LatitudeY(o.getPoint31YTile(0)); }
double lon = MapUtils.get31LongitudeX(o.getPoint31XTile(0)); double lat = MapUtils.get31LatitudeY(o.getPoint31YTile(0));
path.moveTo(tileBox.getPixXFromLonNoRot(lon), tileBox.getPixYFromLatNoRot(lat)); double lon = MapUtils.get31LongitudeX(o.getPoint31XTile(0));
for (int j = 1; j < o.getPointsLength(); j++) { path.moveTo(tileBox.getPixXFromLonNoRot(lon), tileBox.getPixYFromLatNoRot(lat));
lat = MapUtils.get31LatitudeY(o.getPoint31YTile(j)); for (int j = 1; j < o.getPointsLength(); j++) {
lon = MapUtils.get31LongitudeX(o.getPoint31XTile(j)); lat = MapUtils.get31LatitudeY(o.getPoint31YTile(j));
path.lineTo(tileBox.getPixXFromLonNoRot(lon), tileBox.getPixYFromLatNoRot(lat)); lon = MapUtils.get31LongitudeX(o.getPoint31XTile(j));
path.lineTo(tileBox.getPixXFromLonNoRot(lon), tileBox.getPixYFromLatNoRot(lat));
}
} }
canvas.drawPath(path, paint);
}
if (selectedObjects != null) {
pathSelected.reset();
for (BinaryMapDataObject o : selectedObjects) {
double lat = MapUtils.get31LatitudeY(o.getPoint31YTile(0));
double lon = MapUtils.get31LongitudeX(o.getPoint31XTile(0));
pathSelected.moveTo(tileBox.getPixXFromLonNoRot(lon), tileBox.getPixYFromLatNoRot(lat));
for (int j = 1; j < o.getPointsLength(); j++) {
lat = MapUtils.get31LatitudeY(o.getPoint31YTile(j));
lon = MapUtils.get31LongitudeX(o.getPoint31XTile(j));
pathSelected.lineTo(tileBox.getPixXFromLonNoRot(lon), tileBox.getPixYFromLatNoRot(lat));
}
}
canvas.drawPath(pathSelected, paintSelected);
} }
canvas.drawPath(path, paint);
} }
} }
@ -359,11 +391,22 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements ContextMen
} }
} }
if (result.size() > 0) { selectedObjects = result;
String fullName = osmandRegions.getFullName(result.get(0));
for (BinaryMapDataObject o : result) {
String fullName = osmandRegions.getFullName(o);
WorldRegion region = osmandRegions.getRegionData(fullName); WorldRegion region = osmandRegions.getRegionData(fullName);
regions.add(region); regions.add(region);
} }
} }
} }
@Override
public void setSelectedObject(Object o) {
}
@Override
public void clearSelectedObject() {
//selectedObjects = null;
}
} }