Skip to content
This repository has been archived by the owner on Jul 16, 2019. It is now read-only.

Commit

Permalink
Merge pull request #85 from jorgeatgu/develop
Browse files Browse the repository at this point in the history 
reforno #82
  • Loading branch information
@jorgeatgu
jorgeatgu authored Sep 6, 2018
2 parents b3b95e3 + 218ed5c commit 6a80068
Show file tree
Hide file tree
Showing 43 changed files with 534,454 additions and 404 deletions.
2 changes: 1 addition & 1 deletion css/styles.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/styles.css.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion csv/dias-de-lluvia.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ fecha,dias_lluvia,precipitacion_anual
2015,50,336.5
2016,51,361.5
2017,30,272.7
2018,77,376.4
2018,95,442.2
1 change: 1 addition & 0 deletions csv/meses-lluvia.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -930,3 +930,4 @@ ABRIL,2018,109.0,329.6
MAYO,2018,81.6,329.6
JUNIO,2018,11.2,329.6
JULIO,2018,46.8,376.4
AGOSTO,2018,65.8,442.2
31 changes: 31 additions & 0 deletions csv/temperaturas.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24679,3 +24679,34 @@ fecha,maxima,minima
29-07-2018,36.7,20.4
30-07-2018,36.6,22.0
31-07-2018,36.5,23.7
01-08-2018,36.1,21.8
02-08-2018,38.9,22.3
03-08-2018,39.2,23.6
04-08-2018,37.3,23.8
05-08-2018,37.7,22.8
06-08-2018,38.9,22.9
07-08-2018,37.9,22.2
08-08-2018,36.0,21.3
09-08-2018,28.6,19.2
10-08-2018,30.3,17.9
11-08-2018,34.6,20.0
12-08-2018,34.7,16.9
13-08-2018,32.5,19.1
14-08-2018,28.3,19.1
15-08-2018,31.0,17.3
16-08-2018,34.3,19.8
17-08-2018,28.8,17.6
18-08-2018,28.8,15.4
19-08-2018,32.2,17.1
20-08-2018,32.6,18.9
21-08-2018,34.1,19.7
22-08-2018,34.9,20.1
23-08-2018,33.2,21.7
24-08-2018,29.7,19.1
25-08-2018,27.0,17.3
26-08-2018,31.2,16.2
27-08-2018,33.7,18.4
28-08-2018,34.2,21.1
29-08-2018,31.7,19.4
30-08-2018,30.3,18.7
31-08-2018,30.5,18.4
12 changes: 12 additions & 0 deletions csv/tropicales-por-dia.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -997,3 +997,15 @@ fecha,max,min
29-07-2018,36.7,20.4
30-07-2018,36.6,22.0
31-07-2018,36.5,23.7
01-08-2018,36.1,21.8
02-08-2018,38.9,22.3
03-08-2018,39.2,23.6
04-08-2018,37.3,23.8
05-08-2018,37.7,22.8
06-08-2018,38.9,22.9
07-08-2018,37.9,22.2
08-08-2018,36.0,21.3
11-08-2018,34.6,20.0
22-08-2018,34.9,20.1
23-08-2018,33.2,21.7
28-08-2018,34.2,21.1
2 changes: 1 addition & 1 deletion csv/tropicales.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ fecha,dias
2015,41
2016,33
2017,38
2018,19
2018,31
26 changes: 6 additions & 20 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="css/styles.css">
<link href="https://fonts.googleapis.com/css?family=Montserrat:700|Roboto+Condensed" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Montserrat:700|Roboto+Condensed:400,700" rel="stylesheet">
</head>

