Fix issues

datagouv · Apr 4, 2023 · d603543 · d603543
1 parent 7a00fc3
commit d603543
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/commands/extract-ems.js b/lib/commands/extract-ems.js
@@ -9,8 +9,8 @@ import {recreateDirectory} from '../util/fs.js'
 import {createAggregate} from '../aggregate/index.js'
 import postprocessPrefixesSections from '../post-processing/prefixes-sections.js'
 import {writeLayeredFeatures} from '../writers/geojson.js'
-import rts from '../convert/ems-rts.js'
-import ems from '../convert/ems-cadastre.js'
+import {prepareCommune, prepareBatiment} from '../convert/ems-rts.js'
+import {prepareSection, prepareParcelle, validateParcelle} from '../convert/ems-cadastre.js'
 
 const communesToIgnore = new Set([
   '67001',
@@ -21,10 +21,10 @@ const communesToIgnore = new Set([
 ])
 
 const LAYERS_MAPPING = {
-  rg_r2m_commune: {layer: 'communes', convertFn: rts.prepareCommune},
-  rg_r2m_bati_fusionne: {layer: 'batiments', convertFn: rts.prepareBatiment},
-  rg_cad_section: {layer: 'sections', convertFn: ems.prepareSection},
-  rg_cad_parcelle: {layer: 'parcelles', convertFn: ems.prepareParcelle, validateFn: ems.validateParcelle},
+  rg_r2m_commune: {layer: 'communes', convertFn: prepareCommune},
+  rg_r2m_bati_fusionne: {layer: 'batiments', convertFn: prepareBatiment},
+  rg_cad_section: {layer: 'sections', convertFn: prepareSection},
+  rg_cad_parcelle: {layer: 'parcelles', convertFn: prepareParcelle, validateFn: validateParcelle},
 }
 
 async function handler({rtsPath, parcellairePath}, distPath) {

diff --git a/lib/commands/recreate-edigeo-archive.js b/lib/commands/recreate-edigeo-archive.js
@@ -1,6 +1,6 @@
 import bluebird from 'bluebird'
 import decompress from 'decompress'
-import {reprojectArchive} from 'edigeo-reproject'
+import {reprojectArchive} from '@etalab/edigeo-reproject'
 import {WritableZipFile} from '../util/zip.js'
 
 async function handler(src, dest, from, dep) {