merge

libraries/mogo-map-api/src/main/java/com/mogo/map/MogoLatLng.java

@@ -17,7 +17,6 @@ public class MogoLatLng implements Parcelable {
     @Deprecated
     public final double lng;
     public final double lon;
-    public long time;
 
     public MogoLatLng( double lat, double lon ) {
         this.lat = lat;
@@ -43,14 +42,6 @@ public class MogoLatLng implements Parcelable {
         return lon;
     }
 
-    public long getTime() {
-        return time;
-    }
-
-    public void setTime( long time ) {
-        this.time = time;
-    }
-
     @Override
     public boolean equals( Object o ) {
         if ( this == o ) return true;
@@ -83,14 +74,12 @@ public class MogoLatLng implements Parcelable {
         dest.writeDouble( this.lat );
         dest.writeDouble( this.lng );
         dest.writeDouble( this.lon );
-        dest.writeLong( this.time );
     }
 
     protected MogoLatLng( Parcel in ) {
         this.lat = in.readDouble();
         this.lng = in.readDouble();
         this.lon = in.readDouble();
-        this.time = in.readLong();
     }
 
     public static final Creator< MogoLatLng > CREATOR = new Creator< MogoLatLng >() {

libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java

@@ -86,6 +86,20 @@ public class MogoMarkerOptions extends Observable {
      */
     private String mResName;
 
+    /**
+     * 吸附在车道上
+     */
+    private boolean mMatchOnRoadSide = true;
+
+    public MogoMarkerOptions matchOnRoadSide( boolean matchOnRoadSide ) {
+        this.mMatchOnRoadSide = matchOnRoadSide;
+        return this;
+    }
+
+    public boolean isMatchOnRoadSide() {
+        return mMatchOnRoadSide;
+    }
+
     public MogoMarkerOptions resName( String resName ) {
         this.mResName = resName;
         return this;