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

Timestamp:

2012-03-15T13:59:12+01:00 (13 years ago)

Author:

donvip

Message:

opendata: Le Mans data support, continuation

Location:

applications/editors/josm/plugins/opendata

Files:

• modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/LeMansModule.java (modified) (2 diffs)
• modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/CantonsSartheHandler.java (added)
• modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java (modified) (1 diff)
• modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/ServicesCommunautairesMunicipauxHandler.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java (modified) (2 diffs)

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

@@ -18 +18 @@
 import org.openstreetmap.josm.plugins.opendata.core.modules.AbstractModule;
 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.ServicesCommunautairesMunicipauxHandler;
 
@@ -25 +26 @@
                 super(info);
                 handlers.add(new ServicesCommunautairesMunicipauxHandler());
+                handlers.add(new CantonsSartheHandler());
     }
 }

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

@@ -107 +107 @@
                 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 (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

@@ -17 +17 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
 
 public class ServicesCommunautairesMunicipauxHandler extends LeMansDataSetHandler {
@@ -33 +34 @@
         @Override
         public void updateDataSet(DataSet ds) {
-                // TODO Auto-generated method stub
+                for (Node n : ds.getNodes()) {
+                        replace(n, "NOM", "name");
+                }
         }
 }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java

@@ -69 +69 @@
                 String cdisp = this.activeConnection.getHeaderField("Content-disposition");
                 if (cdisp != null) {
-                        Matcher m = Pattern.compile("attachment; filename=(.*)").matcher(cdisp);
+                        Matcher m = Pattern.compile("attachment;.?filename=(.*)").matcher(cdisp);
                         if (m.matches()) {
                                 filename = m.group(1);
@@ -97 +97 @@
 
         private Class<? extends AbstractReader> findReaderByExtension(String filename) {
+                filename = filename.replace("\"", "");
         if (filename.endsWith("."+XLS_EXT)) {
                 return XlsReader.class;