Changeset 33661 in osm for applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap

Timestamp:

2017-09-24T18:59:50+02:00 (7 years ago)

Author:

donvip

Message:

Edigeo: decoding of composed attributes

Location:

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

Files:

• EdigeoFile.java (modified) (1 diff)
• EdigeoFileSCD.java (modified) (1 diff)
• EdigeoFileVEC.java (modified) (6 diffs)
• EdigeoLotFile.java (modified) (1 diff)

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

@@ -74 +74 @@
         }
 
-        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)
         }
 

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

@@ -55 +55 @@
 
         @Override
-        void resolve() {
-            super.resolve();
+        void resolvePhase1() {
+            super.resolvePhase1();
             for (List<String> values : lAttributes) {
                 attributes.add(lot.scd.find(values, McdAttributeDef.class));

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

@@ -77 +77 @@
 
         @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<RelationBlock> relations = getSemanticRelations().stream().filter(
+                            rel -> rel.elements.stream().anyMatch(e -> e.attributeDefs.contains(def))).collect(Collectors.toList());
+                    assert relations.size() == 1;
+                    List<VecBlock<?>> 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 +401 @@
 
         @Override
-        final void resolve() {
-            super.resolve();
+        final void resolvePhase1() {
+            super.resolvePhase1();
             for (List<String> values : lElements) {
                 VecBlock<?> b = lot.vec.stream().filter(v -> v.subsetId.equals(values.get(1))).findAny()
@@ -472 +489 @@
         for (ObjectBlock obj : getObjects()) {
             if (!ignoredObjects.stream().anyMatch(p -> p.test(obj))) {
-                List<RelationBlock> 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 +508 @@
     }
 
-    private static void fillPoint(DataSet ds, Projection proj, ObjectBlock obj, List<RelationBlock> 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<RelationBlock> constructionRelations) {
-        assert constructionRelations.size() >= 1 : constructionRelations;
-        // Retrieve all arcs for the linear object
-        final List<ArcBlock> arcs = new ArrayList<>();
+    @SuppressWarnings("unchecked")
+    private static <T extends VecBlock<?>> List<T> extract(Class<T> klass, List<RelationBlock> constructionRelations, RelationKind kind) {
+        final List<T> 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<RelationBlock> constructionRelations, List<RelationBlock> semanticRelations) {
+        assert constructionRelations.size() == 1 : constructionRelations;
+        List<NodeBlock> 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<RelationBlock> constructionRelations, List<RelationBlock> semanticRelations) {
+        assert constructionRelations.size() >= 1 : constructionRelations;
+        // Retrieve all arcs for the linear object
+        final List<ArcBlock> 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 +566 @@
             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 +582 @@
     }
 
-    private static void fillArea(DataSet ds, Projection proj, ObjectBlock obj, List<RelationBlock> constructionRelations) {
+    private static void fillArea(DataSet ds, Projection proj, ObjectBlock obj,
+            List<RelationBlock> constructionRelations, List<RelationBlock> semanticRelations) {
         assert constructionRelations.size() >= 1 : constructionRelations;
+        // TODO
     }
 

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

@@ -57 +57 @@
     @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));
     }