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
0353d3e5
Commit
0353d3e5
authored
Mar 19, 2021
by
Rodrigo Tapia-McClung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix periurbano chart divs
parent
d85f55ff
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
595 additions
and
595 deletions
+595
-595
index.html
public/centropais/index.html
+6
-7
centropais_basemap.js
public/js/centropais_basemap.js
+1
-1
centropais_charts.js
public/js/centropais_charts.js
+1
-1
centropais_functions.js
public/js/centropais_functions.js
+2
-1
centropais_periurbano_charts.js
public/js/centropais_periurbano_charts.js
+583
-584
evolucion_urbana.js
public/js/evolucion_urbana.js
+1
-0
evolucion_urbana_charts.js
public/js/evolucion_urbana_charts.js
+1
-1
No files found.
public/centropais/index.html
View file @
0353d3e5
...
...
@@ -82,16 +82,15 @@
<div
class=
"col-6"
id=
"story"
>
<div
class=
"loader"
></div>
<div
class=
"row h-50 border-bottom"
>
<div
class=
"col"
id=
"topChart"
>
<div
class=
"col"
id=
"top
Left
Chart"
>
<div
class=
"row h-100"
>
<div
id=
"odChart"
></div>
<div
id=
"barChart"
></div>
</div>
</div>
<div
class=
"col
"
id=
"topLef
tChart"
>
<div
class=
"col
border-left"
id=
"topRigh
tChart"
>
<div
class=
"row h-100"
>
</div>
</div>
</div>
...
...
@@ -214,10 +213,10 @@
$
(
"#showPeriurban"
).
on
(
"click"
,
()
=>
{
[
"../js/centropais_periurbano.js"
,
"../js/centropais_periurbano_charts.js"
].
forEach
(
src
=>
{
let
script
=
document
.
createElement
(
'script'
);
//let script = document.createElement('script');
script
.
src
=
src
;
//"../js/centropais_periurbano.js";
script
.
async
=
false
;
document
.
body
.
appendChild
(
script
);
//let script = document.createElement('script');
script
.
src
=
src
;
//"../js/centropais_periurbano.js";
script
.
async
=
false
;
document
.
body
.
appendChild
(
script
);
});
});
</script>
...
...
public/js/centropais_basemap.js
View file @
0353d3e5
...
...
@@ -664,7 +664,7 @@ const createFlowLayer = (geojson, type, addOnCreate) => {
// if layer is to be added on creation, add click funcionality and populate chart
if
(
addOnCreate
)
{
flowMapLayer
.
addTo
(
map
).
on
(
"click"
,
odClick
);
let
odChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"topChart"
);
let
odChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"top
Left
Chart"
);
odChart
.
data
=
newData
;
let
chordChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"bottomLeftChart"
);
...
...
public/js/centropais_charts.js
View file @
0353d3e5
...
...
@@ -19,7 +19,7 @@ am4core.ready(function() {
am4core
.
options
.
autoSetClassName
=
true
;
// Themes end
let
chart
=
am4core
.
create
(
"topChart"
,
am4charts
.
XYChart
);
let
chart
=
am4core
.
create
(
"top
Left
Chart"
,
am4charts
.
XYChart
);
chart
.
maskBullets
=
false
;
let
title
=
chart
.
titles
.
create
();
...
...
public/js/centropais_functions.js
View file @
0353d3e5
...
...
@@ -97,6 +97,7 @@ d3.json("https://unpkg.com/d3-time-format@2.1.1/locale/es-MX.json").then(locale
// TODO: remove unused functions
$
(
"#startHeader"
).
remove
();
$
(
"#initial-backdrop"
).
remove
();
$
(
"#topRightChart"
)[
0
].
style
.
setProperty
(
"display"
,
"none"
);
$
(
"#regionSelect"
).
remove
();
$
(
"#mainContainer"
)[
0
].
style
.
setProperty
(
"display"
,
"flex"
,
"important"
);
$
(
"#mexmap"
).
show
();
...
...
@@ -291,7 +292,7 @@ $("#indicatorSelect").on("change", function() {
});
// on select, update chart data
let
odChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"topChart"
);
let
odChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"top
Left
Chart"
);
odChart
.
data
=
odData
[
option
];
let
chordChart
=
am4core
.
registry
.
baseSprites
.
find
(
c
=>
c
.
htmlContainer
.
id
===
"bottomLeftChart"
);
...
...
public/js/centropais_periurbano_charts.js
View file @
0353d3e5
This diff is collapsed.
Click to expand it.
public/js/evolucion_urbana.js
View file @
0353d3e5
...
...
@@ -352,6 +352,7 @@ L.timeDimension.layer.Tile = (layer, options) => {
$
(
"#startHeader"
).
remove
();
$
(
".picker"
).
remove
();
$
(
"#initial-backdrop"
).
remove
();
$
(
"#topRightChart"
)[
0
].
style
.
setProperty
(
"display"
,
"none"
);
$
(
"#mainContainer"
)[
0
].
style
.
setProperty
(
"display"
,
"flex"
,
"important"
);
$
(
"#mexmap"
).
show
();
...
...
public/js/evolucion_urbana_charts.js
View file @
0353d3e5
...
...
@@ -13,7 +13,7 @@ am4core.ready(function() {
let
mainTextColor
=
getComputedStyle
(
document
.
body
).
getPropertyValue
(
"--main-text-color"
);
// bar and line chart
let
chart
=
am4core
.
create
(
"topChart"
,
am4charts
.
XYChart
);
let
chart
=
am4core
.
create
(
"top
Left
Chart"
,
am4charts
.
XYChart
);
let
ctitle
=
chart
.
titles
.
create
();
ctitle
.
text
=
"Área urbanizada trimestralmente"
;
...
...
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