tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add gps button

Browse Source
This commit is contained in:
Leith Bade
2014-11-23 19:02:01 +11:00
parent 5c33d88bbf
commit db68e86a95
12 changed files with 97 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/java/lib/src/main/AndroidManifest.xml
View File

@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mapbox.mapboxgl.lib" >
package="com.mapbox.mapboxgl.lib">
<uses-feature android:glEsVersion="0x00020000" android:required="true" />

2
android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java
View File

@@ -23,7 +23,7 @@ public class LonLat implements Parcelable {
this.lat = lat;
}
private LonLat(Parcel in) {
protected LonLat(Parcel in) {
lon = in.readDouble();
lat = in.readDouble();
}

51
android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java
View File

@@ -3,7 +3,7 @@ package com.mapbox.mapboxgl.lib;
import android.os.Parcel;
import android.os.Parcelable;
public class LonLatZoom implements Parcelable {
public class LonLatZoom extends LonLat implements Parcelable {
public static final Parcelable.Creator<LonLatZoom> CREATOR = new Parcelable.Creator<LonLatZoom>() {
public LonLatZoom createFromParcel(Parcel in) {
@@ -15,44 +15,23 @@ public class LonLatZoom implements Parcelable {
}
};
private double lon;
private double lat;
private double zoom;
public LonLatZoom(double lon, double lat, double zoom) {
this.lon = lon;
this.lat = lat;
super(lon, lat);
this.zoom = zoom;
}
public LonLatZoom(LonLat lonLat, double zoom) {
this.lon = lonLat.getLon();
this.lat = lonLat.getLat();
super(lonLat.getLon(), lonLat.getLat());
this.zoom = zoom;
}
private LonLatZoom(Parcel in) {
lon = in.readDouble();
lat = in.readDouble();
super(in);
zoom = in.readDouble();
}
public double getLon() {
return lon;
}
public void setLon(double lon) {
this.lon = lon;
}
public double getLat() {
return lat;
}
public void setLat(double lat) {
this.lat = lat;
}
public double getZoom() {
return zoom;
}
@@ -61,25 +40,12 @@ public class LonLatZoom implements Parcelable {
this.zoom = zoom;
}
public LonLat getLonLat() {
return new LonLat(lon, lat);
}
public void setLonLat(LonLat lonLat) {
this.lon = lonLat.getLon();
this.lat = lonLat.getLat();
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
long temp;
temp = Double.doubleToLongBits(lat);
result = prime * result + (int) (temp ^ (temp >>> 32));
temp = Double.doubleToLongBits(lon);
result = prime * result + (int) (temp ^ (temp >>> 32));
temp = Double.doubleToLongBits(zoom);
temp = super.hashCode();
result = prime * result + (int) (temp ^ (temp >>> 32));
return result;
}
@@ -93,12 +59,12 @@ public class LonLatZoom implements Parcelable {
if (getClass() != obj.getClass())
return false;
LonLatZoom other = (LonLatZoom) obj;
return Double.doubleToLongBits(lat) == Double.doubleToLongBits(other.lat) && Double.doubleToLongBits(lon) == Double.doubleToLongBits(other.lon) && Double.doubleToLongBits(zoom) == Double.doubleToLongBits(other.zoom);
return super.equals(obj) && Double.doubleToLongBits(zoom) == Double.doubleToLongBits(other.zoom);
}
@Override
public String toString() {
return "LonLatZoom [lon=" + lon + ", lat=" + lat + ", zoom=" + zoom
return "LonLatZoom [lon=" + super.getLon() + ", lat=" + super.getLat() + ", zoom=" + zoom
+ "]";
}
@@ -109,8 +75,7 @@ public class LonLatZoom implements Parcelable {
@Override
public void writeToParcel(Parcel out, int flags) {
out.writeDouble(lon);
out.writeDouble(lat);
super.writeToParcel(out, flags);
out.writeDouble(zoom);
}