Commit d6540d9b authored by Anatole Rakotoson's avatar Anatole Rakotoson
Browse files

sommom

parent 7ff43483
......@@ -713,7 +713,7 @@ div.card:hover .infos .seats, div.card:hover .infos .txt, div.card:hover .infos
name : t<?php echo $i; ?>.name,
type: "poi",
geo: { "type": "GeoCoordinates", "latitude" : "<?php echo $territoire[4][$i]['latitude']?>", "longitude" : "<?php echo $territoire[4][$i]['longitude']?>"},
typeObs : 'zone',
typeObs : 'zone'
};
t<?php echo $i; ?>.gps = contextDataTerritoire<?php echo $i ?>;
......@@ -730,42 +730,43 @@ div.card:hover .infos .seats, div.card:hover .infos .txt, div.card:hover .infos
territoires.push(t<?php echo $i; ?>);
<?php
if(count($territoire[3][$i]) > 0){
foreach ($territoire[3][$i] as $value) {
// if(count($territoire[3][$i]) > 0){
// foreach ($territoire[3][$i] as $value) {
?>
var o<?php echo $i; ?> = new Object();
o<?php echo $i; ?>.show = true;
o<?php echo $i; ?>.name = "<?php echo $value["intitule"]; ?>" ;
o<?php echo $i; ?>.statut = "<?php echo $value["statut"]; ?>" ;
o<?php echo $i; ?>.role = <?php echo json_encode($value["role"]); ?> ;
o<?php echo $i; ?>.territoire = <?php echo $i; ?>;
// var o<?php //echo $i; ?> = new Object();
// o<?php //echo $i; ?>.show = true;
// o<?php //echo $i; ?>.name = "<?php //echo $value["intitule"]; ?>" ;
// o<?php //echo $i; ?>.statut = "<?php //echo $value["statut"]; ?>" ;
// o<?php //echo $i; ?>.role = <?php //echo json_encode($value["role"]); ?> ;
// o<?php //echo $i; ?>.territoire = <?php //echo $i; ?>;
<?php if(isset($value["pointGPS"])){ ?>
o<?php echo $i; ?>.havemap = true;
// <?php //if(isset($value["pointGPS"])){ ?>
// o<?php //echo $i; ?>.havemap = true;
var contextDataOrganisme<?php echo $i ?> = {
name : o<?php echo $i; ?>.name,
type: "poi",
geo: { "type": "GeoCoordinates", "latitude" : "<?php echo $value["pointGPS"]['latitude']?>", "longitude" : "<?php echo $value["pointGPS"]['longitude']?>"},
typeObs : 'zone',
};
o<?php echo $i; ?>.gps = contextDataOrganisme<?php echo $i ?>;
// var contextDataOrganisme<?php //echo $i ?> = {
// name : o<?php //echo $i; ?>.name,
// type: "poi",
// geo: { "type": "GeoCoordinates", "latitude" : "<?php //echo $value["pointGPS"]['latitude']?>", "longitude" : "<?php //echo $value["pointGPS"]['longitude']?>"},
// typeObs : 'zone',
// };
// o<?php //echo $i; ?>.gps = contextDataOrganisme<?php //echo $i ?>;
totalMap.push(contextDataOrganisme<?php echo $i ?>);
// totalMap.push(contextDataOrganisme<?php //echo $i ?>);
<?php }else{ ?>
o<?php echo $i; ?>.havemap = false;
o<?php echo $i; ?>.gps = [];
<?php } ?>
// <?php //}else{ ?>
// o<?php //echo $i; ?>.havemap = false;
// o<?php //echo $i; ?>.gps = [];
// <?php// } ?>
organisme.push(o<?php echo $i; ?>);
// organisme.push(o<?php// echo $i; ?>);
<?php }}} ?>
<?php //}}
} ?>
var current_page = 1;
var records_per_page = 2;
var listing = [];
......@@ -819,13 +820,13 @@ div.card:hover .infos .seats, div.card:hover .infos .txt, div.card:hover .infos
}
}
}
for (var i = 0; i < organisme.length; i++) {
if(organisme[i]["show"] == true){
if(organisme[i]["havemap"] == true){
totalMap.push(organisme[i]["gps"]);
}
}
}
// for (var i = 0; i < organisme.length; i++) {
// if(organisme[i]["show"] == true){
// if(organisme[i]["havemap"] == true){
// totalMap.push(organisme[i]["gps"]);
// }
// }
// }
}
......@@ -1332,18 +1333,16 @@ jQuery(document).ready(function() {
$('.shmap').off().click(function(){
mapCO.clearMap();
if(typeof mapCO != 'undefined'){
mapCO.clearMap();
mapCO.getPopupSimple = function (data) {
if(data["typeObs"] !== undefined){
if(data["typeObs"] != undefined){
if(data["typeObs"] == "zone"){
return'';
return data["name"];
}
if(data["typeObs"] == 'acteur'){
}
} else {
......@@ -1353,7 +1352,7 @@ jQuery(document).ready(function() {
mapCO.addElts(totalMap);
mapCO.map.invalidateSize();
//mapCO.map.invalidateSize();
showMap();
// $('#mapContent').append( '<div class="py-4 px-4 beyondthemap"></div>');
// $('.beyondthemap').append( $('#azerty'));
......
Markdown is supported
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