From 9df330e34ccc88cd4e7e54fbd5fc17a555812dbb Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Sun, 17 Apr 2016 10:31:44 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D1=83=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=BA=D0=B2=D0=B5=D1=81=D1=82=D0=BE=D0=B2;=20=D0=BF=D0=BB?=
 =?UTF-8?q?=D0=B0=D1=82=D0=BD=D1=8B=D0=B5=20=D1=82=D0=BE=D1=87=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D1=83=D1=85=D0=BE?=
 =?UTF-8?q?=D0=B4=D1=8F=D1=82=20=D0=B2=20=D0=BE=D0=B1=D1=89=D0=B8=D0=B9=20?=
 =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/Category.php |   2 +-
 public/ico/key.png  | Bin 1007 -> 1009 bytes
 public/js/map.js    |  23 ++++++++++++-----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/models/Category.php b/models/Category.php
index e455b24..b8d447c 100644
--- a/models/Category.php
+++ b/models/Category.php
@@ -3,7 +3,7 @@
 class Category extends Model
 {
 	private static $categories = NULL;
-	public static $paidIds = array(24,25,26);
+	public static $paidIds = array(24,25,26,27);
 
 	function __construct($fromArray = array())
 	{
diff --git a/public/ico/key.png b/public/ico/key.png
index 5febd656f628320d0dfb0d67c4050088699087cf..7147eebc8071e2c15604ca79e84c9e1ff046f1fd 100644
GIT binary patch
delta 987
zcmV<110?+K2k{4xB!9R`L_t(og~gX)Xd7i1$A7t|>6u;<noJjp#B{Dyx-CVw4~~fz
zX+H=-M5Z8xvTrKvs~`NXU-avohzKGShlq%@$P74iN@dbX<2pC%ntF(>y0kPG&NIDU
z{LuG}mo8cE>UDeI<-N;$JpbSGyw6?UCseQ30T>@24+9Di5r1=-V9f>`pawXFLcs<I
z)$4UB9syJ_A_71ONZb(sHNX<1Rwxwg(Ae0R6psRNF{|uN1}wk?Dq^n5C{-bTUon-R
z4OqCza^>mc;?e<Zcj}|XRDL#_%@U19QB^fiVau{GO_L(|*<5-02x1%Dg{K00A`a~I
zDeFv;)h@@Lh<~?$XlTkp^HlAdo0}Mhfn{0Pw%xQA4u?@yl~^oBcXziJcZwwOWb5ne
z7>2>X{y3BQM>w2GasNIIfZuLbxuTc(;KDUZD=WleG5Y%YJo)tmP^nZf41-smJ<6#k
zAG&3IIFn>JljQlw26_L>YrOf%99>;q#N+W`0IJn0FMmEY!sO@>pIs_3U;2w1s~ar-
zz5&2se}V_o2}TC)WpZ?g%HKBc6&8X6a2$uHk7aoI?F)SK(+WL3J*cWm_dPKHe*W_x
zin`9Zi;K*BU*gr1$9VVrk6v8w?o%5Ig$RX0ZSVb<rwk~H!pvozw_Y0M)9;oj{(6(r
zYK5ggDt`bR*dJ#gog(+ZKAw5>0PlQp6-DtDn<s$Y-d@hm%#-Zx;f2QsIeFq>+h;%g
zdXcj;^CS|9-~bYd1Y28My!O#0&Rx9D#1lgt&ZHR5BmuapuW>~$GxgPVep%T-)3jg#
z0Fuchnx?U8RC)d5%h<Nf!kGyGo_pi-#)l}KPJa`LM7+B7_m>-qL`WvLqt<o3X|2D%
z-;b+?1$E%qwcT}qz)n5xEy-jucNRbvBfz24Q|P+x86xm4SU59r=QAMf(CMkh^<Bw;
zjD9y6aQ=_5J96+Gy(0l^*TAwY&*wtFDYq<3UN$tt{MRm70H$dIoe!se(k#WLZ=qEK
zoPV%O+{~4yj~8j(m}Ilr#%H*bt*x!Gyu93UO*AGZuD-w#Hx==~5t>^w1)xa&Tc9I^
z6wj5XPl%sneeG<`EWq*7oHowz#Z-RocA0RAAEmjr+Bc^i+H*O(+qWNDLAb;pcBgm;
zK<oDWb|%17KocWcOy%d@5H9f%Azl^3l2k(NtRp}h2u)@Ja7SLnhqz~e77%d(F$c&!
zud-cSp2d9u?0|@hA<telwo`BV5%&$?f{;ZiUsd^v)%=J9{0j$yoY)ihyA}Wd002ov
JPDHLkV1lZX<uCvM

delta 985
zcmV;~119|O2k!@vB!9L^L_t(og~gY_Ya2%thd;^EYO%GFEi7YvFlj<jVyBc!V7v6X
zy5=tk1RQcnAR?DQ?#>|zB;=3~atP!Qd=0&&+G}gqpww;S#HMXX1f>w0%Jm9&y}MrZ
zpc!TDO7?ELP9Ho*(n$0B-kZ0hd9hZj1wgr6P5^O05o3aA&3^?vzy`c(wdw-ITCJ88
zR{&MGA^_qMiF*RT1}x!rwOVy!x~@y{ejp=8m7~dk1#AObVzgzHst_MB%Em&(!h1}w
z>R*bN9^m>@-*1$Sh5WHRss0p-szfSmTQ)n}I~ZkSL9gncA-2I^cq(ut;=ukjWu3)k
zwM#z|@h%V@O@CQvfvVkc98A;1vMgNJ-7}X+Bv4fqP18swlR=h?OOim=Xf!ZQlR~yY
zWvW7HxWsYoH~_EB*VHy@++DfL+8=9Zn#R!3P@r`K0c>q;VVWj4r*Cp)^2)#Fi>V^T
z;UX7KUf|Bk9j<<VmA<|{GMP*?0L^BTYsG6+CMrDn^?wPA?-qHr`HB~f7XX|dI?buU
zQ_PIaP?@OEa2nkD=~i?Ap67A)le3)p<_yn%e?}^mLRD3gT6?dT|6XRXvB-nf2h9IA
z&+VDp+*rO5Wa$q(YGbh&u~@9<`!E(L1MzsA`8V@CEkEV)FOOMTUt;aAHC8uQ0hk<|
zq%cxoDt|x4xlhk={pah%<H2GJ1TZi#z+7#Pd@9eylNUK(IN$TT_gC*TSDPc7%|-{1
z&1Tu%-KFwfg@-R6a%ticrQs6A;UWOfH=a}5sB!P*JyteXNT<`$0s!Q4InwDgZ<}wq
zymT4Yb#Z1L0H(j5?i@s;qoXKF@Y6KZU#_Ak<bQHG0P6Mnp1HBHu`o+@EUF8~2iyM+
z5ZSHAza``2;~y7579&9NQIdMS9vC9>EpTR?kDmc)$w%++0YM=m1#o5^P8cUb{YC<K
z|3%mzIRuX0lK`&Iu`N6By)bObZOfJ~JDLgJw@Vhl&h`#)_~kTAp-FMMw$QQxFQ)6d
z0)M1|K@Mn4^2hRMIW3Tw`KQVHoAs`9qA_^~YywT00gHCKglHQ4tyvtvC>!4bheAkk
zy{dmDK9cpdzcsS}FGzFRxx*V}qjpdxeBvec)>iN4^pN&kj{f%Thi(u)@h?P_a-aPG
z-P`knOn|Ah>m)58e)L25#6K6}P2rXl>QZHg0`!1L%S-_N$eV-^4-C)+A|oJbfZX#Y
z?cxe79tvO|M89x(SlF~vza2(AG=L967NvYt<s)W?5eN7Oa&wmuMS)rc00000NkvXX
Hu0mjfHjCM_

diff --git a/public/js/map.js b/public/js/map.js
index c172e7d..cfc2d2c 100644
--- a/public/js/map.js
+++ b/public/js/map.js
@@ -56,7 +56,7 @@ suggestInit('#addressField');
 function init(lat, lng) {
 	myMap = L.map('map', {zoomControl: false}).setView([lat, lng], defaultZoom);
 	markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 30});
