Changeset 33688 in osm for applications

Timestamp:

2017-09-30T15:48:06+02:00 (7 years ago)

Author:

donvip

Message:

Edigeo: add source + fixme

Location:

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

Files:

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

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

@@ -12 +12 @@
 import java.io.File;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
@@ -501 +502 @@
 
     private static String checkSourceMillesime() {
-        java.util.Calendar calendar = java.util.Calendar.getInstance();
-        int currentYear = calendar.get(java.util.Calendar.YEAR);
+        int currentYear = Calendar.getInstance().get(Calendar.YEAR);
         String src = Main.pref.get("cadastrewms.source",
             "cadastre-dgi-fr source : Direction G\u00e9n\u00e9rale des Imp\u00f4ts - Cadastre. Mise \u00e0 jour : AAAA");

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

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
 import org.openstreetmap.josm.plugins.fr.cadastre.edigeo.EdigeoFileSCD.McdAttributeDef;
 import org.openstreetmap.josm.plugins.fr.cadastre.edigeo.EdigeoFileSCD.McdConstructionRelationDef;
@@ -563 +564 @@
                             e.b.accept(obj, p);
                         }
+                    }
+                    if (p.isTagged()) {
+                        p.put("source", CadastrePlugin.source);
                     }
                 }

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

@@ -173 +173 @@
         EdigeoFileVEC.addObjectPostProcessor((o, p) -> {
             p.put("place", "unknown");
+            p.put("fixme", "place type");
         }, o -> o.hasScdIdentifier("LIEUDIT_id"));