Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
fordecyt_2019
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rodrigo Tapia-McClung
fordecyt_2019
Commits
6c2f49de
Commit
6c2f49de
authored
Nov 24, 2020
by
Tania Gómez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style changes
parent
94ced372
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
index.html
public/centropais/index.html
+3
-3
centropais_basemap.js
public/js/centropais_basemap.js
+2
-2
centropais_charts.js
public/js/centropais_charts.js
+2
-2
centropais_functions.js
public/js/centropais_functions.js
+2
-2
evolucion_urbana_charts.js
public/js/evolucion_urbana_charts.js
+3
-3
No files found.
public/centropais/index.html
View file @
6c2f49de
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
<div
class=
"col-6"
id=
"story"
>
<div
class=
"col-6"
id=
"story"
>
<div
class=
"loader"
></div>
<div
class=
"loader"
></div>
<div
class=
"row h-50 border-bottom"
>
<div
class=
"row h-50 border-bottom"
>
<div
class=
"col"
>
<div
class=
"col"
id=
"topChart"
>
<div
class=
"row h-100"
>
<div
class=
"row h-100"
>
<div
id=
"odChart"
></div>
<div
id=
"odChart"
></div>
<div
id=
"barChart"
></div>
<div
id=
"barChart"
></div>
...
@@ -81,14 +81,14 @@
...
@@ -81,14 +81,14 @@
</div>
</div>
<div
class=
"row h-50"
>
<div
class=
"row h-50"
>
<div
class=
"col-6 border-right"
id=
"
chordChart2
"
>
<div
class=
"col-6 border-right"
id=
"
bottomLeftChart
"
>
<div
class=
"row h-100"
>
<div
class=
"row h-100"
>
<div
id=
"chordChart"
></div>
<div
id=
"chordChart"
></div>
<div
id=
"pieChart"
></div>
<div
id=
"pieChart"
></div>
</div>
</div>
</div>
</div>
<div
class=
"col-6 align-self-center"
id=
"odTableRow"
>
<div
class=
"col-6 align-self-center"
id=
"odTableRow"
>
<div
class=
"row h-100 justify-content-center"
id=
"
radarChart2
"
>
<div
class=
"row h-100 justify-content-center"
id=
"
bottomRightChart
"
>
<div
id=
"radarChart"
></div>
<div
id=
"radarChart"
></div>
<div
class=
"card text-center"
id=
"odCard"
>
<div
class=
"card text-center"
id=
"odCard"
>
<div
class=
"card-body"
>
<div
class=
"card-body"
>
...
...
public/js/centropais_basemap.js
View file @
6c2f49de
...
@@ -1030,10 +1030,10 @@ const createFlowLayer = (geojson, type, addOnCreate) => {
...
@@ -1030,10 +1030,10 @@ const createFlowLayer = (geojson, type, addOnCreate) => {
// if layer is to be added on creation, add click funcionality and populate chart
// if layer is to be added on creation, add click funcionality and populate chart
if
(
addOnCreate
)
{
if
(
addOnCreate
)
{
flowMapLayer
.
addTo
(
map
).
on
(
'click'
,
odClick
);
flowMapLayer
.
addTo
(
map
).
on
(
'click'
,
odClick
);
let
odChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"
od
Chart"
);
let
odChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"
top
Chart"
);
odChart
.
data
=
newData
;
odChart
.
data
=
newData
;
let
chordChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"
chordChart2
"
);
let
chordChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"
bottomLeftChart
"
);
chordChart
.
data
=
newData
;
chordChart
.
data
=
newData
;
chordChart
.
data
=
chordChart
.
data
.
filter
(
function
(
e
)
{
return
e
.
flowCount
>
0
});
chordChart
.
data
=
chordChart
.
data
.
filter
(
function
(
e
)
{
return
e
.
flowCount
>
0
});
}
}
...
...
public/js/centropais_charts.js
View file @
6c2f49de
...
@@ -19,7 +19,7 @@ am4core.ready(function() {
...
@@ -19,7 +19,7 @@ am4core.ready(function() {
am4core
.
options
.
autoSetClassName
=
true
;
am4core
.
options
.
autoSetClassName
=
true
;
// Themes end
// Themes end
var
chart
=
am4core
.
create
(
"
od
Chart"
,
am4charts
.
XYChart
);
var
chart
=
am4core
.
create
(
"
top
Chart"
,
am4charts
.
XYChart
);
chart
.
maskBullets
=
false
;
chart
.
maskBullets
=
false
;
var
title
=
chart
.
titles
.
create
();
var
title
=
chart
.
titles
.
create
();
...
@@ -250,7 +250,7 @@ am4core.ready(function() {
...
@@ -250,7 +250,7 @@ am4core.ready(function() {
am4core
.
useTheme
(
am4themes_animated
);
am4core
.
useTheme
(
am4themes_animated
);
// Themes end
// Themes end
var
cd_chart
=
am4core
.
create
(
"
chordChart2
"
,
am4charts
.
ChordDiagram
);
var
cd_chart
=
am4core
.
create
(
"
bottomLeftChart
"
,
am4charts
.
ChordDiagram
);
var
cd_title
=
cd_chart
.
titles
.
create
();
var
cd_title
=
cd_chart
.
titles
.
create
();
//cd_title.text = "Viajes de ocupados desde centros de mercado";
//cd_title.text = "Viajes de ocupados desde centros de mercado";
...
...
public/js/centropais_functions.js
View file @
6c2f49de
...
@@ -826,10 +826,10 @@ $("#indicatorSelect").on("change", function() {
...
@@ -826,10 +826,10 @@ $("#indicatorSelect").on("change", function() {
});
});
// on select, update chart data
// on select, update chart data
let
odChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"
od
Chart"
)
let
odChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"
top
Chart"
)
odChart
.
data
=
odData
[
option
];
odChart
.
data
=
odData
[
option
];
let
chordChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"
chord
Chart"
)
let
chordChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"
bottomLeft
Chart"
)
chordChart
.
data
=
odData
[
option
];
chordChart
.
data
=
odData
[
option
];
chordChart
.
data
=
chordChart
.
data
.
filter
(
function
(
e
)
{
return
e
.
flowCount
>
0
});
chordChart
.
data
=
chordChart
.
data
.
filter
(
function
(
e
)
{
return
e
.
flowCount
>
0
});
//console.log(amchart2.data.filter(function(e) { return e.flowCount > 0 }))
//console.log(amchart2.data.filter(function(e) { return e.flowCount > 0 }))
...
...
public/js/evolucion_urbana_charts.js
View file @
6c2f49de
...
@@ -20,7 +20,7 @@ am4core.ready(function() {
...
@@ -20,7 +20,7 @@ am4core.ready(function() {
// bar and line chart
// bar and line chart
var
chart
=
am4core
.
create
(
"
bar
Chart"
,
am4charts
.
XYChart
);
var
chart
=
am4core
.
create
(
"
top
Chart"
,
am4charts
.
XYChart
);
let
ctitle
=
chart
.
titles
.
create
();
let
ctitle
=
chart
.
titles
.
create
();
ctitle
.
text
=
"Área urbanizada mensual"
;
ctitle
.
text
=
"Área urbanizada mensual"
;
...
@@ -140,7 +140,7 @@ am4core.ready(function() {
...
@@ -140,7 +140,7 @@ am4core.ready(function() {
// pie chart
// pie chart
let
pchart
=
am4core
.
create
(
"
chordChart2
"
,
am4charts
.
PieChart
);
let
pchart
=
am4core
.
create
(
"
bottomLeftChart
"
,
am4charts
.
PieChart
);
let
query2
=
`
${
baseUrl
}
/query/
${
table
}
?columns=sum(area)/10000 as area,DATE_PART('year',date) as yy&group=yy&sort=yy`
;
// &sort=yeartrimes`;
let
query2
=
`
${
baseUrl
}
/query/
${
table
}
?columns=sum(area)/10000 as area,DATE_PART('year',date) as yy&group=yy&sort=yy`
;
// &sort=yeartrimes`;
d3
.
json
(
query2
).
then
(
d
=>
pchart
.
data
=
d
);
d3
.
json
(
query2
).
then
(
d
=>
pchart
.
data
=
d
);
...
@@ -190,7 +190,7 @@ am4core.ready(function() {
...
@@ -190,7 +190,7 @@ am4core.ready(function() {
am4core
.
useTheme
(
am4themes_animated
);
am4core
.
useTheme
(
am4themes_animated
);
// Themes end
// Themes end
var
rchart
=
am4core
.
create
(
"
radarChart2
"
,
am4charts
.
RadarChart
);
var
rchart
=
am4core
.
create
(
"
bottomRightChart
"
,
am4charts
.
RadarChart
);
// chart.hiddenState.properties.opacity = 0; // this creates initial fade-in
// chart.hiddenState.properties.opacity = 0; // this creates initial fade-in
//const baseUrl = new URL(`/data`, window.location.href).href;
//const baseUrl = new URL(`/data`, window.location.href).href;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment