Changeset 19149 in osm for applications/editors/josm

Timestamp:

2009-12-20T01:51:24+01:00 (15 years ago)

Author:

pieren

Message:

Add a 25m crosspiece ref and the possibility to change the source in the UploadHook

Location:

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

Files:

• CadastrePreferenceSetting.java (modified) (3 diffs)
• CheckSourceUploadHook.java (modified) (3 diffs)
• WMSLayer.java (modified) (1 diff)

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

@@ -48 +48 @@
     private JRadioButton crosspiece1 = new JRadioButton("off");
     
-    private JRadioButton crosspiece2 = new JRadioButton("50m");
-
-    private JRadioButton crosspiece3 = new JRadioButton("100m");
+    private JRadioButton crosspiece2 = new JRadioButton("25m");
+
+    private JRadioButton crosspiece3 = new JRadioButton("50m");
+
+    private JRadioButton crosspiece4 = new JRadioButton("100m");
 
     static final int DEFAULT_SQUARE_SIZE = 100;
@@ -191 +193 @@
         if (crosspieces == 1) crosspiece2.setSelected(true);
         if (crosspieces == 2) crosspiece3.setSelected(true);
+        if (crosspieces == 3) crosspiece4.setSelected(true);
         bgCrosspieces.add(crosspiece1);
         bgCrosspieces.add(crosspiece2);
         bgCrosspieces.add(crosspiece3);
+        bgCrosspieces.add(crosspiece4);
         cadastrewms.add(crosspiece1, GBC.std().insets(5, 0, 5, 0));
         cadastrewms.add(crosspiece2, GBC.std().insets(5, 0, 5, 0));
-        cadastrewms.add(crosspiece3, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 0, 5));
+        cadastrewms.add(crosspiece3, GBC.std().insets(5, 0, 5, 0));
+        cadastrewms.add(crosspiece4, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 0, 5));
 
         // separator
@@ -256 +261 @@
         else if (crosspiece2.isSelected()) Main.pref.put("cadastrewms.crosspieces", "1");
         else if (crosspiece3.isSelected()) Main.pref.put("cadastrewms.crosspieces", "2");
+        else if (crosspiece4.isSelected()) Main.pref.put("cadastrewms.crosspieces", "3");
         Main.pref.put("cadastrewms.enableCaching", enableCache.isSelected());
 

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

@@ -13 +13 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JTextField;
 
 import org.openstreetmap.josm.Main;
@@ -78 +79 @@
             JPanel p = new JPanel(new GridBagLayout());
             OsmPrimitivRenderer renderer = new OsmPrimitivRenderer();
-            p.add(new JLabel(tr("Auto-tag source added:")), GBC.eol());
+            p.add(new JLabel(tr("Add \"source=...\" to elements?")), GBC.eol());
+            JTextField tf = new JTextField(CadastrePlugin.source);
+            p.add(tf, GBC.eol());
             JList l = new JList(sel.toArray());
             l.setCellRenderer(renderer);
@@ -86 +89 @@
                    JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
             if (bContinue)
-                Main.main.undoRedo.add(new ChangePropertyCommand(sel, "source", CadastrePlugin.source));
+                Main.main.undoRedo.add(new ChangePropertyCommand(sel, "source", tf.getText()));
         }
 
     }
 }
+

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

@@ -588 +588 @@
         String crosspieces = Main.pref.get("cadastrewms.crosspieces", "0");
         if (!crosspieces.equals("0")) {
-            int modulo = 50;
-            if (crosspieces.equals("2")) modulo = 100;
+            int modulo = 25;
+            if (crosspieces.equals("2")) modulo = 50;
+            if (crosspieces.equals("3")) modulo = 100;
             EastNorthBound currentView = new EastNorthBound(mv.getEastNorth(0, mv.getHeight()),
                     mv.getEastNorth(mv.getWidth(), 0));