etc
/
VancedMicroG
mirror of https://github.com/YTVanced/VancedMicroG
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Small Map fixes to support Severe Weather 

Fixes #66
This commit is contained in:
mar-v-in 2016-01-02 15:38:33 +01:00
parent 1c5da4a07a
commit 9abd7ebac3
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
play-services-core/src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java
View File

@ -44,6 +44,8 @@ public class GmsMapsTypeHelper {
double maxLon = MercatorProjection.toLongitude(box.xmax); double maxLon = MercatorProjection.toLongitude(box.xmax);
double minLat = MercatorProjection.toLatitude(box.ymax); double minLat = MercatorProjection.toLatitude(box.ymax);
double maxLat = MercatorProjection.toLatitude(box.ymin); double maxLat = MercatorProjection.toLatitude(box.ymin);
if (Double.isNaN(minLon) || Double.isNaN(maxLon) || Double.isNaN(minLat) || Double.isNaN(maxLat))
minLon = maxLon = minLat = maxLat = 0;
return new LatLngBounds(new LatLng(minLat, minLon), new LatLng(maxLat, maxLon)); return new LatLngBounds(new LatLng(minLat, minLon), new LatLng(maxLat, maxLon));
} }

3
play-services-core/src/main/java/org/microg/gms/maps/ProjectionImpl.java
View File

@ -29,6 +29,7 @@ import org.oscim.map.Viewport;
public class ProjectionImpl extends IProjectionDelegate.Stub { public class ProjectionImpl extends IProjectionDelegate.Stub {
private Viewport viewport; private Viewport viewport;
private float[] extents = new float[8];
public ProjectionImpl(Viewport viewport) { public ProjectionImpl(Viewport viewport) {
this.viewport = viewport; this.viewport = viewport;
@ -51,6 +52,8 @@ public class ProjectionImpl extends IProjectionDelegate.Stub {
@Override @Override
public VisibleRegion getVisibleRegion() throws RemoteException { public VisibleRegion getVisibleRegion() throws RemoteException {
viewport.getMapExtents(extents, 0);
// TODO: Support non-flat map extents
return new VisibleRegion(GmsMapsTypeHelper.toLatLngBounds(viewport.getBBox(null, 0))); return new VisibleRegion(GmsMapsTypeHelper.toLatLngBounds(viewport.getBBox(null, 0)));
} }
} }

4
play-services-core/src/main/java/org/microg/gms/maps/markup/PolygonImpl.java
View File

@ -152,6 +152,10 @@ public class PolygonImpl extends IPolygonDelegate.Stub implements DrawableMarkup
for (LatLng point : options.getPoints()) { for (LatLng point : options.getPoints()) {
points.add(GmsMapsTypeHelper.fromLatLng(point)); points.add(GmsMapsTypeHelper.fromLatLng(point));
} }
if (points.size() < 3 || (points.size() == 3 && points.get(2).equals(points.get(0)))) {
// Need at least 3 distinguished points to draw a polygon
return null;
}
// TODO: holes // TODO: holes
return new PolygonDrawable(points, Style.builder() return new PolygonDrawable(points, Style.builder()
.fillAlpha(1) .fillAlpha(1)