Changeset 34630 in osm for applications

Timestamp:

2018-09-11T00:46:18+02:00 (6 years ago)

Author:

donvip

Message:

fix bug observed with 31248000AO01 church preventing data to be downloaded

Location:

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

Files:

• EdigeoFileVEC.java (modified) (2 diffs)
• pci/EdigeoPciReader.java (modified) (1 diff)

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

@@ -11 +11 @@
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
@@ -661 +662 @@
                 EastNorth en = ab.points.get(ab.nPoints - 1);
                 Stream<ArcBlock> stream = arcs.stream().filter(a -> a.points.get(0).equalsEpsilon(en, EPSILON));
-                assert stream.count() == 1;
-                newArcs.add(stream.findAny().get());
+                Optional<ArcBlock> x = stream.findAny();
+                if (!x.isPresent()) {
+                    // Problem observed with 31248000AO01. Choose the nearest node
+                    Logging.warn("Degraded mode for " + obj + " around " + en);
+                    stream = arcs.stream()
+                                 .sorted((o1, o2) -> Double.compare(en.distance(o1.points.get(0)), en.distance(o2.points.get(0))));
+                    x = stream.findFirst();
+                }
+                newArcs.add(x.get());
             }
             assert newArcs.size() == arcs.size();

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

@@ -276 +276 @@
             throw e;
         } catch (Exception | AssertionError e) {
+            Logging.error(e);
             throw new IOException(e);
         }