qwerty/milfs
2
0
Fork 2
Code Issues 6 Pull Requests 1 Releases Wiki Activity

mejoras en visualizacion de mapa

Browse Source
This commit is contained in:
humano 2018-11-03 20:15:46 -05:00
parent 3f9dd30dad
commit 5a368faa7a
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
funciones/funciones.php
View File

@ -11990,9 +11990,10 @@ return $resultado;
function imprime_geojson($id,$id2,$plantilla,$busqueda){
function imprime_geojson($id,$id2,$plantilla,$busqueda,$item){
$id_form = mysql_seguridad($id);
$id_form2 = mysql_seguridad($id2);
$item = mysql_seguridad($item);
$campo = buscar_campo_tipo($id_form,"14");
$campo2 = buscar_campo_tipo($id_form2,"14");
$id_campo = $campo[0];
@ -12002,6 +12003,13 @@ function imprime_geojson($id,$id2,$plantilla,$busqueda){
$consulta = "SELECT form_id as id, control, GROUP_CONCAT(contenido ORDER by timestamp desc ) as data FROM `form_datos` WHERE (form_id = '$id_form' $w_id2 AND id_campo ='$busqueda[0]' AND contenido COLLATE utf8_spanish2_ci like '%$busqueda[1]%' ) group by control ORDER BY orden desc";
}
elseif($item !=""){
$consulta = "SELECT form_id as id, control, GROUP_CONCAT(contenido ORDER by timestamp desc ) as data
FROM `form_datos`
WHERE control= '$item'
limit 1";
}
else{
@ -12031,7 +12039,7 @@ $link=Conectarse();
while( $row = mysqli_fetch_array( $sql ) ) {
$marcador = array();
$propiedades = array();
$identificador = explode(',',$row[data]);
$identificador = explode(',',$row['data']);
$localizacion = remplacetas('form_datos','control',$row['control'],'contenido',"id_campo = '$id_campo'") ;
$identificador = $identificador[0];
@ -12040,11 +12048,11 @@ while( $row = mysqli_fetch_array( $sql ) ) {
$lat = $campos[0];
$lon = $campos[1];
$zoom = $campos[2];
$formulario = formulario_imprimir($row[id],$row[control],"$plantilla",'');
$formulario = formulario_imprimir($row['id'],$row['control'],"$plantilla",'');
$marcador["type"] = "Point";
$marcador["coordinates"] = array($lat,$lon);
$propiedades = formulario_imprimir_linea($row[id],$row[control],"array");//
$propiedades = formulario_imprimir_linea($row['id'],$row['control'],"array");//
//$propiedades[description] ="HOLA MUNDO";
//$propiedades[buscar] ="$consulta ";
$propiedades[localizacion] ="$localizacion[0] ";
@ -12057,18 +12065,18 @@ while( $row = mysqli_fetch_array( $sql ) ) {
$titulo = remplacetas('form_datos','id_campo',$campo_titulo[0],'contenido'," control = '$row[control]' ") ;
$propiedades[description] ="$titulo[0]"; }
$propiedades['description'] ="$titulo[0]"; }
//$propiedades[description] ="<div class='container-fluid' id='contenedor_datos' >$formulario</div>";
$propiedades[description] ="$formulario";
$propiedades[icon][iconSize] =[60];
$propiedades['description'] ="$formulario <div class='text-center'><a class='btn btn-info btn-sm' href='?id=$row[id]'>Mostrar todos</a> <a class='btn btn-info btn-sm' href='?id=$row[id]&item=$row[control]'>Mostar solo este</a></div> ";
$propiedades['icon']['iconSize'] =[60];
//$propiedades[icon][shadowSize] =[70,70];
//$propiedades[icon][shadowUrl] = "https://raw.githubusercontent.com/humano/milfs/master/milfs/images/iconos/negro.png";
//$propiedades[title] ='Hola mundo';
if($propiedades[icon][iconUrl] =="") {
if($propiedades['icon']['iconUrl'] =="") {
$icono_imagen = buscar_imagen("$id_form",$row['control'],"","");
//$propiedades[icon][iconUrl] = "$_SESSION[site]/milfs/images/iconos/negro.png";
$propiedades[icon][iconUrl] = "$_SESSION[url]images/secure/?file=150/$icono_imagen";
$propiedades['icon']['iconUrl'] = "$_SESSION[url]images/secure/?file=150/$icono_imagen";
}
//$propiedades[sounds] ="";
//$propiedades[url] ='';
@ -13370,7 +13378,7 @@ if (mysqli_num_rows($sql)!='0'){
$url_pin = urlencode("$_SESSION[site]milfs/images/iconos/pin.png");
$contenido = "
<img class=' mapa+estatico lazy img img-rounded img-responsive' style='' src ='https://staticmap.openstreetmap.co/staticmap.php?center=$lon,$lat&zoom=$zoom&size=600x100&maptype=mapnik&markers=$lon,$lat,red-pushpin' >
<img class=' mapa_estatico lazy img img-rounded img-responsive' style='' src ='https://staticmap.openstreetmap.co/staticmap.php?center=$lon,$lat&zoom=$zoom&size=600x100&maptype=mapnik&markers=$lon,$lat,red-pushpin' >
<a href='https://www.openstreetmap.org/?mlat=$lon&mlon=$lat#map=$zoom/$lon/$lat' target='mapa'>Ampliar mapa</a>
"; }else{ $contenido ="<div class='alert alert-danger'>No se ha definido un token de mapbox</div>";}
}
@ -13528,8 +13536,8 @@ if($contenido_original !="") {
$resultado .= "
<div id='contenedor_$row[id_campo]' class='container-fluid contenedor_campo text-left'>
<pdata-toc-skip class='campo_contenido' id='contenido_$row[id_campo]'>
<span type= '$campo_tipo' class='col-md-2 campo_titulo campo_nombre' id='nombre_$row[id_campo]'>$campo_nombre[0]:</span>
<p class='contenido_item col-md-10 '><b>$contenido</b>
<span type= '$campo_tipo' class='col-lg-2 campo_titulo campo_nombre' id='nombre_$row[id_campo]'>$campo_nombre[0]:</span>
<p class='contenido_item col-lg-10 '><b>$contenido</b>
<span class=' pull-right'> $metadatos </span>
</p>
</div>";
@ -13568,7 +13576,7 @@ $plantilla= $plantilla[0];
}
*/
}
if($plantilla != ""){
if($tiene_plantilla != ""){
@eval("\$plantilla = \"$plantilla \";");
$full ="$plantilla";
/// $full = preg_replace("/<[^\/][^<>]*> *<\/[^<>]*>/", "", $full );

4
geojson.js.php
View File

@ -9,9 +9,9 @@ require ("funciones/conex.php");
$geojson = imprime_geojson("$_REQUEST[id]","","mapa","$_REQUEST[buscar]");
$geojson = imprime_geojson("$_REQUEST[id]","","mapa","$_REQUEST[buscar]","$_REQUEST[item]");
//header('Content-Type: application/json');
echo "var geojsonSample = ";
echo $geojson;
echo ";"
?>
?>