<body id="forno">
Expand Down Expand Up @@ -40,20 +40,6 @@ <h2 class="subtitle clima-subtitle">EL CLIMA EN ZARAGOZA</h2>
<a class="clima-link" href="https://es.wikipedia.org/wiki/Zaragoza#Clima">Fuente</a></p>
</div>
</div>
<picture class="clima-img">
<!-- <source sizes="(max-width: 1380px) 100vw, 1380px" type="image/webp" srcset="
img/zaragoza_320.webp 320w,
img/zaragoza_739.webp 739w,
img/zaragoza_1110.webp 1110w,
img/zaragoza_1366.webp 1366w" />
<img sizes="(max-width: 1366px) 100vw, 1366px" class="zaragoza-img" srcset="
img/zaragoza_320.jpg 320w,
img/zaragoza_739.jpg 739w,
img/zaragoza_1110.jpg 1110w,
img/zaragoza_1366.jpg 1366w" src="zaragoza_moncayo_ohf3fq_c_scale,w_1366.jpg" alt="Atardecer desde la margen izquierda de Zaragoza con el Moncayo al fondo"> -->
<img src="img/zaragoza-atardecer.jpg" class="zaragoza-img retro" alt="Atardecer desde la margen izquierda de Zaragoza">
<span class="clima-pie">Atardecer desde la margen izquierda de Zaragoza.</span>
</picture>
<article class="grafica-temp margin-section" id="maximas">
<div class="wrapper-vw">
<h2 class="subtitle">TEMPERATURAS MÁXIMAS Y MÍNIMAS</h2>
Expand All @@ -70,8 +56,8 @@ <h2 class="subtitle">TEMPERATURAS MÁXIMAS Y MÍNIMAS</h2>
<label class="inputs-label" for="updateButtonMonth">Mes</label>
<input maxlength="2" class="input-update-grafica" id="updateButtonMonth" type="text" value="1" />
</div>
<button class="btn-update-grafica font-system btn-update-max" id="update" onclick="update()">MÁXIMAS</button>
<button class="btn-update-grafica font-system btn-update-min" id="updateMin" onclick="updateMin()"> MÍNIMAS</button>
<button class="btn-update-grafica roboto btn-update-max" id="update" onclick="update()">MÁXIMAS</button>
<button class="btn-update-grafica roboto btn-update-min" id="updateMin" onclick="updateMin()"> MÍNIMAS</button>
<p class="text-button">Puedes actualizar la gráfica con la máxima o mínima de cualquier día del año.</p>
</div>
</article>
Expand Down Expand Up @@ -2747,16 +2733,16 @@ <h5 class="grid-title grid-title-min color-title-min">Año</h5>
</section>
</article>
<div class="wrapper-vw margin-section">
<h2 class="system-font">METODOLOGÍA</h2>
<h2 class="roboto">METODOLOGÍA</h2>
<p class="texto">Las razones por las cuales he elegido el período transcurrido entre 1951 y 2017 son, el costo de <span class="bold">obtener mes a mes los datos de cada año</span>, y la legibilidad de los datos. <span class="bold">Incluir más años haría que los datos fueran menos legibles</span>.</p>
<p class="texto">Para contabilizar las <span class="bold">noches tropicales</span>, se ha tomado como referencia, que la temperatura mínima, <span class="bold">fuera igual o superior a 20ºC</span>.</p>
<p class="texto">Para contabilizar las <span class="bold">heladas</span>, se ha tomado como referencia, que la temperatura mínima, <span class="bold">fuera igual o inferior a 0ºC</span>.</p>
<p class="texto">Para los récords, solamente se tienen en cuenta el último. Es decir, si el 3 de agosto de 2010 se alcanzo la máxima y en 2017 se volvió a batir ese récord, solamente se contabiliza el de 2017.</p>
</div>
<div class="wrapper-vw">
<h2 class="system-font">DATOS</h2>
<h2 class="roboto">DATOS</h2>
<p class="texto">Todos los datos de las temperaturas son <a href="https://opendata.aemet.es/centrodedescargas/inicio">Información elaborada por la Agencia Estatal de Meteorología"</a>. Que es el sistema para la difusión y reutilización de la información de AEMET.</p>
<p class="texto">Las fechas están actualizadas hasta el 30 de junio de 2018.</p>
<p class="texto">Las fechas están actualizadas hasta el 31 de agosto de 2018.</p>
</div>
<section class="data-viz">
<article class="data-viz-container">
Expand Down
2 changes: 1 addition & 1 deletion js/index.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6a80068

Please sign in to comment.