Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFile.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFile.java (revision 33660) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFile.java (revision 33661) @@ -74,6 +74,10 @@ } - void resolve() { - // To be overriden if relevant + void resolvePhase1() { + // To be overriden if relevant (before relations are resolved) + } + + void resolvePhase2() { + // To be overriden if relevant (after relations are resolved) } Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileSCD.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileSCD.java (revision 33660) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileSCD.java (revision 33661) @@ -55,6 +55,6 @@ @Override - void resolve() { - super.resolve(); + void resolvePhase1() { + super.resolvePhase1(); for (List values : lAttributes) { attributes.add(lot.scd.find(values, McdAttributeDef.class)); Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileVEC.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileVEC.java (revision 33660) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileVEC.java (revision 33661) @@ -77,12 +77,29 @@ @Override - void resolve() { - super.resolve(); + void resolvePhase1() { + super.resolvePhase1(); for (EdigeoRecord r : lAttributeValues) { + // Does not work for composed attributes, the value is overriden in phase 2 + attributeValues.add(r.values.get(0)); + } + } + + @Override + void resolvePhase2() { + super.resolvePhase2(); + for (int i = 0; i < nAttributes; i++) { + EdigeoRecord r = lAttributeValues.get(i); if (r.nature == Nature.COMPOSED) { - //attributeValues.add(lot.scd.find(r.values, McdAttributeDef.class).dictRef); - attributeValues.add(r.values.toString()); // FIXME - } else { - attributeValues.add(r.values.get(0)); + assert !parentRelations.isEmpty(); + McdAttributeDef def = lot.scd.find(r.values, McdAttributeDef.class); + List relations = getSemanticRelations().stream().filter( + rel -> rel.elements.stream().anyMatch(e -> e.attributeDefs.contains(def))).collect(Collectors.toList()); + assert relations.size() == 1; + List> elements = relations.get(0).elements.stream().filter( + e -> e.attributeDefs.contains(def)).collect(Collectors.toList()); + assert elements.size() == 1; + VecBlock e = elements.get(0); + attributeValues.set(i, e.attributeValues.get(e.attributeDefs.indexOf(def))); + attributeDefs.set(i, def); } } @@ -384,6 +401,6 @@ @Override - final void resolve() { - super.resolve(); + final void resolvePhase1() { + super.resolvePhase1(); for (List values : lElements) { VecBlock b = lot.vec.stream().filter(v -> v.subsetId.equals(values.get(1))).findAny() @@ -472,9 +489,8 @@ for (ObjectBlock obj : getObjects()) { if (!ignoredObjects.stream().anyMatch(p -> p.test(obj))) { - List constructionRelations = obj.getConstructionRelations(); switch (obj.scdRef.kind) { - case POINT: fillPoint(ds, proj, obj, constructionRelations); break; - case LINE: fillLine(ds, proj, obj, constructionRelations); break; - case AREA: fillArea(ds, proj, obj, constructionRelations); break; + case POINT: fillPoint(ds, proj, obj, obj.getConstructionRelations(), obj.getSemanticRelations()); break; + case LINE: fillLine(ds, proj, obj, obj.getConstructionRelations(), obj.getSemanticRelations()); break; + case AREA: fillArea(ds, proj, obj, obj.getConstructionRelations(), obj.getSemanticRelations()); break; case COMPLEX: break; // TODO (not used in PCI) default: throw new IllegalArgumentException(obj.toString()); @@ -492,46 +508,43 @@ } - private static void fillPoint(DataSet ds, Projection proj, ObjectBlock obj, List constructionRelations) { - assert constructionRelations.size() == 1 : constructionRelations; - RelationBlock rel = constructionRelations.get(0); - assert rel.scdRef instanceof McdConstructionRelationDef : rel; - if (rel.scdRef instanceof McdConstructionRelationDef) { - McdConstructionRelationDef crd = (McdConstructionRelationDef) rel.scdRef; - assert crd.kind == RelationKind.IS_MADE_OF; - assert crd.nAttributes == 0; - } - for (VecBlock e : rel.elements) { - if (e instanceof NodeBlock) { - NodeBlock nb = (NodeBlock) e; - assert nb.nAttributes == 0; - LatLon ll = proj.eastNorth2latlon(nb.getCoordinate()); - //if (ds.searchNodes(around(ll)).isEmpty()) { - addPrimitiveAndTags(ds, obj, new Node(ll)); - //} - break; - } - } - } - - private static void fillLine(DataSet ds, Projection proj, ObjectBlock obj, List constructionRelations) { - assert constructionRelations.size() >= 1 : constructionRelations; - // Retrieve all arcs for the linear object - final List arcs = new ArrayList<>(); + @SuppressWarnings("unchecked") + private static > List extract(Class klass, List constructionRelations, RelationKind kind) { + final List list = new ArrayList<>(); for (RelationBlock rel : constructionRelations) { assert rel.scdRef instanceof McdConstructionRelationDef : rel; if (rel.scdRef instanceof McdConstructionRelationDef) { McdConstructionRelationDef crd = (McdConstructionRelationDef) rel.scdRef; - assert crd.kind == RelationKind.IS_MADE_OF_ARC; + assert crd.kind == kind; assert crd.nAttributes == 0; } for (VecBlock e : rel.elements) { - if (e instanceof ArcBlock) { - arcs.add((ArcBlock) e); + if (klass.isInstance(e)) { + list.add((T) e); } } } + return list; + } + + private static void fillPoint(DataSet ds, Projection proj, ObjectBlock obj, + List constructionRelations, List semanticRelations) { + assert constructionRelations.size() == 1 : constructionRelations; + List nodes = extract(NodeBlock.class, constructionRelations, RelationKind.IS_MADE_OF); + assert nodes.size() == 1 : nodes; + NodeBlock nb = nodes.get(0); + assert nb.nAttributes == 0; + LatLon ll = proj.eastNorth2latlon(nb.getCoordinate()); + //if (ds.searchNodes(around(ll)).isEmpty()) { + addPrimitiveAndTags(ds, obj, new Node(ll)); + //} + } + + private static void fillLine(DataSet ds, Projection proj, ObjectBlock obj, + List constructionRelations, List semanticRelations) { + assert constructionRelations.size() >= 1 : constructionRelations; + // Retrieve all arcs for the linear object + final List arcs = extract(ArcBlock.class, constructionRelations, RelationKind.IS_MADE_OF_ARC); final double EPSILON = 1e-2; assert arcs.size() >= 1; - Way w = new Way(); // Some lines are made of several arcs, but they need to be sorted if (arcs.size() > 1) { @@ -553,6 +566,6 @@ arcs.clear(); arcs.addAll(newArcs); - w.put(new Tag("fixme", "several_arcs")); // FIXME - } + } + Way w = new Way(); // Add first node of first arc w.addNode(getNodeAt(ds, proj, arcs.get(0).points.get(0))); @@ -569,6 +582,8 @@ } - private static void fillArea(DataSet ds, Projection proj, ObjectBlock obj, List constructionRelations) { + private static void fillArea(DataSet ds, Projection proj, ObjectBlock obj, + List constructionRelations, List semanticRelations) { assert constructionRelations.size() >= 1 : constructionRelations; + // TODO } Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoLotFile.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoLotFile.java (revision 33660) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoLotFile.java (revision 33661) @@ -57,5 +57,6 @@ @Override final void resolve() { - blocks.forEach((k, v) -> v.forEach(Block::resolve)); + blocks.forEach((k, v) -> v.forEach(Block::resolvePhase1)); + blocks.forEach((k, v) -> v.forEach(Block::resolvePhase2)); }