Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias

This commit is contained in:
Luis 2017-06-17 17:06:14 +02:00
commit ea8767e8c3
2 changed files with 11 additions and 7 deletions

View file

@ -38,9 +38,6 @@
</header> </header>
{{ content }} {{ content }}
</div> </div>
<section id="banner" style="height:120px;min-height:120px;">
<a href="#two" class="more scrolly">Contin&uacute;a</a>
</section>
</section> </section>
<!-- Two --> <!-- Two -->

View file

@ -25,7 +25,7 @@ function preload() {
function setup() { function setup() {
pg = createGraphics(800, 519); pg = createGraphics(800, 519);
var as = 519. / 800.; var as = 519. / 800.;
var w = windowWidth*.95; var w = windowWidth;
var h = windowWidth*as; var h = windowWidth*as;
createCanvas(w,h); createCanvas(w,h);
@ -37,6 +37,15 @@ function setup() {
function draw() { function draw() {
// Resize:
var w = min(800,width*.85);
var h = w*519./800.;
var zoom = w*800.;
var mx = map(mouseX-width/2+w/2,0,w,0,800);
var my = map(mouseY-height/2+h/2,0,h,0,519);
pg.background("#cad2d3"); pg.background("#cad2d3");
// capas // capas
for (var n = 0; n < ids.length; n++) { for (var n = 0; n < ids.length; n++) {
@ -47,7 +56,7 @@ function draw() {
} }
// Parcelas segun PGC // Parcelas segun PGC
var mc = cmap.get(mouseX,mouseY); var mc = cmap.get(mx,my);
for (var n = 0; n < colores.length; n++) { for (var n = 0; n < colores.length; n++) {
if (compara(mc,color(colores[n]))) { if (compara(mc,color(colores[n]))) {
pg.tint(255,100); pg.tint(255,100);
@ -95,8 +104,6 @@ function draw() {
pg.text("Datos reales (verde) frente a datos según Plan de Colonización (blanco)", 620, 445, 150, 80); pg.text("Datos reales (verde) frente a datos según Plan de Colonización (blanco)", 620, 445, 150, 80);
background("#cad2d3"); background("#cad2d3");
imageMode(CENTER); imageMode(CENTER);
var w = min(800,width*.85);
var h = w*519./800.;
image(pg,width/2, height/2,w,h); image(pg,width/2, height/2,w,h);
} }