Changeset 33655 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

2017-09-22T22:25:11+02:00 (7 years ago)

Author:

donvip

Message:

Edigeo: improve support of NF Z 52-000

File:

• applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileTHF.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileTHF.java

@@ -53 +53 @@
         /** LOC */ int nLots;
         /** VOC */ int nVolumes;
-        /**     */ final List<String> volumeLabels = new ArrayList<>(); // TODO
+        /** VOL */ final List<String> volumeLabels = new ArrayList<>();
         /** SEC */ SecurityClassification security;
         /** RDI */ String diffusionRestriction = "";
@@ -74 +74 @@
             case "LOC": nLots = safeGetInt(r); break;
             case "VOC": nVolumes = safeGetInt(r); break;
+            case "VOL": safeGet(r, volumeLabels); break;
             case "SEC": security = SecurityClassification.of(safeGetInt(r)); break;
             case "RDI": safeGetAndLog(r, s -> diffusionRestriction += s, tr("Diffusion restriction")); break;
@@ -123 +124 @@
         public final int getnVolumes() {
             return nVolumes;
+        }
+
+        /**
+         * Returns volume labels.
+         * @return volume labels
+         */
+        public final List<String> getVolumeLabels() {
+            return Collections.unmodifiableList(volumeLabels);
         }