Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java	(revision 35278)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java	(revision 35279)
@@ -22,5 +22,5 @@
 
     public VoirieHandler() {
-        this("filaire-de-voirie", "lib_off", "highway");
+        this("filaire-de-voirie", "libelle", "highway");
         setName("Filaire de voirie");
         setCategory(CAT_URBANISME);
@@ -33,7 +33,10 @@
         map.put("motorway", Arrays.asList("A6", "AUTOROUTE "));
         map.put("trunk", Arrays.asList("ROCADE "));
-        map.put("secondary", Arrays.asList("AV ", "BD ", "ALL ", "PONT ", "RTE ", "PORT ", "BOULINGRIN"));
-        map.put("residential", Arrays.asList("RUE ", "GRANDE-RUE ", "PROM ", "CHE", "CAMINOT ", "IMP ", "COURS ",
-                "LOT ", "ANC", "VIEUX ", "PL ", "CLOS ", "CITE ", "RESIDENCE ", "SENTIER ", "QU ", "SQ ", "VOIE ", "ESP "));
+        map.put("primary", Arrays.asList("NATIONALE ", "RN "));
+        map.put("secondary", Arrays.asList("AV ", "AVENUE ", "BD ", "BOULEVARD ", "ALL ", "ALLEE ", "ALLEES ", "PONT ", "RTE ", "ROUTE ",
+                "PORT ", "BOULINGRIN", "DEPARTEMENTALE ", "RD "));
+        map.put("residential", Arrays.asList("RUE ", "GRANDE-RUE ", "PASSAGE ", "PROM ", "PROMENADE ", "CHE", "CAMINOT ", "IMP ", "IMPASSE ",
+                "COURS ", "LOT ", "LOTISSEMENT ", "ANC", "VIEUX ", "PL ", "PLACE ", "CLOS ", "CITE ", "RESIDENCE ", "SENTIER ", "QU ", "QUAI ",
+                "SQ ", "SQUARE ", "VOIE ", "ESP ", "ESPACE ", "ESPLANADE ", "TRAVERSE "));
         map.put("unclassified", Arrays.asList("ZONE "));
         map.put("road", Arrays.asList("VA "));
@@ -72,5 +75,8 @@
                 w.remove(streetField);
                 w.remove("mot_directeur");
+                w.remove("code_insee");
                 w.remove("color");
+                w.remove("commune");
+                w.remove("id_troncon");
                 w.remove("rivoli");
                 w.remove("nrivoli");
@@ -80,5 +86,5 @@
                 }
 
-                if (name.startsWith("RPT ") || name.startsWith("GIRATOIRE ")) {
+                if (name.startsWith("RPT ") || name.startsWith("RON") || name.startsWith("GIRAT")) {
                     // TODO: find correct highway
                     w.put("junction", "roundabout");
@@ -87,5 +93,9 @@
                 }
 
-                w.put("name", name);
+                if (w.hasKey("libelle_complet")) {
+                    replace(w, "libelle_complet", "name");
+                } else {
+                    w.put("name", name);
+                }
 
                 if (name.matches("D[0-9]+.*")) {
@@ -101,5 +111,5 @@
                         associatedStreets.put(getStreetId(w), street = new Relation());
                         street.put("type", "associatedStreet");
-                        street.put("name", name);
+                        street.put("name", w.get("name"));
                         ds.addPrimitive(street);
                     }