(evol) Ajout tag typeproc pour récupération type de procédure (basé sur NOMPROC ou TYPEPROC)

Author: Bloumy

validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/DocUrbaPostProcess.java

@@ -2,6 +2,7 @@
 
 import java.io.File;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
@@ -34,6 +35,10 @@ public class DocUrbaPostProcess implements ValidatorListener {
      * Tag to store TYPEREF for the document
      */
     private static final String TAG_TYPEREF = "typeref";
+    /**
+     * Tag to store TYPEPROC for the document
+     */
+    private static final String TAG_TYPEPROC = "typeproc";
 
     @Override
     public void beforeMatching(Context context, Document document) throws Exception {
@@ -81,12 +86,16 @@ public void afterValidate(Context context, Document document) throws Exception {
         }
 
         /*
-         * Add idurba and typeref to document tags.
+         * Add idurba, typeref and typeproc to document tags.
          */
         log.info(MARKER, "Found idurba={} in filtered DOC_URBA.", result.idurba);
         document.setTag(TAG_IDURBA, result.idurba);
         log.info(MARKER, "Found typeref={} in filtered DOC_URBA.", result.typeref);
         document.setTag(TAG_TYPEREF, result.typeref);
+        if (!StringUtils.isEmpty(result.typeproc)) {
+            log.info(MARKER, "Found typeproc={} in filtered DOC_URBA.", result.typeproc);
+            document.setTag(TAG_TYPEPROC, result.typeproc);
+        }
 
         log.info(
             MARKER,

validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/DocUrbaFilter.java

@@ -20,7 +20,8 @@
 /**
  *
  * Filter table DOC_URBA to keep rows with the expected IDURBA and outputs the
- * number of rows, idurba and typeref (cadastral reference) if available.
+ * number of rows, idurba, typeref (cadastral reference) and typeproc
+ * (TYPEPROC or NOMPROC column) if available.
  *
  * @author MBorne
  *
@@ -34,6 +35,7 @@ public class Result {
         public int count = 0;
         public String idurba;
         public String typeref = DEFAULT_TYPEREF;
+        public String typeproc;
     }
 
     /**
@@ -83,6 +85,16 @@ public Result process(File docUrbaFile) {
                 log.warn(MARKER, "TYPEREF not found in DOC_URBA");
             }
 
+            int indexTypeproc = reader.findColumn("TYPEPROC");
+            if (indexTypeproc < 0) {
+                log.warn(MARKER, "TYPEPROC not found in DOC_URBA");
+            }
+
+            int indexNomproc = reader.findColumn("NOMPROC");
+            if (indexNomproc < 0) {
+                log.warn(MARKER, "NOMPROC not found in DOC_URBA");
+            }
+
             /*
              * Create writer for filtered file
              */
@@ -126,6 +138,20 @@ public Result process(File docUrbaFile) {
                     }
                 }
 
+                if (indexTypeproc >= 0) {
+                    String typeproc = row[indexTypeproc];
+                    log.info(MARKER, "Found TYPEPROC={} for IDURBA={}", typeproc, idurba);
+                    if (!StringUtils.isEmpty(typeproc)) {
+                        result.typeproc = typeproc.trim();
+                    }
+                } else if (indexNomproc >= 0) {
+                    String nomproc = row[indexNomproc];
+                    log.info(MARKER, "Found NOMPROC={} for IDURBA={}", nomproc, idurba);
+                    if (!StringUtils.isEmpty(nomproc)) {
+                        result.typeproc = nomproc.trim();
+                    }
+                }
+
                 printer.printRecord(row);
             }
 

validator-plugin-cnig/src/test/resources/documents-expected/19182_CC_20150517/document-info.json

@@ -93,7 +93,8 @@
   "documentExtent" : [ 1.3550602, 45.2199213, 1.4226516, 45.2535966 ],
   "tags" : {
     "idurba" : "19182_CC_20150517",
-    "typeref" : "04"
+    "typeref" : "04",
+    "typeproc" : "MS"
   },
   "metadata" : {
     "fileIdentifier" : "fr-000019182-CC20150517",

validator-plugin-cnig/src/test/resources/documents-expected/200078244_SCOT_20180218/document-info.json

@@ -88,7 +88,8 @@
   "documentExtent" : [ 2.4591245, 49.6799345, 3.2027693, 50.0784749 ],
   "tags" : {
     "idurba" : "200078244_SCOT_20180218",
-    "typeref" : "01"
+    "typeref" : "01",
+    "typeproc" : "01"
   },
   "metadata" : {
     "fileIdentifier" : "fr-200078244-scot20180218",

validator-plugin-cnig/src/test/resources/documents-expected/30014_PLU_20171013/document-info.json

@@ -220,7 +220,8 @@
   "documentExtent" : [ 4.3387357, 43.9760147, 4.3986027, 44.0207913 ],
   "tags" : {
     "idurba" : "30014_PLU_20171013",
-    "typeref" : "01"
+    "typeref" : "01",
+    "typeproc" : "R"
   },
   "metadata" : {
     "fileIdentifier" : "fr-000030014-PLU20171013",