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(); $result = array();
foreach ($points as $point) { foreach ($points as $point) {
$id = $point->id; $tempPoint['id'] = $point->id;
$result[$id]['id'] = $point->id; $tempPoint['name'] = $point->name;
$result[$id]['name'] = $point->name; $tempPoint['lat'] = $point->lat;
$result[$id]['lat'] = $point->lat; $tempPoint['lng'] = $point->lng;
$result[$id]['lng'] = $point->lng; $tempPoint['categoryId'] = $point->categoryId;
$result[$id]['categoryId'] = $point->categoryId; $tempPoint['moderate'] = $point->moderate ? 'show' : 'hide';
$result[$id]['moderate'] = $point->moderate ? 'show' : 'hide';
$result[] = $tempPoint;
} }
self::renderPartial('json.php', array( self::renderPartial('json.php', array(

6
public/js/map.js
View File

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

10
public/js/mapPoint.js
View File

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