Index: applications/editors/josm/plugins/cadastre-fr/CONTRIBUTION =================================================================== --- applications/editors/josm/plugins/cadastre-fr/CONTRIBUTION (revision 13382) +++ applications/editors/josm/plugins/cadastre-fr/CONTRIBUTION (revision 13382) @@ -0,0 +1,4 @@ +The French Cadastre plugin is designed and coded by Pieren +and is inspired by the wmsplugin for the special handling required by +the french cadastre WMS www.cadatre.gouv.fr. +This particular WMS provides vectorized or raster images for only one municipality at a time. Index: applications/editors/josm/plugins/cadastre-fr/LICENSE =================================================================== --- applications/editors/josm/plugins/cadastre-fr/LICENSE (revision 13382) +++ applications/editors/josm/plugins/cadastre-fr/LICENSE (revision 13382) @@ -0,0 +1,346 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Index: applications/editors/josm/plugins/cadastre-fr/README =================================================================== --- applications/editors/josm/plugins/cadastre-fr/README (revision 13382) +++ applications/editors/josm/plugins/cadastre-fr/README (revision 13382) @@ -0,0 +1,26 @@ +cadastre-fr is a plugin for JOSM that is able to handle the +french land registry WMS. This WMS is not a complete standard WMS +since it is not providing most of the standard services. It is also +just delivering data for one municipality at a time. A special request +is required at the beginning to specify which municipality is desired. + +The plugin is today only requesting PNG images on user request only. The +images can be stored in a cache file and reloaded later. The grabed images +can be done at any zoom level and the drawing method will always select the +best images (highest scale) to be displayed in front of worst images +(lowest scale). + +Also the plugin is able to transform original images to add the transparency +or replace the default background by the JOSM background color. Enabling +transparency gives the possibility to use several layers, each layer with a +different municipality, making contrbutor's work much easier. + +Access to the french land registry WMS has been granted by the autorithies (DFFiP). +It's opened not only for OSM but for all GIS applications. A new version of the +WMS will take place mid 2009. + +Announce here (english): +http://lists.openstreetmap.org/pipermail/talk/2009-January/033289.html +First announcement here (french): +http://lists.openstreetmap.org/pipermail/talk-fr/2009-January/005790.html + Index: applications/editors/josm/plugins/cadastre-fr/build.xml =================================================================== --- applications/editors/josm/plugins/cadastre-fr/build.xml (revision 13382) +++ applications/editors/josm/plugins/cadastre-fr/build.xml (revision 13382) @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/cadastre-fr/src/META-INF/MANIFEST.MF =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/META-INF/MANIFEST.MF (revision 13382) +++ applications/editors/josm/plugins/cadastre-fr/src/META-INF/MANIFEST.MF (revision 13382) @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +Plugin-Class: cadastre_fr.CadastrePlugin +Plugin-Description: A special handler for the french land registry WMS server +Plugin-Version: 0.8 +Plugin-Stage: 60 +Plugin-Author: Pieren; Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java (revision 13382) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java (revision 13382) @@ -0,0 +1,230 @@ +package cadastre_fr; +/** + * This class handles the WMS layer cache mechanism. The design is oriented for a good performance (no + * wait status on GUI, fast saving even in big file). A separate thread is created for each WMS + * layer to not suspend the GUI until disk I/O is terminated (a file for the cache can take + * several MB's). If the cache file already exists, new images are just appended to the file + * (performance). Since we use the ObjectStream methods, it is required to modify the standard + * ObjectOutputStream in order to have objects appended readable (otherwise a stream header + * is inserted before each append and an exception is raised at objects read). + */ + +import static org.openstreetmap.josm.tools.I18n.tr; +import java.io.*; +import java.util.ArrayList; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +import javax.swing.JOptionPane; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.EastNorth; + +public class CacheControl implements Runnable { + + public class ObjectOutputStreamAppend extends ObjectOutputStream { + public ObjectOutputStreamAppend(OutputStream out) throws IOException { + super(out); + } + protected void writeStreamHeader() throws IOException { + reset(); + } + } + + public static boolean cacheEnabled = true; + + public static int cacheSize = 500; + + + public WMSLayer wmsLayer = null; + + private ArrayList imagesToSave = new ArrayList(); + private Lock imagesLock = new ReentrantLock(); + + public CacheControl(WMSLayer wmsLayer) { + cacheEnabled = Main.pref.getBoolean("cadastrewms.enableCaching", true); + this.wmsLayer = wmsLayer; + try { + cacheSize = Integer.parseInt(Main.pref.get("cadastrewms.cacheSize", String.valueOf(CadastrePreferenceSetting.DEFAULT_CACHE_SIZE))); + } catch (NumberFormatException e) { + cacheSize = CadastrePreferenceSetting.DEFAULT_CACHE_SIZE; + } + File path = new File(CadastrePlugin.cacheDir); + if (!path.exists()) + path.mkdirs(); + else // check directory capacity + checkDirSize(path); + new Thread(this).start(); + } + + private void checkDirSize(File path) { + long size = 0; + long oldestFileDate = Long.MAX_VALUE; + int oldestFile = 0; + File[] files = path.listFiles(); + for (int i = 0; i < files.length; i++) { + size += files[i].length(); + if (files[i].lastModified() < oldestFileDate) { + oldestFile = i; + oldestFileDate = files[i].lastModified(); + } + } + if (size > cacheSize*1024*1024) { + System.out.println("Delete oldest file \""+ files[oldestFile].getName() + + "\" in cache dir to stay under the limit of " + cacheSize + " MB."); + files[oldestFile].delete(); + checkDirSize(path); + } + } + + public boolean loadCacheIfExist() { + try { + File file = new File(CadastrePlugin.cacheDir + wmsLayer.name + "." + String.valueOf(wmsLayer.lambertZone+1)); + if (file.exists()) { + int reply = JOptionPane.showConfirmDialog(null, + "Location \""+wmsLayer.name+"\" found in cache.\n"+ + "Load cache first ?\n"+ + "(No = new cache)", + "Location in cache", + JOptionPane.YES_NO_OPTION); + if (reply == JOptionPane.OK_OPTION) { + return loadCache(file, wmsLayer.lambertZone); + } else + file.delete(); + } + } catch (Exception e) { + e.printStackTrace(System.out); + } + return false; + } + + public void deleteCacheFile() { + try { + File file = new File(CadastrePlugin.cacheDir + wmsLayer.name + "." + String.valueOf(wmsLayer.lambertZone+1)); + if (file.exists()) + file.delete(); + } catch (Exception e) { + e.printStackTrace(System.out); + } + } + + public boolean loadCache(File file, int currentLambertZone) { + try { + FileInputStream fis = new FileInputStream(file); + ObjectInputStream ois = new ObjectInputStream(fis); + int sfv = ois.readInt(); + if (sfv != wmsLayer.serializeFormatVersion) { + JOptionPane.showMessageDialog(Main.parent, tr("Unsupported WMS file version; found {0}, expected {1}", + sfv, wmsLayer.serializeFormatVersion), tr("Cache Format Error"), JOptionPane.ERROR_MESSAGE); + return false; + } + wmsLayer.setLocation((String) ois.readObject()); + wmsLayer.setCodeCommune((String) ois.readObject()); + wmsLayer.lambertZone = ois.readInt(); + wmsLayer.setRaster(ois.readBoolean()); + wmsLayer.setRasterMin((EastNorth) ois.readObject()); + wmsLayer.setRasterCenter((EastNorth) ois.readObject()); + wmsLayer.setRasterRatio(ois.readDouble()); + if (wmsLayer.lambertZone != currentLambertZone) { + JOptionPane.showMessageDialog(Main.parent, tr("Lambert zone {0} in cache "+ + " incompatible with current Lambert zone {1}", + wmsLayer.lambertZone+1, currentLambertZone), tr("Cache Lambert Zone Error"), JOptionPane.ERROR_MESSAGE); + return false; + } + boolean EOF = false; + try { + while (!EOF) { + GeorefImage newImage = (GeorefImage) ois.readObject(); + for (GeorefImage img : wmsLayer.images) { + if (CadastrePlugin.backgroundTransparent) { + if (img.overlap(newImage)) + // mask overlapping zone in already grabbed image + img.withdraw(newImage); + else + // mask overlapping zone in new image only when + // new image covers completely the existing image + newImage.withdraw(img); + } + } + wmsLayer.images.add(newImage); + } + } catch (EOFException e) {} + ois.close(); + fis.close(); + } catch (Exception ex) { + ex.printStackTrace(System.out); + JOptionPane + .showMessageDialog(Main.parent, tr("Error loading file"), tr("Error"), JOptionPane.ERROR_MESSAGE); + } + return true; + } + + + 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(); + this.imagesToSave.add(image); + this.notify(); + imagesLock.unlock(); + } + + /** + * Thread saving the grabbed images in background. + */ + public synchronized void run() { + for (;;) { + imagesLock.lock(); + // copy locally the images to save for better performance + ArrayList images = new ArrayList(imagesToSave); + imagesToSave.clear(); + imagesLock.unlock(); + if (images != null && !images.isEmpty()) { + File file = new File(CadastrePlugin.cacheDir + wmsLayer.name + "." + String.valueOf((wmsLayer.lambertZone + 1))); + try { + if (file.exists()) { + ObjectOutputStreamAppend oos = new ObjectOutputStreamAppend( + new BufferedOutputStream(new FileOutputStream(file, true))); + for (GeorefImage img : images) { + oos.writeObject(img); + } + oos.close(); + } else { + ObjectOutputStream oos = new ObjectOutputStream( + new BufferedOutputStream(new FileOutputStream(file))); + oos.writeInt(wmsLayer.serializeFormatVersion); + oos.writeObject(wmsLayer.getLocation()); + oos.writeObject(wmsLayer.getCodeCommune()); + oos.writeInt(wmsLayer.lambertZone); + oos.writeBoolean(wmsLayer.isRaster()); + oos.writeObject(wmsLayer.getRasterMin()); + oos.writeObject(wmsLayer.getRasterCenter()); + oos.writeDouble(wmsLayer.getRasterRatio()); + for (GeorefImage img : images) { + oos.writeObject(img); + } + oos.close(); + } + } catch (IOException e) { + e.printStackTrace(System.out); + } + } + try {wait();} catch (InterruptedException e) { + e.printStackTrace(System.out); + } + } + } + +} Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java (revision 13382) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java (revision 13382) @@ -0,0 +1,51 @@ +package cadastre_fr; + +import static org.openstreetmap.josm.tools.I18n.tr; +import java.io.File; +import javax.swing.filechooser.FileFilter; + +public class CacheFileFilter extends FileFilter { + + /** + * Derived from ExtensionFileFilter writen by imi + */ + private final String extension; + private final String description; + + public static CacheFileFilter[] filters = { + new CacheFileFilter("1", tr("Lambert Zone 1 cache file (.1)")), + new CacheFileFilter("2", tr("Lambert Zone 2 cache file (.2)")), + new CacheFileFilter("3", tr("Lambert Zone 3 cache file (.3)")), + new CacheFileFilter("4", tr("Lambert Zone 4 cache file (.4)")) + }; + + /** + * Construct an extension file filter by giving the extension to check after. + * + */ + private CacheFileFilter(String extension, String description) { + this.extension = extension; + this.description = description; + } + + public boolean acceptName(String filename) { + String name = filename.toLowerCase(); + for (String ext : extension.split(",")) + if (name.endsWith("." + ext)) + return true; + return false; + } + + @Override + public boolean accept(File pathname) { + if (pathname.isDirectory()) + return true; + return acceptName(pathname.getName()); + } + + @Override + public String getDescription() { + return description; + } + +} Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java (revision 13382) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java (revision 13382) @@ -0,0 +1,102 @@ +package cadastre_fr; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.imageio.ImageIO; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.io.ProgressInputStream; + +public class CadastreGrabber { + + public static final double epsilon = 1e-11; + + private CadastreInterface wmsInterface = new CadastreInterface(this); + private String lastWMSLayerName = null; + + CadastreGrabber() { + getWmsInterface().downloadCancelled = false; + } + + public GeorefImage grab(WMSLayer wmsLayer, EastNorth lambertMin, EastNorth lambertMax) throws IOException { + + try { + URL url = null; + if (wmsLayer.isRaster()) + url = getURLRaster(wmsLayer, lambertMin, lambertMax); + else + url = getURLVector(lambertMin, lambertMax); + System.out.println("grab:"+url); + BufferedImage img = grab(url); + ImageModifier imageModified = new ImageModifier(img); + return new GeorefImage(imageModified.bufferedImage, lambertMin, lambertMax); + } catch (MalformedURLException e) { + throw (IOException) new IOException(tr("CadastreGrabber: Illegal url.")).initCause(e); + } + } + + private URL getURLRaster(WMSLayer wmsLayer, EastNorth lambertMin, EastNorth lambertMax) throws MalformedURLException { + String str = new String(wmsInterface.baseURL+"/scpc/wms?version=1.1&request=GetMap"); + str += "&layers=CDIF:PMC@"; + str += wmsLayer.getCodeCommune(); + str += "&format=image/png"; + str += "&bbox="; + str += wmsLayer.eastNorth2raster(lambertMin, lambertMax); + str += "&width=600&height=600"; // maximum allowed by wms server + str += "&exception=application/vnd.ogc.se_inimage&styles="; + return new URL(str.replace(" ", "%20")); + } + + private URL getURLVector(EastNorth lambertMin, EastNorth lambertMax) throws MalformedURLException { + String str = new String(wmsInterface.baseURL+"/scpc/wms?version=1.1&request=GetMap"); + str += "&layers=CDIF:LS3,CDIF:LS2,CDIF:LS1,CDIF:PARCELLE,CDIF:NUMERO"; + str += ",CDIF:PT3,CDIF:PT2,CDIF:PT1,CDIF:LIEUDIT"; + str += ",CDIF:SUBSECTION"; + str += ",CDIF:SECTION"; + str += ",CDIF:COMMUNE"; + str += "&format=image/png"; + //str += "&format=image/jpeg"; + str += "&bbox="+lambertMin.east()+","; + str += lambertMin.north() + ","; + str += lambertMax.east() + ","; + str += lambertMax.north(); + str += "&width=800&height=600"; // maximum allowed by wms server + str += "&styles=LS3_90,LS2_90,LS1_90,PARCELLE_90,NUMERO_90,PT3_90,PT2_90,PT1_90,LIEUDIT_90"; + str += ",SUBSECTION_90"; + str += ",SECTION_90"; + str += ",COMMUNE_90"; + System.out.println("URL="+str); + return new URL(str.replace(" ", "%20")); + } + + private BufferedImage grab(URL url) throws IOException { + wmsInterface.urlConn = (HttpURLConnection)url.openConnection(); + wmsInterface.urlConn.setRequestMethod("GET"); + wmsInterface.setCookie(); + InputStream is = new ProgressInputStream(wmsInterface.urlConn, Main.pleaseWaitDlg); + BufferedImage img = ImageIO.read(is); + is.close(); + return img; + } + + public CadastreInterface getWmsInterface() { + return wmsInterface; + } + + public String getLastWMSLayerName() { + return lastWMSLayerName; + } + + public void setLastWMSLayerName(String lastWMSLayerName) { + this.lastWMSLayerName = lastWMSLayerName; + } + +} Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java (revision 13382) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java (revision 13382) @@ -0,0 +1,336 @@ +package cadastre_fr; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagLayout; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Vector; + +import javax.swing.JComboBox; +import javax.swing.JOptionPane; +import javax.swing.JPanel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.tools.GBC; + +public class CadastreInterface { + public boolean downloadCancelled = false; + public HttpURLConnection urlConn = null; + + private CadastreGrabber cadastreGrabber; + private String cookie; + private String interfaceRef = null; + private URL searchFormURL; + private Vector listOfCommunes = new Vector(); + private Vector listOfTA = new Vector(); + + final String baseURL = "http://www.cadastre.gouv.fr"; + final String cImageFormat = "Cette commune est au format "; + final String cCommuneListStart = " + * + * + * + * + * + * @param location + * @param codeCommune + * @return retURL url to available cadastre vectorised master piece; "" if not found + * @throws IOException + */ + private String postForm(WMSLayer wmsLayer, String codeCommune) throws IOException { + try { + String ln = null; + String line = null; + listOfCommunes.clear(); + listOfTA.clear(); + // send a POST request with a city/town/village name + String content = "numerovoie="; + content += "&indiceRepetition="; + content += "&nomvoie="; + content += "&lieuDit="; + if (codeCommune == "") { + content += "&ville=" + new String(java.net.URLEncoder.encode(wmsLayer.getLocation(), "UTF-8")); + content += "&codePostal="; + } else { + content += "&codeCommune=" + codeCommune; + } + content += "&codeDepartement="; + content += "&nbResultatParPage=10"; + urlConn = (HttpURLConnection)searchFormURL.openConnection(); + urlConn.setRequestMethod("POST"); + urlConn.setDoOutput(true); + urlConn.setDoInput(true); + setCookie(); + OutputStream wr = urlConn.getOutputStream(); + wr.write(content.getBytes()); + wr.flush(); + wr.close(); + BufferedReader rd = new BufferedReader(new InputStreamReader(urlConn.getInputStream())); + while ((ln = rd.readLine()) != null) { + line += ln; + } + rd.close(); + urlConn.disconnect(); + System.out.println("POST="+line); + if (line.indexOf(cImageFormat) != -1) { + int i = line.indexOf(cImageFormat); + int j = line.indexOf(".", i); + wmsLayer.setRaster(line.substring(i+cImageFormat.length(), j).equals("image")); + } + if (!wmsLayer.isRaster() && line.indexOf(cInterfaceVector) != -1) { // "afficherCarteCommune.do" + // shall be something like: interfaceRef = "afficherCarteCommune.do?c=X2269"; + line = line.substring(line.indexOf(cInterfaceVector),line.length()); + line = line.substring(0, line.indexOf("'")); + System.out.println("interface ref.:"+line); + return line; + } else if (wmsLayer.isRaster() && line.indexOf(cInterfaceRaster) != -1) { // "afficherCarteTa.do" + // list of values parsed in listOfTA (Tableau d'assemblage) + parseTAList(line.substring(line.indexOf(cInterfaceRaster))); + if (listOfTA.size() == 1) { + wmsLayer.setCodeCommune(listOfTA.firstElement()); + return buildRasterInterfaceRef(listOfTA.firstElement()); + } + return null; + } else if (line.indexOf(cCommuneListStart) != -1 && line.indexOf(cCommuneListEnd) != -1) { + // list of values parsed in listOfCommunes + int i = line.indexOf(cCommuneListStart); + int j = line.indexOf(cCommuneListEnd, i); + parseCommuneList(line.substring(i, j)); + } + } catch (MalformedURLException e) { + throw (IOException) new IOException( + "Illegal url.").initCause(e); + } catch (Exception e){ + e.printStackTrace(); + } + return null; + } + + private void parseCommuneList(String input) { + if (input.indexOf(c0ptionListStart) != -1) { + while (input.indexOf("