Changeset 22387 in osm for applications

Timestamp:

2010-07-19T21:06:52+02:00 (14 years ago)

Author:

pieren

Message:

add ctrl modifier in address mode; add "tableau d'assemblage" in list of cadastre raster images

Location:

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

Files:

• Address.java (modified) (3 diffs)
• CadastreInterface.java (modified) (2 diffs)
• CadastrePlugin.java (modified) (1 diff)
• CadastrePreferenceSetting.java (modified) (3 diffs)

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

@@ -89 +89 @@
     JLabel link = new JLabel();
     private Way selectedWay;
-    //private Relation selectedRelation;
     private boolean shift;
+    private boolean ctrl;
 
     public Address(MapFrame mapFrame) {
@@ -121 +121 @@
             return;
         shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
+        ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
         MapView mv = Main.map.mapView;
         Point mousePos = e.getPoint();
@@ -143 +144 @@
             if (currentMouseNode.get(tagHouseStreet) != null) {
                 inputStreet.setText(currentMouseNode.get(tagHouseStreet));
+                if (ctrl) {
+                    Collection<Command> cmds = new LinkedList<Command>();
+                    addAddrToPrimitive(currentMouseNode, cmds);
+                    applyInputNumberChange();
+                }
                 setSelectedWay((Way)null);
             } else {

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

@@ -59 +59 @@
     final String cInterfaceRasterFeuille = "afficherCarteFeuille.do";
     final String cImageLinkStart = "title=\"image\"><a href=\"#\" onClick=\"popup('afficherCarteFeuille.do?f=";
+    final String cTAImageLinkStart = "title=\"image\"><a href=\"#\" onClick=\"popup('afficherCarteTa.do?f=";
     final String cImageNameStart = ">Feuille ";
+    final String cTAImageNameStart = "Tableau d'assemblage <strong>";
     
     final static long cCookieExpiration = 30 * 60 * 1000; // 30 minutes expressed in milliseconds
@@ -380 +382 @@
     private void parseFeuillesList(String input) {
         listOfFeuilles.clear();
+        // get "Tableau d'assemblage"
+        if (Main.pref.getBoolean("cadastrewms.useTA", false)) {
+            while (input.indexOf(cTAImageLinkStart) != -1) {
+                input = input.substring(input.indexOf(cTAImageLinkStart) + cTAImageLinkStart.length());
+                String refTA = input.substring(0, input.indexOf("'"));
+                String nameTA = input.substring(input.indexOf(cTAImageNameStart) + cTAImageNameStart.length());
+                nameTA = nameTA.substring(0, nameTA.indexOf("<"));
+                listOfFeuilles.add(new PlanImage(nameTA, refTA));
+            }
+        }
+        // get "Feuilles"
         while (input.indexOf(cImageLinkStart) != -1) {
             input = input.substring(input.indexOf(cImageLinkStart)+cImageLinkStart.length());

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

@@ -115 +115 @@
  *                 - add 'departement' as option in the municipality selection
  *                 - fixed bug in cache directory size control (and disabled by default)
+ *                 - add map mode for addressing
+ *                 - from Nicolas Dumoulin:
+ *                 -     add "tableau d'assemblage" in raster images for georeferencing (as option)
  */
 public class CadastrePlugin extends Plugin {

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

@@ -40 +40 @@
 
     private JCheckBox disableImageCropping = new JCheckBox(tr("Disable image cropping during georeferencing."));
+    
+    private JCheckBox enableTableauAssemblage = new JCheckBox(tr("Use \"Tableau d''assemblage\""));
     
     private JCheckBox autoFirstLayer = new JCheckBox(tr("Select first WMS layer in list."));
@@ -287 +289 @@
         disableImageCropping.setSelected(Main.pref.getBoolean("cadastrewms.noImageCropping", false));
         disableImageCropping.setToolTipText(tr("Disable image cropping during georeferencing."));
-        cadastrewms.add(disableImageCropping, GBC.eop().insets(0, 0, 0, 0));
+        cadastrewms.add(disableImageCropping, GBC.std().insets(0, 0, 10, 0));
+        // option to add the "Tableau d'assemblage" in list of sheets to grab
+        enableTableauAssemblage.setSelected(Main.pref.getBoolean("cadastrewms.useTA", false));
+        enableTableauAssemblage.setToolTipText(tr("Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab."));
+        cadastrewms.add(enableTableauAssemblage, GBC.eop().insets(0, 0, 0, 0));
         // the crosspiece display
         JLabel jLabelCrosspieces = new JLabel(tr("Display crosspieces:"));
@@ -401 +407 @@
         }
         Main.pref.put("cadastrewms.noImageCropping", disableImageCropping.isSelected());
+        Main.pref.put("cadastrewms.useTA", enableTableauAssemblage.isSelected());
         if (crosspiece1.isSelected()) Main.pref.put("cadastrewms.crosspieces", "0");
         else if (crosspiece2.isSelected()) Main.pref.put("cadastrewms.crosspieces", "1");