Changeset 36478 in osm

Timestamp:

2026-02-09T18:32:44+01:00 (13 hours ago)

Author:

stoecker

Message:

fix #24617 - patch by Adrian - new edigeo features

Location:

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

Files:

• EdigeoFile.java (modified) (3 diffs)
• pci/EdigeoPciReader.java (modified) (2 diffs)

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

@@ -92 +92 @@
 
         protected final void safeGet(EdigeoRecord r, Consumer<String> callback) {
-            (lastReadString = callback).accept(r.length > 0 ? r.values.get(0) : null);
+            lastReadString = callback;
+            lastReadString.accept(r.length > 0 ? r.values.get(0) : null);
         }
 
@@ -120 +121 @@
                 String v = r.values.get(0);
                 Logging.info(msg + ": " + v);
-                (lastReadString = callback).accept(v);
+                lastReadString = callback;
+                lastReadString.accept(v);
             }
         }
@@ -148 +150 @@
             String line;
             while ((line = reader.readLine()) != null) {
-                if (!line.isEmpty()) {
+                if (line.length() >= 4) {
                     // Read record
                     EdigeoRecord r = new EdigeoRecord(line);

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

@@ -119 +119 @@
         EdigeoFileVEC.addObjectPostProcessor("63", symbo, "man_made=water_well"); // Well
         EdigeoFileVEC.addObjectPostProcessor("65", water, "leisure=swimming_pool;access=private"); // Swimming pool
+        EdigeoFileVEC.addObjectPostProcessor("66", water, "leisure=swimming_pool;access=private;note=IA"); // Swimming pool traced by AI
 
         // Mapping TEX*_id => name (first step)
@@ -180 +181 @@
 
         EdigeoFileVEC.addObjectPostProcessor((o, p) -> p.put("wall", "no"), build, "DUR_id", "02");
+        EdigeoFileVEC.addObjectPostProcessor((o, p) -> p.put("note", "IA"), build, "DUR_id", "03");
         EdigeoFileVEC.addObjectPostProcessor((o, p) -> {
             p.put("building", "yes");