Index: /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/LeMansModule.java
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/LeMansModule.java	(revision 28087)
+++ /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/LeMansModule.java	(revision 28088)
@@ -18,4 +18,5 @@
 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,4 +26,5 @@
 		super(info);
 		handlers.add(new ServicesCommunautairesMunicipauxHandler());
+		handlers.add(new CantonsSartheHandler());
     }
 }
Index: /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/CantonsSartheHandler.java
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/CantonsSartheHandler.java	(revision 28088)
+++ /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/CantonsSartheHandler.java	(revision 28088)
@@ -0,0 +1,40 @@
+//    JOSM opendata plugin.
+//    Copyright (C) 2011-2012 Don-vip
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+package org.openstreetmap.josm.plugins.opendata.modules.fr.lemans.datasets;
+
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+
+public class CantonsSartheHandler extends LeMansDataSetHandler {
+
+	public CantonsSartheHandler() {
+		super("F7D936DF-550EA533-37695DD8-29CFF55B");
+		setName("Cantons de la Sarthe");
+		setCsvKmzShpUuid("62DF4EEF-550EA533-7E7BB44A-45C66201", "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 .*");
+	}
+
+	@Override
+	public void updateDataSet(DataSet ds) {
+		for (Node n : ds.getNodes()) {
+			replace(n, "NOM", "name");
+		}
+	}
+}
Index: /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java	(revision 28087)
+++ /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java	(revision 28088)
@@ -107,5 +107,5 @@
 		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)));
Index: /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/ServicesCommunautairesMunicipauxHandler.java
===================================================================
--- /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/ServicesCommunautairesMunicipauxHandler.java	(revision 28087)
+++ /applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/ServicesCommunautairesMunicipauxHandler.java	(revision 28088)
@@ -17,4 +17,5 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
 
 public class ServicesCommunautairesMunicipauxHandler extends LeMansDataSetHandler {
@@ -33,5 +34,7 @@
 	@Override
 	public void updateDataSet(DataSet ds) {
-		// TODO Auto-generated method stub
+		for (Node n : ds.getNodes()) {
+			replace(n, "NOM", "name");
+		}
 	}
 }
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java	(revision 28087)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java	(revision 28088)
@@ -69,5 +69,5 @@
 		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,4 +97,5 @@
 
 	private Class<? extends AbstractReader> findReaderByExtension(String filename) {
+		filename = filename.replace("\"", "");
     	if (filename.endsWith("."+XLS_EXT)) {
     		return XlsReader.class;
