Changeset 29801 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java

Timestamp:

2013-08-01T15:45:24+02:00 (12 years ago)

Author:

pieren

Message:

Fix transparency issue on new raster images. Temporary disable georeferences parsing not working on new cadastre WMS. Workaround on address help tool when switching to full screen.

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java (modified) (4 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java

@@ -113 +113 @@
             Main.map.mapView.removeMouseListener(this);
         }
-        dialog.setVisible(false);
+//        dialog.setVisible(false);
+        // kill the window completely to fix an issue on some linux distro and
+        // full screen mode.
+        if(dialog != null)
+        {
+            dialog.dispose();
+            dialog = null;
+        }
     }
 
@@ -132 +139 @@
             setNewSelection(currentMouseNode);
             String num = currentMouseNode.get(tagHouseNumber);
-            if (num != null //
-                    && currentMouseNode.get(tagHouseStreet) == null //
-                    && findWayInRelationAddr(currentMouseNode) == null //
+            if (num != null
+                    && currentMouseNode.get(tagHouseStreet) == null
+                    && findWayInRelationAddr(currentMouseNode) == null
                     && !inputStreet.getText().equals("")) {
-                // address already present but not linked to a street
+                // house number already present but not linked to a street
                 Collection<Command> cmds = new LinkedList<Command>();
                 addStreetNameOrRelation(currentMouseNode, cmds);
@@ -154 +161 @@
                 }
                 if (currentMouseNode.get(tagHouseStreet) != null) {
-                    inputStreet.setText(currentMouseNode.get(tagHouseStreet));
-                    if (ctrl) {
-                        Collection<Command> cmds = new LinkedList<Command>();
-                        addAddrToPrimitive(currentMouseNode, cmds);
-                        if (num == null)
-                            applyInputNumberChange();
+                    if(Main.pref.getBoolean("cadastrewms.addr.dontUseRelation", false)) {
+                        inputStreet.setText(currentMouseNode.get(tagHouseStreet));
+                        if (ctrl) {
+                            Collection<Command> cmds = new LinkedList<Command>();
+                            addAddrToPrimitive(currentMouseNode, cmds);
+                            if (num == null)
+                                applyInputNumberChange();
+                        }
+                        setSelectedWay((Way)null);
                     }
-                    setSelectedWay((Way)null);
                 } else {
                     // check if the node belongs to an associatedStreet relation
@@ -528 +537 @@
         } else
             link.setEnabled(true);
+        link.repaint();
     }