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

Timestamp:

2009-02-08T20:34:53+01:00 (16 years ago)

Author:

pieren

Message:

Fix minor issues.

Location:

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

Files:

• CadastreInterface.java (modified) (1 diff)
• CadastrePlugin.java (modified) (4 diffs)
• CheckSourceUploadHook.java (modified) (1 diff)
• DownloadSVGBuilding.java (added)
• DownloadSVGTask.java (modified) (1 diff)
• EastNorthBound.java (modified) (1 diff)
• ImageModifier.java (modified) (2 diffs)
• MenuActionBuildings.java (added)
• MenuActionLambertZone.java (modified) (1 diff)

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

@@ -62 +62 @@
             openInterface();
         } catch (IOException e) {
-            e.printStackTrace();
+            JOptionPane.showMessageDialog(Main.parent,
+                    tr("Town/city {0} not found or not available in WMS.\n" +
+                                "Please check its availibility on www.cadastre.gouv.fr", wmsLayer.getLocation()));
             return false;
         }

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

@@ -66 +66 @@
  * 0.9 05-Feb-2009 - grab vectorized full commune bbox, save in file, convert to OSM way
  *                   and simplify
+ * 1.0 05-Feb-2009 - fix various bugs
  */
 public class CadastrePlugin extends Plugin {
-    static String VERSION = "0.8";
+    static String VERSION = "1.0";
 
     static JMenu cadastreJMenu;
@@ -153 +154 @@
             JMenuItem menuLoadFromCache = new JMenuItem(new MenuActionLoadFromCache());
             JMenuItem menuActionBoundaries = new JMenuItem(new MenuActionBoundaries());
+            JMenuItem menuActionBuildings = new JMenuItem(new MenuActionBuildings());
             
             cadastreJMenu.add(menuGrab);
@@ -161 +163 @@
             cadastreJMenu.add(menuLoadFromCache);
             cadastreJMenu.add(menuActionBoundaries);
+            //cadastreJMenu.add(menuActionBuildings);
         }
         setEnabledAll(menuEnabled);
@@ -191 +194 @@
             if (item != null)
                 if (item.getText().equals(MenuActionGrab.name) ||
-                    item.getText().equals(MenuActionBoundaries.name)) {
+                    item.getText().equals(MenuActionBoundaries.name) ||
+                    item.getText().equals(MenuActionBuildings.name)) {
                     item.setEnabled(isEnabled);
                 } else if (item.getText().equals(MenuActionLambertZone.name)) {

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

@@ -81 +81 @@
             l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10);
             p.add(new JScrollPane(l), GBC.eol().fill());
-            boolean bContinue = JOptionPane.showConfirmDialog(Main.parent, p, tr("Add \"source=Cadastre...\" to ?"),
-                    JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
+            boolean bContinue = JOptionPane.showConfirmDialog(Main.parent, p, tr("Add \"source=...\" to elements?"),
+                   JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
             if (bContinue)
                 Main.main.undoRedo.add(new ChangePropertyCommand(sel, "source", CadastrePlugin.source));

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

@@ -95 +95 @@
     private void createWay(String svg) {
         String[] SVGpaths = new SVGParser().getPaths(svg);
-        //double[] fitViewBox = new double[SVGpaths.length];
         ArrayList<Double> fitViewBox = new ArrayList<Double>();  
         ArrayList<ArrayList<EastNorth>> eastNorths = new ArrayList<ArrayList<EastNorth>>();
         for (int i=0; i< SVGpaths.length; i++) {
             ArrayList<EastNorth> eastNorth = new ArrayList<EastNorth>();
-            fitViewBox.add( createNodes(SVGpaths[i], eastNorth) );;
+            fitViewBox.add( createNodes(SVGpaths[i], eastNorth) );
             eastNorths.add(eastNorth);
         }

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

@@ -23 +23 @@
     }
 
+    public EastNorthBound interpolate(EastNorthBound en2, double proportion) {
+        EastNorthBound enb = new EastNorthBound(this.min.interpolate(en2.min, proportion),
+                this.max.interpolate(en2.max, proportion));
+        return enb;
+    }
+
     @Override public String toString() {
         return "EastNorthBound[" + min.east() + "," + min.north() + "," + max.east() + "," + max.north() + "]";

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

@@ -28 +28 @@
     public ImageModifier(BufferedImage bi) {
         bufferedImage = bi;
-        System.out.println("cadastrewms.alterColors="+Main.pref.getBoolean("cadastrewms.alterColors"));
-        System.out.println("cadastrewms.backgroundTransparent="+Main.pref.getBoolean("cadastrewms.backgroundTransparent"));
         if (Main.pref.getBoolean("cadastrewms.alterColors")) {
             changeColors();
@@ -49 +47 @@
         int josmBackgroundColor = ColorHelper.html2color(Main.pref.get("color.background", "#FFFFFF")).getRGB();
         boolean invertGrey = (Main.pref.getBoolean("cadastrewms.invertGrey"));
-        System.out.println("cadastrewms.invertGrey="+invertGrey);
-        System.out.println("color.background="+Main.pref.get("color.background", "#FFFFFF"));
         for (int x = 0; x < w; x++) {
             for (int y = 0; y < h; y++) {

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

@@ -29 +29 @@
     public void actionPerformed(ActionEvent e) {
         JPanel p = new JPanel(new GridBagLayout());
-        String[] zones = { "", "1 (51.30° to 48.15°)", "2 (48.15° to 45.45°)", "3 (45.45° to 42.76°)", "4 (Corsica)" };
+        String[] zones = { "", "1 (51.30 to 48.15 degrees)", "2 (48.15 to 45.45 degrees)", "3 (45.45 to 42.76 degrees)", "4 (Corsica)" };
         final JComboBox inputLambertZone = new JComboBox(zones);
         JLabel newLambertZone = new JLabel(tr("Zone"));