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

Переделал выдачу точек в JSON в виде массива с объектами

This commit is contained in:
Krivchikov Dmitry 2015-09-03 19:48:41 +03:00
parent efa1fba20e
commit 3face5f2f4
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ground/controllers/JsonController.php
View File

@ -29,13 +29,14 @@ class JsonController extends Controller
$result = array();
foreach ($points as $point) {
$id = $point->id;
$result[$id]['id'] = $point->id;
$result[$id]['name'] = $point->name;
$result[$id]['lat'] = $point->lat;
$result[$id]['lng'] = $point->lng;
$result[$id]['categoryId'] = $point->categoryId;
$result[$id]['moderate'] = $point->moderate ? 'show' : 'hide';
$tempPoint['id'] = $point->id;
$tempPoint['name'] = $point->name;
$tempPoint['lat'] = $point->lat;
$tempPoint['lng'] = $point->lng;
$tempPoint['categoryId'] = $point->categoryId;
$tempPoint['moderate'] = $point->moderate ? 'show' : 'hide';
$result[] = $tempPoint;
}
self::renderPartial('json.php', array(

6
public/js/map.js
View File

@ -189,9 +189,9 @@ function initPoints(useBounds)
bounds: bounds
},
success: function (data) {
for (var k in data) {
if (typeof points[k] == 'undefined') {
markers.addLayer(constructPoint(data[k]));
for(var i=0; i<data.length; i++) {
if (typeof points[data[i].id] == 'undefined') {
markers.addLayer(constructPoint(data[i]));
}
}
myMap.addLayer(markers);

10
public/js/mapPoint.js
View File

@ -89,12 +89,12 @@ function initPoints()
$.ajax({
url: "/json/points/",
success: function (data) {
for (var k in data) {
if (k == pointId) {
constructPoint(data[k]);
points[k].addTo(myMap);
for(var i=0; i<data.length; i++) {
if (data[i].id == pointId) {
constructPoint(data[i]);
points[data[i].id].addTo(myMap);
} else {
markers.addLayer(constructPoint(data[k]));
markers.addLayer(constructPoint(data[i]));
}
}
myMap.addLayer(markers);