Changeset 28053 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2012-03-12T20:18:35+01:00 (12 years ago)

Author:

donvip

Message:

opendata: download public forests from data.gouv.fr

Location:

applications/editors/josm/plugins/opendata

Files:

• modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/DataGouvFrModule.java (modified) (2 diffs)
• modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/agriculture/RegistreParcellaireHandler.java (modified) (2 diffs)
• modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/ecologie/ForetsPubliquesHandler.java (added)
• src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchAdministrativeUnit.java (moved) (moved from applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDepartment.java ) (3 diffs)

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/DataGouvFrModule.java

@@ -23 +23 @@
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.diplomatie.EtabAEFEHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.ecologie.AssainissementHandler;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.ecologie.ForetsPubliquesHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.education.Etab1er2ndDegreHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.education.EtabSupHandler;
@@ -41 +42 @@
         handlers.add(new PassageNiveauHandler());
         handlers.add(new ROEHandler());
+        handlers.add(new ForetsPubliquesHandler());
     }
 }

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/agriculture/RegistreParcellaireHandler.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
-import org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchDepartment;
+import org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchAdministrativeUnit;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.DataGouvDataSetHandler;
 import org.openstreetmap.josm.tools.Pair;
@@ -144 +144 @@
                 List<Pair<String, URL>> result = new ArrayList<Pair<String,URL>>();
                 try {
-                        for (FrenchDepartment dpt : FrenchDepartment.allDepartments) {
+                        for (FrenchAdministrativeUnit dpt : FrenchAdministrativeUnit.allDepartments) {
                                 result.add(getRpgURL(dpt.getCode(), dpt.getName()));
                         }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java

@@ -30 +30 @@
                         if (associatedFile != null) {
                                 handler.setAssociatedFile(associatedFile);
-                                handler.setSourceDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date(associatedFile.lastModified())));
+                                long lastmodified = associatedFile.lastModified();
+                                if (lastmodified > 0) {
+                                        handler.setSourceDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date(lastmodified)));
+                                }
                         }
                         if (!Main.pref.getBoolean(PREF_RAWDATA)) {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchAdministrativeUnit.java

@@ -16 +16 @@
 package org.openstreetmap.josm.plugins.opendata.core.datasets.fr;
 
-public final class FrenchDepartment {
+public abstract class FrenchAdministrativeUnit {
         private final String code; 
         private final String name;
         
-        private FrenchDepartment(String code, String name) {
+        private FrenchAdministrativeUnit(String code, String name) {
                 this.code = code;
                 this.name = name;
@@ -31 +31 @@
         public final String getName() {
                 return name;
+        }
+        
+        public static final class FrenchDepartment extends FrenchAdministrativeUnit {
+                private FrenchDepartment(String code, String name) {
+                        super(code, name);
+                }
+        }
+        
+        public static final class FrenchRegion extends FrenchAdministrativeUnit {
+                private FrenchRegion(String code, String name) {
+                        super(code, name);
+                }
         }
 
@@ -136 +148 @@
                 new FrenchDepartment("976", "Mayotte"),
         };
+
+        public static final FrenchRegion[] allRegions = new FrenchRegion[] {
+                new FrenchRegion("42", "Alsace"),
+                new FrenchRegion("72", "Aquitaine"),
+                new FrenchRegion("83", "Auvergne"),
+                new FrenchRegion("25", "Basse-Normandie"),
+                new FrenchRegion("26", "Bourgogne"),
+                new FrenchRegion("53", "Bretagne"),
+                new FrenchRegion("24", "Centre"),
+                new FrenchRegion("21", "Champagne-Ardenne"),
+                new FrenchRegion("94", "Corse"),
+                new FrenchRegion("43", "Franche-Comté"),
+                new FrenchRegion("23", "Haute-Normandie"),
+                new FrenchRegion("11", "Île-de-France"),
+                new FrenchRegion("91", "Languedoc-Roussillon"),
+                new FrenchRegion("74", "Limousin"),
+                new FrenchRegion("41", "Lorraine"),
+                new FrenchRegion("73", "Midi-Pyrénées"),
+                new FrenchRegion("31", "Nord-Pas-de-Calais"),
+                new FrenchRegion("52", "Pays de la Loire"),
+                new FrenchRegion("22", "Picardie"),
+                new FrenchRegion("54", "Poitou-Charentes"),
+                new FrenchRegion("93", "Provence-Alpes-Côte d'Azur"),
+                new FrenchRegion("82", "Rhône-Alpes"),
+                new FrenchRegion("01", "Guadeloupe"),
+                new FrenchRegion("02", "Martinique"),
+                new FrenchRegion("03", "Guyane"),
+                new FrenchRegion("04", "La Réunion"),
+                new FrenchRegion("05", "Mayotte")
+        };
 }