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

Timestamp:

2010-03-09T22:02:00+01:00 (15 years ago)

Author:

pieren

Message:

Many small fixes and improvements

File:

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

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

@@ -90 +90 @@
  * 1.6 28-Nov-2009 - Fix minor issues if Grab is called without layer (possible since projection rework)
  * 1.7 12-Dec-2009 - Change URL's changes for cookie and downgrade imgs resolution due to WMS changes
- * 1.8 xxx         - filter the mouse button 1 during georeferencing
+ * 1.8 09-Mar-2010 - filter the mouse button 1 during georeferencing
  *                 - retry if getting a new cookie failed (10 times during 30 seconds)
  *                 - cookie expiration automatically detected and renewed (after 30 minutes)
@@ -188 +188 @@
             // temporary disabled:
             //JMenuItem menuActionBoundaries = new JMenuItem(new MenuActionBoundaries());
-            //JMenuItem menuActionBuildings = new JMenuItem(new MenuActionBuildings());
+            JMenuItem menuActionBuildings = new JMenuItem(new MenuActionBuildings());
 
             cadastreJMenu.add(menuGrab);
@@ -196 +196 @@
             //cadastreJMenu.add(menuResetCookie); not required any more
             //cadastreJMenu.add(menuLambertZone);
+            if (Main.pref.getBoolean("cadastrewms.buildingsMenu", false))
+                cadastreJMenu.add(menuActionBuildings);
             cadastreJMenu.add(menuLoadFromCache);
             // all SVG features disabled until official WMS is released
             //cadastreJMenu.add(menuActionBoundaries);
-            //cadastreJMenu.add(menuActionBuildings);
         }
         setEnabledAll(menuEnabled);
@@ -224 +225 @@
             imageWidth = 600; imageHeight = 400;
         }
-        grabLayers = "";
-        grabStyles = "";
-        if (Main.pref.getBoolean("cadastrewms.layerWater", true)) {
-            grabLayers += "CDIF:LS3,";
-            grabStyles += "LS3_90,";
-        }
-        if (Main.pref.getBoolean("cadastrewms.layerBuilding", true)) {
-            grabLayers += "CDIF:LS2,";
-            grabStyles += "LS2_90,";
-        }
-        if (Main.pref.getBoolean("cadastrewms.layerSymbol", true)) {
-            grabLayers += "CDIF:LS1,";
-            grabStyles += "LS1_90,";
-        }
-        if (Main.pref.getBoolean("cadastrewms.layerParcel", true)) {
-            grabLayers += "CDIF:PARCELLE,";
-            grabStyles += "PARCELLE_90,";
-        }
-        if (Main.pref.getBoolean("cadastrewms.layerNumero", true)) {
-            grabLayers += "CDIF:NUMERO,";
-            grabStyles += "NUMERO_90,";
-        }
-        if (Main.pref.getBoolean("cadastrewms.layerLabel", true)) {
-            grabLayers += "CDIF:PT3,CDIF:PT2,CDIF:PT1,";
-            grabStyles += "PT3_90,PT2_90,PT1_90,";
-        }
-        if (Main.pref.getBoolean("cadastrewms.layerLieudit", true)) {
-            grabLayers += "CDIF:LIEUDIT,";
-            grabStyles += "LIEUDIT_90,";
-        }
-        if (Main.pref.getBoolean("cadastrewms.layerSection", true)) {
-            grabLayers += "CDIF:SUBSECTION,CDIF:SECTION,";
-            grabStyles += "SUBSECTION_90,SECTION_90,";
-        }
-        if (Main.pref.getBoolean("cadastrewms.layerCommune", true)) {
-            grabLayers += "CDIF:COMMUNE,";
-            grabStyles += "COMMUNE_90,";
-        }
-        if (grabLayers.length() > 0) { // remove the last ','
-            grabLayers = grabLayers.substring(0, grabLayers.length()-1);
-            grabStyles = grabStyles.substring(0, grabStyles.length()-1);
-        }
+        refreshLayersURL();
         
         // overwrite F11 shortcut used from the beginning by this plugin and recently used
@@ -296 +256 @@
         refreshMenu();
     }
+    
+    private static void refreshLayersURL() {
+        grabLayers = "";
+        grabStyles = "";
+        if (Main.pref.getBoolean("cadastrewms.layerWater", true)) {
+            grabLayers += "CDIF:LS3,";
+            grabStyles += "LS3_90,";
+        }
+        if (Main.pref.getBoolean("cadastrewms.layerBuilding", true)) {
+            grabLayers += "CDIF:LS2,";
+            grabStyles += "LS2_90,";
+        }
+        if (Main.pref.getBoolean("cadastrewms.layerSymbol", true)) {
+            grabLayers += "CDIF:LS1,";
+            grabStyles += "LS1_90,";
+        }
+        if (Main.pref.getBoolean("cadastrewms.layerParcel", true)) {
+            grabLayers += "CDIF:PARCELLE,";
+            grabStyles += "PARCELLE_90,";
+        }
+        if (Main.pref.getBoolean("cadastrewms.layerNumero", true)) {
+            grabLayers += "CDIF:NUMERO,";
+            grabStyles += "NUMERO_90,";
+        }
+        if (Main.pref.getBoolean("cadastrewms.layerLabel", true)) {
+            grabLayers += "CDIF:PT3,CDIF:PT2,CDIF:PT1,";
+            grabStyles += "PT3_90,PT2_90,PT1_90,";
+        }
+        if (Main.pref.getBoolean("cadastrewms.layerLieudit", true)) {
+            grabLayers += "CDIF:LIEUDIT,";
+            grabStyles += "LIEUDIT_90,";
+        }
+        if (Main.pref.getBoolean("cadastrewms.layerSection", true)) {
+            grabLayers += "CDIF:SUBSECTION,CDIF:SECTION,";
+            grabStyles += "SUBSECTION_90,SECTION_90,";
+        }
+        if (Main.pref.getBoolean("cadastrewms.layerCommune", true)) {
+            grabLayers += "CDIF:COMMUNE,";
+            grabStyles += "COMMUNE_90,";
+        }
+        if (grabLayers.length() > 0) { // remove the last ','
+            grabLayers = grabLayers.substring(0, grabLayers.length()-1);
+            grabStyles = grabStyles.substring(0, grabStyles.length()-1);
+        }
+    }
 
     @Override
@@ -322 +327 @@
                 Main.map.addMapMode(new IconToggleButton
                         (new WMSAdjustAction(Main.map)));
+                Main.map.addMapMode(new IconToggleButton
+                        (new Buildings(Main.map)));
             } else if (oldFrame != null && newFrame == null) {
                 setEnabledAll(false);