From 6ec5c4ef079f32147a3cf0c935b2b3ed7e1deadc Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Wed, 12 Aug 2015 22:24:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=20=D0=BF=D0=BE=20=D1=80=D0=B8=D1=81?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8E=20=D0=B8=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D0=BE=D0=BA=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF?= =?UTF-8?q?=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ground/models/Point.php | 2 + ground/views/indexTemplate.php | 10 +- public/css/style.css | 1 + public/img/buttons/addPoint.png | Bin 0 -> 1377 bytes public/img/buttons/layers.png | Bin 0 -> 1309 bytes public/img/buttons/myPosition.png | Bin 0 -> 1130 bytes public/img/buttons/route.png | Bin 0 -> 1337 bytes public/img/buttons/search.png | Bin 0 -> 1561 bytes source/icons.svg | 784 +++++++++++++++++++++++++++--- 9 files changed, 732 insertions(+), 65 deletions(-) create mode 100644 public/img/buttons/addPoint.png create mode 100644 public/img/buttons/layers.png create mode 100644 public/img/buttons/myPosition.png create mode 100644 public/img/buttons/route.png create mode 100644 public/img/buttons/search.png diff --git a/ground/models/Point.php b/ground/models/Point.php index d0d7e89..dbe8465 100644 --- a/ground/models/Point.php +++ b/ground/models/Point.php @@ -67,6 +67,8 @@ class Point extends Model ORDER BY `dist` LIMIT 6;'; + $gumLat = sin(deg2rad($lng))*111-11; + var_dump($gumLat, $lat, $lng);die; $res = App::DB()->prepare($query, array(PDO::ATTR_CURSOR => PDO::CURSOR_FWDONLY)); $res->execute(array(':lat' => $lat, ':lng' => $lng, ':minLat' => $lat - 1, ':minLng' => $lng - 1, ':maxLat' => $lat + 1, ':maxLng' => $lng + 1)); diff --git a/ground/views/indexTemplate.php b/ground/views/indexTemplate.php index d810ec0..69b9e8d 100644 --- a/ground/views/indexTemplate.php +++ b/ground/views/indexTemplate.php @@ -11,14 +11,14 @@ if (App::$user) {
-
-
-
-
+
+
+
+
-
+
diff --git a/public/css/style.css b/public/css/style.css index 7f746ce..1a62d40 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -66,6 +66,7 @@ div#control div._t {border-radius: 8px 0 0 0;border-bottom: solid 1px #666; marg div#control div._c {border-radius: 0; border-bottom: solid 1px #666; margin-bottom: 0;} div#control div._b {border-radius: 0 0 0 8px;} div#control div.space {height: 10px; background-color: transparent; padding: 0;} +div#control div._t2 {background-color: rgba(200, 200, 200, 0.65); border-radius: 8px 0 0 0;border-bottom: solid 1px #ddd; margin-bottom: 0;} /*BOX*/ body.openBox div#box {display: block;} diff --git a/public/img/buttons/addPoint.png b/public/img/buttons/addPoint.png new file mode 100644 index 0000000000000000000000000000000000000000..fb9a968ea50ac9cc5b8848563567d1419aead854 GIT binary patch literal 1377 zcmV-n1)lneP)I50rmcU;w*iK1<4FU}{82C+OvQ4ngU?N=X5%!0G9l&m&28;s}fsJlpF0d3c zA$vUR9l%W7(CA$lS?0tV8*ICzBPktUlGNk?SS4v7Qr0`#H%odY#pjWL>onMn zDV=tDfFfyKtl#S%eVUa%!W-kT-I69PjlY%uPoD=i3<+BdPX>HcgGJ#1pxv^RJPiEi zvE&rdabTULt{uboFYGEy!vSDdxm;Gg0}NT}R)K--0Tx;sJzY9dx@`Uy0zFk=B~VFd z@FOr%Cn%dfz`OzDssJmizyeFh9d$#p>r{&01y#(>K1oA$!EtNYa=*73J8Ug>y&8Db z;pn{B^-aLXjy}794Jm#@rNSPLUH1UjI2^~-6_hj`bodR`TLs!Il_xSll_{Iwwkj}Y zsf_=mjgrmpSTisRT$WJTi`fW=+75i-aC9f|P~`eOV6&so(FDIq8VzBSbYb8uR1JIZ zhq@vGWXRDc$#0TItJq;zWOP!NY<^Q=ZwAh&506!60gEklqg7x(=FJh;Y~Y?cLD_U4 z(2{Wf6tKSv9K#-0n`qqVcJSYqLsY}Sv2csH&C;j`c)V;Xi~4|bEp>)3*s0HvG-cVT z|1D`rolgq4NSe0zpOVxOJt<5AZ(E+K1+&K5mXxBJ2fTs(Yh*v+TP^Z*%Pdb8>Y${{ z9V2wMqu7(Kq@NsqZw=c=J2ol(C@x9AOS;_w;9FM99(tjUD)O-|Zr~|L=TL9T zj9ebb`I7oQ{cMW%jT>s0H126=TGBR2D56ynkHZ$W({n#MuAI!>3Bub$bv}$_0^LoMNg6d3hq2uKaJhj4gkw+l`h!1 zz&F60lA)4x5||JCU~6CtgHSaZ7Y-Xp0R_KwXcd!py|yH%Bz+p#pGj-vo4dUf_>AOT zd{IqfzPGtf&dx9hwGViv2vLfj#RC+wWyPB?iMhr3m=d)YSb}A#iYsdhzZ>`*zf7S^ zZYmDgvU zznz5Y06qaO%FyR~;A(QFs`7+Es1um4hEtyH{{ZfwKu)a)EWlU5TFc=)@dP00000NkvXXu0mjf30`#( literal 0 HcmV?d00001 diff --git a/public/img/buttons/layers.png b/public/img/buttons/layers.png new file mode 100644 index 0000000000000000000000000000000000000000..97ec6aa796383164155df723998fe3a4446a34b7 GIT binary patch literal 1309 zcmV+&1>*XNP)iM;a&`Dl^?AlcOJeeAy$jEn1w+*JHg3V(g3kq{DP~|Z)YQTB;M=>v05y{ z1!(JSg5&TU{>gB99!|hvxKBENRrmy_^ajDb@hJYzaPnPD>O#k8Jb|qlI^M?7Jwb2} z+<`wcocau>XXqS{IT`w3ZpZqj6C8k<_#?xK?{SgF&(BdBu=C5u)`QLVQL)sy|DLZTj4v`56;l5T25 zMBE$^$F;m~YaC-DVpc>dirB1o9p3<}NRffX9@Bnsg z0kJkIap%;(YjC}kFSpZEW}pu)m1@i?{EF+)ze(gy#ito|H{&i0t*5KZ$N_j(UNc+Z zM@*B>^o|fa2JbXrkJOf()(F9U z_W<6*akWM}$r#L**VX476?j=HJ+~t`O!~a4(7Bl%i>Ia3QH6Q7&!NNQ-^(nPI-HQM zE#Au5v$fb0(s`-sBFdWC!|`f{(QSBLI@dY5>}#CUg}uPZs+;0f7!|msWYId@B(Ir0 z9*Z&@uflR%CPne8G%^+6mgrjC9%)uk5B(!zkBAtMQ5!Cbh~p#TtcdtBv!3jX)e$ix zBF06;?1j3sdC3 zu|}fjHav-ai@jYbYa}0jjx!o?v{4x^UH0Z+yZl#1u#i!BOmh-?qtZwLuu#Y6*p=iM zI}p#yt4UvxhATTtEVr2@72~H?>1@RK1kBGcTr|aF8_+#iiqh*c^nZs7WsU}R) zH{{%m2Qi{VS3fB#=hT@yG#u^DImx}+UoTZloug(uE|H>f6}mOv?he85-*9GmhNHhr zqqmt-^sPeHaHZ7*3mJeJ@~+maP>cpfHN&@N5iF#UtM#t%f+mj!noY2fk$717)p}>l zm!fpjeQ6cJLiWcq>gUjpw0JboMvwe$Y+OW4jx+)o5)mIn#QPo6QU`j9V6Wj{VKBAa TgHE@B00000NkvXXu0mjf7Wj4R literal 0 HcmV?d00001 diff --git a/public/img/buttons/myPosition.png b/public/img/buttons/myPosition.png new file mode 100644 index 0000000000000000000000000000000000000000..038f20fe84c27ac6d885e74d15c47f49880a3a79 GIT binary patch literal 1130 zcmV-w1eN=VP) zcoBFCxTA*ezrY#b2=F0rr53ZAYj>*S>bxt1dG*aAZkC2zp?lQX6%yHw*&=?|VjJqj zEfU#|iGr^qvFp`iw@GLd#|qw3O|cEOzSsyO8O#13;49!1@Ec+0F8~9C%rFe>ENo3i zyzdAb_wSqy)=-aT%)*SiPwk7%M4PQsUs8X_h<((OB~cc%YK<aKD6xnV=>U0I)OPpTVMNNCe~O>g2^Tk>$L<9Nd9tchLP zrL9$`65Qj>cbnOu4>%9pU9vkDfX9Ff89R9Zcm#N;cz>$M5LFlgCV_h*{9Ax4&956v zeA#Hm?7XJ_67j#JzFo{#M~9}TT=T`_eNg0Y&w@7uPL;Ni|SpGm<_|SDZ}0d;o@9| z6TnjB*(mUQ#>Oeby}&z>XE%V)BhR)s2*a=p3H+Uiubl7kt*TD_b_l<`me#>`*)UE4OA~5O} z^-QMFU)7xz@nTiO@~x}tKD(=eprP(J-d4J*zHfCE{B%OYn3Zj_~nj$x=9~ts( z3WqIOa2ZE?`woh`X)jbaR;!QysqT8z%xaRn~|7>UiDDM z442_rhkl0&-cn6DY2`qN#C37Nifog+)^;2Ev9|&;K~#90-JD;DR8<_uKYLrN2PueLnq*CDv&eRR3xfV=SY%oT zJ^5giQPi4bMX|wF^w2|Dfe;ZyL=PETfu^Z#e@KeZ2&CFgLbKg9OEWfP(-5is_Hgd7 zXUCb{nS1`+JAUB6otZt~`3%Cpz0tSFVpdZ*DJE+r; z6tg@a>9D3|RMMl8S|Z0bskB7uF(u$N;LZl>d$5|WI?kl^m;_h_yaUX_%%N(n z;C;g6OXe})W$X1J%%sxS7^ymuddh=oiw{a#l%f6;6}@Ui(%g_S$1r7{ zQwRkNwGhyldGozN((Gn4=3C2@{gTe{ ztbdcF6O#5xDm9ZaU6Q^|jalkhyCXHF%ukXoY8GRV$q(HUNc$yCX0N2SA{%o}1jEZ^ zLxnkmk}h=BZ4EFqT7;S7>;TpR2LhbK<`G~9CQSooHh;qUd>(K!W>}k zr!mB4T+-XJEO|eTN>GK9mvFQt8%tq@3$7NbA4`X^Vnj)E=v)Z>Y zcSt&ro}ecuQx-}(=3tB@{Vr*a&xNWjzye?$@QO#>Mpyxy@2F7%miaK|0_*rBumL#b zK{pHDQo^prlrZCz*O_ckUU)Ocbp>xDurfU!1}+Ewbqp#iGl5ayY!6z8U3$!7CQJc% zmHbQrlfw0tMHtFz%nXbXWq!omTk_@yUpiThSqEHYy?&T{drKK_DdDWfi~`5f<9C6b zUczzbL)>>o90j)5nq8ML+q)K|r2~_09mHHV{lFE#^T4x?f%xP*U_J1hgT^z!aJA9n zDoMlBj1K>lv{pH9Qm#?XlJsS!F|V|_tYZtd$;@}gr>I!THU-Y_WGwU5_(XD(%tZJ! zWBM8tD)X7lj5cpGDoY~iNlngaRpU2F_gB_05Af~*-g3Audw>@l>WAb?U@7Kac{S!C zkDoF3%e|O6-oeUBEt1-SZ!kC9tc(HIk;BfXP$a-I+)M#DkH#LLC_D*Gyh%AE39!(U zmM@(`kkG`NltYrx#G8~ulHl)`#MjKW5co7^(34IfNHD3?KOA-b2DZ9~Qydb^#z5B@ z@_HgaffgEj%{S{N<(-&K%F!R_42iu^wFa|Exe;~%_i=`q0#waJ-Yc`wcq$6<(0IsF vD}B<=#J?Hn#H2+=nAlU&5A2K7cDe9B;C348X|?(b00000NkvXXu0mjfMQnAI literal 0 HcmV?d00001 diff --git a/public/img/buttons/search.png b/public/img/buttons/search.png new file mode 100644 index 0000000000000000000000000000000000000000..5e99af7c9608f7196aa273aaeda4cf8c84dbadd2 GIT binary patch literal 1561 zcmV+!2Il#RP)~Fs559i_Am$TOSv-aL=ueH7^Nu)$IFbTK?xC9u|@zel+0*8RZKr65V_yG7N ztuP;`Nh3@^gRU3>qrw zElF(|5mAg^CCx2237t>WGPxF51zeq{aRQ5hg+N=5aw1U(>1)8&cTyrw1MLaMR{;+L z?*l^<%E}Zj%V+>r13e?=9|1ODr0oWpfqg)K;BxHaZUAlvt_RMGc;6OaGVn({^)p7m z+8HD1aKu{QFX<6UeG{z7(UMk5Iur5k6_TpTv1gPv443p{h@xjCEs`|wKL{N!Xyc!A*Savz|F4+TnazN7tw58(xZEub%Og%1Tv;M%`hd41 zl=NK)A+L3e$x8TWNxMSi&GSh_DH%wbEVs!@mW3aZf#7M9T0`V~EUCKOWFTpNh?0`D zPtrpvl^rQ*xh&%DLYt(!d=ud!14&CG2$7`ik`_uD6(OX$f&llwu%oC3b=o7sVdL;t@%cQM)_d z7Z)didx5nH<(!MGOf2JPNrI))i8e_OmSdUZjXs!9F)qd27lB7f;g5usK9&=wu(0F0 z6mu5>?_$BJMChtyfNi|>z|s_R@4*u1HAyCQWir5u@9)PVVM)!t4)~k|N$akFUjZ5k$i-AD8DJUvRk$k^!_WlGqNI4Q(w0dvPGbAO%PHp8V@};US^r8V z1I*MLf%zm)L5>BsQIy}U_0AFb|*5xN*bC-UiQ=iT-V*m0K59H z2Sz5GH?Pw7j3Dd*#uHpw5Qf_BNCwz{=OzO0C79D~$pDMC%>-VEIeuq%+%tmk0OpUl z;;JpcsP1eT#aM!QszH^F?U + id="grid3122" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> @@ -133,6 +137,32 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> + + + - - - + + + + + x="-2526.5076" + style="font-size:339.47021484px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#333333;fill-opacity:1;stroke:none;font-family:Sans" + xml:space="preserve">+ + @@ -296,11 +330,106 @@ id="g4268" style="fill:#000000" /> + + + id="g3055" + transform="matrix(0.77646065,0,0,0.77646065,-2479.8235,380.88801)"> + + + + + + + + + + + + + transform="matrix(0.50760953,0,0,0.50760953,-3574.089,110.09702)" /> + + transform="matrix(6.6616945,0,0,6.6616945,-21585.345,-1475.8551)"> + ry="26.197889" + y="362.36215" + x="-4826" + height="752" + width="752" + id="rect3880" + style="fill:#f2f2f2;stroke:none" /> + style="fill:#f2f2f2;stroke:none" + id="rect3882" + width="752" + height="752" + x="-4834" + y="1172.3622" + ry="26.197889" /> + + + + + + + + + + + + + - + ?-! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + ?-! + + + + + + + + + + +