Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java (revision 13601) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java (revision 13611) @@ -62,5 +62,7 @@ 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; } Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java (revision 13601) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java (revision 13611) @@ -66,7 +66,8 @@ * 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,4 +154,5 @@ JMenuItem menuLoadFromCache = new JMenuItem(new MenuActionLoadFromCache()); JMenuItem menuActionBoundaries = new JMenuItem(new MenuActionBoundaries()); + JMenuItem menuActionBuildings = new JMenuItem(new MenuActionBuildings()); cadastreJMenu.add(menuGrab); @@ -161,4 +163,5 @@ cadastreJMenu.add(menuLoadFromCache); cadastreJMenu.add(menuActionBoundaries); + //cadastreJMenu.add(menuActionBuildings); } setEnabledAll(menuEnabled); @@ -191,5 +194,6 @@ 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)) { Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java (revision 13601) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java (revision 13611) @@ -81,6 +81,6 @@ 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)); Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java (revision 13611) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java (revision 13611) @@ -0,0 +1,236 @@ +package cadastre_fr; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.io.ProgressInputStream; + +public class DownloadSVGBuilding extends PleaseWaitRunnable { + + private WMSLayer wmsLayer; + private CadastreGrabber grabber = CadastrePlugin.cadastreGrabber; + private CadastreInterface wmsInterface; + private String svg = null; + private EastNorthBound viewBox = null; + + public DownloadSVGBuilding(WMSLayer wmsLayer) { + super(tr("Downloading {0}", wmsLayer.name)); + + this.wmsLayer = wmsLayer; + this.wmsInterface = grabber.getWmsInterface(); + } + + @Override + public void realRun() throws IOException { + Main.pleaseWaitDlg.currentAction.setText(tr("Contacting WMS Server...")); + try { + if (wmsInterface.retrieveInterface(wmsLayer)) { + MapView mv = Main.map.mapView; + EastNorthBound enb = new EastNorthBound(mv.getEastNorth(0, mv.getHeight()), + mv.getEastNorth(mv.getWidth(), 0)); + svg = grabBoundary(enb); + if (svg == null) + return; + getViewBox(svg); + if (viewBox == null) + return; + createWay(svg); + } + } catch (DuplicateLayerException e) { + System.err.println("removed a duplicated layer"); + } + } + + @Override + protected void cancel() { + grabber.getWmsInterface().cancel(); + } + + @Override + protected void finish() { + } + + private boolean getViewBox(String svg) { + double[] box = new SVGParser().getViewBox(svg); + if (box != null) { + viewBox = new EastNorthBound(new EastNorth(box[0], box[1]), + new EastNorth(box[0]+box[2], box[1]+box[3])); + return true; + } + System.out.println("Unable to parse SVG data (viewBox)"); + return false; + } + + /** + * The svg contains more than one commune boundary defined by path elements. So detect + * which path element is the best fitting to the viewBox and convert it to OSM objects + */ + private void createWay(String svg) { + String[] SVGpaths = new SVGParser().getPaths(svg); + ArrayList> eastNorths = new ArrayList>(); + Collection existingNodes = Main.ds.nodes; + + for (int i=0; i< SVGpaths.length; i++) { + ArrayList eastNorth = new ArrayList(); + createNodes(SVGpaths[i], eastNorth); + if (eastNorth.size() > 2) + eastNorths.add(eastNorth); + } + List wayList = new ArrayList(); + List nodeList = new ArrayList(); + for (ArrayList path : eastNorths) { + List tmpNodeList = new ArrayList(); + Way wayToAdd = new Way(); + for (EastNorth eastNorth : path) { + Node nodeToAdd = new Node(Main.proj.eastNorth2latlon(eastNorth)); + // check if new node is not already created by another new path + Node nearestNewNode = checkNearestNode(nodeToAdd, tmpNodeList); + if (nearestNewNode == nodeToAdd) { + // check if new node is not already in existing OSM objects + nearestNewNode = checkNearestNode(nodeToAdd, existingNodes); + if (nearestNewNode == nodeToAdd) + tmpNodeList.add(nodeToAdd); + } + wayToAdd.nodes.add(nearestNewNode); // either a new node or an existing one + } + // at least two nodes have to be new, otherwise the polygon is not new (duplicate) + if (tmpNodeList.size() > 1) { + for (Node n : tmpNodeList) + nodeList.add(n); + wayToAdd.nodes.add(wayToAdd.nodes.get(0)); // close the way + wayList.add(wayToAdd); + } + } + Collection cmds = new LinkedList(); + for (Node node : nodeList) + cmds.add(new AddCommand(node)); + for (Way way : wayList) + cmds.add(new AddCommand(way)); + Main.main.undoRedo.add(new SequenceCommand(tr("Create buildings"), cmds)); + Main.map.repaint(); + } + + private void createNodes(String SVGpath, ArrayList eastNorth) { + // looks like "M981283.38 368690.15l143.81 72.46 155.86 ..." + String[] coor = SVGpath.split("[MlZ ]"); //coor[1] is x, coor[2] is y + double dx = Double.parseDouble(coor[1]); + double dy = Double.parseDouble(coor[2]); + for (int i=3; i nodes) { + double epsilon = 0.01; // smallest distance considering duplicate node + for (Node n : nodes) { + if (!n.deleted && !n.incomplete) { + double dist = n.eastNorth.distance(nodeToAdd.eastNorth); + if (dist < epsilon) { + System.out.println("distance="+dist); + return n; + } + } + } + return nodeToAdd; + } + + private String grabBoundary(EastNorthBound bbox) throws IOException { + + try { + URL url = null; + url = getURLsvg(bbox); + System.out.println("grab:"+url); + return grabSVG(url); + } catch (MalformedURLException e) { + throw (IOException) new IOException(tr("CadastreGrabber: Illegal url.")).initCause(e); + } + } + + private URL getURLsvg(EastNorthBound bbox) throws MalformedURLException { + String str = new String(wmsInterface.baseURL+"/scpc/wms?version=1.1&request=GetMap"); + str += "&layers="; + str += "CDIF:LS2"; + str += "&format=image/svg"; + str += "&bbox="+bbox.min.east()+","; + str += bbox.min.north() + ","; + str += bbox.max.east() + ","; + str += bbox.max.north(); + str += "&width=800&height=600"; // maximum allowed by wms server + str += "&styles="; + str += "LS2_90"; + System.out.println("URL="+str); + return new URL(str.replace(" ", "%20")); + } + + private String grabSVG(URL url) throws IOException { + wmsInterface.urlConn = (HttpURLConnection)url.openConnection(); + wmsInterface.urlConn.setRequestMethod("GET"); + wmsInterface.setCookie(); + InputStream is = new ProgressInputStream(wmsInterface.urlConn, Main.pleaseWaitDlg); + File file = new File(CadastrePlugin.cacheDir + "building.svg"); + String svg = new String(); + try { + if (file.exists()) + file.delete(); + BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file, true)); + InputStreamReader isr =new InputStreamReader(is); + BufferedReader br = new BufferedReader(isr); + String line=""; + while ( null!=(line=br.readLine())){ + line += "\n"; + bos.write(line.getBytes()); + svg += line; + } + bos.close(); + } catch (IOException e) { + e.printStackTrace(System.out); + } + is.close(); + return svg; + } + + public static void download(WMSLayer wmsLayer) { + Main.worker.execute(new DownloadSVGBuilding(wmsLayer)); + } + +} Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java (revision 13601) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java (revision 13611) @@ -95,10 +95,9 @@ private void createWay(String svg) { String[] SVGpaths = new SVGParser().getPaths(svg); - //double[] fitViewBox = new double[SVGpaths.length]; ArrayList fitViewBox = new ArrayList(); ArrayList> eastNorths = new ArrayList>(); for (int i=0; i< SVGpaths.length; i++) { ArrayList eastNorth = new ArrayList(); - fitViewBox.add( createNodes(SVGpaths[i], eastNorth) );; + fitViewBox.add( createNodes(SVGpaths[i], eastNorth) ); eastNorths.add(eastNorth); } Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/EastNorthBound.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/EastNorthBound.java (revision 13601) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/EastNorthBound.java (revision 13611) @@ -23,4 +23,10 @@ } + 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() + "]"; Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/ImageModifier.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/ImageModifier.java (revision 13601) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/ImageModifier.java (revision 13611) @@ -28,6 +28,4 @@ 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,6 +47,4 @@ 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++) { Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java (revision 13611) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java (revision 13611) @@ -0,0 +1,36 @@ +package cadastre_fr; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; + +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; + +public class MenuActionBuildings extends JosmAction { + + public static String name = "Building footprints"; + + private static final long serialVersionUID = 1L; + private WMSLayer wmsLayer = null; + + public MenuActionBuildings() { + super(tr(name), "cadastre_small", tr("Extract building footprints"), null, false); + } + + public void actionPerformed(ActionEvent arg0) { + wmsLayer = WMSDownloadAction.getLayer(); + if (wmsLayer != null) { + if (wmsLayer.isRaster()) { + JOptionPane.showMessageDialog(Main.parent, + tr("Only on vectorized layers"), tr("Error"), + JOptionPane.ERROR_MESSAGE); + return; + } + DownloadSVGBuilding.download(wmsLayer); + } + } + +} Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java (revision 13601) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java (revision 13611) @@ -29,5 +29,5 @@ 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"));