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

Timestamp:

2009-02-05T01:00:53+01:00 (16 years ago)

Author:

pieren

Message:

Add municipality boundary import from SVG data delivered by cadastre WMS.

Location:

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

Files:

• CacheControl.java (modified) (2 diffs)
• CadastrePlugin.java (modified) (4 diffs)
• CheckSourceUploadHook.java (modified) (3 diffs)
• DownloadSVGTask.java (added)
• DownloadWMSTask.java (modified) (1 diff)
• EastNorthBound.java (modified) (1 diff)
• ImageModifier.java (modified) (2 diffs)
• MenuActionBoundaries.java (added)
• MenuActionNewLocation.java (modified) (1 diff)
• SVGParser.java (added)
• SimplifyWay.java (added)
• WMSDownloadAction.java (modified) (3 diffs)
• WMSLayer.java (modified) (1 diff)

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

@@ -117 +117 @@
         } catch (Exception ex) {
             ex.printStackTrace(System.out);
-            JOptionPane
-                    .showMessageDialog(Main.parent, tr("Error loading file"), tr("Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent, tr("Error loading file"), tr("Error"), JOptionPane.ERROR_MESSAGE);
             return false;
         }
@@ -125 +124 @@
 
 
-    public boolean existCache() {
-        try {
-            /*
-            File pathname = new File(CadastrePlugin.cacheDir);
-            String[] fileNames = pathname.list();
-            for (String fileName : fileNames) {
-                System.out.println("check file:"+fileName);
-                //WMSLayer cached = new WMSLayer(new File(cacheDir+fileName));
-            }*/
-        } catch (Exception e) {
-            e.printStackTrace(System.out);
-        }
-        return false;
-    }
-    
     public synchronized void saveCache(GeorefImage image) {
         imagesLock.lock();

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

@@ -64 +64 @@
  *                 - minor fixes due to changes in JOSM core classes
  *                 - first draft of raster image support 
- * 0.9 draft       - grab vectorized full commune bbox and save it in cache
+ * 0.9 05-Feb-2009 - grab vectorized full commune bbox, save in file, convert to OSM way
+ *                   and simplify
  */
 public class CadastrePlugin extends Plugin {
@@ -151 +152 @@
             JMenuItem menuLambertZone = new JMenuItem(new MenuActionLambertZone());
             JMenuItem menuLoadFromCache = new JMenuItem(new MenuActionLoadFromCache());
+            JMenuItem menuActionBoundaries = new JMenuItem(new MenuActionBoundaries());
             
             cadastreJMenu.add(menuGrab);
@@ -158 +160 @@
             cadastreJMenu.add(menuLambertZone);
             cadastreJMenu.add(menuLoadFromCache);
+            cadastreJMenu.add(menuActionBoundaries);
         }
         setEnabledAll(menuEnabled);
@@ -187 +190 @@
             JMenuItem item = cadastreJMenu.getItem(i);
             if (item != null)
-                if (item.getText().equals(MenuActionGrab.name))
+                if (item.getText().equals(MenuActionGrab.name) ||
+                    item.getText().equals(MenuActionBoundaries.name)) {
                     item.setEnabled(isEnabled);
-                else if (item.getText().equals(MenuActionLambertZone.name))
+                } else if (item.getText().equals(MenuActionLambertZone.name)) {
                     item.setEnabled(!isEnabled);
+                }
         }
         menuEnabled = isEnabled;

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

@@ -46 +46 @@
             }
             if (!sel.isEmpty()) {
-                return displaySource(sel);
+                displaySource(sel);
             }
         }
@@ -70 +70 @@
      * source="cadastre.." if it is approved.
      * @param sel the list of elements added without a key "source"
-     * @return true if it is accepted by user 
      */
-    private boolean displaySource(Collection<OsmPrimitive> sel) 
+    private void displaySource(Collection<OsmPrimitive> sel) 
     {
-        boolean bContinue = true;
         if (!sel.isEmpty()) {
             JPanel p = new JPanel(new GridBagLayout());
@@ -83 +81 @@
             l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10);
             p.add(new JScrollPane(l), GBC.eol().fill());
-            bContinue = JOptionPane.showConfirmDialog(Main.parent, p, tr("Add \"source=...\" to elements?"),
+            boolean bContinue = JOptionPane.showConfirmDialog(Main.parent, p, tr("Add \"source=Cadastre...\" to ?"),
                     JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
             if (bContinue)
                 Main.main.undoRedo.add(new ChangePropertyCommand(sel, "source", CadastrePlugin.source));
         }
-        return bContinue;
                 
     }    

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

@@ -60 +60 @@
     @Override
     protected void finish() {
-        //wmsLayer.saveToCache();
     }
 

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

@@ -14 +14 @@
         this.max = max;
     }
+
+    public boolean contains(EastNorth eastNorth) {
+        if (eastNorth.east() < min.east() || eastNorth.north() < min.north())
+            return false;
+        if (eastNorth.east() > max.east() || eastNorth.north() > max.north())
+            return false;
+        return true;
+    }
+
     @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();
@@ -47 +49 @@
         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/MenuActionNewLocation.java

@@ -48 +48 @@
             String codeCommune = "";
             boolean resetCookie = false;
-            JLabel labelSectionNewLocation = new JLabel(tr("Add new layer"));
+            JLabel labelSectionNewLocation = new JLabel(tr("Add a new layer"));
             JPanel p = new JPanel(new GridBagLayout());
             JLabel labelLocation = new JLabel(tr("Location"));

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

@@ -5 +5 @@
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
+
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -14 +16 @@
     private static final long serialVersionUID = 1L;
 
-    //private String layerName;
-        
         public WMSDownloadAction(String layerName) {
                 super(layerName, "wmsmenu", tr("Download WMS tile from {0}",layerName), null, false);
@@ -38 +38 @@
             if (existingWMSlayers.size() == 1)
                 return existingWMSlayers.get(0);
-            return new MenuActionNewLocation().addNewLayer(existingWMSlayers);
+            if (existingWMSlayers.size() == 0)
+                return new MenuActionNewLocation().addNewLayer(existingWMSlayers);
+            JOptionPane.showMessageDialog(Main.parent,
+                    tr("More than one WMS layer present\nSelect one of them first, then retry"));
         }
         return null;

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

@@ -180 +180 @@
     @Override
     public String getToolTipText() {
-        return tr("WMS layer ({0}), {1} tile(s) loaded", name, images.size());
+        String str = tr("WMS layer ({0}), {1} tile(s) loaded", name, images.size());
+        if (isRaster) {
+            str += "\n"+tr("Is not vectorized.");
+            str += "\n"+tr("Raster center: {0}", rasterCenter);
+        } else
+            str += "\n"+tr("Is vectorized.");
+            str += "\n"+tr("Commune bbox: {0}", communeBBox);
+        return str;
     }