-	markersPlus = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 25});
+//	markersPlus = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 25});
 
 	layers['quest'] = L.tileLayer('https://otile1-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com" target="_blank">Mapbox</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18});
 	layers['osm'] = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18});
@@ -198,15 +198,16 @@ function initPoints(useBounds)
 		success: function (data) {
 			for(var i=0; i<data.length; i++) {
 				if (typeof points[data[i].id] == 'undefined') {
-					if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25) {
-						markersPlus.addLayer(constructPoint(data[i]));
-					} else {
+//					if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25 || data[i]['categoryId'] == 26 || data[i]['categoryId'] == 27) {
+//						console.log(data[i]);
+//						markersPlus.addLayer(constructPoint(data[i]));
+//					} else {
 						markers.addLayer(constructPoint(data[i]));
-					}
+//					}
 				}
 			}
 			myMap.addLayer(markers);
-			myMap.addLayer(markersPlus);
+//			myMap.addLayer(markersPlus);
 
 			if (getURLParameter('point') != 'null')
 			{
@@ -252,15 +253,15 @@ function loadPointsInBounds()
 		success: function (data) {
 			for(var i=0; i < data.length; i++) {
 				if (typeof points[data[i].id] == 'undefined') {
-					if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25) {
-						markersPlus.addLayer(constructPoint(data[i]));
-					} else {
+//					if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25) {
+//						markersPlus.addLayer(constructPoint(data[i]));
+//					} else {
 						markers.addLayer(constructPoint(data[i]));
-					}
+//					}
 				}
 			}
 			myMap.addLayer(markers);
-			myMap.addLayer(markersPlus);
+//			myMap.addLayer(markersPlus);
 		}
 	});