Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java	(revision 22041)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java	(revision 22042)
@@ -119,8 +119,6 @@
         MapView mv = Main.map.mapView;
         Point mousePos = e.getPoint();
-//        Node mouseOnExistingNode = null;
         List<Way> mouseOnExistingWays = new ArrayList<Way>();
         mouseOnExistingWays = new ArrayList<Way>();
-//        mouseOnExistingNode = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
         Node currentMouseNode = mv.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
         if(currentMouseNode != null) {
@@ -164,8 +162,25 @@
             }
             if (mouseOnExistingWays.size() == 1) {
+                // clicked on existing highway => set new street name
                 inputStreet.setText(mouseOnExistingWays.get(0).get(tagHighwayName));
+            } else if (mouseOnExistingWays.size() == 0) {
+                // clicked a non highway and not a node => add the new address 
+                Node n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
+                if (n != null)
+                    if (!n.hasKey(tagHouseNumber))
+                        addAddrToNode(n);
+                else
+                    createNewNode(mousePos);
             }
         }
 
+    }
+    
+    private void addAddrToNode(Node n) {
+        // node exists : just add the tag addr:housenumber and member in relation
+    }
+    
+    private void createNewNode(Point mousePos) {
+        
     }