From 252f46a22c0252166296e676424d6103ce3857de Mon Sep 17 00:00:00 2001 From: Michael Douchin Date: Tue, 28 Jan 2025 16:36:09 +0100 Subject: [PATCH] =?UTF-8?q?Import=20-=20TOPO:=20formatage=20des=20donn?= =?UTF-8?q?=C3=A9es=20MAJIC=20pour=20commune=20et=20voie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cadastre/cadastre_common_base.py | 2 +- cadastre/cadastre_import.py | 43 +++-- cadastre/definitions.py | 6 +- cadastre/dialogs/options_dialog.py | 10 +- cadastre/dialogs/search_dialog.py | 2 +- cadastre/forms/cadastre_option_form.ui | 8 +- .../plugin/2024/majic3_formatage_donnees.sql | 149 ++++++++++++------ .../scripts/plugin/commun_create_metier.sql | 18 ++- .../plugin/majic3_purge_donnees_brutes.sql | 2 +- docs/extension-qgis/import.md | 13 +- docs/extension-qgis/interface.md | 6 +- 11 files changed, 171 insertions(+), 88 deletions(-) diff --git a/cadastre/cadastre_common_base.py b/cadastre/cadastre_common_base.py index 89088b57..904d890f 100644 --- a/cadastre/cadastre_common_base.py +++ b/cadastre/cadastre_common_base.py @@ -262,7 +262,7 @@ def postgisToSpatialite(sql: str, targetSrid: str = '2154') -> str: {'in': r'alter table [^;]+drop constraint[^;]+;', 'out': ''}, # ~ {'in': r'^analyse [^;]+;', 'out': ''}, # replace - {'in': r'truncate (bati|fanr|lloc|nbat|pdll|prop)', + {'in': r'truncate (bati|topo|lloc|nbat|pdll|prop)', 'out': r'drop table \1;create table \1 (tmp text)'}, {'in': r'truncate ', 'out': 'delete from '}, {'in': r'distinct on *\([a-z, ]+\)', 'out': 'distinct'}, diff --git a/cadastre/cadastre_import.py b/cadastre/cadastre_import.py index 79cefef4..a9b81def 100644 --- a/cadastre/cadastre_import.py +++ b/cadastre/cadastre_import.py @@ -43,12 +43,12 @@ from cadastre.definitions import ( IMPORT_MEMORY_ERROR_MESSAGE, REGEX_BATI, - REGEX_FANTOIR, REGEX_LOTLOCAL, REGEX_NBATI, REGEX_PDL, REGEX_PROP, - URL_FANTOIR, + REGEX_TOPO, + URL_TOPO, ) from cadastre.dialogs.dialog_common import CadastreCommon @@ -118,9 +118,9 @@ def __init__(self, dialog): 'required': True }, { - 'key': '[FICHIER_FANTOIR]', - 'regex': s.value("cadastre/regexFantoir", REGEX_FANTOIR, type=str), - 'table': 'fanr', + 'key': '[FICHIER_TOPO]', + 'regex': s.value("cadastre/regexTopo", REGEX_TOPO, type=str), + 'table': 'topo', 'required': True }, { @@ -165,7 +165,7 @@ def __init__(self, dialog): if self.dialog.hasStructure: self.hasConstraints = True - # Remove MAJIC from tables bati|fanr|lloc|nbat|pdll|prop + # Remove MAJIC from tables bati|topo|lloc|nbat|pdll|prop self.removeMajicRawData = True self.beginImport() @@ -305,7 +305,7 @@ def importMajic(self): # dict for parameters replacement replaceDict = self.replaceDict.copy() - # mandatoryFilesKeys = ['[FICHIER_BATI]', '[FICHIER_FANTOIR]', '[FICHIER_NBATI]', '[FICHIER_PROP]'] + # mandatoryFilesKeys = ['[FICHIER_BATI]', '[FICHIER_TOPO]', '[FICHIER_NBATI]', '[FICHIER_PROP]'] # missingMajicFiles = False scriptList = [] @@ -350,6 +350,7 @@ def importMajic(self): scriptList.append(importScript) # Format data + replaceDict['DEPDIR'] = f'{self.dialog.edigeoDepartement}{self.dialog.edigeoDirection}' scriptList.append( { 'title': 'Mise en forme des données', @@ -461,8 +462,8 @@ def get_available_majic_files(self) -> tuple[dict, dict]: maj_list.append(file_path) # Store dep_dir for this file - # avoid fantoir, as now it is given for the whole country - if table == 'fanr': + # avoid topo, as now it is given for the whole country + if table == 'topo': continue # Get dep_dir : first line with content @@ -490,17 +491,21 @@ def check_missing_majic_files(self, majic_files_found: dict) -> bool: "Des fichiers MAJIC importants sont manquants :
" " {}

