From fe92d590bbe23748c691aa991f5608409a4b5924 Mon Sep 17 00:00:00 2001
From: Jesse Bounds <jesse@rebounds.net>
Date: Thu, 26 May 2016 16:34:26 -0700
Subject: [PATCH 1/3] [ios] Force update from display link when display link is
 created.

This forces the call of the map view's display link target when the
display link is created. When a map view is shown the first time
this is not required. However, if the display link was torn down
and then recreated due to the map view being removed / obscured in the
view hierarchy the map view delegate may expect to be informed when
the map view did finish loading the map when it is shown again.

This adds a call to `updateFromDisplayLink` just after a display link
is created which helps trigger a full refresh of the map in the sense
that all delegate methods get exercised including
`mapViewDidFinishLoadingMap`.
---
 platform/ios/src/MGLMapView.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 359827ae612..57e59be10d1 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -913,6 +913,7 @@ - (void)validateDisplayLink
         _displayLink.frameInterval = MGLTargetFrameInterval;
         [_displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
         _needsDisplayRefresh = YES;
+        [self updateFromDisplayLink];
     }
     else if ( ! isVisible && _displayLink)
     {

From c9c0767a1d5163b8e4b6a8c2c7f44eafdff711a0 Mon Sep 17 00:00:00 2001
From: Jesse Bounds <jesse@rebounds.net>
Date: Fri, 27 May 2016 16:26:48 -0700
Subject: [PATCH 2/3] [ios] Update telem domain and certs

Change domain from api -> events
Replace old certs with new ones with the same name. The new certs
have an expiry that is further out.
---
 .../resources/api_mapbox_com-digicert.der     | Bin 2077 -> 1913 bytes
 .../resources/api_mapbox_com-geotrust.der     | Bin 1969 -> 1757 bytes
 platform/ios/src/MGLAPIClient.m               |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/default/resources/api_mapbox_com-digicert.der b/platform/default/resources/api_mapbox_com-digicert.der
index d84cee390869435b9b0672232b5597f347b67faf..e8ef427f3302ce3bbc2f024ed67bf5a6b8aae199 100644
GIT binary patch
delta 1009
zcmV<N0}lM15cv)tFoFklFoFhMpaTK{0s;^LQpmWH<l(#TYm<9U1bH}-AB!J0Ff}qW
zFfcGMFfdvd4KX+{H8U|WGB7YOFj_Ez0RxfA=nxt(7zP7X1OpQhWp-t5baRuw0W5#$
zAAzxt&{BxC;7$oSd6vKI1)7NWQ-c)9AHq=cPIS@NH<05wU{!6pguMzt(Ac;i#foz#
zd1YSt&ly2+m^nkw_0d}~y1umX9FVB)jqaC;sm-4f1R!J}JV1%pX>OWY76uS(>yKS<
z^eEt?Go7(shpD>gtz67_p8ah%j$nVVV{G6I&TSMslz|C_PQ~2m=9H<Bs7E<r?*`G-
zS!Ga%%?G?Ffh1Abgo|(N5-D8OC=1A+oD-XBkH!D8ab*II_L`QGP0|oQ=LD+s@c=iT
z32=Pa_SYW?Q|_<4C$#)u@inIS1_f2{qZW>S2%I|eZ``t2<@FSEg1gpd-G2|B83F?V
z00E<d18*>b18bA_0xTyG*Hr*U4zPd)*u(?%ML+0BX7Z9S90mhb9T5Z-FcX3iWp-t5
zbaRvV1F{NB1_M<cAOu7(LX)%vItT{_1!sW_0RfZk1e_Ut1_~<%0R#coc>)9i1cCu=
z1cCu+0cQYplcEJAQB>a(-sS)R1Oos@Fhl|%8tg=i;o{R2)6~Oaj0>%^9!sE<*Ta>x
zP16s-vNuz_0w6b<5~^vM0W!?3TtG>_J7f~`Pe)L)u?y*OL%>%qgO-yR1}0Qg-xJ=u
z000C707o!I0w6~dVi?O6q!Q8bR~ZrL?D5MPsv%2j<!dkMlQbS0+fo7{0F*X96GIfi
zkFR{(ZoGd2Y3ieI=uABN?8YR<$YP8WN&t3~k_IGyRNoWdEdT%n0{}-bMFJrJmU0w(
zH--KVS}ykHdJo5Gt%!zro38L1Kj~UbR}i@Y0w4rjJecOEW@97jfh4LB{JJjTn-+wY
zQCNYRGeYgzeMK-01_>&LNQU<f0RamI00V*n0RS9-21Tvxlv!CVXOF%>JB?L00WUG$
zHLGKPBEvF?Xf694BXETKn~JlUwe9?|*6j3iW|rLZ4y~W6w=5t65BO#oaqXx__9_5q
z>L2_t&{d+6d|K82xDaN@totP1(NtZ5&sm!i)Y$~mV=S2WfJg<BMfTY|(yESUbA!!m
zHCIf(;7_QSGxU=r12}s;iU9EHZTqRLOn+u*ceROtWcuI0K&Vy%C{vb;;_KhqS_EAF
zSdXK<+U|!`>d?gu4kpy{(Is-x5b@?71g=<MP5s#1NvD&fnX`Uh!~`ijoIK&_MHE3@
fouK$nf(Yk*pGl3PrOeZ;i|L!DZ^(t}F_?KyVz#z~

delta 1173
zcmey#H&;O3pov4$poyJv0W%XL6O#b%yo%QIt8XgY`MCV!7v=t-iSpg@rUoWPCI(;-
zCC+PT4&<5}8iDvx22G3%6HmV26*mxNV-96u7UoMV$eetTQK$a6@IH^14U2a~S-r{Q
zIsJ<5{)>x`=V%K@My@j4(c2=rOx%uP#nN6*5uepzrp`Qzv%fCcA2>yuUEHVZ%u;*z
zsaxJYmrgWJ+Qe5mwODzDli~N=-=$ycn{EX>iY)JJl&ZEbyK|5Awx7kzjk_juZNHoM
znBi;MnmY^S&U{T(>pYO^TtD4K_Q~aE_s$6{<ox6l&E9iT-1l#U_5aU?0;?A7*?(nm
z0b}$mf%Oyed~5B`gh$Q)%K3Zk!Gk|n1q!bz(7(Ce^vQ+iS5H;^ZHw*xoO^KUq2NPb
za(I_TZ~N0NarP4P7Zqz&gOe-goSWmmwsD3^uU^^XO*SXAofoXhlg@lQDesFC4}Xm%
z6Eh<N<KiY3F@q)+p~=6Pbm|X1U-2;ZlJfoOztT4yijJ+CxbdBhLE}ka$jJ(_G#)f)
z+}8vOKfT<<f~5Qkz2yAdCZR;VlFXdcVid6?EMm!6#8Obj!axR!fGof;QXo+e&0>Kh
z43T6Ekra@~WMAe@TuvZQD6m)?SWf0-v6}3|GF!5qjZ2%2k%jSEB@+u1OA}*05N9)H
zGL%hXRSEKWS$<rIfq{jY!QH@>Ns-~%#@9XRhSqz!jV|jR*mIL<?m?$p`^)E-*KXrI
z6=^p2GLwRRS>3vQ1zftnFYq5-Y~~|x`>(F6cXHFmggNuKUYmJaZgMHBS_shCW9Q(;
zD%3Bu@GV^P?flPk_p-X5t+~1DfYfRB3J#C=`&Mn;k^Nya(Bip0-v55Sc{lwrn+lin
z+G^%0)7!<5X{LX+bltkPUNx?ap?vatR+W07!6(jx4fZf_18V#Be@kTT4hy+TgGPJj
zm%D{Fmt`*3jSOo#vN*i=YC(7hP)Q%-vek82(^GjgFByN?+$SfKp2NpF-Q%zCN_*xS
zu~`ZRylk9WZ60mkc^MhGSs9p{7#SG?pPA)NE?ctl?4Gs1D?$SKK6`FdT<K*QRsYK3
z&W9#zv6evY%NyqX6H;Dg^y|~2JDMSJTXz3?aAe<q?##y@Bc9Zx&-q!)!?4@0>FKPC
z0ajMq3n%_ck(%$is82#>ALkFjn5#=-cu(%V$<e%oIVyOWymw5ofbp(_|JGZz?`L*i
zB*0mvcH7^=x#;Fw&6?v6`dco92!1)oWTaV;xoOSK=apB}cr{ipU9+#S`^DdDC24y^
znYq3meVFoI$vkXPYmn3C{TUM`%WP7A`eIY*-t-F=ilvq^4~i~atL?gYzoy<zf2!J!
oo7;pZ?-#!twIzLl`Cq1~X_^(AoLmy;s+9fM^}u-F{T*q?0Qv{~GXMYp

diff --git a/platform/default/resources/api_mapbox_com-geotrust.der b/platform/default/resources/api_mapbox_com-geotrust.der
index 116144bc0ccb71925a4354b5bb2d98f98d8ef35c..1c7331dedc85867901676e021e6e9875360f66dc 100644
GIT binary patch
delta 1079
zcmV-71jzfb58VwPFoFizFoFfapaTK{0s;_G`F+4KT6&mzE&c`G%29ujA6*_cFf}qZ
zFfcGMFfdvd4KX+{H8M6bGc`FiIa)A*)sdSf3KIxKWo%)0VRB`W{6|v^6hvurbaH89
zbRchLAVY6#b!}p4VKEah5e5TQ1P2TXS7CE#X>Mn9Z*DOaFcSs?RRjtQ3{7EhLT`91
zAW3dxE-@M~7zP7X1Op5aWp-t5baRuF0W5#PEaingfwZA9XNM97S2NquY-jm}ByNDu
zIa-gaB&>;YxE9;EWNe2b++CRlf=<hFqjDD;Gs0AUICc4ZI_38z9d$@Fnl0XK<vK*W
zRkd(QfPfedFtUz(a{j~~BBxl#OFTBHTBkcIWj@ATi!dz;exWX;S6_tPa1#V#WWj%7
zwVzO>jQ;l04#ru%P!6?~6UK>9xmQ&0|H?I|i_{hwk#>ej9FSU&&3=m8(e7t+9E6JN
z+12=3IE23BMNCn4jUK!8QuSJBP?1Q@*-PNZG-z&Um~;I#WJR2!laP3g*LHuW6-7<T
z&Okm(5&E6U-frUbc!)kJ*(|(q@XjIuUjhRG00E<d128ax11vBc1_M<c5d;-56M_+C
zc4cmKbCZn&RSc;H163U$1c9M2fu57@1C|H}1_ft<3;_X?g9NmHb^zV$9V>bbPo^M?
zfvtgPaDFb1odMNch>blF#Lc$szRUms0aWf;Dpddg1Oos^Fhv3(0EHSJ@Wk6ZXGCF2
zMyZL@gSzbjwYUK)L{o+y$pqL!HUc0fj)EI+Xgr@c`M+k(rM(E^e5ppPh^ce8S8XU%
z5I->hbpWKf36QjtJ_R08RPI?Sf&c&n0{})aL;@g8q=`_soXQ1{1%#dPV1L*we_ev?
z3l+r4;)5kGHI;$_ARRe3*lB1`>jdZ92GmZZw}1DWJM&OG)RjQJI4ehA7?ULiCVy1!
zSt@V<00aX7M=(VKAa`I~?^i~UB(e-}mLE@HmsEmpHBzlh=CngM_(}@^3j!ek;$~oI
z8FH(8KbdRFcb@c&LSWa)6>H~e7&qluF(H%wFbxI?Duzgg_YDC73k3iJf&l>lWwI97
z+VpRoKE2qSM`nVb#`DD+EU>i}+ke1{SHZ)ZhWKpt{UYrZ^xdikaq0-~G8`KAJqe{V
zbNiy4Qb-uc6AR3ihKicRHRUw^kf4nmVG6|3EI6V${vo>i+$?r)Hp}1e|Np(QA6j66
zHe?_s5QG7?%-y<ho}!uFW_RufM(V|pJ6U7{FEjCJTc20n;F|DyI{V9bS!mc}ldgju
zd2>W;4Zbf~Zy7AWFeLG}vy?>cUd|GeB>)Rp3Ye#;hw(Sagt~GI!~JPvh`}x09fJNq
xY%@PWgy%Ea6<lcCbsjXFG8b*sh0A~I{k{>4`3NX8oQN1F=+tb3QhmeAE@V7W!A1Z8

delta 1215
zcmcc1yOCespox90K@;251<Xv0OiTi5Y2qhc*xO@u4c6z^75)1-Q9f4Q)WF2h!T=1S
z#CZ+Pfn0MVV^d30%P4~;M&^mL)EGr39<-i#+D$=3#3i%1q$o4FL?J&-!8t#tG&d<T
z(NNexkc~N%g<WK_A)|<l2#;@KK~jE&j)G@ivYw&1fhb6lS%fdKAaimGqfY$|ZOg?$
z4USLzPO<f8{tw!=@PYJk!JN+9jhoZsb}2da2uYfJFTAMwtl|=f>5-M{QNK=AzrU5A
zG->w2_?p<JUx%HdpNsn+4O_>#Bvhl>#7=D4!9-7mCEUltI468BDS7(i07LJs2YK7h
z?3}YK!04NA?vHCMd&9VNOcyRz$Tnf+so%QkS$~N@%d;Iy`?~}??zesa<|lLg$t>;b
zhFvxJR+cCCJDqoaV5*rY9?U+g(n!kXbJX>amflxsQ;vPGNto`r=Fyw{(^~1bBmd7e
znRd0sINQ+fx}__d&Xad3m)fpRFkd8S&MEolfNO*GhRyzeZXCHAvL~m_@ma7=`t2Kk
zRx7mEN7OPgGcqtPZeqS_(8PSvpz$OyfMf+(8V?#Y?rRcC)GNu%NiEjP1&5+ua(-@;
zP!blgWGrGSm|`NpU`G)R1RE)ks0WfjvP2*WLnIkPBn4fB4-~5#m_m6LfIOkV(m2DQ
zaq472=4q2RFmIlGn?<$W=bYN-Z43-7%nWV@E=&qW7gJ`Z1cwBzKFz9}>$OC&dkIUu
z?X?vaY76pryUdUO#H1iETB-8%&eu(+e)1&q&SlV8bftEOT#iEB^7nVecN+CvU?^h<
z6JeXBfBn##%U>Vvb=hQh+^uZqo|%F%2i{Ma5qhoj!d(UiMxeD{ih<U8F*CRuxH2g+
z{Pmq=GVd6>!s?y=6aJm%m}h#E_X_(q`K<4YxC|#QnIg-ikXv)%`u7dIf1Zmz5i@xl
z;=8&`PPsQBX3d_n$6NZQl(<d~WK{!u=MvaEAY&CYPX26Y-@Y%A@qUf$hJYQ6LD}to
zmt|jd&RQOxms81l6KL_O)kXj7_SfCvsE!MlY?O?T3b?r8>pheCx{3u>f_!hB40zc%
zwc0$|zVk9Na<eipH!(6Y9RGJ@&hMpH>So<%dRy%)bM@+u&oR4t%qBV23%V_Rkjviq
zHTET!*w3UDXG2ZqMFpzdx;-=JNXWLylUwS4o=w}s-=EFTU*Ni>+|Oi%ti|f69ik$e
z-|TFw*5&n_<LP`L_1PV_wbP~VTnPxDk}B~^&&Pi&%iRP49f!EWQ@2+HY3*9n%2C%~
zyrtl#_1DRE8H@*<qvl?f>b|nH%snG~(vR|;s}zcR5__GETQbfn_uf!p(zM($uW4mX
zVv=)B;Xe*7H+Oy4kZbKN7kQ$zj=0>-yZkDDfB%I2n(3$V7u6s7*7d5ee!=btZt=-H
gk)Mw&zxyDk<ISEa=UYrGSDY2IKiuR0V$Pzg0KR+zeE<Le

diff --git a/platform/ios/src/MGLAPIClient.m b/platform/ios/src/MGLAPIClient.m
index 91bc0744256..63adb3c4631 100644
--- a/platform/ios/src/MGLAPIClient.m
+++ b/platform/ios/src/MGLAPIClient.m
@@ -3,7 +3,7 @@
 #import "MGLAccountManager.h"
 
 static NSString * const MGLAPIClientUserAgentBase = @"MapboxEventsiOS";
-static NSString * const MGLAPIClientBaseURL = @"https://api.mapbox.com";
+static NSString * const MGLAPIClientBaseURL = @"https://events.mapbox.com";
 static NSString * const MGLAPIClientEventsPath = @"events/v2";
 
 static NSString * const MGLAPIClientHeaderFieldUserAgentKey = @"User-Agent";

From 87d1191b84d8b2662f49fb91b5ccf0f4fba5577a Mon Sep 17 00:00:00 2001
From: Jesse Bounds <jesse@rebounds.net>
Date: Tue, 7 Jun 2016 15:08:11 -0700
Subject: [PATCH 3/3] [ios] Update changelog and bump version to 3.2.3

---
 platform/ios/CHANGELOG.md                   | 5 +++++
 platform/ios/Mapbox-iOS-SDK-symbols.podspec | 2 +-
 platform/ios/Mapbox-iOS-SDK.podspec         | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index a12fa0244fe..c0eaa9b7f5c 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 Mapbox welcomes participation and contributions from everyone.  If you’d like to do so please see [CONTRIBUTING.md](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) first to get started.
 
+## 3.2.3
+
+- Fixed an issue preventing `-[MGLMapViewDelegate mapViewDidFinishLoadingMap:]` from being called when returning to the view controller containing the map view from another view controller. ([#5164](https://github.com/mapbox/mapbox-gl-native/pull/5164))
+- Declarations in the API documentation are shown in both Objective-C and Swift. ([realm/jazzy#530](https://github.com/realm/jazzy/pull/530))
+
 ## 3.2.2
 
 - Existing MGLStyle class methods that return default style URLs have been deprecated in favor of new methods that require an explicit style version parameter. The deprecated, unversioned methods continue to return version 8 of the respective styles and will not be updated as new versions of the styles are released. ([#4759](https://github.com/mapbox/mapbox-gl-native/pull/4759))
diff --git a/platform/ios/Mapbox-iOS-SDK-symbols.podspec b/platform/ios/Mapbox-iOS-SDK-symbols.podspec
index 8f081f26527..5b3ef83113a 100644
--- a/platform/ios/Mapbox-iOS-SDK-symbols.podspec
+++ b/platform/ios/Mapbox-iOS-SDK-symbols.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |m|
 
   m.name    = 'Mapbox-iOS-SDK'
-  m.version = '3.2.2-symbols'
+  m.version = '3.2.3-symbols'
 
   m.summary           = 'Open source vector map solution for iOS with full styling capabilities.'
   m.description       = 'Open source, OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa Touch APIs.'
diff --git a/platform/ios/Mapbox-iOS-SDK.podspec b/platform/ios/Mapbox-iOS-SDK.podspec
index 086d4ddc411..a93e002a55b 100644
--- a/platform/ios/Mapbox-iOS-SDK.podspec
+++ b/platform/ios/Mapbox-iOS-SDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |m|
 
   m.name    = 'Mapbox-iOS-SDK'
-  m.version = '3.2.2'
+  m.version = '3.2.3'
 
   m.summary           = 'Open source vector map solution for iOS with full styling capabilities.'
   m.description       = 'Open source, OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa Touch APIs.'