refactor: reuse local communes.json, aides-collectivities.json files

Also, update miniatures generation by fetching images from github
instead of using git submodules

package.json

@@ -43,7 +43,7 @@
 		"yaml": "^2.3.4"
 	},
 	"dependencies": {
-		"@betagouv/aides-velo": "^0.1.0-12",
+		"@betagouv/aides-velo": "^0.1.0",
 		"@etalab/decoupage-administratif": "^4.0.0",
 		"fuzzysort": "^2.0.4",
 		"jsdom": "^23.0.1",

src/lib/components/DetailsLine.svelte

@@ -1,7 +1,7 @@
 <script>
 	import { engine as baseEngine, getEngine } from '$lib/engine';
 	import { formatDescription } from '$lib/utils';
-	import miniaturesManifest from '$lib/data/miniatures.json';
+	import miniatures from '$lib/data/miniatures';
 
 	import AnimatedAmount from './AnimatedAmount.svelte';
 	import Badge from './Badge.svelte';
@@ -37,13 +37,13 @@
 
 {#if aide.nodeValue !== null}
 	<div class="flex flex-row">
-		{#if miniaturesManifest[ruleName]}
+		{#if miniatures[ruleName]}
 			<div
-				class="basis-12 sm:basis-18 py-4 pl-3 pr-0 flex-shrink-0 opacity-85 cursor-pointer"
+				jclass="basis-12 sm:basis-18 py-4 pl-3 pr-0 flex-shrink-0 opacity-85 cursor-pointer"
 				on:click={() => rawNode.lien && window.open(rawNode.lien, '_blank')}
 			>
 				<img
-					src="/miniatures/{miniaturesManifest[ruleName]}"
+					src="/miniatures/{miniatures[ruleName]}"
 					class="object-fill"
 					alt="Logo {title.toLowerCase()}"
 				/>

src/lib/components/MiniatureCollectivite.svelte

@@ -1,13 +1,13 @@
 <script>
-	import miniaturesManifest from '$lib/data/miniatures.json';
+	import miniatures from '$lib/data/miniatures';
 
 	export let ruleName;
 	export let titre;
 </script>
 
-{#if miniaturesManifest[ruleName]}
+{#if miniatures[ruleName]}
 	<img
-		src="/miniatures/{miniaturesManifest[ruleName]}"
+		src="/miniatures/{miniatures[ruleName]}"
 		alt="Logo de {titre}"
 		class="float-left pt-4 mr-6 !mb-6 max-h-[120px] w-[140px] object-contain"
 	/>

src/routes/(front)/(about)/liste-aides/+page.server.ts

@@ -1,7 +1,7 @@
-import { data } from '@betagouv/aides-velo';
 import { engine } from '$lib/engine';
 import { aidesPerVeloKind } from '$lib/textUtils';
 import { formatValue } from 'publicodes';
+import aidesCollectivites from '$lib/data/aides-collectivities.json';
 
 export const prerender = true;
 
@@ -34,9 +34,9 @@ const formatAideForClient = (aide) => ({
 
 /** @type {import('./$types').PageServerLoad} */
 export async function load() {
-	const associatedCollectivities = Object.keys(data.aidesAvecLocalisation).map((ruleName) => ({
+	const associatedCollectivities = Object.keys(aidesCollectivites).map((ruleName) => ({
 		...engine.getRule(ruleName),
-		...data.aidesAvecLocalisation[ruleName],
+		...aidesCollectivites[ruleName],
 	}));
 
 	const aidesEtat = associatedCollectivities

src/routes/(front)/(search)/ville/[slug]/+page.server.js

@@ -1,4 +1,3 @@
-import { data } from '@betagouv/aides-velo';
 import { compile } from 'mdsvex';
 import labelTourDeFrance from '/src/content/label-tour-de-france.json';
 import labelTourDeFranceCommentairesSource from '/src/content/label-tour-de-france-commentaires.txt?raw';
@@ -7,6 +6,8 @@ import { error } from '@sveltejs/kit';
 import { engine } from '$lib/engine';
 import { rawCityToFullLocalisation } from '$lib/utils';
 import classementVilleplus from '$lib/data/classement-villeplus.json';
+import communes from '$lib/data/communes.json';
+import aidesCollectivites from '$lib/data/aides-collectivities.json';
 
 const barometreFubPerCity = Object.fromEntries(
 	barometreFubRawCsv
@@ -27,7 +28,7 @@ const commentairesLabelTourDeFrance = labelTourDeFranceCommentairesLines.reduce(
 	}
 }, {});
 
-const ruleNamePerCollectivity = Object.entries(data.aidesAvecLocalisation).reduce(
+const ruleNamePerCollectivity = Object.entries(aidesCollectivites).reduce(
 	(manifest, [ruleName, { collectivity }]) => {
 		manifest[collectivity.kind][collectivity.value] = ruleName;
 		return manifest;
@@ -75,7 +76,7 @@ const prependPartialSentence = (content, { prepend } = {}) =>
 /** @type {import('./$types').PageServerLoad} */
 export async function load({ params }) {
 	const slug = params.slug;
-	const city = data.communes.find((c) => c.slug === slug);
+	const city = communes.find((c) => c.slug === slug);
 	if (!city) {
 		error(404);
 	}

src/routes/(front)/(search)/ville/[slug]/cover-sharing.png/+server.js

@@ -1,19 +1,21 @@
-import { data } from '@betagouv/aides-velo';
 import { compile } from 'mdsvex';
 import playwright from 'playwright-aws-lambda';
 import template from './template.html?raw';
+import communes from '$lib/data/communes.json';
+import aidesCollectivites from '$lib/data/aides-collectivities.json';
+import miniatures from '$lib/data/miniatures.json';
 
 /** @type {import('./$types').RequestHandler} */
 export async function GET({ params: { slug } }) {
 	// NOTE: communes may not be exported by the publicodes package in the
 	// future.
-	const ville = data.communes.find((c) => c.slug === slug);
+	const ville = communes.find((c) => c.slug === slug);
 
 	if (!ville) {
 		throw error(404);
 	}
 
-	const localRuleName = Object.entries(data.aidesAvecLocalisation).find(
+	const localRuleName = Object.entries(aidesCollectivites).find(
 		([, { collectivity }]) =>
 			(collectivity.kind === 'code insee' && collectivity.value === ville.code) ||
 			(collectivity.kind === 'epci' && collectivity.value === ville.epci),
@@ -24,8 +26,8 @@ export async function GET({ params: { slug } }) {
 		localRuleName &&
 			// NOTE: should really be the publicodes package that provides this
 			// information?
-			data.miniatures[localRuleName]
-			? `https://mesaidesvelo.fr/miniatures/${data.miniatures[localRuleName]}`
+			miniatures[localRuleName]
+			? `https://mesaidesvelo.fr/miniatures/${miniatures[localRuleName]}`
 			: '',
 	);
 	const res = await compile(html);

src/routes/(front)/departement/[slug]/+page.server.js

@@ -1,10 +1,10 @@
-import { data } from '@betagouv/aides-velo';
 import { engine } from '$lib/engine';
 import { slugify } from '$lib/utils';
 import departements from '@etalab/decoupage-administratif/data/departements.json';
 import regions from '@etalab/decoupage-administratif/data/regions.json';
 import { error, redirect } from '@sveltejs/kit';
 import classementVilleplus from '$lib/data/classement-villeplus.json';
+import aidesCollectivites from '$lib/data/aides-collectivities.json';
 import { _getCorrespondingContent } from '../../(search)/ville/[slug]/+page.server.js';
 
 // https://www.insee.fr/fr/information/2114773#:~:text=TNCC%20%2D%20Type%20de%20nom%20en%20clair
@@ -29,7 +29,7 @@ export async function load({ params }) {
 	}
 
 	const region = regions.find((r) => departement.region === r.code);
-	const aidesAvecLocalisationEntries = Object.entries(data.aidesAvecLocalisation);
+	const aidesAvecLocalisationEntries = Object.entries(aidesCollectivites);
 
 	const aideDepartement = aidesAvecLocalisationEntries.find(
 		([, { collectivity }]) =>

src/routes/(front)/sitemap.txt/+server.js

@@ -1,5 +1,5 @@
-import { data } from '@betagouv/aides-velo';
 import { _departementWithSlug } from '../departement/[slug]/+page.server';
+import communes from '$lib/data/communes.json' assert { type: 'json' };
 
 /** @type {import('./$types').RequestHandler} */
 export async function GET() {
@@ -10,9 +10,7 @@ export async function GET() {
 			'/forfait-mobilite-durable',
 			'/liste-aides',
 			..._departementWithSlug.map(({ slug }) => `/departement/${slug}`),
-			...data.communes
-				.sort((a, b) => b.population - a.population)
-				.map(({ slug }) => `/ville/${slug}`),
+			...communes.sort((a, b) => b.population - a.population).map(({ slug }) => `/ville/${slug}`),
 		]
 			.map((path) => `https://mesaidesvelo.fr${path}`)
 			.join('\n'),

src/routes/api/collectivites/+server.js

@@ -6,16 +6,17 @@
 // - associer les communes à une "métropole" (Bordeaux Métropole, Grand Lyon
 //   etc.) ou une intercommunalité. En effet, c'est à cet échelon que sont
 //   souvent définies les aides à la mobilité.
+//   NOTE(Emile): pourrait être fait avec epci.json
 // - chercher par le nom de la commune ou par le code postal via le même champ
 //   de recherche
 // - « recherche approximative » pour gérer les erreurs de saisie de
 //   l'utilisateur.
 
 import { rawCityToFullLocalisation, removeAccents } from '$lib/utils';
-import { data } from '@betagouv/aides-velo';
 import fuzzysort from 'fuzzysort';
+import communes from '$lib/data/communes.json' assert { type: 'json' };
 
-const indexedData = data.communes.flatMap(({ codesPostaux, ...rest }) =>
+const indexedData = communes.flatMap(({ codesPostaux, ...rest }) =>
 	codesPostaux.map((codePostal, i) => {
 		const cpPrincipal = i === 0;
 		return {

src/scripts/associate-collectivities.js

@@ -1,16 +1,13 @@
-import fs from 'node:fs';
+import { rules } from '@betagouv/aides-velo';
 import { writeJsonData } from './writeData.js';
 import Publicodes, { reduceAST } from 'publicodes';
-import { parse } from 'yaml';
 
 import communes from '../lib/data/communes.json' assert { type: 'json' };
 import epci from '@etalab/decoupage-administratif/data/epci.json' assert { type: 'json' };
 import departements from '@etalab/decoupage-administratif/data/departements.json' assert { type: 'json' };
 import regions from '@etalab/decoupage-administratif/data/regions.json' assert { type: 'json' };
 
-const sourceRules = fs.readFileSync(new URL('../aides.yaml', import.meta.url).pathname, 'utf8');
-
-const engine = new Publicodes(parse(sourceRules));
+const engine = new Publicodes(rules);
 
 const aidesRuleNames = Object.keys(engine.getParsedRules()).filter(
 	(ruleName) => ruleName.startsWith('aides .') && engine.getRule(ruleName).rawNode.titre,

src/scripts/generate-miniatures.js

@@ -0,0 +1,44 @@
+/**
+ * Download the images from github (aides-jeune repo) and create the miniatures
+ * from them.
+ */
+import fs from 'fs';
+import { data } from '@betagouv/aides-velo';
+import sharp from 'sharp';
+import { join } from 'path';
+
+import { writeJsonData } from '../scripts/writeData.js';
+import aidesWithCollectivities from '../lib/data/aides-collectivities.json' assert { type: 'json' };
+
+const currentPath = new URL('./', import.meta.url).pathname;
+const rootPath = join(currentPath, '../../');
+
+const miniatureDirectory = join(rootPath, 'static/miniatures/');
+if (fs.existsSync(miniatureDirectory)) {
+	fs.rmSync(miniatureDirectory, { recursive: true });
+}
+fs.mkdirSync(miniatureDirectory, { recursive: true });
+
+const thumbnailsManifest = Object.keys(aidesWithCollectivities).reduce((acc, id) => {
+	const imgSrc = data.miniatures[id];
+
+	if (!imgSrc) {
+		return acc;
+	}
+
+	const imgName = imgSrc.split('/').at(-1).split('.')[0] + '.webp';
+	generateThumbnail(imgSrc, imgName);
+
+	return { ...acc, [id]: imgName };
+}, {});
+
+async function generateThumbnail(imgSrc, imgName) {
+	const resp = await fetch(imgSrc);
+	const blob = await resp.blob();
+	const buffer = await blob.arrayBuffer();
+	const img = sharp(buffer);
+	img.resize({ fit: 'inside', height: 170, width: 120 });
+	img.webp().toFile(join(miniatureDirectory, imgName));
+}
+
+writeJsonData('miniatures.json', thumbnailsManifest);

src/scripts/postinstall.js

@@ -1,4 +1,3 @@
-// TODO: to remove
-// await import('./transform-communes-data.js');
-// await import('./associate-collectivities.js');
-// await import('../../data-fetch/miniatures/extract-from-aides-jeunes.js');
+await import('./transform-communes-data.js');
+await import('./associate-collectivities.js');
+await import('./generate-miniatures.js');