Commit 2165cce0 authored by Raph El's avatar Raph El
Browse files

Modif

parent e9e2f61a
Pipeline #3185 failed with stages
in 24 seconds
......@@ -2,6 +2,40 @@
CO.js
********************* */
var interopObj = {
osm : {
name : "Wikidata",
color : "grey",
icon : "group",
type : "wiki",
urlImg : modules.interop.assets +"/images/logos/logo-osm.png",
paramsUrl : {
// cityFields : ["wikidataID"],
// others : ["textSearch"]
},
getUrlApi : function(params){
var url_osm = baseUrl + '/api/convert/osm?url=http://overpass-api.de/api/interpreter?data=[out:json];node["name"](poly:"'+geoShape+'");out%20'+endNow+';';
// if (amenity_filter == null) {
// if (text_search_name !== "") {
// url_osm = baseUrl + '/api/convert/osm?url=http://overpass-api.de/api/interpreter?data=[out:json];node["name"~"'+text_search_name+'",i](poly:"'+geoShape+'");out%20'+endNow+';';
// }
// } else {
// if (amenity_filter == "") {
// url_osm = baseUrl + '/api/convert/osm?url=http://overpass-api.de/api/interpreter?data=[out:json];node["amenity"="NIMPORTEQUOI"](poly:"'+geoShape+'");out%20'+endNow+';';
// } else {
// if (text_search_name == "") {
// url_osm = baseUrl + '/api/convert/osm?url=http://overpass-api.de/api/interpreter?data=[out:json];node["amenity"~"^('+amenity_filter+')"](poly:"'+geoShape+'");out%20'+endNow+';';
// } else {
// url_osm = baseUrl + '/api/convert/osm?url=http://overpass-api.de/api/interpreter?data=[out:json];node["name"~"'+text_search_name+'"]["amenity"~"^('+amenity_filter+')"](poly:"'+geoShape+'");out%20'+endNow+';';
// }
// }
// }
var url = baseUrl + '/api/convert/osm?url=http://overpass-api.de/api/interpreter?data=[out:json];node["name"](poly:"'+geoShape+'");out%20'+endNow+';';
if (params.textSearch !== "")
url += "&text_filter="+params.textSearch;
return url;
}
},
wikidata : {
name : "Wikidata",
color : "grey",
......
......@@ -7,8 +7,9 @@ class IndexAction extends CAction
if(Yii::app()->request->isAjaxRequest)
echo $this->getController()->render("interop.views.co.index");
else {
//$this->getController()->layout = "//layouts/empty";
$controller->render( "interop.views.co.index");
$this->getController()->layout = "//layouts/empty";
//$controller->render( "interop.views.co.index");
echo $this->getController()->render("interop.views.co.index");
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment