From fedaefbd4574d5e9ff2f34ab5901d3593759c46d Mon Sep 17 00:00:00 2001 From: Skylar Date: Thu, 31 Mar 2016 15:15:00 -0600 Subject: [PATCH] Place markers now open place page when tapped --- .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../2.2.1/taskArtifacts/fileHashes.bin | Bin 142713 -> 142713 bytes .../2.2.1/taskArtifacts/fileSnapshots.bin | Bin 3091772 -> 3147594 bytes .../2.2.1/taskArtifacts/taskArtifacts.bin | Bin 178900 -> 178900 bytes platforms/android/assets/www/css/main.css | 8 ++++---- platforms/android/assets/www/js/home.js | 9 ++++++--- .../android/assets/www/screens/place.html | 9 +++++++++ www/js/home.js | 9 ++++++--- www/screens/place.html | 9 +++++++++ 9 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 platforms/android/assets/www/screens/place.html create mode 100644 www/screens/place.html diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index cf35cda3b76a1ea9e1f90d7a2713c6c5aac9a00d..9d2b0bd1690d631d3fc2826d746ac173403db65b 100644 GIT binary patch literal 17 VcmZQx-&@mz;qHyx)<#9a**|M+qV;b^^ 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 diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index fddc7fd5982f1a0fec4b9192bd54c15d6ba898ce..6f56d13bb3b72eec7d4f5304df4f282dd7d41975 100644 GIT binary patch delta 1896 zcma)-4NwzD6vuBbM+^y&3nY*j2#KHx5du{NDhgWsfP#uf6c_~|Iw(SomQpAxP{yK; zU-XbQY86_QsVD-m?o6flRTS}qpte;kmSWLbl@B{AifA{7b~@lV-I?FroA=(ny?y)N zx!RUm(75F!*d~b)5!L~;-{Ys0wdHFA@%snX2HGn)IE%GC+s_aLXAEmo#`6SWbBwjg z{w9JDtzm6}PY^-GyA-7^b|qx7`w1d#ppH&|3fm{FIn&oC1y=vHRcbDh`Y#HvHg-n~Gfj+XK>F(u2$M&#JU(+*lsk;U+ZAzI?UUVrnz$JqX zaQ25W-Aa|&OBD#rStEFWKHD8r5@WylIUA-jbD1oU9gM~^$z0|c1cb#Fx^q*=K{iMV z{Ta*1Ds$B+6%fkXHR1(F*9`>v?lTQ)l^JNxQB0e6k~z-D9nh*5Tf&Z?pYdv-aEU!* z)R}~J&3(JhUrT3w>cn4aeD47>crO|VLvkL>b!h8g1N^m7=I}8VKu28l-P%8+CX)4P z#LpSpeR_2DUovLKTzu zel7K4xu1xcG+s8!0&_LlW?v8;j-tas-fA>KNd5`v-KnMx-|cd7d$ugC zbl-s$&CKM4NJs|*F;vpP9+ry8)0B6|Q4)okC>}r;XKE7x%ncLJXk{a~Fa@=`%krtS)qgwbIVVetP)3mu(pI^OuMbUc9#)H5;iU zApO8KpaiCVQ>@QkHQ&U)9biq*&P=X`J)hZ3gOwHz4;ni?C>XMYD?`5JoY*GxcORJy zq=Q>!oyepVSHb+>WK;h$v96z#pp-1C(v2IENf05KsPseaRF$KM*rSR*tJa)ruXBn+ zkA@$1g893_JU9zc0@yW1;D}1^fW>@tDN`HeNC_S4m%*~1xqfg`r=6&<l z@=l8R9Mql7zXMRN#@3co*yGN_*rFbHz9E4dWgv(s1H?t2gG@A8C#a(6FH_U+of;u> z_1dd$TtDxR0tm(ma_J%aEV`x5ay6zU8J6glW~8TaXntVu%*stSAI{B~QPXOFJQcqA zB5DF{cvM1Q^l}I`lM7*999M#7trjpgg^dDYt@} z^tz9@Lsh|^xqG$xsV%DP^?AsJUGue$(9W#gf&6ahcyq-qvqdIrsq`>RFiRzB*6Vz1 ah6oR>>~r!3L)ZA9%6rFGP}yx4!~OwPQrIj2 delta 1616 zcmb`_c~BEq7y$5no6W)H?qVVdM+gEYgu_@Fi6|&ykqUL9cz}b%2#&X+jtC zBV?B5)!Vir+E&C_+h-lHs8AJaiHJ2ir4#B|Z8aQFSto?+Gzw_aTU6i4bee zw+LdUR*0on>j+|Qifv_HVChO;P7rHWyYo{lJ^H`mBd2c_oO)cLq@C8O#pPM4LLWK! zgwI#)01US&ds6l0``3kROvZVx$A31xpr-fofsqe~S9VR}jRDI=+!=KvUm2_c3_9`q zgtpDep9p2IXd`z_6T)?Bl(Z#f=AijTuaFOAGWj0ORKPTz9b6oDvm#!|Qu$YS-Dn1I zrqD{JW!oI*jNs08p%V7Mi8x@LXPaa!yChr0A~xY(cOA8O1%*3lH81`bbzp6_oOhSdEC+7)^jF{vcy)tykhPq2yVT&XrB9r)}7_`0xT%C>_ zP2drL^M*(U#j+&bfpXqbP(Zxa_nS#aQF=FNm!i!0a4~?3BJscK?Cm22DBK^dKcN8NoYLrfe5?IG{N+6dMYq74)) zbLUgWH}HSo@7xfnK+6iL+8|lNYl6TwLbf?D&AxyQf|UyuDs<3J9T!0+Px}yd4@R)= zn>#Iq*QCBI0-5@57EV$7GRTr7eE?vvS;fHj_JjHG4Gi;!#djkZ#HPur0CE|14jD4c zlBSAKWi$0!0vq))z9@ST^hw3BsJr(Hw2c=B!Gs6mJyvHsg`DkTriAI3zPj+{w}~%u zl1_lV$4M_}D-Fn{$a3#ut2sl0%o);!h2jK)NK1e{hx7xe{snuIf?Mw5bAFto3J1t> zRIm3&__Ri&c*d2@Z5{BG2l*V8HOf6jsHe#D0YIfX4-b*GH&}*wpx$85+#E^TKlXGj zQvKVW?kg$F$QBXUu+~M#}wEo%nwsy zD$E}Xzyh%#OpOI&8Y~30I7Zv2NQfu+r#^u$J=nrB!px=*Nk1g-sB5cqgThVe7{8uZ zE0(QYnipfqUnOEP_hjwsQ;Oy0FHB`$N5!pkPerrxLY0qoD;tW1Vd2;qw3XE^nT1vr z;#pTZpV6k@veY$A*%h+R^v*BcUE$J!e#l;a2(XQ4Fnue;k|I18`@a`IQ0NHkop}nnYvkr^E^jIVog+(K^IY#~cA9)j87XSbN diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index f13e36499054a7f30c772b395042d0d0adbd8cee..72ae41d5d057614ed2ef1fb842fdd387429a868f 100644 GIT binary patch delta 337 zcmccemFvn^t_}IUf|p+G58>}9IqQ5;L4wbt$$isg$A|Kh=l8Y>=6BBy+!||Px45WF z_4DU=JGji`{NAk`3_xHTbuMtad>o_w=BxdSxda|%Oj8cp?JqTD+roUi+Ue(}FKA(O z-fS>Oh*4n4{rtw7w~kpgrB)rm$I1f`QkyGgr7})dNMK=2vY!yoGC6SFrOop<9bp0q zZT4D}?IJM0>A_U*wVfN-rta$~yLWi)<^^v~vkF9RNn7D|O-8mM=kf2i@3)=+i*DZf z>^3XdY0GYO7H;HGDu#~%sKoBm)Elf(Aayo`$(rz>n>cp;WdnhX-GYi;;AM5_;wx;CDLHecO?Ir`iV`G9Usb1p5NOlIGs=4Y`68C zp6NTPww?>%yaAWtU;qM^BV{Sm<>MIbH(%{v%(dBRZYra|%>g}5lf}IC7j5?Y!OpuqnwOE8MS!<4 zJLB%7_Zl;QCrQkm&v0P+gH22h+gI~4Ze|u(zO5umaN8r7mYoZh`rF<73YS~V2r`;$ gdjvnDA%r>o%>t(LEZW+l7u(YW8MmhiGUcrV09t;Xod5s; diff --git a/platforms/android/assets/www/css/main.css b/platforms/android/assets/www/css/main.css index 7ccc5f3..468f96c 100644 --- a/platforms/android/assets/www/css/main.css +++ b/platforms/android/assets/www/css/main.css @@ -218,10 +218,10 @@ body { #buttons .circlebutton img { position: absolute; - top: 5px; - left: 5px; - width: 50px; - height: 50px; + top: 15px; + left: 15px; + width: 30px; + height: 30px; } .scrollable-box { diff --git a/platforms/android/assets/www/js/home.js b/platforms/android/assets/www/js/home.js index ff06c71..15faf2f 100644 --- a/platforms/android/assets/www/js/home.js +++ b/platforms/android/assets/www/js/home.js @@ -99,7 +99,7 @@ function mapPos(lat, lon) { function onPlaceTap(feature, layer) { layer.on('click', function (e) { - + openPlace(feature); }); } @@ -117,8 +117,11 @@ function loadPlaces(lat, long) { }); } -function openplace(osmid) { - alert(osmid); +function openPlace(feature) { + $('#main-content').load("screens/place.html", null, function () { + loadPlace(feature); + $('#overlay-main').css('display', 'block'); + }); } /** diff --git a/platforms/android/assets/www/screens/place.html b/platforms/android/assets/www/screens/place.html new file mode 100644 index 0000000..1bd2dd2 --- /dev/null +++ b/platforms/android/assets/www/screens/place.html @@ -0,0 +1,9 @@ +
+
+
+ + \ No newline at end of file diff --git a/www/js/home.js b/www/js/home.js index ff06c71..15faf2f 100644 --- a/www/js/home.js +++ b/www/js/home.js @@ -99,7 +99,7 @@ function mapPos(lat, lon) { function onPlaceTap(feature, layer) { layer.on('click', function (e) { - + openPlace(feature); }); } @@ -117,8 +117,11 @@ function loadPlaces(lat, long) { }); } -function openplace(osmid) { - alert(osmid); +function openPlace(feature) { + $('#main-content').load("screens/place.html", null, function () { + loadPlace(feature); + $('#overlay-main').css('display', 'block'); + }); } /** diff --git a/www/screens/place.html b/www/screens/place.html new file mode 100644 index 0000000..1bd2dd2 --- /dev/null +++ b/www/screens/place.html @@ -0,0 +1,9 @@ +
+
+
+ + \ No newline at end of file