Merge pull request #420 from BaseAdresseNationale/antoineludeau/fix-u…

…nknown-bounding-box fix unknown bounding box
BaseAdresseNationale · May 22, 2024 · 90a7a0e · 90a7a0e
2 parents 06fb9c8 + 56e8eaf
commit 90a7a0e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/geo.json b/geo.json
diff --git a/lib/api/consumers/format-to-legacy-helpers.js b/lib/api/consumers/format-to-legacy-helpers.js
@@ -49,7 +49,7 @@ export const formatDistrictDataForLegacy = async (district, totalCommonToponymRe
 
   // Geographic data
   const districtGeoData = districtsGeographicOutline[cog]
-  const districtBbox = districtGeoData.bbox
+  const districtBbox = districtGeoData?.bbox
 
   let addressAnalysis
   // Address analysis

diff --git a/lib/compose/index.cjs b/lib/compose/index.cjs
@@ -1,3 +1,4 @@
+/* eslint-disable complexity */
 const {chain, omit, pick, keyBy} = require('lodash')
 const bluebird = require('bluebird')
 
@@ -127,14 +128,18 @@ async function composeCommune(codeCommune, ignoreIdConfig) {
     districtID = digestIDsFromBalAddress(balData.adresses[0], balAddressVersion)?.districtID
   }
 
+  if (!geo[codeCommune]) {
+    console.warn(`La commune ${codeCommune} n'a pas de données géographiques associées dans le fichier geo.json`)
+  }
+
   const communeRecord = {
     banId: districtID,
     nomCommune: communeCOG.nom,
     population: communeCOG.population,
     departement: pick(getDepartement(communeCOG.departement), 'nom', 'code'),
     region: pick(getRegion(communeCOG.region), 'nom', 'code'),
     codesPostaux: communeCOG.codesPostaux || [],
-    displayBBox: geo[codeCommune].bbox,
+    displayBBox: geo[codeCommune]?.bbox,
     typeCommune: communeCOG.type,
     nbNumeros,
     nbNumerosCertifies,

diff --git a/lib/util/contours.cjs b/lib/util/contours.cjs
@@ -19,7 +19,7 @@ function db() {
 }
 
 async function getCommunesFeatures() {
-  const response = await fetch('https://adresse.data.gouv.fr/data/contours-administratifs/2023/geojson/communes-50m.geojson')
+  const response = await fetch('https://adresse.data.gouv.fr/data/contours-administratifs/2024/geojson/communes-50m.geojson')
   const communesFile = await response.json()
 
   return communesFile.features

diff --git a/scripts/build-geo.cjs b/scripts/build-geo.cjs
@@ -8,7 +8,7 @@ const getStream = require('get-stream')
 const {outputJson} = require('fs-extra')
 const fetch = require('../lib/util/fetch.cjs')
 
-const communes = 'http://etalab-datasets.geo.data.gouv.fr/contours-administratifs/2023/geojson/communes-100m.geojson.gz'
+const communes = 'http://etalab-datasets.geo.data.gouv.fr/contours-administratifs/2024/geojson/communes-100m.geojson.gz'
 
 async function getFeatures(url) {
   const response = await fetch(url)