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

ADD гео-кодирование через Google; FIX поиск по координатам в Яндекс

This commit is contained in:
Krivchikov Dmitry 2015-09-06 23:09:08 +03:00
parent 3face5f2f4
commit 4e08b64a01
1 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ground/controllers/JsonController.php
View File

@ -94,7 +94,7 @@ class JsonController extends Controller
*/ */
static function actionCategories() static function actionCategories()
{ {
$categories = Category::model()->getAll(array('order' => 'ord ASC', 'asArray' => true, 'asArrayOf' => true)); $categories = Category::model()->getAll(array('order' => 'ord ASC', 'asArray' => true, 'noKeys' => true));
self::renderPartial('json.php', array( self::renderPartial('json.php', array(
'data' => $categories, 'data' => $categories,
@ -372,6 +372,39 @@ class JsonController extends Controller
$lng = $coords[0]; $lng = $coords[0];
$results[] = array('value' => $name, 'data' => "/?lat=$lat&lng=$lng&zoom=13"); $results[] = array('value' => $name, 'data' => "/?lat=$lat&lng=$lng&zoom=13");
} }
} else if (isset($obj->GeoObjectCollection->metaDataProperty->GeocoderResponseMetaData->Point)) {
$coords = explode(' ', (string) $obj->GeoObjectCollection->metaDataProperty->GeocoderResponseMetaData->Point->pos);
$lat = $coords[1];
$lng = $coords[0];
$name = "Координаты N°" . $lat . ' E°' . $lng;
$results[] = array('value' => $name, 'data' => "/?lat=$lat&lng=$lng&zoom=13");
}
}
}
curl_close($ch);
}
if (count($results) < 10 && strlen($search) > 5) {
// ====== GOOGLE ============
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, 'https://maps.googleapis.com/maps/api/geocode/json?language=ru&key=AIzaSyDuWmguxO35oV9WGc6D8xUPvQBaUS4kt78&address=' . urlencode($search));
curl_setopt($ch, CURLOPT_TIMEOUT, 3);
curl_setopt($ch, CURLOPT_REFERER, "http://wikipoints.ru");
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
$out = null;
$out = curl_exec($ch);
if (!empty($out)) {
$obj = json_decode($out);
if ((string) $obj->status == 'OK') {
$count = count($obj->results);
if ($count > 0) {
for ($index = 0; $index < $count && $index < 5 && count($results) < 25; $index++) {
$name = (string) $obj->results[$index]->formatted_address;
$lat = (string) $obj->results[$index]->geometry->location->lat;
$lng = (string) $obj->results[$index]->geometry->location->lng;
$results[] = array('value' => $name, 'data' => "/?lat=$lat&lng=$lng&zoom=13");
}
} }
} }
} }
@ -423,10 +456,10 @@ class JsonController extends Controller
self::renderPartial('json.php', array( self::renderPartial('json.php', array(
'data' => ArticlePhotos::model()->getAll( 'data' => ArticlePhotos::model()->getAll(
array( array(
'where'=>'`owner` = '.(int) App::$user->id, 'where' => '`owner` = ' . (int) App::$user->id,
'order' => '`id` DESC', 'order' => '`id` DESC',
'asArray'=>true, 'asArray' => true,
'noKeys'=>true 'noKeys' => true
) )
) )
)); ));