Changeset 28091 in osm for applications/editors/josm/plugins/opendata/modules/fr.lemans/src

Timestamp:

2012-03-15T20:29:01+01:00 (13 years ago)

Author:

donvip

Message:

opendata: Le Mans full data support

Location:

applications/editors/josm/plugins/opendata/modules/fr.lemans

Files:

• . (modified) (1 prop)
• src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/LeMansModule.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/CantonsSartheHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/CirconscriptionsLegislativesHandler.java (added)
• src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/CodesPostauxHandler.java (added)
• src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/CommunesHandler.java (added)
• src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/ConseilsQuartiersHandler.java (added)
• src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/PointsApportVolontaireHandler.java (added)
• src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/ServicesCommunautairesMunicipauxHandler.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/LeMansModule.java

@@ -19 +19 @@
 import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleInformation;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.lemans.datasets.CantonsSartheHandler;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.lemans.datasets.CirconscriptionsLegislativesHandler;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.lemans.datasets.CodesPostauxHandler;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.lemans.datasets.CommunesHandler;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.lemans.datasets.ConseilsQuartiersHandler;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.lemans.datasets.PointsApportVolontaireHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.lemans.datasets.ServicesCommunautairesMunicipauxHandler;
 
@@ -27 +32 @@
                 handlers.add(new ServicesCommunautairesMunicipauxHandler());
                 handlers.add(new CantonsSartheHandler());
+                handlers.add(new CommunesHandler());
+                handlers.add(new CodesPostauxHandler());
+                handlers.add(new CirconscriptionsLegislativesHandler());
+                handlers.add(new ConseilsQuartiersHandler());
+                handlers.add(new PointsApportVolontaireHandler());
     }
 }

applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/CantonsSartheHandler.java

@@ -24 +24 @@
                 super("F7D936DF-550EA533-37695DD8-29CFF55B");
                 setName("Cantons de la Sarthe");
-                setCsvKmzShpUuid("62DF4EEF-550EA533-7E7BB44A-45C66201", "62DFCA8F-550EA533-7E7BB44A-7D1AA2D4", "62E017CA-550EA533-7E7BB44A-23772121");
+                setKmzShpUuid("62DFCA8F-550EA533-7E7BB44A-7D1AA2D4", "62E017CA-550EA533-7E7BB44A-23772121");
         }
 
         @Override
         public boolean acceptsFilename(String filename) {
-                return acceptsCsvKmzShpFilename(filename, "CANTONS_72") || acceptsZipFilename(filename, "Les cantons de la Sarthe .*");
+                return acceptsKmzShpFilename(filename, "CANTONS_72") || acceptsZipFilename(filename, "Les cantons de la Sarthe .*");
         }
 

applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java

@@ -30 +30 @@
         private String uuid;
         
-        private String csvUuid;
         private String kmzUuid;
         private String shpUuid;
@@ -61 +60 @@
                 this.uuid = uuid;
         }
-        
-        protected final void setCsvKmzShpUuid(String csvUuid, String kmzUuid, String shpUuid) {
-                this.csvUuid = csvUuid;
+                
+        protected final void setKmzShpUuid(String kmzUuid, String shpUuid) {
                 this.kmzUuid = kmzUuid;
                 this.shpUuid = shpUuid;
@@ -107 +105 @@
                 List<Pair<String, URL>> result = new ArrayList<Pair<String,URL>>();
                 try {
-                        //if (csvUuid != null && !csvUuid.isEmpty()) result.add(new Pair<String, URL>("CSV", new URL(PORTAL + "download.do?uuid=" + csvUuid)));
                         if (kmzUuid != null && !kmzUuid.isEmpty()) result.add(new Pair<String, URL>("KMZ", new URL(PORTAL + "download.do?uuid=" + kmzUuid)));
                         if (shpUuid != null && !shpUuid.isEmpty()) result.add(new Pair<String, URL>("SHP", new URL(PORTAL + "download.do?uuid=" + shpUuid)));

applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/ServicesCommunautairesMunicipauxHandler.java

@@ -24 +24 @@
                 super("F7F65F15-550EA533-37695DD8-F7A74F05");
                 setName("Services communautaires et municipaux");
-                setCsvKmzShpUuid("66C8C51F-550EA533-7E7BB44A-B9216F89", "66C925DA-550EA533-7E7BB44A-BCF0B629", "66C972AD-550EA533-7E7BB44A-E842FFAD");
+                setKmzShpUuid("66C925DA-550EA533-7E7BB44A-BCF0B629", "66C972AD-550EA533-7E7BB44A-E842FFAD");
         }
 
         @Override
         public boolean acceptsFilename(String filename) {
-                return acceptsCsvKmzShpFilename(filename, "SERVICES_VDM_LMM") || acceptsZipFilename(filename, "Les services de le Mans Métropole et de la Ville du Mans .*");
+                return acceptsKmzShpFilename(filename, "SERVICES_VDM_LMM") || acceptsZipFilename(filename, "Les services de le Mans Métropole et de la Ville du Mans .*");
         }