Index: /applications/editors/josm/plugins/tracer/build.xml
===================================================================
--- /applications/editors/josm/plugins/tracer/build.xml (revision 19830)
+++ /applications/editors/josm/plugins/tracer/build.xml (revision 19830)
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/tracer/changelog.txt
===================================================================
--- /applications/editors/josm/plugins/tracer/changelog.txt (revision 19830)
+++ /applications/editors/josm/plugins/tracer/changelog.txt (revision 19830)
@@ -0,0 +1,5 @@
+Changelog
+
+- Based on Lakewalker [Rodney Kinney, Brent Easton]
+- Initial version [Jan Bilak]
+- Edit mode [Petr Dlouhy]
Index: /applications/editors/josm/plugins/tracer/license.txt
===================================================================
--- /applications/editors/josm/plugins/tracer/license.txt (revision 19830)
+++ /applications/editors/josm/plugins/tracer/license.txt (revision 19830)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, 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 Lesser 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 Street, 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 Lesser General
+Public License instead of this License.
Index: /applications/editors/josm/plugins/tracer/src/tracer/TracerAction.java
===================================================================
--- /applications/editors/josm/plugins/tracer/src/tracer/TracerAction.java (revision 19830)
+++ /applications/editors/josm/plugins/tracer/src/tracer/TracerAction.java (revision 19830)
@@ -0,0 +1,390 @@
+/**
+ * Tracer - plugin for JOSM
+ * Jan Bilak
+ * This program is free software and licensed under GPL.
+ */
+
+package tracer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.Cursor;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
+import org.xml.sax.SAXException;
+import org.openstreetmap.josm.data.osm.BBox;
+
+/**
+ * Interface to Darryl Shpak's Tracer module
+ *
+ * @author Brent Easton
+ */
+class TracerAction extends MapMode implements MouseListener {
+
+ private static final long serialVersionUID = 1L;
+ protected Thread executeThread;
+ protected boolean cancel;
+ protected Collection commands = new LinkedList();
+ protected Collection ways = new ArrayList();
+
+ public TracerAction(MapFrame mapFrame) {
+ super(tr("Tracer"), "tracer-sml", tr("Tracer."), Shortcut.registerShortcut("tools:tracer", tr("Tool: {0}", tr("Tracer")), KeyEvent.VK_T, Shortcut.GROUP_EDIT), mapFrame, getCursor());
+ }
+
+ @Override public void enterMode() {
+ if (!isEnabled())
+ return;
+ super.enterMode();
+ Main.map.mapView.setCursor(getCursor());
+ Main.map.mapView.addMouseListener(this);
+ }
+
+ @Override public void exitMode() {
+ super.exitMode();
+ Main.map.mapView.removeMouseListener(this);
+ }
+
+ private static Cursor getCursor() {
+ return ImageProvider.getCursor("crosshair", "tracer-sml");
+ }
+
+
+
+ /**
+ * check for presence of cache folder and trim cache to specified size.
+ * size/age limit is on a per folder basis.
+ */
+ protected void trace(Point clickPoint) {
+ cancel = false;
+ /**
+ * Positional data
+ */
+ final LatLon pos = Main.map.mapView.getLatLon(clickPoint.x, clickPoint.y);
+ final LatLon topLeft = Main.map.mapView.getLatLon(0, 0);
+ final LatLon botRight = Main.map.mapView.getLatLon(Main.map.mapView.getWidth(), Main.map.mapView.getHeight());
+
+ try {
+ PleaseWaitRunnable tracerTask = new PleaseWaitRunnable(tr("Tracing")) {
+
+ @Override
+ protected void realRun() throws SAXException {
+ processnodelist(pos, topLeft, botRight,
+ progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+ }
+
+ @Override
+ protected void finish() {
+ }
+
+ @Override
+ protected void cancel() {
+ TracerAction.this.cancel();
+ }
+ };
+ Thread executeThread = new Thread(tracerTask);
+ executeThread.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private String callWeb(String urlString) {
+ try {
+ URL url = new URL(urlString);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
+
+ StringBuilder sb = new StringBuilder();
+ String sx;
+ while ((sx = reader.readLine()) != null) {
+ sb.append(sx);
+ }
+ return sb.toString();
+ } catch (Exception e) {
+ return "";
+ }
+ }
+
+ private ArrayList getNodeList(LatLon pos) {
+ try {
+ String content = callWeb("http://localhost:5050/trace/simple/" + pos.lat() + ";" + pos.lon());
+ ArrayList nodelist = new ArrayList();
+ String[] lines = content.split("\\|");
+ for (String line : lines) {
+ String[] items = line.split(";");
+ double x = Double.parseDouble(items[0]);
+ double y = Double.parseDouble(items[1]);
+ double[] d = new double[2];
+ d[0] = x;
+ d[1] = y;
+ nodelist.add(d);
+ }
+
+ return nodelist;
+ } catch (Exception e) {
+ ArrayList nodelist = new ArrayList();
+ return nodelist;
+ }
+ }
+
+ private void processnodelist(LatLon pos, LatLon topLeft, LatLon botRight, ProgressMonitor progressMonitor) {
+ progressMonitor.beginTask(null, 3);
+ try {
+ ArrayList nodelist = new ArrayList();
+ nodelist = getNodeList(pos);
+
+ if (nodelist.size() == 0) {
+ return;
+ }
+
+ /**
+ * Turn the arraylist into osm nodes
+ */
+ Way way = new Way();
+ Node n = null;
+ Node fn = null;
+
+ double eastOffset = 0;
+ double northOffset = 0;
+
+
+ int nodesinway = 0;
+
+ for (int i = 0; i < nodelist.size(); i++) {
+ if (cancel) {
+ return;
+ }
+
+ try {
+ LatLon ll = new LatLon(nodelist.get(i)[0] + northOffset, nodelist.get(i)[1] + eastOffset);
+
+ double minDistanceSq = 0.00001;
+ List nodes = Main.main.getCurrentDataSet().searchNodes(new BBox(
+ ll.getX() - minDistanceSq,
+ ll.getY() - minDistanceSq,
+ ll.getX() + minDistanceSq,
+ ll.getY() + minDistanceSq
+ ));
+ Node nearestNode = null;
+ for (Node nn : nodes) {
+ if (!nn.isUsable()) {
+ continue;
+ }
+ LatLon ll2 = nn.getCoor();
+ double dist = ll2.distance(ll);
+ if (dist < minDistanceSq) {
+ minDistanceSq = dist;
+ nearestNode = nn;
+ }
+ }
+
+ if (nearestNode == null) {
+ // hledani blizke usecky, kam bod pridat ... nebo vytvorit samostatny bod?
+ List ways = Main.main.getCurrentDataSet().searchWays(new BBox(
+ ll.getX() - minDistanceSq,
+ ll.getY() - minDistanceSq,
+ ll.getX() + minDistanceSq,
+ ll.getY() + minDistanceSq
+ ));
+ double minDist = Double.MAX_VALUE;
+ Way nearestWay = null;
+ int nearestNodeIndex = 0;
+
+
+ for (Way ww : ways) {
+ for (int nindex = 0; nindex < ww.getNodesCount(); nindex++) {
+ Node n1 = ww.getNode(nindex);
+ Node n2 = ww.getNode((nindex + 1) % ww.getNodesCount());
+
+ double dist = distanceFromSegment(ll, n1.getCoor(), n2.getCoor());
+ if (dist < minDist) {
+ minDist = dist;
+ nearestWay = ww;
+ nearestNodeIndex = nindex;
+ }
+ }
+ }
+
+ if (minDist < 0.00001) {
+ n = new Node(ll);
+ commands.add(new AddCommand(n));
+ Way newWay = new Way(nearestWay);
+ newWay.addNode(nearestNodeIndex + 1, n);
+ commands.add(new ChangeCommand(nearestWay, newWay));
+ } else {
+ n = new Node(ll);
+ commands.add(new AddCommand(n));
+ }
+ } else {
+ n = nearestNode;
+ }
+
+ if (fn == null) {
+ fn = n;
+ }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ way.addNode(n);
+ nodesinway++;
+ }
+/**/
+ // projdi kazdou novou usecku a zjisti, zda by nemela vest pres existujici body
+ int i = 0;
+ while (i < nodelist.size()) {
+ if (cancel) {
+ return;
+ }
+
+ callWeb("http://localhost:5050/log/i/" + i);
+
+ // usecka n1, n2
+ double d[] = nodelist.get(i);
+ LatLon n1 = new LatLon(d[0], d[1]);
+ d = nodelist.get((i + 1) % nodelist.size());
+ LatLon n2 = new LatLon(d[0], d[1]);
+
+ double minDistanceSq = 0.00001;
+ double maxAngle = 10;
+ List nodes = Main.main.getCurrentDataSet().searchNodes(new BBox(
+ Math.min(n1.getX(), n2.getX()) - minDistanceSq,
+ Math.min(n1.getY(), n2.getY()) - minDistanceSq,
+ Math.max(n1.getX(), n2.getX()) + minDistanceSq,
+ Math.max(n1.getY(), n2.getY()) + minDistanceSq
+ ));
+ Node nearestNode = null;
+ for (Node nod : nodes) {
+ if (!nod.isUsable()) {
+ continue;
+ }
+ LatLon nn = nod.getCoor();
+ double dist = distanceFromSegment(nn, n1, n2);
+ double angle = angleOfLines(n1, nn, nn, n2);
+
+ if (!n1.equalsEpsilon(nn) && !n2.equalsEpsilon(nn) && dist < minDistanceSq)
+ {
+ callWeb("http://localhost:5050/log/n1/" + n1.toDisplayString());
+ callWeb("http://localhost:5050/log/nn/" + nn.toDisplayString());
+ callWeb("http://localhost:5050/log/n2/" + n2.toDisplayString());
+ callWeb("http://localhost:5050/log/angle/" + Math.abs(angle));
+ }
+ if (!n1.equalsEpsilon(nn) && !n2.equalsEpsilon(nn) && dist < minDistanceSq && Math.abs(angle) < maxAngle) {
+ callWeb("http://localhost:5050/log/ok");
+ maxAngle = angle;
+ nearestNode = nod;
+ }
+ }
+
+ if (nearestNode == null) {
+ // tato usecka se nerozdeli
+ i++;
+ continue;
+ } else {
+ // rozdeleni usecky
+ nodelist.add(i+1, new double[] { nearestNode.getCoor().getY(), nearestNode.getCoor().getX() });
+ way.addNode(i+1, nearestNode);
+ continue; // i nezvetsuji, treba bude treba rozdelit usecku znovu
+ }
+
+ }
+/**/
+ way.put("building", "yes");
+ way.put("source", "cuzk:km");
+
+ way.addNode(fn);
+
+ commands.add(new AddCommand(way));
+
+ if (!commands.isEmpty()) {
+ Main.main.undoRedo.add(new SequenceCommand(tr("Tracer building"), commands));
+ Main.main.getCurrentDataSet().setSelected(ways);
+ } else {
+ System.out.println("Failed");
+ }
+
+ commands = new LinkedList();
+ ways = new ArrayList();
+ } finally {
+ progressMonitor.finishTask();
+ }
+ }
+
+ private double angleOfLines(LatLon a, LatLon b, LatLon c, LatLon d) {
+ return (Math.abs(Math.atan2(a.lat() - b.lat(), a.lon() - b.lon()) - Math.atan2(c.lat() - d.lat(), c.lon() - d.lon())) / Math.PI * 180) % 360;
+ }
+
+ private double distanceFromSegment(LatLon c, LatLon a, LatLon b) {
+ return distanceFromSegment(c.getX(), c.getY(), a.getX(), a.getY(), b.getX(), b.getY());
+ }
+
+ private double distanceFromSegment(double cx, double cy, double ax, double ay, double bx, double by) {
+ double r_numerator = (cx - ax) * (bx - ax) + (cy - ay) * (by - ay);
+ double r_denomenator = (bx - ax) * (bx - ax) + (by - ay) * (by - ay);
+ double r = r_numerator / r_denomenator;
+ double s = ((ay - cy) * (bx - ax) - (ax - cx) * (by - ay)) / r_denomenator;
+ double distanceLine = Math.abs(s) * Math.sqrt(r_denomenator);
+
+ if ((r >= 0) && (r <= 1)) {
+ return distanceLine;
+ } else {
+ double dist1 = (cx - ax) * (cx - ax) + (cy - ay) * (cy - ay);
+ double dist2 = (cx - bx) * (cx - bx) + (cy - by) * (cy - by);
+ if (dist1 < dist2) {
+ return Math.sqrt(dist1);
+ } else {
+ return Math.sqrt(dist2);
+ }
+ }
+ }
+
+ public void cancel() {
+ cancel = true;
+ }
+
+ public void mouseClicked(MouseEvent e) {
+ }
+
+ public void mouseEntered(MouseEvent e) {
+ }
+
+ public void mouseExited(MouseEvent e) {
+ }
+
+ public void mousePressed(MouseEvent e) {
+ if(!Main.map.mapView.isActiveLayerDrawable())
+ return;
+
+ if (e.getButton() == MouseEvent.BUTTON1) {
+ trace(e.getPoint());
+ }
+ }
+
+ public void mouseReleased(MouseEvent e) {
+ }
+}
Index: /applications/editors/josm/plugins/tracer/src/tracer/TracerException.java
===================================================================
--- /applications/editors/josm/plugins/tracer/src/tracer/TracerException.java (revision 19830)
+++ /applications/editors/josm/plugins/tracer/src/tracer/TracerException.java (revision 19830)
@@ -0,0 +1,20 @@
+/**
+ * Tracer - plugin for JOSM
+ * Jan Bilak
+ * This program is free software and licensed under GPL.
+ */
+
+package tracer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+class TracerException extends Exception {
+
+ public TracerException() {
+ super(tr("An unknown error has occurred"));
+ }
+
+ public TracerException(String err) {
+ super(err);
+ }
+}
Index: /applications/editors/josm/plugins/tracer/src/tracer/TracerPlugin.java
===================================================================
--- /applications/editors/josm/plugins/tracer/src/tracer/TracerPlugin.java (revision 19830)
+++ /applications/editors/josm/plugins/tracer/src/tracer/TracerPlugin.java (revision 19830)
@@ -0,0 +1,22 @@
+/**
+ * Tracer - plugin for JOSM
+ * Jan Bilak
+ * This program is free software and licensed under GPL.
+ */
+
+package tracer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainMenu;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
+
+public class TracerPlugin extends Plugin {
+
+ public TracerPlugin() {
+ MainMenu.add(Main.main.menu.toolsMenu, new TracerAction(Main.main.map));
+ }
+}