" "Vérifier le chemin des fichiers MAJIC :
" - "{}
" + "{}

" "ainsi que les mots recherchés pour chaque type de fichier configurés dans les options du plugin Cadastre :
" - "{}

" - "NB: Vous pouvez télécharger les fichiers FANTOIR à cette adresse :
" + "{}


" + "NB: Vous pouvez télécharger les fichiers TOPO à cette adresse :
" "{}
" ).format( - ', '.join(missing_files), + ',
'.join(missing_files), self.dialog.majicSourceDir, - ',
'.join([f"* {a['key'].strip('[]')}: {a['regex'].upper()}" for a in self.majicSourceFileNames]), - URL_FANTOIR, - URL_FANTOIR, + ',
'.join([ + f"* {a['key'].strip('[]')}: {a['regex'].upper()}" + for a in self.majicSourceFileNames + if a['table'] in missing_files + ]), + URL_TOPO, + URL_TOPO, ) missing_majic_ignore = QMessageBox.question( self.dialog, @@ -1187,6 +1192,12 @@ def replaceParametersInScript(self, scriptPath, replaceDict): self.qc.updateLog(msg) return msg + except KeyError as e: + msg = "Erreur lors du paramétrage des scripts d'import: %s" % e + self.go = False + self.qc.updateLog(msg) + return msg + finally: QApplication.restoreOverrideCursor() diff --git a/cadastre/definitions.py b/cadastre/definitions.py index 779daca6..52c644bb 100644 --- a/cadastre/definitions.py +++ b/cadastre/definitions.py @@ -1,15 +1,15 @@ -URL_FANTOIR = ( - "https://drive.opendata.craig.fr/s/opendata?path=%2Fadresse%2Ffantoir" +URL_TOPO = ( + "https://drive.opendata.craig.fr/s/opendata?path=%2Fadresse%2Ftopo" ) URL_DOCUMENTATION = "https://docs.3liz.org/QgisCadastrePlugin/" REGEX_BATI = "BATI" -REGEX_FANTOIR = "FANTOIR|FANR" REGEX_LOTLOCAL = "LLOC|D166" REGEX_NBATI = "NBAT" REGEX_PDL = "PDL" REGEX_PROP = "PROP" +REGEX_TOPO = "TOPO" IMPORT_MEMORY_ERROR_MESSAGE = "ERREUR : Mémoire
" "Veuillez recommencer l'import en baissant la valeur du " diff --git a/cadastre/dialogs/options_dialog.py b/cadastre/dialogs/options_dialog.py index b21105d6..27bd8c84 100644 --- a/cadastre/dialogs/options_dialog.py +++ b/cadastre/dialogs/options_dialog.py @@ -14,11 +14,11 @@ from cadastre.definitions import ( REGEX_BATI, - REGEX_FANTOIR, REGEX_LOTLOCAL, REGEX_NBATI, REGEX_PDL, REGEX_PROP, + REGEX_TOPO, ) from cadastre.tools import set_window_title @@ -120,9 +120,9 @@ def getValuesFromSettings(self): regexBati = s.value("cadastre/regexBati", REGEX_BATI, type=str) if regexBati: self.inMajicBati.setText(regexBati) - regexFantoir = s.value("cadastre/regexFantoir", REGEX_FANTOIR, type=str) - if regexFantoir: - self.inMajicFantoir.setText(regexFantoir) + regexTopo = s.value("cadastre/regexTopo", REGEX_TOPO, type=str) + if regexTopo: + self.inMajicTopo.setText(regexTopo) regexLotLocal = s.value("cadastre/regexLotLocal", REGEX_LOTLOCAL, type=str) if regexLotLocal: self.inMajicLotlocal.setText(regexLotLocal) @@ -192,7 +192,7 @@ def onAccept(self): # Save Majic file names s = QgsSettings() s.setValue("cadastre/regexBati", self.inMajicBati.text().strip(' \t\n\r')) - s.setValue("cadastre/regexFantoir", self.inMajicFantoir.text().strip(' \t\n\r')) + s.setValue("cadastre/regexTopo", self.inMajicTopo.text().strip(' \t\n\r')) s.setValue("cadastre/regexLotLocal", self.inMajicLotlocal.text().strip(' \t\n\r')) s.setValue("cadastre/regexNbati", self.inMajicNbati.text().strip(' \t\n\r')) s.setValue("cadastre/regexPdl", self.inMajicPdl.text().strip(' \t\n\r')) diff --git a/cadastre/dialogs/search_dialog.py b/cadastre/dialogs/search_dialog.py index 8e1b0bc2..7b06fdf6 100644 --- a/cadastre/dialogs/search_dialog.py +++ b/cadastre/dialogs/search_dialog.py @@ -409,7 +409,7 @@ def checkMajicContent(self): if not self.hasMajicDataParcelle or not self.hasMajicDataVoie: self.qc.updateLog( - "Pas de données MAJIC non bâties et/ou fantoir -> désactivation de la recherche d'adresse") + "Pas de données MAJIC non bâties et/ou TOPO -> désactivation de la recherche d'adresse") if not self.hasMajicDataProp: self.qc.updateLog( "Pas de données MAJIC propriétaires -> désactivation de la recherche de propriétaires") diff --git a/cadastre/forms/cadastre_option_form.ui b/cadastre/forms/cadastre_option_form.ui index 0ea530a8..04c5c2a6 100644 --- a/cadastre/forms/cadastre_option_form.ui +++ b/cadastre/forms/cadastre_option_form.ui @@ -169,16 +169,16 @@ - + - FANTOIR|FANR + TOPO - FANTOIR + TOPO @@ -310,7 +310,7 @@ inMajicPdl inMajicProp lineEdit - inMajicFantoir + inMajicTopo inComposerTemplateFile btComposerTemplateFile inTempDir diff --git a/cadastre/scripts/plugin/2024/majic3_formatage_donnees.sql b/cadastre/scripts/plugin/2024/majic3_formatage_donnees.sql index 3839c19f..ff00172c 100644 --- a/cadastre/scripts/plugin/2024/majic3_formatage_donnees.sql +++ b/cadastre/scripts/plugin/2024/majic3_formatage_donnees.sql @@ -966,34 +966,43 @@ FROM ${PREFIXE}lloc; -- Traitement: commune INSERT INTO ${PREFIXE}commune ( - commune, geo_commune, annee, ccodep, ccodir, ccocom, clerivili, libcom, typcom, ruract, carvoi, indpop, poprel, poppart, popfict, annul, dteannul, dtecreart, codvoi, + commune, geo_commune, annee, ccodep, ccodir, ccocom, clerivili, libcom, typcom, + ruract, carvoi, indpop, poprel, poppart, popfict, annul, dteannul, dtecreart, codvoi, typvoi, indldnbat, motclas, lot ) SELECT - REPLACE(SUBSTRING(tmp,1,6),' ', '0') AS commune, - REPLACE(SUBSTRING(tmp,1,6),' ', '0') AS geo_commune, - '${ANNEE}', - SUBSTRING(tmp,1,2) AS ccodep, - SUBSTRING(tmp,3,1) AS ccodir, - SUBSTRING(tmp,4,3) AS ccocom, - SUBSTRING(tmp,11,1) AS clerivili, - SUBSTRING(tmp,12,30) AS libcom, - CASE WHEN trim(SUBSTRING(tmp,43,1))='' THEN NULL ELSE trim(SUBSTRING(tmp,43,1)) END AS typcom, - SUBSTRING(tmp,46,1) AS ruract, - SUBSTRING(tmp,49,1) AS carvoi, - SUBSTRING(tmp,50,1) AS indpop, - CASE WHEN trim(SUBSTRING(tmp,53,7))='' THEN NULL ELSE to_number(trim(SUBSTRING(tmp,53,7)),'0000000') END AS poprel, - to_number(SUBSTRING(tmp,60,7),'9999999') AS poppart, - to_number(SUBSTRING(tmp,67,7),'0000000') AS popfict, - SUBSTRING(tmp,74,1) AS annul, - SUBSTRING(tmp,75,7) AS dteannul, - SUBSTRING(tmp,82,7) AS dtecreart, - SUBSTRING(tmp,104,5) AS codvoi, - SUBSTRING(tmp,109,1) AS typvoi, - SUBSTRING(tmp,110,1) AS indldnbat, - SUBSTRING(tmp,113,8) AS motclas, + '${DEPDIR}' || SUBSTRING("code topo", 10, 3) AS commune, + '${DEPDIR}' || SUBSTRING("code topo", 10, 3) AS geo_commune, + '${ANNEE}' AS annee, + SUBSTRING("code topo", 8, 2) AS ccodep, + SUBSTRING('${DEPDIR}', 3, 1) AS ccodir, + SUBSTRING("code topo", 10, 3) AS ccocom, + NULL AS clerivili, + trim("libelle") AS libcom, + nullif("type commune actuel (r ou n)", '') AS typcom, + nullif("rur actuel", '') AS ruract, + NULL AS carvoi, + NULL AS indpop, + NULL AS poprel, + NULL AS poppart, + NULL AS popfict, + nullif("annulation", '') AS annul, + CASE + WHEN "date annulation" != '00000000' + THEN substr("date annulation", 1, 4) || lpad(extract('doy' FROM to_date("date annulation", 'YYYYMMDD'))::text, 3, '0') + ELSE '0000000' + END AS dteannul, + CASE + WHEN "date creation de article" != '00000000' + THEN substr("date creation de article", 1, 4) || lpad(extract('doy' FROM to_date("date creation de article", 'YYYYMMDD'))::text, 3, '0') + ELSE '0000000' + END AS dtecreart, + NULL AS codvoi, + NULL AS typvoi, + NULL AS indldnbat, + NULL AS motclas, '${LOT}' as lot -FROM ${PREFIXE}fanr WHERE SUBSTRING(tmp,4,3) != ' ' AND trim(SUBSTRING(tmp,7,4))=''; +FROM ${PREFIXE}topo WHERE substr("code topo", 17, 2) = '13'; -- Traitement: voie INSERT INTO ${PREFIXE}voie @@ -1003,33 +1012,75 @@ INSERT INTO ${PREFIXE}voie commune, lot ) SELECT - REPLACE(SUBSTRING(tmp,1,6)||SUBSTRING(tmp,104,5)||SUBSTRING(tmp,7,4),' ', '0') AS voie, + REPLACE('${DEPDIR}' || SUBSTRING("code topo", 10, 3) || '00000' || SUBSTRING("code topo", 13, 4) , ' ', '0') AS voie, '${ANNEE}', - SUBSTRING(tmp,1,2) AS ccodep, - SUBSTRING(tmp,3,1) AS ccodir, - SUBSTRING(tmp,4,3) AS ccocom, - CASE WHEN trim(SUBSTRING(tmp,7,1))='' THEN NULL ELSE trim(SUBSTRING(tmp,7,1)) END AS natvoiriv, - SUBSTRING(tmp,7,4) AS ccoriv, - SUBSTRING(tmp,11,1) AS clerivili, - TRIM(SUBSTRING(tmp,12,4)) AS natvoi, - SUBSTRING(tmp,16,26) AS libvoi, - CASE WHEN trim(SUBSTRING(tmp,43,1))='' THEN NULL ELSE trim(SUBSTRING(tmp,43,1)) END AS typcom, - SUBSTRING(tmp,46,1) AS ruract, - CASE WHEN trim(SUBSTRING(tmp,49,1))='' THEN NULL ELSE trim(SUBSTRING(tmp,49,1)) END AS carvoi, - SUBSTRING(tmp,50,1) AS indpop, - SUBSTRING(tmp,53,7) AS poprel, - to_number(SUBSTRING(tmp,60,7),'0000000') AS poppart, - to_number(SUBSTRING(tmp,67,7),'0000000') AS popfict, - CASE WHEN trim(SUBSTRING(tmp,74,1))='' THEN NULL ELSE trim(SUBSTRING(tmp,74,1)) END AS annul, - SUBSTRING(tmp,75,7) AS dteannul, - SUBSTRING(tmp,82,7) AS dtecreart, - SUBSTRING(tmp,104,5) AS codvoi, - CASE WHEN trim(SUBSTRING(tmp,109,1))='' THEN NULL ELSE trim(SUBSTRING(tmp,109,1)) END AS typvoi, - CASE WHEN trim(SUBSTRING(tmp,110,1))='' THEN NULL ELSE trim(SUBSTRING(tmp,110,1)) END AS indldnbat, - SUBSTRING(tmp,113,8) AS motclas, - REPLACE(SUBSTRING(tmp,1,6),' ', '0') AS commune, + SUBSTRING("code topo", 8, 2) AS ccodep, + SUBSTRING('${DEPDIR}', 3, 1) AS ccodir, + SUBSTRING("code topo", 10, 3) AS ccocom, + SUBSTRING("code topo", 13, 1) AS natvoiriv, + SUBSTRING("code topo", 13, 4) AS ccoriv, + NULL AS clerivili, + replace(libelle, (regexp_replace(libelle, ab.reg, '')), '') AS natvoi, + trim(regexp_replace(libelle, ab.reg, '')) AS libvoi, + nullif("type commune actuel (r ou n)", '') AS typcom, + nullif("rur actuel", '') AS ruract, + nullif("caractere voie", '') AS carvoi, + NULL AS indpop, + NULL AS poprel, + NULL AS poppart, + NULL AS popfict, + nullif("annulation", '') AS annul, + CASE + WHEN "date annulation" != '00000000' + THEN substr("date annulation", 1, 4) || lpad(extract('doy' FROM to_date("date annulation", 'YYYYMMDD'))::text, 3, '0') + ELSE '0000000' + END AS dteannul, + CASE + WHEN "date creation de article" != '00000000' + THEN substr("date creation de article", 1, 4) || lpad(extract('doy' FROM to_date("date creation de article", 'YYYYMMDD'))::text, 3, '0') + ELSE '0000000' + END AS dtecreart, + NULL AS codvoi, + "type voie" AS typvoi, + 1 AS indldnbat, + trim("mot classant") AS motclas, + '${DEPDIR}' || SUBSTRING("code topo", 10, 3) AS commune, '${LOT}' as lot -FROM ${PREFIXE}fanr WHERE trim(SUBSTRING(tmp,4,3)) != '' AND trim(SUBSTRING(tmp,7,4)) != ''; +FROM ${PREFIXE}topo, +LATERAL ( + SELECT concat( + '^(', + 'ACH |AER |AERG|AGL |AIRE|ALL |ANGL|ARC |ART |AUT |AV |', + 'BASE|BD |BER |BORD|BRE |BRG |BRTL|BSN |', + 'CAE |CALL|CAMI|CAMP|CAN |CAR |CARE|CASR|CC |CD |', + 'CF |CHA |CHE |CHEM|CHL |CHP |CHT |CHV |CITE|CIVE|', + 'CLOS|CLR |COIN|COL |COR |CORO|COTE|COUR|CPG |CR |', + 'CRS |CRX |CTR |CTRE|', + 'DARS|DEVI|DIG |DOM |DRA |DSC |', + 'ECA |ECL |EMBR|EMP |ENC |ENV |ESC |ESP |ESPA|ETNG|', + 'FD |FG |FON |FOR |FORT|FOS |FRM |', + 'GAL |GARE|GBD |GPL |GR |GREV|', + 'HAB |HAM |HIP |HLE |HLG |HLM |HTR |', + 'ILE |ILOT|IMP |', + 'JARD|JTE |', + 'LAC |LEVE|LICE|LIGN|LOT |', + 'MAIL|MAIS|MAR |MARE|MAS |MNE |MRN |MTE |', + 'NTE |', + 'PAE |PARC|PAS |PASS|PCH |PCHE|PHAR|PIST|PKG |PL |', + 'PLA |PLAG|PLAN|PLCI|PLE |PLN |PLT |PNT |PONT|PORQ|', + 'PORT|POST|POT |PROM|PRT |PRV |PTA |PTE |PTR |PTTE|', + 'QUA |QUAI|', + 'RAC |REM |RES |RIVE|RLE |ROC |RPE |RPT |RTD |RTE |', + 'RUE |RUET|RUIS|RULT|RVE |', + 'SAS |SEN |SQ |STDE|', + 'TER |TOUR|TPL |TRA |TRAB|TRN |TRT |TSSE|TUN |', + 'VAL |VALL|VC |VCHE|VEN |VGE |VIA |VIAD|VIL |VLA |', + 'VOIE|VOIR|VOUT|VOY |VTE |', + 'ZA |ZAC |ZAD |ZI |ZONE|ZUP |', + 'N |D |V ', ')' + ) AS reg +) AS ab +WHERE substr("code topo", 17, 2) = '14' -- purge des doublons : voie CREATE INDEX idxan_voie ON voie (annee); diff --git a/cadastre/scripts/plugin/commun_create_metier.sql b/cadastre/scripts/plugin/commun_create_metier.sql index 0ba3d296..82f78b57 100644 --- a/cadastre/scripts/plugin/commun_create_metier.sql +++ b/cadastre/scripts/plugin/commun_create_metier.sql @@ -1,10 +1,26 @@ CREATE TABLE bati (tmp text); -CREATE TABLE fanr (tmp text); CREATE TABLE lloc (tmp text); CREATE TABLE nbat (tmp text); CREATE TABLE pdll (tmp text); CREATE TABLE prop (tmp text); +CREATE TABLE topo ( + ogc_fid serial, + "code topo" character varying, + libelle character varying, + "type commune actuel (r ou n)" character varying, + "type commune fip (rounfip)" character varying, + "rur actuel" character varying, + "rur fip" character varying, + "caractere voie" character varying, + annulation character varying, + "date annulation" character varying, + "date creation de article" character varying, + "type voie" character varying, + "mot classant" character varying, + "date derniere transition" character varying +); + CREATE TABLE parcelle ( parcelle text, annee text, diff --git a/cadastre/scripts/plugin/majic3_purge_donnees_brutes.sql b/cadastre/scripts/plugin/majic3_purge_donnees_brutes.sql index ec315b33..bb41fb51 100644 --- a/cadastre/scripts/plugin/majic3_purge_donnees_brutes.sql +++ b/cadastre/scripts/plugin/majic3_purge_donnees_brutes.sql @@ -1,6 +1,6 @@ -- PURGE DES DONNEES BRUTES: DEBUT; TRUNCATE ${PREFIXE}bati; -TRUNCATE ${PREFIXE}fanr; +TRUNCATE ${PREFIXE}topo; TRUNCATE ${PREFIXE}lloc; TRUNCATE ${PREFIXE}nbat; TRUNCATE ${PREFIXE}pdll; diff --git a/docs/extension-qgis/import.md b/docs/extension-qgis/import.md index 9a9930a6..b23fceff 100644 --- a/docs/extension-qgis/import.md +++ b/docs/extension-qgis/import.md @@ -66,9 +66,14 @@ Vous pouvez utiliser le téléchargeur Edigeo dans la boîte à outil **Traiteme ### FANTOIR -Si vous ne possédez pas les données FANTOIR dans votre jeu de données MAJIC, nous conseillons de les télécharger sur le -[site du CRAIG](https://drive.opendata.craig.fr/s/opendata?path=%2Fadresse%2Ffantoir) -et de configurer l'extension pour donner le bon nom au fichier FANTOIR. +Le support des fichiers FANTOIR a été abandonné début 2025 au profit du support des fichiers TOPO. + +### TOPO + +Si vous ne possédez pas les données TOPO dans votre jeu de données MAJIC, nous conseillons de les télécharger sur le +[site du CRAIG](https://drive.opendata.craig.fr/s/opendata?path=%2Fadresse%2Ftopo) +et de configurer l'extension pour vérifier que vous avez configuré le bon mot pour la recherche +des fichiers TOPO. ## Les étapes d'importation @@ -166,7 +171,7 @@ SRID. Nous avons utilisé ici `998999`, qui est le maximum possible. !!! tip Pour trouver la chaîne **WKT** décrivant la projection, à défaut de la trouver sur internet pour le moment, nous pouvons utiliser l'API PyQGIS. Dans le menu **Extensions** → **Console Python**, écrire : - + ```python QgsCoordinateReferenceSystem('IGNF:GUAD48UTM20').toWkt() ``` diff --git a/docs/extension-qgis/interface.md b/docs/extension-qgis/interface.md index 4a53f0a0..c58ca885 100644 --- a/docs/extension-qgis/interface.md +++ b/docs/extension-qgis/interface.md @@ -50,7 +50,7 @@ Ainsi qu'une zone contenant des **boutons d'action** : parcelle, zoomer sur la parcelle ou sélectionner l'objet dans la couche * Un dernier bouton pour **sélectionner dans la couche toutes les parcelles du propriétaire** -> Si vous n'avez pas importé de données FANTOIR, la commune de la parcelle ne sera pas affichée dans la +> Si vous n'avez pas importé de données TOPO, la commune de la parcelle ne sera pas affichée dans la > fenêtre et l'adresse pourra être tronquée (de même pour les relevés exportés) >Si vous n'avez pas de données MAJIC, seule les informations sur la parcelle (1er onglet) seront présentées. @@ -133,9 +133,9 @@ Le **PDF est généré et ouvert** avec le lecteur PDF par défaut du système. ### Recherche d'adresse > Pour l'instant, cet outil ne fonctionne que si des données MAJIC sont dans la base, et si les données -> FANTOIR ont été importées. Si vous ne possédez pas de données FANTOIR dans votre lot de données MAJIC, +> TOPO ont été importées. Si vous ne possédez pas de données TOPO dans votre lot de données MAJIC, > vous pouvez le télécharger pour votre département ici (et relancer l'import Majic) : -> https://drive.opendata.craig.fr/s/opendata?path=%2Fadresse%2Ffantoir +> https://drive.opendata.craig.fr/s/opendata?path=%2Fadresse%2Ftopo Pour lancer une **recherche de parcelles par adresse**, il suffit :