Skip to content

feat: use nafrev2 JSON dataset #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
badele merged 2 commits into from
Oct 8, 2026
Merged

feat: use nafrev2 JSON dataset #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38409b2
feat: use nafrev2 JSON dataset
badele Oct 8, 2026
4b2472e
feat: add missing file
badele Oct 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 0 additions & 55 deletions observable/src/components/nafrev2-db.js
View file
Open in desktop

This file was deleted.

30 changes: 30 additions & 0 deletions observable/src/data/nafrev2.json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { runDuckDBLoader, parquetPath } from "./db.js";

const sections = parquetPath("nafrev2", "sections.parquet");
const divisions = parquetPath("nafrev2", "divisions.parquet");
const groupes = parquetPath("nafrev2", "groupes.parquet");
const classes = parquetPath("nafrev2", "classes.parquet");
const sousClasses = parquetPath("nafrev2", "sous_classes.parquet");

await runDuckDBLoader(
"nafrev2",
`SELECT ns.section_id, ns.section,
nd.division_id, nd.division,
ng.groupe_id, ng.groupe,
nc.classe_id, nc.classe,
nsc.sous_classe_id, nsc.sous_classe
FROM read_parquet(${JSON.stringify(sousClasses)}) nsc
JOIN read_parquet(${JSON.stringify(
classes,
)}) nc ON nsc.classe_id = nc.classe_id
JOIN read_parquet(${JSON.stringify(
groupes,
)}) ng ON nsc.groupe_id = ng.groupe_id
JOIN read_parquet(${JSON.stringify(
divisions,
)}) nd ON nsc.division_id = nd.division_id
JOIN read_parquet(${JSON.stringify(
sections,
)}) ns ON nsc.section_id = ns.section_id
ORDER BY nsc.sous_classe_id`,
);
31 changes: 2 additions & 29 deletions observable/src/nafrev2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,11 @@ title: NAF Rév. 2 — Nomenclature d'activités

```js
import * as Inputs from "npm:@observablehq/inputs";
import * as d3 from "npm:d3";
import { showPopup } from "./components/popup.js";
import { initNafrev2DB } from "./components/nafrev2-db.js";
```

```js
const { db, conn } = await initNafrev2DB(invalidation);

const _hierarchyResult = await conn.query(`
SELECT ns.section_id, ns.section,
nd.division_id, nd.division,
ng.groupe_id, ng.groupe,
nc.classe_id, nc.classe,
nsc.sous_classe_id, nsc.sous_classe
FROM read_parquet('sous_classes.parquet') nsc
JOIN read_parquet('classes.parquet') nc ON nsc.classe_id = nc.classe_id
JOIN read_parquet('groupes.parquet') ng ON nsc.groupe_id = ng.groupe_id
JOIN read_parquet('divisions.parquet') nd ON nsc.division_id = nd.division_id
JOIN read_parquet('sections.parquet') ns ON nsc.section_id = ns.section_id
ORDER BY nsc.sous_classe_id
`);
const hierarchy = _hierarchyResult.toArray().map((r) => ({
section_id: r.section_id,
section: r.section,
division_id: r.division_id,
division: r.division,
groupe_id: r.groupe_id,
groupe: r.groupe,
classe_id: r.classe_id,
classe: r.classe,
sous_classe_id: r.sous_classe_id,
sous_classe: r.sous_classe,
}));
const hierarchy = await FileAttachment("data/nafrev2.json").json();
```

```js
Expand Down Expand Up @@ -252,6 +224,7 @@ window.wdaShowApePopup = (event, cell) => {
{ label: "Classe", id: ds.classeId, value: ds.classe },
{ label: "Code APE", id: ds.apeId, value: ds.ape },
],
href: `sirene?ape=${encodeURIComponent(ds.apeId)}`,
});
};
```
Expand Down
Loading