Merge remote-tracking branch 'origin/dev' into dev_lishuo

# Conflicts:
#	Assets/Resources/Apis/Models.meta
#	Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs

Assets/Mapbox/Unity/Map/AbstractMap.cs

@@ -215,9 +215,19 @@ namespace Mapbox.Unity.Map
 			}
 		}
 
+		/// <summary>
+		/// 孙涛修改，增加最大缩放判断
+		/// </summary>
+		/// <param name="zoom"></param>
 		public void SetZoom(float zoom)
 		{
-			Options.locationOptions.zoom = zoom;
+			if (MaxZoom.HasValue)
+			{
+				Options.locationOptions.zoom = Mathf.Max(MaxZoom.Value, zoom);
+			}
+			else {
+				Options.locationOptions.zoom = zoom;
+			}
 		}
 
 		/// <summary>
@@ -1220,6 +1230,19 @@ namespace Mapbox.Unity.Map
 			_options.scalingOptions.HasChanged = true;
 		}
 
+		private float? _MaxZoom;
+		public float? MaxZoom
+        {
+            get
+            {
+				return _MaxZoom;
+            }
+            set
+            {
+				_MaxZoom = value;
+            }
+        }
+
 		#endregion
 
 		#region Events