Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
add examples
> add example on France poverty
> add images for wiki
> fix ‘Made with Khartis’ in export
  • Loading branch information
TomBor committed Nov 21, 2016
1 parent 73d96d3 commit d168bfe
Show file tree
Hide file tree
Showing 16 changed files with 154 additions and 2 deletions.
3 changes: 3 additions & 0 deletions app/locales/en/translations.js
Expand Up @@ -340,8 +340,11 @@ export default {
"unesco": "Unesco sites (2015)",
"br_ufe-pop": "Population (2015)",
"fr_dpt-pop": "Population (2013)",
"fr_dpt-poverty": "Poverty (2013)",
"fr_reg2015-pop": "Population (2013)",
"fr_reg2015-poverty": "Poverty (2013)",
"fr_reg2016-pop": "Population (2013)",
"fr_reg2016-poverty": "Poverty (2013)",
"es_prov-pop": "Population (2000-2015)",
"es_auto-pop": "Population (2000-2015)",
"us_state-pop": "Population (2010-2015)"
Expand Down
3 changes: 3 additions & 0 deletions app/locales/fr/translations.js
Expand Up @@ -340,8 +340,11 @@ export default {
"unesco": "Sites de l'Unesco (2015)",
"br_ufe-pop": "Population (2015)",
"fr_dpt-pop": "Population (2013)",
"fr_dpt-poverty": "Pauvreté (2013)",
"fr_reg2015-pop": "Population (2013)",
"fr_reg2015-poverty": "Pauvreté (2013)",
"fr_reg2016-pop": "Population (2013)",
"fr_reg2016-poverty": "Pauvreté (2013)",
"es_prov-pop": "Population (2000-2015)",
"es_auto-pop": "Population (2000-2015)",
"us_state-pop": "Population (2010-2015)"
Expand Down
4 changes: 2 additions & 2 deletions app/pods/graph/controller.js
Expand Up @@ -145,7 +145,7 @@ export default Ember.Controller.extend({
let extraBuffer = build_pHYs(300);

let meta = {
"Comment": "Made from Khartis",
"Comment": "Made with Khartis",
"Software": "Khartis"
};

Expand Down Expand Up @@ -200,7 +200,7 @@ export default Ember.Controller.extend({
d3Node.selectAll("rect.fg").remove();

d3Node.append("text")
.text("Made from Khartis")
.text("Made with Khartis")
.attr({
"x": x+w,
"y": y+h,
Expand Down
12 changes: 12 additions & 0 deletions config/environment.js.tpl
Expand Up @@ -131,6 +131,10 @@ module.exports = function(environment) {
{
id: "fr_dpt-pop",
source: "fr-dpt-pop-2013.csv"
},
{
id: "fr_dpt-poverty",
source: "fr-dpt-pauvrete-2013.csv"
}
]
},
Expand All @@ -152,6 +156,10 @@ module.exports = function(environment) {
{
id: "fr_reg2015-pop",
source: "fr-reg2015-pop-2013.csv"
},
{
id: "fr_reg2015-poverty",
source: "fr-reg2015-pauvrete-2013.csv"
}
]
},
Expand All @@ -173,6 +181,10 @@ module.exports = function(environment) {
{
id: "fr_reg2016-pop",
source: "fr-reg2016-pop-2013.csv"
},
{
id: "fr_reg2016-poverty",
source: "fr-reg2016-pauvrete-2013.csv"
}
]
},
Expand Down
Binary file added public/assets/images/wiki/error-data.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/wiki/export-dimensions.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/wiki/export-layout-steps.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/wiki/export_tuto-CO2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/wiki/legend-edit-title.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/wiki/select-variable-viz.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/wiki/step-3.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/wiki/symbol-size-40.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/wiki/upload-drag-drop.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
97 changes: 97 additions & 0 deletions public/data/examples/fr-dpt-pauvrete-2013.csv
@@ -0,0 +1,97 @@
Code géographique,Libellé géographique,Nombre de ménages fiscaux,Nombre de personnes dans les ménages fiscaux,Part des ménages fiscaux imposés (%),Taux de pauvreté-Ensemble (% pop totale),Taux de pauvreté selon l’âge du référent fiscal (% des moins de 30 ans),Taux de pauvreté selon l’âge du référent fiscal (% des 30 à 39 ans) ,Taux de pauvreté selon l’âge du référent fiscal (% des 40 à 49 ans),Taux de pauvreté selon l’âge du référent fiscal (% des 50 à 59 ans),Taux de pauvreté selon l’âge du référent fiscal (% des 60 à 74 ans),Taux de pauvreté selon l’âge du référent fiscal (% des 75 ans ou plus),Taux de pauvreté selon le statut d’occupation du logement (propriétaires),Taux de pauvreté selon le statut d’occupation du logement (locataires),Revenu disponible par unité de consommation (Médiane),Revenu disponible par unité de consommation (Rapport inter-décile 9e décile/1er decile),Revenu disponible par unité de consommation (1er décile),Revenu disponible par unité de consommation (9e décile du niveau de vie)
01,Ain,245638,"601507,0","60,2","10,6","15,5","11,7","11,8","10,2","7,4","7,1","5,6","20,8","21489,7","3,4","11881,8","40696,5"
02,Aisne,222055,"529674,0","50,7","18,6","32,1","23,3","22,6","17,3","9,4","8,2","8,9","35,6","18300,0","3,2","9873,8","31594,0"
03,Allier,157993,"333536,0","51,4","15,0","25,7","18,6","19,2","14,9","8,5","9,1","8,4","28,9","18966,2","3,0","10630,5","32418,6"
04,Alpes-de-Haute-Provence,71306,"154509,5","53,0","16,5","26,3","19,7","20,2","16,2","11,0","11,8","9,6","27,4","19003,3","3,3","10155,2","33417,0"
05,Hautes-Alpes,62507,"135756,0","55,3","14,1","20,3","16,5","17,0","14,2","8,6","10,8","8,5","23,3","19199,0","3,0","10847,9","33051,3"
06,Alpes-Maritimes,511512,"1092441,0","60,2","15,8","21,8","17,9","17,6","16,6","12,4","11,3","8,4","25,1","20308,7","3,8","10163,3","38871,3"
07,Ardèche,138729,"314935,5","51,9","14,9","23,3","17,9","18,3","14,5","9,1","10,1","9,0","28,8","19154,0","3,1","10580,7","32347,2"
08,Ardennes,118154,"273843,0","49,3","19,2","32,7","23,4","23,3","17,4","11,4","9,9","9,6","35,5","18171,0","3,2","9723,1","31123,0"
09,Ariège,67189,"145997,0","47,5","18,0","28,2","22,7","21,3","18,2","11,3","13,2","11,4","32,5","18522,6","3,2","9810,0","31805,0"
10,Aube,130892,"296288,5","55,1","15,5","27,5","19,3","18,3","14,4","8,8","6,9","6,5","30,6","19120,7","3,2","10452,6","33957,9"
11,Aude,159568,"351387,0","45,8","21,4","32,7","26,0","25,8","21,6","13,2","16,1","13,1","36,6","17653,3","3,4","9213,8","31000,7"
12,Aveyron,122157,"267115,0","50,9","14,7","22,5","16,4","16,9","15,3","9,2","13,8","10,0","27,5","19134,0","3,1","10642,2","32644,3"
13,Bouches-du-Rhône,832890,"1941404,5","57,1","18,4","27,1","21,1","21,9","18,1","12,9","11,0","7,0","31,3","19784,3","3,9","9539,0","37014,7"
14,Calvados,289248,"664841,0","56,8","12,8","21,9","15,1","15,9","12,3","6,6","7,0","5,8","24,3","19850,0","3,1","11212,7","34308,0"
15,Cantal,66447,"140970,5","49,2","14,8","21,6","15,2","17,3","15,4","9,7","14,7","10,5","26,2","18710,7","3,0","10716,3","31840,5"
16,Charente,154494,"341170,5","52,1","14,8","26,0","17,7","17,6","13,8","9,0","11,4","8,8","29,6","19265,3","3,1","10608,7","33187,1"
17,Charente-Maritime,287543,"628296,0","54,2","13,5","22,0","15,9","17,0","13,9","7,6","9,6","7,9","25,9","19631,0","3,2","11029,3","34809,3"
18,Cher,138617,"302046,0","54,8","14,3","25,0","18,3","17,6","14,0","8,3","8,1","7,5","30,1","19440,7","3,1","10724,7","33094,0"
19,Corrèze,108403,"231445,5","53,7","13,7","22,7","15,5","15,7","13,2","8,7","13,2","8,6","26,1","19345,6","3,0","10995,3","32868,7"
21,Côte-d'Or,223907,"500458,0","61,9","11,1","20,3","12,8","13,1","10,1","6,4","6,8","5,2","23,3","20855,3","3,1","11721,0","36280,0"
22,Côtes-d'Armor,263924,"588545,5","54,0","11,6","19,5","13,2","14,1","11,5","6,2","9,7","7,1","25,2","19844,0","2,9","11586,4","33560,0"
23,Creuse,55917,"114806,5","46,1","19,4","27,5","23,1","23,0","19,3","12,6","18,8","14,5","32,9","17745,5","3,1","9766,0","30354,0"
24,Dordogne,184494,"398696,5","49,4","16,3","26,3","19,7","19,8","16,7","10,1","13,4","10,8","29,5","18755,7","3,1","10290,5","32300,7"
25,Doubs,225600,"520266,5","60,1","12,5","21,0","15,0","14,1","11,0","7,9","7,4","5,4","26,0","20643,9","3,2","11285,7","36633,9"
26,Drôme,212457,"495684,0","54,0","15,2","22,6","18,8","17,9","14,8","9,6","9,1","8,0","29,2","19391,3","3,2","10533,5","34107,2"
27,Eure,240673,"592002,5","59,1","12,5","20,4","15,0","14,6","11,6","7,2","6,2","5,6","26,6","20287,9","3,0","11267,0","34171,7"
28,Eure-et-Loir,177755,"430575,0","61,6","11,5","18,6","14,0","13,7","10,7","6,8","5,8","5,2","25,5","20715,5","3,0","11580,6","35072,5"
29,Finistère,399909,"884150,0","55,9","10,3","19,0","11,4","12,1","10,1","5,4","7,9","5,8","23,9","20267,3","2,8","12020,4","34112,9"
2A,Corse-du-Sud,56961,"127518,0","55,9","17,6","23,7","18,5","19,3","17,9","14,6","16,7","10,3","26,7","19490,5","3,7","9842,8","36149,3"
2B,Haute-Corse,64766,"141934,0","48,2","22,5","32,6","24,9","25,0","21,3","18,7","20,8","13,8","33,3","17993,0","3,8","8920,5","33620,6"
30,Gard,312646,"717862,0","49,8","20,3","30,4","23,9","24,1","20,1","14,6","12,1","10,5","36,1","18419,5","3,5","9316,9","33038,8"
31,Haute-Garonne,545131,"1233114,5","61,8","12,4","22,3","13,2","13,3","11,1","7,6","9,1","5,0","23,6","21791,5","3,5","11232,9","39412,0"
32,Gers,82779,"184500,5","51,3","14,8","23,3","15,4","16,5","15,0","9,7","16,0","10,3","26,1","19487,3","3,2","10635,2","34041,5"
33,Gironde,645178,"1461081,5","58,8","12,3","22,5","14,0","14,0","11,3","7,2","8,3","5,9","22,6","20800,5","3,3","11296,0","37189,3"
34,Hérault,475687,"1063991,0","51,9","19,6","31,2","22,6","22,7","19,4","13,1","12,3","10,0","33,3","18764,7","3,7","9404,7","34780,0"
35,Ille-et-Vilaine,419197,"980620,0","58,1","10,1","20,8","11,1","10,9","8,7","5,2","7,1","5,0","22,6","20688,3","2,9","12080,0","35577,8"
36,Indre,103524,"220489,5","51,0","14,3","25,1","17,6","17,1","14,6","8,5","10,3","8,5","28,1","18926,6","2,9","10857,3","31527,3"
37,Indre-et-Loire,257369,"577977,5","58,2","11,7","22,0","13,7","13,5","10,8","6,6","7,1","5,0","24,2","20402,7","3,1","11527,8","35609,3"
38,Isère,504191,"1213808,5","61,5","11,1","19,5","12,9","12,5","9,7","7,0","7,2","5,0","23,3","21213,3","3,1","11716,0","36788,2"
39,Jura,113046,"256062,5","56,9","12,3","18,9","14,5","14,7","11,5","7,7","9,1","6,8","24,9","19920,5","3,0","11397,1","33916,1"
40,Landes,174120,"395003,0","55,6","11,8","19,7","13,9","14,2","11,6","6,8","9,6","6,8","22,9","20024,6","2,9","11510,0","33832,5"
41,Loir-et-Cher,144410,"327239,0","57,6","12,4","21,3","16,2","15,3","11,9","6,6","6,7","6,1","27,8","19991,0","3,0","11277,3","34012,7"
42,Loire,320336,"735428,0","53,0","14,2","23,4","17,3","17,3","13,1","8,3","7,9","6,6","28,0","19317,3","3,0","10839,2","32719,5"
43,Haute-Loire,97883,"222142,5","49,9","12,9","19,9","14,0","15,9","12,2","7,9","11,4","8,7","25,1","19208,3","2,8","11226,0","31761,7"
44,Loire-Atlantique,560014,"1306060,0","59,4","10,0","17,1","10,5","11,5","9,5","5,6","6,9","5,0","22,3","20796,7","2,9","12125,3","35426,1"
45,Loiret,279093,"660803,5","61,9","12,6","20,9","16,1","14,8","11,1","7,5","5,7","5,0","27,2","20677,6","3,2","11208,6","35767,0"
46,Lot,78362,"168040,0","51,6","15,6","23,9","18,5","19,6","16,2","9,4","12,9","10,7","28,3","19262,2","3,3","10405,5","33861,1"
47,Lot-et-Garonne,144100,"320693,5","48,9","16,6","25,6","19,6","19,6","16,0","11,3","13,3","10,2","29,6","18618,0","3,2","10231,7","32415,3"
48,Lozère,32611,"70894,0","51,6","15,7","21,8","16,9","16,9","15,8","10,5","16,9","11,9","24,2","18788,2","3,0","10483,0","31343,5"
49,Maine-et-Loire,325991,"777200,0","53,1","11,5","19,3","12,9","13,6","11,2","5,9","7,0","5,5","24,7","19479,6","2,8","11626,7","32270,0"
50,Manche,216781,"488498,0","52,6","12,7","19,7","14,7","15,6","12,7","7,2","9,4","7,1","24,1","19249,0","2,8","11306,0","32153,6"
51,Marne,236536,"538728,5","60,1","13,9","26,1","17,1","15,7","12,1","7,5","6,5","5,0","25,6","20153,1","3,4","10877,7","37216,7"
52,Haute-Marne,79402,"176513,5","52,4","15,6","26,3","19,5","19,5","14,4","8,6","10,3","8,5","30,0","18717,9","2,9","10592,5","30894,8"
53,Mayenne,127002,"301631,5","53,0","11,4","17,1","12,0","13,8","11,2","6,5","8,8","6,3","24,3","19295,0","2,7","11655,2","31016,0"
54,Meurthe-et-Moselle,302725,"685458,0","54,4","14,1","26,3","17,2","16,7","12,3","8,0","7,0","6,1","28,9","20206,0","3,3","10714,0","35584,2"
55,Meuse,80644,"185445,0","51,6","15,1","25,3","18,0","18,8","14,1","8,8","9,1","8,5","31,0","19150,7","3,0","10608,7","31917,0"
56,Morbihan,324617,"732042,0","55,8","11,1","18,7","13,2","13,6","10,8","5,8","8,2","6,3","24,1","20117,9","2,9","11735,0","34288,7"
57,Moselle,427601,"996261,0","51,3","14,2","24,0","18,7","16,9","11,6","8,9","7,9","6,7","27,4","20149,3","3,4","10751,8","36417,6"
58,Nièvre,98826,"204603,0","53,1","15,5","27,4","19,6","20,7","16,1","8,8","8,6","9,1","30,3","18971,0","3,0","10441,2","31758,0"
59,Nord,1027576,"2514134,0","52,0","18,9","29,8","21,7","22,3","17,8","11,1","9,1","8,1","34,6","18574,7","3,4","9809,6","33540,0"
60,Oise,317276,"806829,0","61,4","12,9","20,3","15,3","14,9","11,8","8,1","6,9","5,5","26,5","20632,7","3,2","11139,2","35559,4"
61,Orne,124366,"278657,0","51,5","15,5","25,9","19,9","19,4","15,4","8,4","8,3","8,2","30,5","18684,0","2,9","10519,0","30875,3"
62,Pas-de-Calais,590160,"1452279,5","47,4","20,2","33,7","23,8","24,4","18,7","10,1","10,6","8,8","37,0","17706,2","3,1","9771,5","30506,7"
63,Puy-de-Dôme,282088,"616263,0","57,7","12,6","23,2","14,4","14,6","11,7","7,5","8,8","6,6","25,3","20490,6","3,2","11212,9","35941,7"
64,Pyrénées-Atlantiques,291954,"643127,0","57,4","11,8","20,3","13,3","14,5","11,5","6,9","8,8","6,6","22,0","20510,0","3,2","11487,4","36893,0"
65,Hautes-Pyrénées,102984,"221493,0","52,3","14,3","26,5","18,1","17,2","13,2","8,4","11,2","7,9","27,9","19359,3","3,0","10794,0","32738,7"
66,Pyrénées-Orientales,208655,"451230,5","48,2","21,0","34,3","25,2","26,1","21,1","12,9","14,3","11,5","36,3","17906,7","3,4","9321,0","32049,5"
67,Bas-Rhin,446800,"1053604,5","61,8","12,0","21,5","15,8","14,0","10,2","6,8","5,5","5,0","23,9","21495,3","3,3","11403,3","38121,1"
68,Haut-Rhin,311517,"733119,5","62,4","12,5","22,0","17,0","14,7","10,7","7,3","5,3","5,0","26,0","21803,3","3,7","11226,0","40988,9"
69,Rhône,736887,"1719116,5","63,1","13,5","20,8","15,6","15,6","12,4","8,8","6,7","5,0","24,2","21267,1","3,7","10908,8","39962,0"
70,Haute-Saône,101836,"235667,0","52,0","14,3","23,9","17,2","17,0","13,0","8,8","9,7","8,5","29,2","18993,9","2,8","10922,6","30819,0"
71,Saône-et-Loire,244739,"542833,0","54,5","12,9","20,7","16,4","15,7","12,4","7,8","8,7","7,1","25,3","19363,5","2,9","11239,0","32660,7"
72,Sarthe,240135,"556549,5","55,6","12,9","22,9","15,6","15,9","12,2","6,3","6,3","5,7","29,1","19586,7","2,9","11162,1","32041,5"
73,Savoie,182042,"415370,5","63,1","10,2","16,7","11,8","12,0","9,3","6,5","7,0","5,0","19,7","21195,4","3,0","12041,0","36684,0"
74,Haute-Savoie,322891,"759578,0","62,9","9,3","13,4","10,2","10,2","8,6","7,1","7,0","5,0","17,5","24022,5","4,1","12395,0","50336,7"
75,Paris,1038789,"2109850,5","72,2","16,2","18,0","14,1","18,3","19,3","15,0","8,7","5,5","21,6","25981,3","6,6","9652,0","63416,7"
76,Seine-Maritime,523139,"1213285,0","56,9","14,2","24,1","17,0","17,1","12,8","8,2","6,1","5,0","27,0","19811,3","3,2","10830,5","34450,0"
77,Seine-et-Marne,518419,"1362011,0","68,0","11,4","17,0","13,4","12,7","10,6","7,3","6,0","5,0","24,0","22006,5","3,2","11559,4","37446,0"
78,Yvelines,552709,"1427152,5","75,1","9,3","14,6","10,9","10,1","8,8","7,0","5,0","5,0","19,1","25420,7","3,9","12445,0","48692,0"
79,Deux-Sèvres,159663,"367876,0","52,2","12,3","20,7","12,8","14,5","11,6","7,4","11,0","7,4","26,2","19335,3","2,9","11380,0","32475,2"
80,Somme,231991,"549246,5","53,4","16,9","30,1","20,1","20,4","15,7","8,5","9,2","7,9","33,1","18879,0","3,2","10210,8","32982,7"
81,Tarn,165205,"376256,0","49,5","15,1","26,1","18,0","18,2","14,7","9,3","10,9","8,8","30,8","19143,9","3,1","10563,6","33205,0"
82,Tarn-et-Garonne,105015,"248965,0","48,4","16,8","26,1","18,4","18,7","16,1","11,7","14,6","10,3","31,0","18689,0","3,2","10142,0","32058,7"
83,Var,466634,"1036730,5","57,2","15,7","23,8","19,0","18,8","16,6","11,2","9,3","8,0","27,5","19933,0","3,5","10232,5","36161,1"
84,Vaucluse,234906,"554292,0","51,5","20,2","28,0","23,8","22,7","20,3","16,1","12,1","10,0","33,7","18380,0","3,6","9325,2","33303,5"
85,Vendée,282715,"657442,0","54,5","9,9","14,5","10,0","12,2","10,7","5,4","8,9","6,2","22,5","19632,7","2,6","12128,7","31617,0"
86,Vienne,182762,"407310,0","54,0","13,4","24,9","14,9","14,9","12,4","7,6","10,7","6,8","28,2","19654,0","3,1","11012,7","33784,5"
87,Haute-Vienne,165980,"353533,0","54,3","15,2","29,3","18,5","17,7","13,7","8,5","11,0","7,6","31,3","19492,0","3,2","10404,0","33612,4"
88,Vosges,163568,"367016,5","51,2","15,4","27,0","19,8","18,8","15,2","8,5","7,3","7,9","31,4","18946,1","3,0","10526,0","31676,0"
89,Yonne,148396,"335909,5","56,7","13,9","22,7","17,4","17,2","13,7","8,0","7,3","7,4","28,7","19526,0","3,1","10904,5","33353,8"
90,Territoire de Belfort,59279,"135472,0","58,2","15,1","25,1","19,5","17,6","13,4","9,1","6,9","5,5","30,0","20072,0","3,3","10532,0","35019,3"
91,Essonne,483453,"1252093,0","71,0","12,3","18,4","15,0","14,3","11,5","7,4","5,0","5,0","25,4","22819,3","3,6","11185,5","40584,0"
92,Hauts-de-Seine,673637,"1569779,5","74,0","12,1","15,8","11,6","13,0","12,8","11,2","6,8","5,0","18,8","25787,1","4,9","11240,6","55323,0"
93,Seine-Saint-Denis,566884,"1556417,0","54,0","27,8","30,6","30,4","32,7","27,5","21,2","12,0","12,7","37,8","16744,6","4,0","8123,8","32268,5"
94,Val-de-Marne,541062,"1329421,0","67,8","15,8","21,7","17,4","18,4","15,9","11,4","6,9","5,4","24,9","21526,0","4,2","10116,7","42297,5"
95,Val-d'Oise,441207,"1209194,0","65,9","16,7","20,6","19,1","19,4","15,9","11,9","7,4","7,3","29,6","20778,3","3,8","9998,3","37740,0"

0 comments on commit d168bfe

Please sign in to comment.