diff --git a/docs/_includes/_presos.html b/docs/_includes/_presos.html new file mode 100644 index 0000000..e539765 --- /dev/null +++ b/docs/_includes/_presos.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/docs/graficos/data/alberche.png b/docs/graficos/data/alberche.png new file mode 100644 index 0000000..740ab0b Binary files /dev/null and b/docs/graficos/data/alberche.png differ diff --git a/docs/graficos/data/aragon_cataluna.png b/docs/graficos/data/aragon_cataluna.png new file mode 100644 index 0000000..f9a9740 Binary files /dev/null and b/docs/graficos/data/aragon_cataluna.png differ diff --git a/docs/graficos/data/bajo_guadalquivir.png b/docs/graficos/data/bajo_guadalquivir.png new file mode 100644 index 0000000..fe78351 Binary files /dev/null and b/docs/graficos/data/bajo_guadalquivir.png differ diff --git a/docs/graficos/data/datos_grafico_presos.csv b/docs/graficos/data/datos_grafico_presos.csv new file mode 100644 index 0000000..b8753d7 --- /dev/null +++ b/docs/graficos/data/datos_grafico_presos.csv @@ -0,0 +1,10 @@ +CH,AGRUPACION,ENTIDAD,MUNICIPIO,ANYO INICIO,ANYO FINAL,X ETRS89 UTM 30,Y,DESCRIPCION +guadalquivir,SCPM1,La Corchuela,Dos Hermanas,1939,1944,235974,4127991,Canal del Bajo Guadalquivir +guadalquivir,SCPM1,Los Merinales,Dos Hermanas,1944,1960,237303,4132469,Canal del Bajo Guadalquivir/Riegos del Salado del Morón +guadiana,SCPM2,La Colonia,Montijo,1941,1957,188429,4313814,Canal del Montijo/Obras del INC para el Plan Badajoz +tajo,SCPM3,Campamento de la Sal,Talavera de la Reina,1940,1953,352377,4430639,Canal del Bajo Alberche +tajo,SCPM3bis,,Madrigal de la Vera,1953,1959,300052,4443243,Canal del Rio Tietar +tajo,SCPM4,,Añover del Tajo,1940,1944,438074,4430598,Real Acequia del Jarama +tajo,SCPM4,,Navalmoral de la Mata,1950,1953,282823,4419263,Pantano de Rosarito rio Tiétar +guadalquivir,SCPM6,Los Merinales,Dos Hermanas,1942,1944,237303,4132469,Canal del Bajo Guadalquivir y + +ebro,SCMP7,,Vilanova de la Barca,?,1956,810191,4622084,Canal de Aragón y Cataluña/Canal de la Violada diff --git a/docs/graficos/data/ebro.png b/docs/graficos/data/ebro.png index 33d4d38..d1e4f4b 100644 Binary files a/docs/graficos/data/ebro.png and b/docs/graficos/data/ebro.png differ diff --git a/docs/graficos/data/guadalquivir-presos.png b/docs/graficos/data/guadalquivir-presos.png new file mode 100644 index 0000000..9d0c55e Binary files /dev/null and b/docs/graficos/data/guadalquivir-presos.png differ diff --git a/docs/graficos/data/guadiana.png b/docs/graficos/data/guadiana.png index 6df4f75..aad789d 100644 Binary files a/docs/graficos/data/guadiana.png and b/docs/graficos/data/guadiana.png differ diff --git a/docs/graficos/data/jarama.png b/docs/graficos/data/jarama.png new file mode 100644 index 0000000..074a331 Binary files /dev/null and b/docs/graficos/data/jarama.png differ diff --git a/docs/graficos/data/la_mancha.png b/docs/graficos/data/la_mancha.png new file mode 100644 index 0000000..8726b16 Binary files /dev/null and b/docs/graficos/data/la_mancha.png differ diff --git a/docs/graficos/data/montijo.png b/docs/graficos/data/montijo.png new file mode 100644 index 0000000..8b57a63 Binary files /dev/null and b/docs/graficos/data/montijo.png differ diff --git a/docs/graficos/data/rosarito.png b/docs/graficos/data/rosarito.png new file mode 100644 index 0000000..3c6e4da Binary files /dev/null and b/docs/graficos/data/rosarito.png differ diff --git a/docs/graficos/data/tajo.png b/docs/graficos/data/tajo.png index 89ba959..e134a4c 100644 Binary files a/docs/graficos/data/tajo.png and b/docs/graficos/data/tajo.png differ diff --git a/docs/graficos/data/tarrega.png b/docs/graficos/data/tarrega.png new file mode 100644 index 0000000..7ae5817 Binary files /dev/null and b/docs/graficos/data/tarrega.png differ diff --git a/docs/graficos/data/viar.png b/docs/graficos/data/viar.png new file mode 100644 index 0000000..52b6ff1 Binary files /dev/null and b/docs/graficos/data/viar.png differ diff --git a/docs/graficos/data/violada.png b/docs/graficos/data/violada.png new file mode 100644 index 0000000..040b032 Binary files /dev/null and b/docs/graficos/data/violada.png differ diff --git a/docs/graficos/presos.html b/docs/graficos/presos.html new file mode 100644 index 0000000..a1448e9 --- /dev/null +++ b/docs/graficos/presos.html @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/docs/graficos/presos.js b/docs/graficos/presos.js new file mode 100644 index 0000000..395befb --- /dev/null +++ b/docs/graficos/presos.js @@ -0,0 +1,42 @@ +var ids, cuencas; +var idZonas, zonas; + + +function preload() { + nombres = new Array("SCPM1","SCPM1","SCPM2","SCPM3","SCPM3bis","SCPM4","SCPM4","SCPM6","SCPM7"); + inicio = new Array(1939,1944,1941,1940,1953,1940,1950,1942,-1); + final = new Array(1944,1960,1957,1953,1959,1944,1953,1944,1956); +} + + +function setup() { + ids = new Array("guadiana","guadalquivir-presos","tajo","ebro"); + cuencas = new Array(); + for (var n = 0; n < ids.length; n++) { + cuencas[n] = loadImage("data/" + ids[n]+".png"); + } + zonas = []; + idZonas = []; + idZonas[0] = new Array("montijo", "la_mancha"); + idZonas[1] = new Array("bajo_guadalquivir", "viar"); + idZonas[2] = new Array("alberche", "jarama", "rosarito"); + idZonas[3] = new Array("violada", "aragon_cataluna", "tarrega"); + for (var n = 0; n < ids.length; n++) { + zonas[n] = [] + for (var m = 0; m < idZonas[n].length; m++) { + zonas[n][m] = loadImage("data/"+idZonas[n][m]+".png"); + } + } + + createCanvas(655,519); + +} + + +function draw() { + background(200,225,225); + for (var n = 0; n < nombres.length; n++) { + var x = 100; + var y = map(n,0,nombres.length,300, 500); + } +} diff --git a/docs/presos.md b/docs/presos.md index e0e2636..6e63a4f 100644 --- a/docs/presos.md +++ b/docs/presos.md @@ -2,3 +2,4 @@ layout: page title: Empleo de presos en las grandes obras --- +{% include _presos.html %}