From 12fc9490065e1ddc2fada269a045cd2725a257f5 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 19 Nov 2015 16:07:15 -0800
Subject: [PATCH] [tests] Don't use icons from the style for annotations

---
 include/mbgl/platform/default/glfw_view.hpp   |   2 ++
 platform/default/glfw_view.cpp                |   9 +++++-
 test/api/annotations.cpp                      |  30 ++++++++----------
 .../annotations/add_multiple/expected.png     | Bin 4589 -> 2771 bytes
 .../annotations/fill_annotation/expected.png  | Bin 1543 -> 1538 bytes
 .../annotations/line_annotation/expected.png  | Bin 2412 -> 2088 bytes
 .../non_immediate_add/expected.png            | Bin 1543 -> 1538 bytes
 .../annotations/point_annotation/expected.png | Bin 4273 -> 2594 bytes
 .../annotations/switch_style/expected.png     | Bin 4273 -> 2594 bytes
 test/fixtures/api/empty.json                  |   3 +-
 test/fixtures/sprites/default_marker.png      | Bin 0 -> 1010 bytes
 11 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 test/fixtures/sprites/default_marker.png

diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp
index a434b71bb..2318cb6cc 100644
--- a/include/mbgl/platform/default/glfw_view.hpp
+++ b/include/mbgl/platform/default/glfw_view.hpp
@@ -20,6 +20,7 @@ public:
     std::array<uint16_t, 2> getFramebufferSize() const override;
 
     void initialize(mbgl::Map *map) override;
+    void notifyMapChange(mbgl::MapChange) override;
     void activate() override;
     void deactivate() override;
     void notify() override;
@@ -61,6 +62,7 @@ private:
     std::vector<std::string> spriteIDs;
 
 private:
+    bool initializedDefaultMarker = false;
     bool fullscreen = false;
     const bool benchmark = false;
     bool tracking = false;
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index 4e00722e2..48e9386fc 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -117,6 +117,13 @@ void GLFWView::initialize(mbgl::Map *map_) {
     View::initialize(map_);
 }
 
