All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обновил иконку для квестов; платные точки теперь уходят в общий слой.

This commit is contained in:
Krivchikov Dmitry 2016-04-17 10:31:44 +03:00
parent 5652665eab
commit 9df330e34c
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/Category.php
View File

@ -3,7 +3,7 @@
class Category extends Model class Category extends Model
{ {
private static $categories = NULL; private static $categories = NULL;
public static $paidIds = array(24,25,26); public static $paidIds = array(24,25,26,27);
function __construct($fromArray = array()) function __construct($fromArray = array())
{ {

BIN
public/ico/key.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1007 B

After

Width:  |  Height:  |  Size: 1009 B

23
public/js/map.js
View File

@ -56,7 +56,7 @@ suggestInit('#addressField');
function init(lat, lng) { function init(lat, lng) {
myMap = L.map('map', {zoomControl: false}).setView([lat, lng], defaultZoom); myMap = L.map('map', {zoomControl: false}).setView([lat, lng], defaultZoom);
markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 30}); 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['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}); 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) { success: function (data) {
for(var i=0; i<data.length; i++) { for(var i=0; i<data.length; i++) {
if (typeof points[data[i].id] == 'undefined') { if (typeof points[data[i].id] == 'undefined') {
if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25) { // if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25 || data[i]['categoryId'] == 26 || data[i]['categoryId'] == 27) {
markersPlus.addLayer(constructPoint(data[i])); // console.log(data[i]);
} else { // markersPlus.addLayer(constructPoint(data[i]));
// } else {
markers.addLayer(constructPoint(data[i])); markers.addLayer(constructPoint(data[i]));
} // }
} }
} }
myMap.addLayer(markers); myMap.addLayer(markers);
myMap.addLayer(markersPlus); // myMap.addLayer(markersPlus);
if (getURLParameter('point') != 'null') if (getURLParameter('point') != 'null')
{ {
@ -252,15 +253,15 @@ function loadPointsInBounds()
success: function (data) { success: function (data) {
for(var i=0; i < data.length; i++) { for(var i=0; i < data.length; i++) {
if (typeof points[data[i].id] == 'undefined') { if (typeof points[data[i].id] == 'undefined') {
if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25) { // if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25) {
markersPlus.addLayer(constructPoint(data[i])); // markersPlus.addLayer(constructPoint(data[i]));
} else { // } else {
markers.addLayer(constructPoint(data[i])); markers.addLayer(constructPoint(data[i]));
} // }
} }
} }
myMap.addLayer(markers); myMap.addLayer(markers);
myMap.addLayer(markersPlus); // myMap.addLayer(markersPlus);
} }
}); });