Merge remote-tracking branch 'origin/development' into development

ApiModule.php

@@ -29,6 +29,7 @@ class ApiModule extends CWebModule
 		$this->setImport(array(
 			'citizenToolKit.models.*',
 			'eco.models.*',
+			'places.models.*',
 			$this->id.'.models.*',
 			$this->id.'.components.*',
 			$this->id.'.messages.*',

components/ApiController.php

@@ -105,6 +105,9 @@ class ApiController extends Controller
       'get'             => array("href" => "/ph/api/tool/get", "public" => true),
       'datetime'                => array("href" => "/ph/api/tool/datetime", "public" => true),
     ),
+    "tags"=> array(
+      'get'             => array("href" => "/ph/api/tags/get", "public" => true),
+    ),
     "convert" => array(
       "index"              => array("href" => "/ph/api/convert/index", "public" => true),
       "geojson"            => array("href" => "/ph/api/convert/geojson", "public" => true),
@@ -121,9 +124,13 @@ class ApiController extends Controller
       "educetab"           => array("href" => "/ph/api/convert/educetab", "public" => true),
       "valueflows"           => array("href" => "/ph/api/convert/valueflows", "public" => true),
       "organcity"            => array("href" => "/ph/api/convert/organcity", "public" => true),
+      "gogocarto"            => array("href" => "/ph/api/convert/gogocarto", "public" => true),
 
       "get"            => array("href" => "/ph/api/convert/get", "public" => true),
       ),
+    "poi"=> array(
+        "get"                   => array("href" => "/ph/api/poi/get", "public" => true),
+    ),
   );
 
   function initPage(){

controllers/ConvertController.php

@@ -24,6 +24,7 @@ class ConvertController extends ApiController {
 	       	'educetab' => 'citizenToolKit.controllers.convert.EducEtabAction',
 	       	'valueflows' => 'citizenToolKit.controllers.convert.ValueFlowsAction',
 	       	'organcity' => 'citizenToolKit.controllers.convert.OrgancityAction',
+	       	'gogocarto'   => 'citizenToolKit.controllers.convert.GogocartoAction',
 
 	    );
 	}

controllers/PoiController.php

+<?php
+
+class PoiController extends ApiController {
+
+    protected function beforeAction($action) {
+    	parent::initPage();
+    	return parent::beforeAction($action);
+  	}
+  	public function actions()
+	{
+	    return array(
+	    	'get'     		=> 'citizenToolKit.controllers.poi.GetAction',
+	    );
+	}
+}
+
+?>
\ No newline at end of file

controllers/TagsController.php

+<?php
+
+/**
+* Created on examples of other controllers 
+* api tool datetime for update rtctime of Smart-Citizen-Kit 
+* @author: Jean Daniel CAZAL <danzalkay551@gmail.com>
+* Date: 12/01/2017
+*/
+
+class TagsController extends ApiController {
+	
+	protected function beforeAction($action) {
+    	parent::initPage();
+    	return parent::beforeAction($action);
+  	}
+
+  	public function actions(){
+	    return array(
+          'get'                   	=> 'citizenToolKit.controllers.tags.GetAction'
+          
+        );
+	}
+
+}
+?>
\ No newline at end of file