+void GLFWView::notifyMapChange(mbgl::MapChange change) {
+    if (change == mbgl::MapChange::MapChangeDidFinishLoadingMap && !initializedDefaultMarker) {
+        initializedDefaultMarker = true;
+        map->setSprite("default_marker", makeSpriteImage(22, 22, 1));
+    }
+}
+
 void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, int mods) {
     GLFWView *view = reinterpret_cast<GLFWView *>(glfwGetWindowUserPointer(window));
 
@@ -234,7 +241,7 @@ void GLFWView::addRandomPointAnnotations(int count) {
     std::vector<mbgl::PointAnnotation> points;
 
     for (int i = 0; i < count; i++) {
-        points.emplace_back(makeRandomPoint(), "marker-15");
+        points.emplace_back(makeRandomPoint(), "default_marker");
     }
 
     auto newIDs = map->addPointAnnotations(points);
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp
index ae9c80473..4c06b39e4 100644
--- a/test/api/annotations.cpp
+++ b/test/api/annotations.cpp
@@ -14,6 +14,11 @@
 
 using namespace mbgl;
 
+std::shared_ptr<SpriteImage> defaultMarker() {
+    PremultipliedImage image = decodeImage(util::read_file("test/fixtures/sprites/default_marker.png"));
+    return std::make_shared<SpriteImage>(image.width, image.height, 1.0, std::string(reinterpret_cast<char*>(image.data.get()), image.size()));
+}
+
 PremultipliedImage render(Map& map) {
     std::promise<PremultipliedImage> promise;
     map.renderStill([&](std::exception_ptr, PremultipliedImage&& image) {
@@ -35,7 +40,8 @@ TEST(Annotations, PointAnnotation) {
 
     Map map(view, fileSource, MapMode::Still);
     map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
-    map.addPointAnnotation(PointAnnotation({ 0, -20 }, "default_marker"));
+    map.setSprite("default_marker", defaultMarker());
+    map.addPointAnnotation(PointAnnotation({ 0, 0 }, "default_marker"));
 
     checkRendering(map, "point_annotation");
 }
@@ -99,11 +105,12 @@ TEST(Annotations, AddMultiple) {
 
     Map map(view, fileSource, MapMode::Still);
     map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
-    map.addPointAnnotation(PointAnnotation({ 0, -20 }, "default_marker"));
+    map.setSprite("default_marker", defaultMarker());
+    map.addPointAnnotation(PointAnnotation({ 0, -10 }, "default_marker"));
 
     render(map);
 
-    map.addPointAnnotation(PointAnnotation({ 0, 20 }, "default_marker"));
+    map.addPointAnnotation(PointAnnotation({ 0, 10 }, "default_marker"));
 
     checkRendering(map, "add_multiple");
 }
@@ -135,6 +142,7 @@ TEST(Annotations, RemovePoint) {
 
     Map map(view, fileSource, MapMode::Still);
     map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
+    map.setSprite("default_marker", defaultMarker());
     uint32_t point = map.addPointAnnotation(PointAnnotation({ 0, 0 }, "default_marker"));
 
     render(map);
@@ -185,7 +193,8 @@ TEST(Annotations, SwitchStyle) {
 
     Map map(view, fileSource, MapMode::Still);
     map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
-    map.addPointAnnotation(PointAnnotation({ 0, -20 }, "default_marker"));
+    map.setSprite("default_marker", defaultMarker());
+    map.addPointAnnotation(PointAnnotation({ 0, 0 }, "default_marker"));
 
     render(map);
 
@@ -193,16 +202,3 @@ TEST(Annotations, SwitchStyle) {
 
     checkRendering(map, "switch_style");
 }
-
-TEST(Annotations, CustomIcon) {
-    auto display = std::make_shared<mbgl::HeadlessDisplay>();
-    HeadlessView view(display, 1);
-    DefaultFileSource fileSource(nullptr);
-
-    Map map(view, fileSource, MapMode::Still);
-    map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
-    map.setSprite("cafe", std::make_shared<SpriteImage>(12, 12, 1, std::string(12 * 12 * 4, '\xFF')));
-    map.addPointAnnotation(PointAnnotation({ 0, 0 }, "cafe"));
-
-    checkRendering(map, "custom_icon");
-}
diff --git a/test/fixtures/annotations/add_multiple/expected.png b/test/fixtures/annotations/add_multiple/expected.png
index deedf84330c5902065b36179477349d670d12a6a..f77ddb0792f972387ab7fcb38b1491c5fff40365 100644
GIT binary patch
literal 2771
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
B17-jK

literal 4589
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

diff --git a/test/fixtures/annotations/fill_annotation/expected.png b/test/fixtures/annotations/fill_annotation/expected.png
index 30f6f1eb59203bf17630a0c0b7bd6ae69a045348..09f48081a8088406f3a482b6fea2238fcdda653b 100644
GIT binary patch
delta 157
zcmV;O0Al}#41x@hF($l8L_t(|0qxYmZNoqmL&0@AOh@V{CCaKGM?V4{13HtQkL5Xj
zlOY83DRO~V-avs=;6CR!Ef9x458yAZAf7-Y@I3zO`R*_Ou10?&^=G4o76h}J0SW?>
ztN|bwyoyknI|BDP*G`+yH+dewSO5Rdi%TT40R-*=k)THy{44MVc(;cS-m)G!00000
LNkvXXu0mjfXeUAK

delta 168
zcmV;Z09XHl42KMmF)P7IL_t(|0qxY$X+lvHMA2(VCsve>?8u7JiJ+u`e7Xl*58n68
zT?ghIACtiY^DKc};F32`AQiZt^OF{c!++1Y#}&jAXapYT+@9w=Kl%SNX!JKyzcy-U
zL4dPS0!;yvAOn7rAOl_&z@-S4xg+p6=eE=4{Y}0<{Qd72mq@eG0~rF5;2aqESKtNW
W)rSe^WeNKL0000<MNUMnLSTZhCrvW|

diff --git a/test/fixtures/annotations/line_annotation/expected.png b/test/fixtures/annotations/line_annotation/expected.png
index 067027f1d17c167c7d2a9ad0f5b87461a405198b..b86570f990325d18d23b9b627d93119c5aa9348c 100644
GIT binary patch
literal 2088
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZxy-8q?;3=Hg#JY5_^
zDj471NnA27Rp$6d<5ZuSM$39MHIq+GnP`~mBWVoe1OqXU59H1SVUT?AF_%*_W(a8}
zCwVOaimbZt{59#<{ru^#|687WTCmr$PJZ9^$2)9`i}!H|C^$4QFfy@>9LBnd2j&+S
zbFaU+{#!Puz>aH7l?*i#Cg;bqaBLCs_?mzA(f{XLr1Etd&oOn@{kMM@|MhcGy7+BQ
z9{mXq%40?U?yqNkQup@*1DntbtqBLV`yKh85-z?QB>lnM=g9v*P?-<mPydA3FvPum
zm1N%dkX7jKTubrpAN@T12?~wtm^%M0n^WxiM}7CM8@>x#9S+%t9;r9`ZobXIV3LD-
zBTL<uj{i>Y^517988?bCasF`-{J(x@{7t5V9!#>VLO-}&|7;eoyH;wlai#-zBg?-l
zE`Oq<6eK(sEOt0_-$L;Jxjr>B;S9wIAHtu<Xv#7ChRQ99pY}Oc@c(RC-yF3IP6`+G
zPyO7}@&B(Fha1Q%AN<8X&OiCLX`Nn~utc0fqrCPb`}x0@9%h#CSg_iG$v)ypz2^7t
zrKKBZANat;SyL|f|BdVX_I7rI2@c_nEc<em{v8MTCZVFS<^KtnKh|v!nU?<!=j4wv
zC*(r|>BaQte*%uwS5z=CbC!sDeCaOUr}N1E;?<*hOozEuepOn^i+-%1_50^xWr)4?
z%RBzhzN7yV8jL@(UH{lWuR970|L-Cn&&Pd<ybaa=;jQq;d^x!T4otDELjRU^{+JI7
z|9`VOf5gLO?poT5@i#cf#=cQA*yFHhzv}bVO8*{1{kmws-t)&w|8D;M8k-B2XR?nw
zV*k7Q!L^5sJSrDLfnlTdX#QXQ2lHTIwLj#Def7okvoKf9pV?6#3{MsQNA}l3z563u
z{n7o)P{;lewX_%IZ@3N(Lzn$3&tEJ3D~E=ni@p8x$v{`A|2-oucM$BMADuvc`XAkQ
zu)uf-<S+lNClB@Tk9$D=^I!HiV4)!kOeov`$jQRwlYyc08mjr9v+&3F@BrCsIlYVh
zz(J^oF6y7Pj6YJJ1B)c?qH`i2=Yy>UCddDKmHz1$?O(y#G?B%MOXY)k*N^?@|89aN
zx&z-uKgOT@`wE<_G$tG<7X!u6%^Mewq%rBT2>qA_jFh~_1eL}<CeHf1E`RjPAj!C8
zztQvQj~ELUK#l!%yGT#uqx@S)9_aknHfOWzpXK1Byc(EcB9GMTeK#+MCdWS>g8z@+
zxo>LI(8#h2=%nzjANA+|u7bsneK<IN4#VSTMn`=%EPk#7<0l&yKi{9n=mB#KEMNZL
z*75(X7y~ea=zWmqZ{XiO`-cC5xd-m^H=X}foVfcVo3Mg``Sc&}AB?m@bmUYQwDajd
cd8T?spBZwz?m@SY0;_%oPgg&ebxsLQ0RE+_L;wH)

literal 2412
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
I#RGr&UrHN>z5oCK

diff --git a/test/fixtures/annotations/non_immediate_add/expected.png b/test/fixtures/annotations/non_immediate_add/expected.png
index 30f6f1eb59203bf17630a0c0b7bd6ae69a045348..09f48081a8088406f3a482b6fea2238fcdda653b 100644
GIT binary patch
delta 157
zcmV;O0Al}#41x@hF($l8L_t(|0qxYmZNoqmL&0@AOh@V{CCaKGM?V4{13HtQkL5Xj
zlOY83DRO~V-avs=;6CR!Ef9x458yAZAf7-Y@I3zO`R*_Ou10?&^=G4o76h}J0SW?>
ztN|bwyoyknI|BDP*G`+yH+dewSO5Rdi%TT40R-*=k)THy{44MVc(;cS-m)G!00000
LNkvXXu0mjfXeUAK

delta 168
zcmV;Z09XHl42KMmF)P7IL_t(|0qxY$X+lvHMA2(VCsve>?8u7JiJ+u`e7Xl*58n68
zT?ghIACtiY^DKc};F32`AQiZt^OF{c!++1Y#}&jAXapYT+@9w=Kl%SNX!JKyzcy-U
zL4dPS0!;yvAOn7rAOl_&z@-S4xg+p6=eE=4{Y}0<{Qd72mq@eG0~rF5;2aqESKtNW
W)rSe^WeNKL0000<MNUMnLSTZhCrvW|

diff --git a/test/fixtures/annotations/point_annotation/expected.png b/test/fixtures/annotations/point_annotation/expected.png
index 33299a2d6a40691a58defbf7013ef9a16647ec0f..21d38b207315479a13f05b4783cf6504f474048f 100644
GIT binary patch
literal 2594
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
F{RTUJw?F^@

literal 4273
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
KW`Q;LzW;CDjQh_3

diff --git a/test/fixtures/annotations/switch_style/expected.png b/test/fixtures/annotations/switch_style/expected.png
index 33299a2d6a40691a58defbf7013ef9a16647ec0f..21d38b207315479a13f05b4783cf6504f474048f 100644
GIT binary patch
literal 2594
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
F{RTUJw?F^@

literal 4273
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
KW`Q;LzW;CDjQh_3

diff --git a/test/fixtures/api/empty.json b/test/fixtures/api/empty.json
index acc8a630c..61a8fadcd 100644
--- a/test/fixtures/api/empty.json
+++ b/test/fixtures/api/empty.json
@@ -1,6 +1,5 @@
 {
   "version": 8,
   "sources": {},
-  "layers": [],
-  "sprite": "asset://TEST_DATA/fixtures/resources/sprite"
+  "layers": []
 }
diff --git a/test/fixtures/sprites/default_marker.png b/test/fixtures/sprites/default_marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..b112096c180eecca2d6afde217a9fe54eae6f327
GIT binary patch
literal 1010
zcmV<O0}cF%P)<h;3K|Lk000e1NJLTq000yK001}$1^@s6{pZ*~0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#lu1NERCwC#R!e9TQ53yNrkQ9yohGfA
zDw-68qE!lRiVLZT3L@yrozU(CSAul!#znDO7p_E%xDZ^m2!c?hRFJw5TdlP}+tj9w
zG@W#sr1l%*J=2*m87FB)7cO$(GLLufJ#&BW&Df|2?)&{M{J6-{%pz&q3QI3b_qAj)
zV&!MEAiBhly8(|U)DR4k-|bcfNG>m{G8B)KoXJFa>pBy66(wY{N1{V$IeF+19SHcT
z6u!wx>Kh-Ywd`huNn7=Ohk*=HT|M7$glc?V+76YwcTrt+HGNN~8&5eL(u<Xqmw7^@
z$&qz}%;R#=PT>>;+Am2oF`sBU=Mo2*bi}Ud?l#qhEy>oiS&DPrAXu9LANYbpjS$iC
z=2g_qjQ8{N)H5?fi~IJ`oYP6~Mn>poE=RRmlXReI<B5cHrlMj{z-Tno)>@Ly?%6|^
zBN6h~*Kc*13179f5wY$#>x=+L|K#LFq}&)Vy%DK>Tv(vf?d^FoH4<K94?1)D8b_l_
zxYy?^P|B;T6gYgifXqk=9c+xyI2!Hrj{!m@V|rVFJ0}kht2HwNd(Z_;6QOY^ARI_8
z|0tX<hl7ss(4qlGQoSkA!KUCvTO0%Ea(8qw*=#;)Y8Sbi&n{e0Yo^wgBLkVa!vJ&O
z(QV^74Dn*>N>kHsZ`C`lHvnlCvw70rk7d}-2OGCW*D&88mdA?;f;<usD>6Xy?E;tH
z<$FW1S<9of9pD3BaOhnoX71%{sJB>@r2rrJf+J6;q4oXrG?_=J6krP<_!{Ssv?x)_
z&c2C>9TRG{otiJ1BLr^7mzJWRcaS=4U<)7fNg+d&_z1OrnEqBWb?9INTg``xMM$?R
zE8i+Vvkyz9-ZMH%uz{^vmmjQfIP9pZsyfKaP(lz!gPF_;!Db7XZ=!)%j7Am~#-6*~
zw-mcwVjqzuttd(^Psn6W+>tEqtrKovcjt1Sa<Y83R+2=IDCWO(Z@x~X2SxG52d7gn
z^lp|KCQUKvhMscB7%lMH<r<rF2zPphzo<2X;IoN6=qxhbpO28)LsqpKayrNA*Vep?
zsnpR)S*F;=`qRf=Pozj`MUF5oY&RYcyxxv$sZ>y1`+ObS+3SR9mZD$x`##@|9n5*!
zI5shs>|fmc@Qvnci0*J56TGa@y7niKS;nWPrZz4AzO)gNH1U>54<|%nqID{xj55k7
gql_~COZ*aG0OGQs<%kp{B>(^b07*qoM6N<$f?LhmRsaA1

literal 0
HcmV?d00001