Changeset 16929 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

2009-08-09T00:39:02+02:00 (15 years ago)

Author:

pieren

Message:

support new projections for French overseas departements and move projection checking from startup to grab action (since projection is dynamic)

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• CadastrePlugin.java (modified) (3 diffs)
• MenuActionGrab.java (modified) (2 diffs)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
-import org.openstreetmap.josm.data.projection.Lambert;
+import org.openstreetmap.josm.data.projection.*;
 
 /**
@@ -125 +125 @@
 
     public void refreshMenu() throws Exception {
-        boolean isLambertProjection = Main.proj.toString().equals(new Lambert().toString());
         MainMenu menu = Main.main.menu;
 
         if (cadastreJMenu == null) {
             cadastreJMenu = menu.addMenu(marktr("Cadastre"), KeyEvent.VK_C, menu.defaultMenuPos);
-            if (isLambertProjection) {
-                JosmAction grab = new MenuActionGrab();
-                JMenuItem menuGrab = new JMenuItem(grab);
-                KeyStroke ks = grab.getShortcut().getKeyStroke();
-                if (ks != null) {
-                    menuGrab.setAccelerator(ks);
+            JosmAction grab = new MenuActionGrab();
+            JMenuItem menuGrab = new JMenuItem(grab);
+            KeyStroke ks = grab.getShortcut().getKeyStroke();
+            if (ks != null) {
+                menuGrab.setAccelerator(ks);
+            }
+            JMenuItem menuSettings = new JMenuItem(new MenuActionNewLocation());
+            final JCheckBoxMenuItem menuSource = new JCheckBoxMenuItem(tr("Auto sourcing"));
+            menuSource.setSelected(autoSourcing);
+            menuSource.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent ev) {
+                    Main.pref.put("cadastrewms.autosourcing", menuSource.isSelected());
+                    autoSourcing = menuSource.isSelected();
                 }
-                JMenuItem menuSettings = new JMenuItem(new MenuActionNewLocation());
-                final JCheckBoxMenuItem menuSource = new JCheckBoxMenuItem(tr("Auto sourcing"));
-                menuSource.setSelected(autoSourcing);
-                menuSource.addActionListener(new ActionListener() {
-                    public void actionPerformed(ActionEvent ev) {
-                        Main.pref.put("cadastrewms.autosourcing", menuSource.isSelected());
-                        autoSourcing = menuSource.isSelected();
-                    }
-                });
-
-                JMenuItem menuResetCookie = new JMenuItem(new MenuActionResetCookie());
-                JMenuItem menuLambertZone = new JMenuItem(new MenuActionLambertZone());
-                JMenuItem menuLoadFromCache = new JMenuItem(new MenuActionLoadFromCache());
-                //JMenuItem menuActionBoundaries = new JMenuItem(new MenuActionBoundaries());
-                //JMenuItem menuActionBuildings = new JMenuItem(new MenuActionBuildings());
-
-                cadastreJMenu.add(menuGrab);
-                cadastreJMenu.add(menuSettings);
-                cadastreJMenu.add(menuSource);
-                cadastreJMenu.add(menuResetCookie);
-                cadastreJMenu.add(menuLambertZone);
-                cadastreJMenu.add(menuLoadFromCache);
-                // all SVG features disabled until official WMS is released
-                //cadastreJMenu.add(menuActionBoundaries);
-                //cadastreJMenu.add(menuActionBuildings);
-            } else {
-                JMenuItem hint = new JMenuItem(tr("Invalid projection"));
-                hint.setToolTipText(tr("Change the projection to {0} first.", new Lambert().toString()));
-                hint.addActionListener(new ActionListener() {
-                    public void actionPerformed(ActionEvent ev) {
-                        JOptionPane.showMessageDialog(Main.parent,
-                                tr("To enable the cadastre WMS plugin, change\nthe JOSM projection to Lambert and restart"));
-                    }
-                });
-                cadastreJMenu.add(hint);
-            }
+            });
+
+            JMenuItem menuResetCookie = new JMenuItem(new MenuActionResetCookie());
+            JMenuItem menuLambertZone = new JMenuItem(new MenuActionLambertZone());
+            JMenuItem menuLoadFromCache = new JMenuItem(new MenuActionLoadFromCache());
+            //JMenuItem menuActionBoundaries = new JMenuItem(new MenuActionBoundaries());
+            //JMenuItem menuActionBuildings = new JMenuItem(new MenuActionBuildings());
+
+            cadastreJMenu.add(menuGrab);
+            cadastreJMenu.add(menuSettings);
+            cadastreJMenu.add(menuSource);
+            cadastreJMenu.add(menuResetCookie);
+            cadastreJMenu.add(menuLambertZone);
+            cadastreJMenu.add(menuLoadFromCache);
+            // all SVG features disabled until official WMS is released
+            //cadastreJMenu.add(menuActionBoundaries);
+            //cadastreJMenu.add(menuActionBuildings);
         }
         setEnabledAll(menuEnabled);
@@ -250 +237 @@
         }
     }
+    
+    public static boolean isCadastreProjection() {
+            return Main.proj.toString().equals(new Lambert().toString())
+            || Main.proj.toString().equals(new UTM_20N_Guadeloupe_Fort_Marigot().toString())
+            || Main.proj.toString().equals(new UTM_20N_Guadeloupe_Ste_Anne().toString())
+            || Main.proj.toString().equals(new UTM_20N_Martinique_Fort_Desaix().toString())
+            || Main.proj.toString().equals(new GaussLaborde_Reunion().toString());
+    }
 
 }

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

@@ -5 +5 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -27 +29 @@
     public void actionPerformed(ActionEvent e) {
         if (Main.map != null) {
-            WMSLayer wmsLayer = WMSDownloadAction.getLayer();
-            if (wmsLayer != null)
-                DownloadWMSTask.download(wmsLayer);
+            if (CadastrePlugin.isCadastreProjection()) {
+                WMSLayer wmsLayer = WMSDownloadAction.getLayer();
+                if (wmsLayer != null)
+                    DownloadWMSTask.download(wmsLayer);
+            } else {
+                JOptionPane.showMessageDialog(Main.parent,
+                        tr("To enable the cadastre WMS plugin, change\n"
+                         + "the current projection to one of the cadastre\n"
+                         + "projection and retry"));
+            }
         }
     }