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

Merge branch '2486-back-to-the-future'

Browse Source
This commit is contained in:
Brad Leege
2015-10-01 15:22:35 -05:00
parent 343419634f c6d9fda61f
commit e950d8e45b
50 changed files with 103 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Annotation.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java
View File

@@ -1,6 +1,6 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
import com.mapbox.mapboxgl.views.MapView;
import com.mapbox.mapboxsdk.views.MapView;
public abstract class Annotation implements Comparable<Annotation> {

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/AnnotationOptions.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/AnnotationOptions.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
public abstract class AnnotationOptions {

4
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Circle.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Circle.java
View File

@@ -1,9 +1,9 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
import android.graphics.Color;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLng;
/**
* UNIMPLEMENTED: Needs implementation in Native.

4
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/CircleOptions.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/CircleOptions.java
View File

@@ -1,7 +1,7 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLng;
/**
* UNIMPLEMENTED: Needs implementation in Native.

6
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
View File

@@ -1,10 +1,10 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
import android.graphics.Point;
import android.view.View;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxgl.views.InfoWindow;
import com.mapbox.mapboxgl.views.R;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.views.InfoWindow;
public class Marker extends Annotation {

4
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MarkerOptions.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java
View File

@@ -1,6 +1,6 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLng;
public class MarkerOptions extends AnnotationOptions {

4
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MultiPoint.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java
View File

@@ -1,6 +1,6 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLng;
import java.util.ArrayList;
import java.util.List;

4
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MultiPointOptions.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPointOptions.java
View File

@@ -1,6 +1,6 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLng;
import java.util.List;

4
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Polygon.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java
View File

@@ -1,9 +1,9 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
import android.graphics.Color;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLng;
import java.util.ArrayList;
import java.util.List;

4
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/PolygonOptions.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java
View File

@@ -1,7 +1,7 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLng;
import java.util.ArrayList;
import java.util.List;

6
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Polyline.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java
View File

@@ -1,11 +1,7 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
import android.graphics.Color;
import com.mapbox.mapboxgl.geometry.LatLng;
import java.util.List;
public class Polyline extends MultiPoint {
int color = Color.BLACK; // default color is black

6
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/PolylineOptions.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java
View File

@@ -1,8 +1,6 @@
package com.mapbox.mapboxgl.annotations;
package com.mapbox.mapboxsdk.annotations;
import com.mapbox.mapboxgl.geometry.LatLng;
import java.util.List;
import com.mapbox.mapboxsdk.geometry.LatLng;
public class PolylineOptions extends MultiPointOptions {

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/GeoConstants.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.constants;
package com.mapbox.mapboxsdk.constants;
public class GeoConstants {
// http://en.wikipedia.org/wiki/Earth_radius#Equatorial_radius

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/MapboxConstants.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.constants;
package com.mapbox.mapboxsdk.constants;
import java.util.Locale;

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/MathConstants.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.constants;
package com.mapbox.mapboxsdk.constants;
public class MathConstants {
public static final double DEG2RAD = (Math.PI / 180.0);

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/BoundingBox.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.geometry;
package com.mapbox.mapboxsdk.geometry;
import android.os.Parcel;
import android.os.Parcelable;

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateRegion.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.geometry;
package com.mapbox.mapboxsdk.geometry;
/**
* Implementation of iOS MKCoordinateRegion

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateSpan.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.geometry;
package com.mapbox.mapboxsdk.geometry;
/**
* Implementation of iOS MKCoordinateSpan

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ILatLng.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.geometry;
package com.mapbox.mapboxsdk.geometry;
/**
* A Latitude, Longitude point.

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/IProjectedMeters.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.geometry;
package com.mapbox.mapboxsdk.geometry;
public interface IProjectedMeters {
double getNorthing();

6
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLng.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java
View File

@@ -1,11 +1,11 @@
package com.mapbox.mapboxgl.geometry;
package com.mapbox.mapboxsdk.geometry;
import android.location.Location;
import android.os.Parcel;
import android.os.Parcelable;
import com.mapbox.mapboxgl.constants.GeoConstants;
import com.mapbox.mapboxgl.constants.MathConstants;
import com.mapbox.mapboxsdk.constants.GeoConstants;
import com.mapbox.mapboxsdk.constants.MathConstants;
import java.io.Serializable;

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLngZoom.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.geometry;
package com.mapbox.mapboxsdk.geometry;
import android.os.Parcel;
import android.os.Parcelable;

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ProjectedMeters.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.geometry;
package com.mapbox.mapboxsdk.geometry;
import android.os.Parcel;
import android.os.Parcelable;

4
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/http/HTTPContext.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java
View File

@@ -1,6 +1,6 @@
package com.mapbox.mapboxgl.http;
package com.mapbox.mapboxsdk.http;
import com.mapbox.mapboxgl.constants.MapboxConstants;
import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.squareup.okhttp.Call;
import com.squareup.okhttp.Callback;
import com.squareup.okhttp.OkHttpClient;

6
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/InfoWindow.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindow.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.views;
package com.mapbox.mapboxsdk.views;
import android.content.Context;
import android.graphics.PointF;
@@ -8,8 +8,8 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.mapbox.mapboxgl.annotations.Marker;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.geometry.LatLng;
/**
* A tooltip view

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/InfoWindowTipView.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindowTipView.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.views;
package com.mapbox.mapboxsdk.views;
import android.content.Context;
import android.graphics.Canvas;

26
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxgl.views;
package com.mapbox.mapboxsdk.views;
import android.app.Activity;
import android.app.ActivityManager;
@@ -54,16 +54,17 @@ import android.widget.ZoomButtonsController;
import com.almeros.android.multitouch.gesturedetectors.RotateGestureDetector;
import com.almeros.android.multitouch.gesturedetectors.TwoFingerGestureDetector;
import com.mapbox.mapboxgl.annotations.Annotation;
import com.mapbox.mapboxgl.annotations.Marker;
import com.mapbox.mapboxgl.annotations.MarkerOptions;
import com.mapbox.mapboxgl.annotations.Polygon;
import com.mapbox.mapboxgl.annotations.PolygonOptions;
import com.mapbox.mapboxgl.annotations.Polyline;
import com.mapbox.mapboxgl.annotations.PolylineOptions;
import com.mapbox.mapboxgl.geometry.BoundingBox;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxgl.geometry.LatLngZoom;
import com.mapbox.mapboxgl.views.R;
import com.mapbox.mapboxsdk.annotations.Annotation;
import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
import com.mapbox.mapboxsdk.annotations.Polygon;
import com.mapbox.mapboxsdk.annotations.PolygonOptions;
import com.mapbox.mapboxsdk.annotations.Polyline;
import com.mapbox.mapboxsdk.annotations.PolylineOptions;
import com.mapbox.mapboxsdk.geometry.BoundingBox;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLngZoom;
import com.mapzen.android.lost.api.LocationListener;
import com.mapzen.android.lost.api.LocationRequest;
import com.mapzen.android.lost.api.LocationServices;
@@ -73,7 +74,6 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -233,7 +233,7 @@ public class MapView extends FrameLayout implements LocationListener {
/**
* Map change event types received by
* {@link com.mapbox.mapboxgl.views.MapView.OnMapChangedListener#onMapChanged(MapChange)}
* {@link com.mapbox.mapboxsdk.views.MapView.OnMapChangedListener#onMapChanged(MapChange)}
*/
public enum MapChange {
/**

16
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java
View File

@@ -1,15 +1,15 @@
package com.mapbox.mapboxgl.views;
package com.mapbox.mapboxsdk.views;
import android.graphics.PointF;
import android.view.Surface;
import com.mapbox.mapboxgl.annotations.Marker;
import com.mapbox.mapboxgl.annotations.Polygon;
import com.mapbox.mapboxgl.annotations.Polyline;
import com.mapbox.mapboxgl.geometry.BoundingBox;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxgl.geometry.LatLngZoom;
import com.mapbox.mapboxgl.geometry.ProjectedMeters;
import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.annotations.Polygon;
import com.mapbox.mapboxsdk.annotations.Polyline;
import com.mapbox.mapboxsdk.geometry.BoundingBox;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.geometry.LatLngZoom;
import com.mapbox.mapboxsdk.geometry.ProjectedMeters;
import java.util.List;
// Class that wraps the native methods for convenience

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/package-info.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java
View File

@@ -1,4 +1,4 @@
/**
* Classes that render a map and the map's UI.
*/
package com.mapbox.mapboxgl.views;
package com.mapbox.mapboxsdk.views;

2
android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml
View File

@@ -44,7 +44,7 @@
android:visibility="gone"/>
</LinearLayout>
<com.mapbox.mapboxgl.views.InfoWindowTipView
<com.mapbox.mapboxsdk.views.InfoWindowTipView
android:layout_width="fill_parent"
android:layout_height="10dp"/>