diff --git a/sna/application/models/Home_model.php b/sna/application/models/Home_model.php index 33df89e..3a41ff6 100644 --- a/sna/application/models/Home_model.php +++ b/sna/application/models/Home_model.php @@ -192,19 +192,19 @@ Class Home_model extends CI_Model { { //init //corners min, max in geo - $min_lat=46.979446; - $min_long=13.138383; - $max_lat=45.395345; - $max_long=16.698977; + $min_lat=46.980904; + $min_long=13.113429; + $max_lat=45.389575; + $max_long=16.674917; //height,width of canvas - $height=719.964; - $width=1111.625; + $height=720; + $width=1100; //error - $height_err=10; - $width_err=10; - + $height_err=0; + $width_err=0; + //calculate pixes per degree $ppd_height=number_format($height/($min_lat-$max_lat),6); $ppd_width=number_format($width/abs($min_long-$max_long),6); diff --git a/sna/application/views/home/index_view.php b/sna/application/views/home/index_view.php index 0a82a64..8fb7298 100644 --- a/sna/application/views/home/index_view.php +++ b/sna/application/views/home/index_view.php @@ -228,18 +228,18 @@ Slovenski narečni atlas / Slovenian dialectal atlas if(transcription.id) { - g.append("text").attr('id','text-'+transcription.pin).attr("x","-5px").attr("y","0px").attr("font-size","18pt").attr('class','SIMBola').style("fill", transcription.icon_color).text(transcription.pin); + g.append("text").attr('id','text-'+transcription.pin).attr("x","-5px").attr("y","6px").attr("font-size","18pt").attr('class','SIMBola').style("fill", transcription.icon_color).text(transcription.pin); } else { - g.append("text").attr('id','text-'+transcription.pin).attr("x","-5px").attr("y","0px").attr("font-size","18pt").text("/"); + g.append("text").attr('id','text-'+transcription.pin).attr("x","-5px").attr("y","6px").attr("font-size","18pt").text("/"); } var element = d3.select('#text-'+transcription.pin).node(); var width = element.getBoundingClientRect().width; - g.append("text").attr("x",width+3+"px").attr("y","-2px").attr("font-size","12pt").text(transcription.short_name); + g.append("text").attr("x",width+3+"px").attr("y","4px").attr("font-size","12pt").text(transcription.short_name); // Create an SVG element var use = document.createElementNS(svgNS, "use");