҅~cK^xhRmWRpdX GRv.<Ы_xv
+ z-[S1m{\xlڵ #.gtOd{Nd! sdgv #9GQ'W,DL^ nѝy%T;=MFzJ?g,"R > 0-uI#**u*Mq|c]$Nbz%݃WIinJ,_s$ A5Q71eetsMp=yGb3 ?'M4gj
+o >y 4䁌:Ѥ\*w; UfQo@! +4' B=*SA JȓG3zN[O}eF)r2ЛQu pqX*ͻ<7Q) Kq1/ƼjH.cpPyqku /V~;H=M=^F!Ó4}DJȼg@܆0v;'oKz i@ '礩gU:K= #upł"|| F{OG9S@k[R@HZGR4'H &OL&:Ua[7Q5:y^1Q\My.ťP?
+JY@DN ΥŦ@Mq6r,"JA% MXK8P+}
6fU@#Ad'XUe*ג`UFhyJ R 7A&%!){0MIvT[E{:SD G2d\6d4vA? $:mM$9O_Ũb |ΜM'#|EGD,
+3::)tFBkEGЀ5> Z(&ilCz H>\[RxvO<σJOq{K{AXKd LK&;]PBM?Y4{:vd䵟f`͐~%ݠ/Ԋ&mVtMhc0`2a8S"P |BD d,Irңo$).`wEHcs,
.l ?98]zΗJ7ؓO# #*& {"# 37wd8`m E>mEpS<=TO[
]
+?x rCG-渿$joyg(ι#NczPޛיac \l"e+6v(O ~ՙk\,(Ta{D[!Ub?F͇ρZb}xC>$B0`1Ʊ x0;cVN
+yEˏx8ղ:tKN[R8x#u<݃1^u2[q7r06\ln^QK۫ʹZV43
.~3ޑ
+F^B`d3 r;ߑS
+Oo7\ etyY#hO`Xhk ̎*sAlY*?j UJV{O?IMx|Fk[uhf; =V-l3h!Gmzγ}O ={1I
++|vv[H7ֱ
+dX&JIYR{mƛIyi[4_ZnOxUYQ,qQIKAoqٮyٍG}3~QouG?Su4k5
+)&̲뤂ݗP XV? u$) ,q<h|%YMi~EOy y5?lEu6qʝIPn~skU uud&_jf E11;9k8RyßD;a V" !pY q;FOگ- V5] -9ojXw.4
+#Ogrԋx E6UUK} CM$k6k6i<0I4 G o5F\{ {9}s=ͮQj>^
+O{o'+d:2o֗vn^{d?d_7w^;@zo~ N
+_N ;+I|`}C5/_sum8EcQ>2xFc2E> ?^oNӚ|SDYQ&> #γs5XO> }N=^I}So[cm,oaa5~aDŽ)ؗ| ǰhZbr%JX w˿Fʶ{3:4vݲ%m_1}|~ ߹iO
p}y w-Q7㺱p??u]I
+Ckvg[ |3y$:Nm-. y^ͯU-~6iѥ?/G5]݅ɉbL f#M?'osOj0{緗?fe? [Go[{3//A0ƃ|9 Aϙ.1qY0w>8s<|γzˇ
B_6ޙ a 쭖i9 |7=_û'Y ]b
p7aI
63﵁YPKG<!L`Q}yk8N3=huD`=hߞ * YK3 {yKk6/vHP]z6]^RP4si>^EظK+\<% ?/ >b4wY3]ăB yH Ju 3G 6n_oHo]a'1=h`M.:P ykWVڭ_iln=X:x#F+zIX;/ҲX_pi2c%}r!VN'&JNYi>Nλx㣋xvkuO[bW-IssemO._Nް1k<.#}qaHl Kwko6 ^nO_ӱ|b
+!mEf>uS_1ʛ3+\8)X˭7ߌҬϙr&j?iuɲ1#Yp \\
}}`167DE%MG~w\v/4z)>X]~z}{Ty?o߲ۙ?\5 ~aoP6 ysz\KG9TK Y97<}qfnQz-=3˅nwӃZ@slYD㳷r _\Kܻ.??{ػkT!D w )ē6qeח8D» |tg_.o}]sOxk7i˿nSBܭ?p7hݿ4!T|MfʜDž.}WVVµX 2UF PbVa c 9JpHUbJ~-rɓ+y5ٛK索ۚ',̟_m ٠ؙlP< y{~F{x{mLNqyg<'} FWV''$_p۶)i,XǗw߾< ܫ`vi U|?-M] w@1rÿTO"_͟rbYyO-&6n\^ ğqA:hg~P4_duJV< _^9Fq+^<|铧[sν7q;lwc{k_ܹSۏ7.Gة~ǥ*/nRo=W e6 n0WF @Ǘ~}*_\OBԵvO] hڥ?rnn x}Εj=֥ ? P"Ao% V_Zz͔ bξpB_g⦫̬,yjf/6Y9hWdc f7/ }n/
w.bqI+q~d:m섟ߙ}G_1aQx{>"Ň7"Dc;?L @K3n]7 6g@փ' @k[サ={"TDF=z
+!g(3M0v ~ `8 0,mOSD
+җr l n~=Ïqx ܛ K
~"GGO TldUb4zޱD-)~1 z dQ3&C r;rqxY #{zKvhi눘rϖOJRRg <ڼA }}>?^'"1^/#lk=32yGtGܟ'~:?YQڜZWNґ<4Rdy 1GnQ{}0Yo{jVT£GօJ;վ
+C;2^iS9Ҏd^ J[8lx4OϿw/~3.Są)%}` 'TG}xy̲0_N]x%"Y)GI }.)Z$9J3-@J33
_^>yP8 W/!Շ\d`Ӣ
:kNq
LVjZ9G*8NY@e-n^}ow xo"Gh=\AH ]n(qsV,ȿ~p@=z;g.?Z _#aE)qfg?t_x < z?itRpR` 'Mu[/{:w]жڿ Ouoo^X~vOo;UK2p7wܺL#錩LxKa_lX{vV zRkə%ulQ"c/ove N+8E^C`?kጂ }
+6"pi' lw|tn8DdZg /! lG7v@4"lDnX(D$qNE};=x8)H{/~%Ons
7:|}/?z>:hn)8Sk'|ٕO=Qtlz ~ݏՌ8Qw3L;7.ϩP,-XZ5ޟxq/it _w.֥宓A[DՈ^]B\!/^.KO2?ۛ/_֞nndt|rgםO^uSmGmVw}|?ulN^{/gM??n=sqsOy=Fd3`^ۙz ANg'@' |9̟b*ax=ÿHuM:R0ZKX@t~x*}\ }{go ts sC ̽{'ߤ9}:Osǯν1_R5mJcKs%,uUih+y)\X{JG[ ';krΕ%R>dE7|'sa!v'>'pYRR*y
A/~nKs.uYu]ιXb)yƮK}b zv1ȭ;Q> -߷d{˥Cޔd[l{鬒u1=Nv,-yEʴ7 䊈 ~}N*Dɢv*fx=GH UF HO-jag\
+I"e K`C ;m},P/5-RzGDR/8 u)M>]'bz؇95l*ISb=W $"Z,}Ƀ9k \+.r<{#peB}ٸ;3:1QK%v+G~T*=R T;g[!q'ٗA
+ vHeO1#a
+2l
+G
+2vIg7; 5I!Ɉb=슆sE Tb
+q};á)q_E2hh}=T(pEsd NN.G NR W6Q_,+a59POއKsPX+"3QhE#&ST ĕ'K
+ *&e4H ,{t.:}Tr"Wt o) ub >$h.1X$EZ8F[*@E1 遦>: ld'_e*䠓KR3}"/Yd+q]?*\5b38*;LNuikr1Q ZQԃ8 i"$&
H7aɮK#r3eT,守Ϧ0L2G1Ve)f\ bc= LPsaǡ9KA|`\T|?Bpf\1U_{;S F\dv`-
+D[ dEz5Q.J(G[|N> \4|hm$0dj@d+^kJE_`ICoGo5؆91' }BqgTqZ( ёQ+vz@ a7բ!Hw(}-xILHiAd?1i-<+_; E?/
W(V. APaM!h`Mں8 9$>y4q5)P
4.%p0JW],io
+&D e7tJAُ=bT.ҧģe#ej$
+KQeu$V[uW3֑D#@k,WT"1XYYu"Șj1W
Jtx T{bw _'4
+68`=qIt+:?P"˗vpz-0Ti-)>a ?RSW,7?쳤
+ymeW1G0ȄXֈFlWCwth
+F$dSGTCρ J
+NE7q A Z-h$ 3Ks:(1/- $Il5Ϙ s:i! :XϴlDrDl voL YunWplj"N!!BC~i&,|o& "І`o(=cQErQWLD,Sqѓ92Ύl
gAk#802n^>HDI=T0yֈ& lrcUZ,(;TU6y@:R2\B-
+ko3vIᜌ츯
+% tgXYNb XLʊ#xAYt-68|tj:?yzHjmōzP[U
+RUMìds꯲QtSMot b pv]{['Z.S>(cP$ѩHCzpƅCk4;bǎmY}"`wIXm?.yp4kCV% ;Q˨7OJ<+2c?z3_G.[ Β(>d'"U(*B,Dt[h} bD
+G@oKTt^" qH(&q4+<{tZ!)&@%F,yJM . y!ǥY@\LMuԤ#3ؠ9M:b8K/ 4Go*.JW3R
mATĈyRC5Օ3c #5c&d[ xԞ*i\&%W m uHQ&3ܚTf@Gsw&)*q,d&Ȃq"iMUb1F?$ycufst's:6iГ؇ |RrboE5yAzO:C_M;ՊA}o 'wG%%K{M $04M2zQ K>[dkϲLjj8ϕߘ
+X(2Aܷ<} Y2Wx #jeyd &H%lCĦ!*,; Z EXdKj$)< IG1]hf`.Њ'u1 &d0GSkW"Vc7 %=bSb?{x 0b͎QH#-1h]ڱ"4
eŽZ}2Y蠖Apwܾ=+56BDi}~C ( pvϟ\eFdP H@- Y1iut;
9fn&+XJ71aY 7f(^ c 4z{f|윆Y-ecndMLh0|u.z $sׂ %\} ^nLP՛m;z\(r+MM\)%)[(@ I] P2O +c%jHzYZ]Uܨ"r&S.;-w/bbB3hT77 E)ľێ H72yX\$J 4h}Rw]@D'Yg+s2
+0}m$"HJ\oNVZ #S8[Q Vb`u P%kɦqcVfM0p!zлxH,B3iͬZp,>3j ڲzY8Sꑷ] :)!!fC ũgw}9N]:zu(f Y>,yWeZedr _R 4?g4G 9$ KHHӠ$7=~hY\ oG
+#}>CESPi=Hp "vUzG:l+KA-)=*sq ,'H+9_ EKH^$)p`$YiبƾǝaW2#=!pjl9!rl De1h,@GRRgt8Fe2c܀8l V {EA"Xְx \ᓻj{ 5ԻʴWLSFy =bP˫̅9QSY
ρ1,kTT@;2&"\g|V?Fҽ:D f-Qƈ'*@KGkNp Y* T:IVcmBg ,U^U+LVD#$>z3-" ]*#
+
Oapr#j55 e& 'tRFMQ=5RZ }&!dcU#L 7 D3a.@4lg""l1J^H pBaa'"#?f BP ʴNZ @`_K}Y9 B2eR|fbRi~#72v
+E_*%w)II,DX|mE%|jɘ)!2T?H̀n, )1+V9ORjjv@ 8 APޫsX Dd;U>^VѴ,^䱬3]¶UV@Eٱ:߽@8 Dj!/cwxrsdſlr(- W whћHb8) u!!nrA,n@t`~dwuZ = `@#9xydɡ90P6 U9W찇b=XA*g\$jw60 8|ZIQiu0Z)81"5]#Wj
-(ftg@QcIo-ث g "M;g' !S %o`"%D9c_ESؘ 5hei~ 큱0ha.`E"l$yIȳS*$hhf oe^-N}JCIZB]:dFՆ8I\z2{..ʩ4nQym
+Q( 1.LR~EI:WP6 Df 1dxģVC.+fee0),eyLK*Q Z/> ju̅hUPedTgNC1jGs!kQlx'V /::y25(dPR;!# }V'Rv%L j3tIY[ < ?"W0$X4d
NSX$PWk;19H l9KNYIb"f2{GWαPw9(<];5\Qur~ ,P95X¤p*>$]#5 Z0+g6 }bcwۍk/~e9w0?!*XCz(&SH3V vJFHguܓQ杺ӧW
eǜ ; ;ӡY\%apucpiW)\](;#h:?APjՀ);-&zuU: olua`WRnMD8DzM
ZO8Yt GRdC O>a @oe|߰vkE8ԁ5sTU-)<ȣ % Jm x,,vv
+ODL`Q|E6y dCSG+5E(X]F),OS݁OAlZd o,u-3<*dI&W{^7h\$d6߅.u.lRN!0߲e4 H-Zn9j-a2X ܃ q |4
HӠG) 0^P3,W6 {3ƴi
m3grQye6z]zwKv~ ,\6
dѦYn|'^P ; B _#9dրBuEB"֫Rra:=cz Mĕ"]A,Xa&mшyxLZ ՇC0 p
+ Aɤ!PvSՀVbpM1Cx"X!#Dx,%MAIN}Z@RAQvrEe\0d:+" b 8[\xj1E&vi}XkafD84 \Mt>bMi!(,>< 10}ba&M.&wǪ
+ywPp{!@o^HXք0%ʪc 9i&=)~" `[/R/ {ga64N e ZZJ .#c2q&UI_yϓ7%
+ Xih1ġ-
+p3Z+rY8w>8d~23jetYۑ?a{ OZ #*y-V;)V$-y F} ڌZX*Q Dߠq]? vP
+ 0$1֭lEXAA4ي 4 ^z=~3*jMiCjwv%[Hl@4lQ>D].ϝQ5D?)>8Ș_%W0`gEh&]_t }ˮх"Fo , |9RU3d=UVc/Z$)'"Z2 7)0x7>ũ>hTvҐgڪ ^ @cP BTQX`aѷFІ(z`ez[A4xX J݂44WCNMNLlP ϑ1)SFrL^
I͠O*t
+q7Z^j\w!C.ՋZ>Hf59%z0iZH`byzZ 2=
+մERdiw4y h Gd !LϪ,ԶN(&g
6X#7 Q0qmѪA% BcЬvۑCC=fp7 L
a4W9Ɓ@y=p835" ʡPEO3. vAVށ=uc+o탨<RfN21sw容O}|oީ#XtJZi?ZnDt 0K.9h2BoIO9FjQ%@(g #@5<2EkB7
m( G4f $ n0Y
+^*#aiYDXoI!ӟd5 @(K` 74PPǙhKO^BnPlڪݢ $Qrd{QWñs1Xre!ff,;>OHt G ?T'a@H )'L fK,0[mAkӮ5NSjlEd (`GƑ-F'.|Cb䢬gơa>a@pv,漢6FGɰO@ ?D"%{6 O7d3 L"(D0 AzZ(8C}2G
S>e)`v%&vW}D S>i>n}c6pۂt vzHB}h7}:{>ا5˷ g$g$ y
+n0M*~U؇]Hz&]60ף37х@NlTRG A;h!;X}:E` :et'bo\yHDՒaOeT-;4Li@34q@Fxd4<EI{2x?X0#Njd9|
+Ԍn8* 3Xshwdg;x)YN,j-MO P[j:=&aY8 g)8lx\L~RK#ر `uAf8Cb
c8#p]3>-.)Ď 0
g)8d5\,+0l.m
+<p54<$1z+Ƃ۸NFD=*Bsl232!44MGXw#7 X/u[M`^e:vqBE"4gEQOr4 0qԩsjo,f;/ K ] 50z, ShUXU.
;"\ D묓 #` h j2 XJ~N>@&0K >o.vƎgU,LDxSOyaKgH*t5rhI'
!N)N !盛nU}ln
S~zkA[7 mDH
4}_K 0{$AUtZaY\anXz8 o`b.+õ>U~0ZJ1. B&|] m㙭)Ӕٴ9C jLMְ>6ljV7Z
Ǫ#њ
hMl
GfXf:M?
+~ ۥ5Tٱ~LQ"CO D;=gL)hB)g~uM䮽 .<ݰ'5P DG;6; NO6 uNV *d 8AzISp4 '"*^8( [ uv>0Z[ ^%I=>dY/&h q 6GmKPt%;P9Y cLYy̫H귰Dk
늬2ojQ۟>
endobj
xref
+0 34
+0000000000 65535 f
+0000000016 00000 n
+0000000144 00000 n
+0000029357 00000 n
+0000000000 00000 f
+0000046771 00000 n
+0000107208 00000 n
+0000029408 00000 n
+0000029806 00000 n
+0000047070 00000 n
+0000046957 00000 n
+0000045194 00000 n
+0000045340 00000 n
+0000045486 00000 n
+0000045632 00000 n
+0000044246 00000 n
+0000044632 00000 n
+0000044680 00000 n
+0000046561 00000 n
+0000046345 00000 n
+0000046129 00000 n
+0000045778 00000 n
+0000045894 00000 n
+0000046011 00000 n
+0000046224 00000 n
+0000046440 00000 n
+0000046656 00000 n
+0000046841 00000 n
+0000046872 00000 n
+0000047143 00000 n
+0000047317 00000 n
+0000048387 00000 n
+0000060561 00000 n
+0000107231 00000 n
+trailer
+<]>>
+startxref
+107419
+%%EOF
diff --git a/ionic2/app/assets/img/pokemon-mob.svg b/ionic2/app/assets/img/pokemon-mob.svg
new file mode 100644
index 0000000..6200546
--- /dev/null
+++ b/ionic2/app/assets/img/pokemon-mob.svg
@@ -0,0 +1,368 @@
+
+
+
+
diff --git a/ionic2/app/components/map/map.component.ts b/ionic2/app/components/map/map.component.ts
index aa0b32b..229d8a0 100644
--- a/ionic2/app/components/map/map.component.ts
+++ b/ionic2/app/components/map/map.component.ts
@@ -2,10 +2,8 @@ import { Component, ViewChild } from '@angular/core';
import { Events } from 'ionic-angular';
import { Geolocation } from 'ionic-native';
-import { PokeSighting } from '../../models/poke-sighting';
-import { PokePrediction } from '../../models/poke-prediction';
-import { PokeMob } from '../../models/poke-mob';
import { Filter } from '../../models/filter';
+import { poiFromMapEventData } from '../../utils/poi-from-map-event-data'
let PokeMap = require('pokemap-1');
@@ -46,9 +44,9 @@ export class MapComponent {
//this.map.filter(filter);
}
- private onClick(pokePOI) {
- console.debug('map:click', pokePOI);
- this.events.publish('map:click', MapComponent.mapPokePOI(pokePOI));
+ private onClick(poi) {
+ console.debug('map:click', poi);
+ this.events.publish('map:click', poiFromMapEventData(poi));
}
private onMove(position) {
@@ -67,15 +65,4 @@ export class MapComponent {
this.map.navigate(start, destination);
})
}
-
- private static mapPokePOI(pokePOI: Object): (PokeSighting | PokePrediction | PokeMob) {
- if ('source' in pokePOI) {
- return PokeSighting.fromObject(pokePOI);
- } else if ('clusterId' in pokePOI) {
- return PokeMob.fromObject(pokePOI);
- } else {
- throw new Error('PokePOI cannot be identified as PokeSighting or PokeMob:\n' + JSON.stringify(pokePOI));
- }
- }
-
}
diff --git a/ionic2/app/components/poi-bubble/poi-bubble.component.html b/ionic2/app/components/poi-bubble/poi-bubble.component.html
index 624491c..e808c57 100644
--- a/ionic2/app/components/poi-bubble/poi-bubble.component.html
+++ b/ionic2/app/components/poi-bubble/poi-bubble.component.html
@@ -1,4 +1,4 @@
-
![]()
+
![]()
diff --git a/ionic2/app/components/poi-bubble/poi-bubble.component.scss b/ionic2/app/components/poi-bubble/poi-bubble.component.scss
index e3c6fa6..b80a4cf 100644
--- a/ionic2/app/components/poi-bubble/poi-bubble.component.scss
+++ b/ionic2/app/components/poi-bubble/poi-bubble.component.scss
@@ -8,7 +8,6 @@
display: flex;
border-radius: 50%;
border: 1px solid #cacaca;
- box-shadow: 0 0 4px 1px rgba(0,0,0,0.4);
padding: 10px;
}
diff --git a/ionic2/app/components/poi-bubble/poi-bubble.component.ts b/ionic2/app/components/poi-bubble/poi-bubble.component.ts
index 2eeee67..3f3b2aa 100644
--- a/ionic2/app/components/poi-bubble/poi-bubble.component.ts
+++ b/ionic2/app/components/poi-bubble/poi-bubble.component.ts
@@ -1,6 +1,6 @@
import { Component, Input, ViewChild, ElementRef, OnInit } from '@angular/core';
-import { PokeSighting } from '../../models/poke-sighting';
+import { Pokemon } from '../../models/pokemon';
@Component({
selector: 'poke-poi-bubble',
@@ -10,7 +10,8 @@ import { PokeSighting } from '../../models/poke-sighting';
})
export class POIBubbleComponent implements OnInit {
- @Input() pokePOI: PokeSighting;
+ @Input() pokemon: Pokemon;
+ @Input() appearedOn: number;
@ViewChild('circle') circle: ElementRef;
arcHighlightColor = '#FFF75A';
@@ -19,7 +20,7 @@ export class POIBubbleComponent implements OnInit {
constructor() { }
ngOnInit() {
- let appearedOn = (new Date(this.pokePOI.appearedOn)).getTime() / 1000;
+ let appearedOn = (new Date(this.appearedOn)).getTime() / 1000;
let now = Date.now() / 1000;
let diff = Math.max(Math.log((now -appearedOn) / 1000), 1);
let max = Math.log(30 * 86400 / 1000);
diff --git a/ionic2/app/components/poi-card/poi-card.component.html b/ionic2/app/components/poi-card/poi-card.component.html
index 7096b4d..84424ad 100644
--- a/ionic2/app/components/poi-card/poi-card.component.html
+++ b/ionic2/app/components/poi-card/poi-card.component.html
@@ -1,46 +1,59 @@
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{ pokePOI.pokemon.name }}
-
-
-
-
- {{ pokePOI.pokemon.description }}
-
+
+
+
{{ pokemon.name }}
+
+
+
{{ pokemon.description }}
+
+
+
+
+
+
+ Pokemon Sighting
+
-
-
+
+
+
+ 
+
-
-
-
-
+
+ PokeMob
+
+ A lot of players seem to gather at this location!
+ Based on {{ poi.tweets.length }} tweets.
+
+
+
+
+
-
-
- {{ getPOITypeBadgeLabel() }}
-
+
+
+
PokeMob