Index: /applications/editors/josm/plugins/mirrored_download/LICENSE =================================================================== --- /applications/editors/josm/plugins/mirrored_download/LICENSE (revision 27678) +++ /applications/editors/josm/plugins/mirrored_download/LICENSE (revision 27678) @@ -0,0 +1,345 @@ + 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/mirrored_download/README =================================================================== --- /applications/editors/josm/plugins/mirrored_download/README (revision 27678) +++ /applications/editors/josm/plugins/mirrored_download/README (revision 27678) @@ -0,0 +1,123 @@ + +The JOSM Plugin "Public Transport" is designed to simplify the mapping and editing of public transport routes according to the Oxmoa scheme (see USED NOTIONS). In the first section, we will describe how to create a line from scratch. If there exists already one or more lines running partly or completely parallel, you can take advantage of this (see third section). Also, you can easily convert lines from older mapping formats to the Oxmoa scheme (see fourth section). The last section contains a reference of all items in the plugin. + +This manual refers to the prototype version of 2010-01-30. This is not even a beta version, so DON'T FORGET TO SAVE YOUR WORK BEFORE you use this plugin. Later versions may simplify the steps explained below. Feel free to make suggestions for simplications or extra functionality or report bugs to me (mailto:roland.olbricht(at)gmx.de). From the first mature version on, the plugin source code should appear in the OSM SVN and thus the plugin won't any more require any special installation procedures. + + +HOW TO INSTALL + +In JOSM: Bearbeiten > Einstellungen, dort Plugins (Stecker) -> Liste laden +cp public_transport.jar ~/.josm/plugins/ +In JOSM: Bearbeiten > Einstellungen, dort Plugins (Stecker): Public Transport aus der Liste wählen +JOSM neustarten, Aktualisierung überspringen + + +MAP A BUS LINE FROM SCRATCH + +The Oxmoa schema consists of a relation per direction (details see USED NOTIONS) and contains the itinerary (the way a bus actually takes from its starting stop to its terminus) and the stops served by the bus. You need to specify one half of the itinerary, the stops and the back direction can mostly be derived by the software. + +Download the area where your bus route takes place. Create a new relation with the standard relation editor and set the tags "type=route", "route=bus" and "ref" set to the line number. Then choose the menue item "Public Transport > Route patterns". Now you can find your route in the list of the main window. Select it and change to the tab "Itinerary". Now select on the map the first way that belongs to your line and press "Add". Mark the second item and press "Add" again. You can select several ways at once and press "Add". If your ways are added in the wrong order or with wrong roles, mark them (click the first entry in the window, then shift-click the last entry in the window) and press "Sort". If there appear one or more lines "[gap]", then your ways don't fit together. If sorting won't solve that, there are gaps in your itinerary and you need to add the missing links or split ways (mark the way, the node where to split at and then use menu "Tools > Split Way") if your bus service only partly uses them. You can delete one or more items from the list by marking them and clicking on "Delete". You can also move one or more items by marking them, clicking on "Mark" (this copies them to the clipboard, like the middle mouse button on X servers), then "Delete", then mark the first item before which you want to insert the items and click "Add". + +Now you can add the bus stops in a convienient way: change to the tab "Meta" and press "Suggest Stops". This will compile a list of stops that are near the itinerary. You can choose up to which distance from the itinerary stops should be considered and whether stops only the right hand side, only on the left hand side or on both sides are possible. Now change to the tab "Stops". You can identify stops by marking them and then click "Mark" and/or "Show". Delete spurious stops by marking them and pressing "Delete". Add missing stops by marking them on the map, marking the entry before which you want to insert the stop (unmark all entries if you want to append stops to the end), then press "Add". + + +REUSE A PARTLY PARALLEL LINE + +The plugin has an internal clipboard to simplify copying parts of the itinerary or the stops from one bus route to another. Data is put into the clipboard in the X server paradigm. Mark one or more entry from the itinerary list or stops list and click the respective button "Copy". The objects themselves are kept by they state being marked on the map. The plugin additionally saves their order and role. You can paste data from clipboard by using the respective button "Add". + +To do this, first choose the source relation at the tab "Overview" and change to the tab "Itinerary". Mark there the entries you want to copy and click "Mark". Then choose at the tab "Overview" your destination relation and mark at the tab "Itinerary" the entry before which you want to paste the entries or unmark all entries if you want to append the data from clipboard. + +Stops can be copied in the same way: first choose the source relation at the tab "Overview" and change to the tab "Stops". Mark there the entries you want to copy and click "Mark". Then choose at the tab "Overview" your destination relation and mark at the tab "Stops" the entry before which you want to paste the entries or unmark all entries if you want to append the data from clipboard. + + +REUSE AN OLD RELATION + +If you have a bus route in an old format, you can with the help of the plugin spread it into separate relations for both (or more) directions. First, use the standard relation editor of JOSM to duplicate the relation: click on the most lower but one icon on the left toolbar. this opens the relation window on the right. Choose there the relation to duplicate. Click then there on the third button to duplicate the relation, then change "to" and "from" in the opening dialog. + +Now open "Public transport > Route patterns ..." and select there the new relation. Change to the tab "Itinerary" and click "Reflect" to reflect the itinerary. If this does not work properly, first click "Sort" to sort the itinerary, then if necessary again "Reflect" to bring them in their proper order. + +To edit the bus stops, use one of the functions described above: "Suggest Stops" to have a clean restart from scratch. Or use the buttons in the tab "Stops". + + +USED NOTIONS + +Note: I'm not a native English speaker. So if you have suggestions for better wording, please send them to me (mailto:roland.olbricht(at)gmx.de). + +... +http://wiki.openstreetmap.org/wiki/User:Oxomoa/Public_transport_schema#Network_information_.28lines_and_routes.29 + + +REFERENCE MANUAL + +* Tab "Overview" + +- List "Existing route patterns" +The large list in the center contains all relations that are recognised as bus routes. They are listed with the value of their tag "ref" and the ID of their relation. A relation is considered as bus service if it has the tags "type=route" and "route=bus". + +- Button "Refresh" +This button refreshes the list "Existing route patterns". + + +* Tab "Tags" + +The content of this tag is not yet implemented. + + +* Tab "Itinerary" + +- List of member ways +This list contains all the current members of the relation you are editing that are ways. The intended format of a route relation (see Oxmoa scheme at USED NOTIONS above) expects a continuos list of ways that represents the itinerary the bus takes in reality. Whenever two ways don't fit head on tail, a marker "[gap]" is put between them in an extra line to make breaks clearly visible. This is not a member of the relation but just a marker. You can change the role of a way in the right column. To achieve maximum backward compability, you should choose "forward" or "backward". To properly display relations that don't follow the Oxmoa scheme, all other roles including the empty are also displayed and you can choose despite "forward" and "backward" also an empty role. + +- Button "Show" +Ths button changes the view on the map such that all marked entries are visible. + +- Button "Mark" +Ths button marks all entries that are marked in the list as objects on the map and unmarks all other ways. It also copies a list of the marked entries to the plugin's internal clipboard, such that roles and the order can be reconstructed. + +- Button "Add" +This button adds all ways that are currently marked on the map as entries in the list. The entries are added in arbitrary order before the first marked entry. You can order the just added elements by marking them and clicking "Sort". + +- Button "Delete" +This button deletes all currently marked entries. + +- Button "Sort" +If one or more entries are marked, all marked entries are sorted. I.e. their order and role is changed such that they form a continuous itinerary. If this is not possible, the plugin tries to construct long series of continuous sections. If no entries are marked, the entire list are sorted. + +- Button "Reflect" +If one or more entries are marked, their order is reflected and their roles get flipped. I.e. every entry it put after its successor and its role is changed from "backward" to "forward", from "forward" to "backward" or left unchanged if it is empty. + + +* Tab "Stops" + +- List of member nodes +This list contains all the current members of the relation you are editing that are nodes. The intended format of a route relation (see Oxmoa scheme at USED NOTIONS above) expects a list of nodes that represents the stops in the order the bus takes them in reality. The roles can be changed to "forward" or "backward" but due to Oxmoa scheme, they should remain empty. + +- Button "Show" +Ths button changes the view on the map such that all marked entries are visible. + +- Button "Mark" +Ths button marks all entries that are marked in the list as objects on the map and unmarks all other nodes. It also copies a list of the marked entries to the plugin's internal clipboard, such that roles and the order can be reconstructed. + +- Button "Add" +This button adds all ways that are currently marked on the map as entries in the list. The entries are added in arbitrary order before the first marked entry. You can order the just added elements by marking them and clicking "Sort". + +- Button "Delete" +This button deletes all currently marked entries. + +- Button "Sort" +If one or more entries are marked, all marked entries are sorted. The sorting order depends on the itinerary and the settings for the distance limit, the right hand side and the left hand side in the meta "tab": the sorting algorithm attaches each stop to the nearest segment of the itinerary and then orders them in the order they are passed on the itinerary. Then all stops that can't be attached are added to the end of the list. + +- Button "Reflect" +If one or more entries are marked, their order is reflected. I.e. every entry it put after its successor. + + +* Tab "Meta" + +- Checkbox "Stops are possible" +This checkbox controls the behaviour of the button "Suggest stops" and the button "Sort" in the tab "Stops". If you mark only one of the boxes "Right hand side" or "Left hand side", only stops on the respective side are taken into account. If you mark both boxes, stops on both sides are taken into account. + +- Text field "Maximum distance from route" +This textfield also controls the behaviour of the button "Suggest stops" and the button "Sort" in the tab "Stops". Only stops that have a distance less or equal the limit set here are taken into account. + +- Button "Suggest stops" +This button replaces the current list of stops by a list of all stops that are on the itinerary with regard to the setting of the checkboxes and the text field described above. Index: /applications/editors/josm/plugins/mirrored_download/README.template =================================================================== --- /applications/editors/josm/plugins/mirrored_download/README.template (revision 27678) +++ /applications/editors/josm/plugins/mirrored_download/README.template (revision 27678) @@ -0,0 +1,75 @@ +README +====== + +This is a template project structure for a JOSM plugin. + +Layout +====== ++--- src source of your plugin + |- images images your plugin needs + |- resources resources your plugin needs + + LICENSE license file + README README for your plugin + + README.template this file + + +Build +===== +A JOSM plugin is built as a single jar. We use ant to build. + +See build.xml in this directory and update the plugin specific properties in the +configuration section. + + +Maintaining versions +==================== +There are two versions maintained with each plugin: + 1) the main version + You have to manually set the plugins main version in the build script. + Set the property plugin.main.version in build.xml accordingly. + + 2) the build version + The build version is unique for every build of the plugin. It is equal + to the SVN revision of your plugin directory. + + Both the main version and the build version are included in properties of the plugins + manifest: + Plugin-Version the build version + Plugin-Mainversion the main version + + JOSM automatically detects whether a plugin needs to be upgraded. It compares the build + version of the currently installed plugin jar with the build version of the plugin jar in + the SVN. The main version is irrelevant for this process. + + Making your plugin available to JOSM users + =========================================== + When a plugin jar is checked into SVN a script updates the plugins list on the JOSM wiki: + http://josm.openstreetmap.de/wiki/Plugins + JOSM retrieves the list of available plugins and their build versions from this list. + + commit publish read + meta data meta data + Build ==> SVN =======> JOSM Wiki <======= JOSM + ^ + ================================== + fetch current plugin jar + + Note that you have to manually publish (commit) your plugin jar. There is no nightly build + in place. Everything else (pulishing meta data, updating plugins in the client) is then handled + by automatic processes. + +See also +======== +* Developing Plugins + http://josm.openstreetmap.de/wiki/DevelopingPlugins + +* List of JOSM Plugins + http://josm.openstreetmap.de/wiki/Plugins + + + + + + Index: /applications/editors/josm/plugins/mirrored_download/build.xml =================================================================== --- /applications/editors/josm/plugins/mirrored_download/build.xml (revision 27678) +++ /applications/editors/josm/plugins/mirrored_download/build.xml (revision 27678) @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/mirrored_download/resources/html2wiki.awk =================================================================== --- /applications/editors/josm/plugins/mirrored_download/resources/html2wiki.awk (revision 27678) +++ /applications/editors/josm/plugins/mirrored_download/resources/html2wiki.awk (revision 27678) @@ -0,0 +1,30 @@ +{ + buf = $0; + result = ""; + match_idx = match(buf, "\"); + while (match_idx > 0) + { + result = result substr(buf, 0, match_idx); + result = result ""; + buf = substr(buf, match_idx+RLENGTH); + match_idx = match(buf, "\"); + }; + result = result buf + + buf = result; + result = ""; + match_idx = match(buf, "\"); + while (match_idx > 0) + { + result = result substr(buf, 0, match_idx); + result = result "[[" substr(buf, match_idx+9, RLENGTH-11) "|"; + buf = substr(buf, match_idx+RLENGTH); + match_idx = match(buf, "\<\/a\>"); + result = result substr(buf, 0, match_idx); + result = result "]]"; + buf = substr(buf, match_idx+RLENGTH); + match_idx = match(buf, "\"); + }; + result = result buf + print result; +} Index: /applications/editors/josm/plugins/mirrored_download/resources/public_transport.html =================================================================== --- /applications/editors/josm/plugins/mirrored_download/resources/public_transport.html (revision 27678) +++ /applications/editors/josm/plugins/mirrored_download/resources/public_transport.html (revision 27678) @@ -0,0 +1,633 @@ + + + + + + Public Transport Plugin for JOSM + + + +

Public Transport Plugin for JOSM

+ +

+Introduction - +Examples how to Use - +Used Notions - +Reference Manual +

+ +
+

Table of Contents

+
+ +

+Introduction
+    How to Install
+Examples how to Use
+    Map Stops from Waypoints
+    Map Stops with a Tracklog and a Stopwatch
+    Map Stops with a Tracklog only
+    Map a Bus Line from Scratch
+    Reuse a partly parallel line
+    Reuse an Old Relation
+Used Notions
+        clipboard
+        entry
+        GPX file
+        itinerary
+        line
+        mark
+        network
+        node
+        Oxmoa scheme
+        public transport route
+        relation
+        route type
+        select
+        stop
+        track
+        way
+Create Stops from GPX
+    Tab Tracks
+        List Tracks in this GPX file
+    Tab Settings
+        Combo box Type of stops to add
+        Text field Time on your GPS device
+        Text field Time on your stopwatch
+        Text field Time window
+        Text field Move Threshold
+        Button Suggest Stops
+    Tab Stops
+        List of created stops
+        Button Find
+        Button Show
+        Button Mark
+        Button Detach
+        Button Add
+        Button Delete
+        Button Sort
+    Tab Waypoints
+        List of waypoints in the file
+        Button Find
+        Button Show
+        Button Mark
+        Button Detach
+        Button Enable
+        Button Disable
+Route patterns
+    Tab Overview
+        List Existing route patterns
+        Button Refresh
+        Button New
+        Button Delete
+        Button Duplicate
+        Button Reflect
+    Tab Tags
+        List Required tags
+        List Common tags
+        List Additional tags
+        Button Add a new Tag
+    Tab Itinerary
+        List of member ways
+        Button Find
+        Button Show
+        Button Mark
+        Button Add
+        Button Delete
+        Button Sort
+        Button Reflect
+    Tab Stops
+        List of member nodes
+        Button Find
+        Button Show
+        Button Mark
+        Button Add
+        Button Delete
+        Button Sort
+        Button Reflect
+    Tab Meta
+        Check box Stops are possible
+        Text field Maximum distance from route
+        Button Suggest Stops
+

+ + + +
+ +

Introduction

+
+ +

The JOSM Plugin Public Transport is designed to simplify the mapping and editing of public transport routes according to best practice standards (see Oxmoa scheme). After some installation instructions, we start with a chapter about usage examples: Mapping public transport means mapping of its stops and its routes. In the first three sections, we present different methods of how to map stops and how this plugin can be used to simplify this. The first section is about mapping by waypoints. The second section explains how to map with the help of a stopwatch. The third section explains mapping by tracklogs only. The subsequent sections are devoted to map routes. In the fourth section, we describe how to create a bus route from scratch. If there exists already one or more lines running partly or completely parallel, you can take advantage of this (see fifth section). Also, you can easily convert routes from older data formats to the Oxmoa scheme (see sixth section). The following chapter explains the notions used along the plug-in. The last chapter contains a reference manual of all items in the plug-in.

+ +

This manual refers to the version of 2010-04-13. This plug-in is still a beta version, so don't forget to save your work before and during you use this plug-in. Feel free to make suggestions for simplifications or extra functionality or report bugs to me (mailto:roland.olbricht(at)gmx.de).

+ +
+ +

How to Install

+
+ +

Open JOSM and select from menu Edit > Preferences, then there Plugins > Download list. Check public_transport in the list. Now restart JOSM.

+ + + +
+ +

Examples how to Use

+
+ +

To map public transport, in particular bus services, means to map stops and routes. The larger part of the work is to map stops; the routes can usually be derived from other information in the map and local knowledge. To properly map the stops, you need a GPS device, because an estimation is almost always surprisingly inexact (even bus stops are often a lot larger than one would expect).

+ +

We discuss three different approaches. The basic assumption of all three approaches is that you are mapping the public transport service by actually using it. Take the GPS device, pen and paper with you and ride on the vehicle from its starting point to its terminus. With some cleverness and fortune, you should be able to log forth and back direction within a single ride. Also, all three methods will need more or less post-processing with JOSM and the plugin.

+ + + +
+ +

Map Stops from Waypoints

+
+ +

You need a GPS logger which can register waypoints and pen and paper. Get on the vehicle and mark a waypoint at each station: bus stops and tram stops are mapped on the side of the road at their respective sign, all other stops are mapped as part of the railway line. Use pen and paper to note the names of the bus stops and whether they have a shelter or not. I personally also collect stops forth and back during a single ride and thus take also a note whether the stop is in forward or backward direction.

+ +

When you are back at your computer, download the collected data from your GPS device into a GPX file: the exact steps depend on your particular device, but in general one of the programs gpsbabel, mtkbabel or bt747 may help. They are explained on the respective pages of the wiki.

+ +

Once you have created the GPX file, open JOSM. Now choose Create Stops from GPX in the menue Public Transport. This raises first a file selection dialogue. Select here your just generated GPX file. The plugin now generates one stop at every waypoint. Now go to the tab Settings and select the type of stop you want to create. Open tab Waypoints and click onto the table. Now you can use keyboard shortcuts to edit the stops: Alt-N will focus the stop of the current line in the table and activate the name cell of this line. Alt-S, Alt-T and Alt-U help you to select the proper type of shelter: Alt-S yields Yes, Alt-T yields No and Alt-U yields implicit. If you don't want to map the shelter, just use only Alt-N. The key combination Alt-D disables the current waypoint and deletes the node associated to it. Now process all waypoints and then close the dialogue. Or process all waypoints, mark the lines they belong to and click Detach - this has the same effect. Once you have pressed Detach, the nodes are released from the dialogue and complete. Congratulations.

+ + +
+ +

Map Stops with a Tracklog and a Stopwatch

+
+ +

You need a GPS logger that displays its current time, pen and paper and a stopwatch that can store sufficently much split times. First, syncronise stopwatch and GPS logger: Note the time the GPS logger has shown in the moment when you have started the stopwatch. Take a split time for every stop you pass: bus stops and tram stops are mapped on the side of the road at their respective sign, all other stops are mapped as part of the railway line. Use pen and paper to note the names of the bus stops and whether they have a shelter or not.

+ +

When you are back at your computer, download the collected data from your GPS device into a GPX file: the exact steps depend on your particular device, but in general one of the programs gpsbabel, mtkbabel or bt747 may help. They are explained on the respective pages of the wiki.

+ +

Once you have created the GPX file, open JOSM. Now choose Create Stops from GPX in the menu Public Transport. This raises first a file selection dialogue. Select here your just generated GPX file. Select in the tab Tracks the track to create stops from. Now go to the tab Settings and select the type of stop you want to create. Put the sync time of the GPS device and the stopwatch in the respective fields. Open tab Stops and click onto the table. Click the button Add unless you have sufficiently much lines for all your split times. Now enter your split times in the first column. Then proceed as explained in the last paragraph of the section before.

+ + +
+ +

Map Stops with a Tracklog only

+
+ +

N.B.: This apporach requires the software to do some semi-automatic guesswork. Although I've tried several approaches, the software still produces annoyingly much false positive (e.g. halts at traffic lights) and might miss stops (in particular, if the bus has passed them with no stop). Thus you should try to use one of the other two methods (with or without waypoints) first or a combination of these methods. The method might be useful to map stops you have forgotten to record.

+ +

You need a GPS logger, pen and paper. Record a GPS track while taking a ride on the route you want to map. Note the names of the bus stops you have passed and whether they have a shelter or not.

+ +

When you are back at your computer, download the collected data from your GPS device into a GPX file: the exact steps depend on your particular device, but in general one of the programs gpsbabel, mtkbabel or bt747 may help. They are explained on the respective pages of the wiki.

+ +

Once you have created the GPX file, open JOSM. Now choose Create Stops from GPX in the menu Public Transport. This raises first a file selection dialogue. Select here your just generated GPX file. Select in the tab Tracks the track to create stops from. Now go to the tab Settings and select the type of stop you want to create. Put the sync time of the GPS device and the stopwatch in the respective fields. Click the button Suggest stops and open tab Stops. If there are way too much or way too few stops or clusters of stops, adapt the values Time window and Move Threshold in the tab Settings. Now enter in the second column the names of the stops: Mark a line in the table and press Alt-N. This focuses and marks the stop and makes its name editable. If the stop is a false positive, you can delete it with the button Delete or Alt-D. All keyboard shortcuts are explained in the waypoints section.

+ +
+ +

Map a Bus Line from Scratch

+
+ +

The Oxmoa schema consists of a relation per direction and contains the itinerary (the way a bus actually takes from its starting stop to its terminus) and the stops served by the bus. Roughly, you need to enter one direction of the itinerary by hand. The stops and the back direction can mostly be derived from that by the software.

+ +

Download the area where your bus route takes place. Choose the menu item Public Transport > Route patterns. This opens a window where you can see all public transport routes existing in the downloaded data set. Create a new relation by clicking on the button New. Now change to the tab Tags and set appropriate values for a least route (the type of public transport), ref (the line number) and to (the destination displayed).

+ +

Change to the tab Itinerary. Now select on the map the first way that belongs to your route and press Add. Mark the second item and press Add again. You also can select several ways at once and click Add. If your ways are added in the wrong order or with wrong roles, mark them (click the first entry in the window, then shift-click the last entry in the window) and press Sort. If there appear one or more lines [gap], then your ways don't fit together. If sorting won't solve that then there are gaps in your itinerary and you need to add the missing links or split ways (mark the way, the node where to split at and then use menu Tools > Split Way) if your bus service only partly uses them. To help you +with the tasks you can:

+ + + +

There are buttons Mark, Show and Find with similar functionality in the tab Stops.

+ +

You can delete one or more entries from the list by marking them and clicking Delete. You can also move one or more entry by marking them, clicking on Mark (this copies them to the clipboard, like the middle mouse button on X servers), then Delete, then mark the first item before which you want to insert the items and click Add.

+ +

Now you can add the bus stops in a convenient way: change to the tab Meta and press Suggest Stops. This will compile a list of stops that are near the itinerary. You can choose up to which distance from the itinerary stops should be considered and whether stops only the right hand side, only on the left hand side or on both sides are possible. Now change to the tab Stops. You can identify the stops by their entries as follows: click Mark and/or Show. Delete spurious entries by marking them and pressing Delete. Add missing stops by marking them on the map, marking the entry before which you want to insert the stop (unmark all entries if you want to append stops to the end), then press Add.

+ +

When you are complete with the forward direction, go back to the tab Overview. Then click Duplicate (this adds a copy of the relation) and click Reflect (this reflects the copy to become the backward direction). Review the itinerary in the tab Itinerary and correct oneways passed in the now wrong direction. Then change to the tab Meta and let you suggest bus stops. Review them. Congratulations, you are done with the entire bus line.

+ +
+ +

Reuse a partly parallel line

+
+ +

The plug-in has an internal clipboard to simplify copying parts of the itinerary or the stops from one bus route to another. Data is put into the clipboard following the X server paradigm. Mark one or more entries from the itinerary list or stops list and click the respective button Mark (in Itinerary, in Stops). The objects themselves are kept by being marked on the map. The plug-in additionally saves their order and role. You can paste data from clipboard by using the respective button Add (in Itinerary, in Stops).

+ +

To do this, first choose the source route at the tab Overview and then change to the tab Itinerary. Mark there the entries you want to copy and click Mark. Then choose at the tab Overview your destination relation and mark in the tab Itinerary the entry before which you want to paste the entries or unmark all entries if you want to append the data from clipboard.

+ +

Stops can be copied in the same way: first choose the source relation at the tab Overview and change to the tab Stops. Mark there the entries you want to copy and click Mark. Then choose at the tab Overview your destination relation and mark at the tab Stops the entry before which you want to paste the entries or unmark all entries if you want to append the data from clipboard.

+ + +
+ +

Reuse an Old Relation

+
+ +

If you have a bus route in an old format, you can spread it with the help of the plug-in into separate relations for both (or more) directions. Go to the tab Overview, mark the respective relation and click Duplicate, then Reflect. Now you have a relation for each direction. The remaining task is to cleanup the new relations.

+ +

First, mark again the first relation. Go to the tab Itinerary and cleanup the itinerary to contain only the forward direction as described above. Now you can use Suggest Stops from tab Meta to obtain a good guess for the bus stops. Use the tools in the tab Stops to cleanup this list.

+ +

Now go back to the tab Overview and select the newly created route. Proceed with the same steps as for the forward direction. Congratulations, now you have corrected the bus line.

+ + + +
+ +

Used Notions

+
+ +

+Note: I'm not a native English speaker. Thus, if you have suggestions for better wording, please send them to me (mailto:roland.olbricht(at)gmx.de). +

+ +

+ +clipboard - Beside the operating system, the plug-in has an internal clipboard that allows to maintain the order and roles of relation members, in particular bus stops and ways belonging to the itinerary. The clipboard is used similar to the X window system clipboard: there you copy text into the clipboard by marking it with the mouse and paste it by clicking the middle mouse button. We can't assume that every computer has a middle mouse button. Thus, in the plug-in you copy data into the internal clipboard by marking the entries and clicking Mark (in Itinerary, in Stops). You paste data by keeping it marked on the map and clicking Add (in Itinerary, in Stops). +

+ +

+ +entry - An entry in the list of objects that are members of a relation. Here, the relations are public transport routes and members are stops or stations or the ways that constitute the itinerary. The notion entry is used to discriminate between the relation members (entries) and the objects referred to by the relation members (objects on the map). +

+ +

+ +GPX file - This is a common file format supported by most GPS loggers. The data you log in the real world, in particular logged stops and stations, get fed into this software as GPX files. +

+ +

+ +itinerary - The way a bus service actually takes. Note that buses or other vehicles can't make jumps, thus there cannot be gaps in an itinerary. For that reason, a line [gap] is displayed in the itinerary list whenever the first node of a way differs from the last node of the preceding way. +

+ +

+ +(bus) line - The notion refers usually to all bus or train services that are offered in a certain network with the same line identifier. The line identifier for a relation is declared by the tag ref. +

+ +

+ +mark - see select. +

+ +

+ +network - the set of all services that a organised as a whole by some kind of transport authority. Often, the network is the responsible party for ticket fares. It is used to disambiguate different routes with the same line identifier in different regions. In particular, we assume that in every network a line identifier is unique, i.e. that all relations with the same line identifier constitute a logical unit. The network is declared by the tag network. +

+ +

+ +node - The respective OSM primitive. The only objects represented by nodes here are stops and stations. Nodes are visible in the JOSM main window and a list of nodes as members of the route relation constitutes the served stops of a public transport route. +

+ +

+ +Oxmoa scheme +- see http://wiki.openstreetmap.org/wiki/User:Oxomoa/Public_transport_schema. +This plug-in implements a subset of the Oxmoa scheme. We implement in particular here the splitting of bus lines into bus routes. This allows to display the correct order of an itinerary and stops even if a section is passed twice or several times. The extra relations per line number on top of the bus route relations aren't implemented yet because there is no known use case for them. Also, the concept stop_position has not been implemented as it causes ambiguities: if it is placed on a non-oneway, the direction of the stop_position is unclear. +

+ +

+In particular, the data model underlying this plug-in is as follows: Every bus stop is represented at its road sign by a node with tag highway=bus_stop which is off the road itself, usually a few meters, depending on the width of the street. Every bus route (i.e. every service with distinct starting point, ending point or itinerary) is represented by a relation on its own with tags type=route, route=bus|tram|light_rail|subway|rail and ref set to the line number or line identifier and network set to the network the line belongs to. The name tag may be used if the line has a name but it won't appear somewhere. The relation contains as members the ways which constitute the itinerary the bus actually takes and the bus stops in the order they are served. The member role of the ways is set to either forward or backward, depending on whether the bus passes the street in or against the direction it is drawn in the map. +

+ +

+ +public transport route - The pattern of passed roads and served stops by a particular public transport service. A (bus) line usually consists of two or more (bus) routes but there are exceptions: bus services only operating in one direction or bus services with the same line number but different branches. +

+ +

+ +relation - The respective OSM primitive. The only objects represented by relations here are the public transport routes. They are not visible on the JOSM main map but can be edited with this plug-in. +

+ +

+ +Route type - You don't want to see an international high speed rail service and a local school bus to be mapped in the same way. For this purpose, we need some further taxonomy to classify public transport services into. As a preliminary classification, we use the following: +

+
    +
  • Bus: Any service that operates completely or partly on ordinary streets with rubber tyre vehicles.
    • +
  • Tram: A service that operates on rails, almost always on the surface and often shares space with car traffic.
    • +
  • Light rail: Most newer tram-like services will go into this category. Operates on rails, has most of the time separated tracks, might go underground or overgorund or use wide area railway networks and has usually a level entrance.
    • +
  • Subway: A service that has its tracks grade separated from street traffic but is also apart from wide area railway networks.
    • +
  • Railway: Services that operate on wide area railway networks.
    • +
+ +

+ +select - Unfortunately, there are different things that can be selected. You can and need to mark objects (ways and nodes) on the map in the JOSM main window. Or you can mark entries in the list in one of the tabs Overview, Itinerary or Stops. The former is usually referred to as select on the map, the latter as select an entry. For the entries it is sometimes useful to know that you can mark several entries at once by clicking on the first entry, then shift-clicking on the last entry. You can unmark all entries as follows: click an entry (this marks it and unmarks all other entries) then Ctrl-click it again (this unmarks this entry). +

+ +

+ +stop - The location where a bus or train calls. It is represented here by the position of the road sign that indicates the bus stop in the real world. In particular, bus stops are always off the road. This is necessary because buses have doors only on one side. Thus, there are no two-directional bus stops. This is in contrast to railway stations: as trains have usually doors on both sides, a train station can and is often used in both directions. +

+ +

+ +track - A data structure from GPX files: GPX files are organised as a collection of waypoints and tracks. While waypoints are just points, each track is a sequence of points representing an arbitrary motion. The track contains the information when the vehicle was where. Usually, a GPS logger starts a new track each time you put its power on. +

+ +

+ +way - The respective OSM primitive. It is visible in the JOSM main window and a list of ways constitutes the itinerary of a bus route. A way has an orientation from its first node to its last node. In JOSM, this is visualised by the direction of the arrows that represent the way. Thus, a vehicle can pass a way in or against its orientation. This is indicated by the role of the relation membership representing the itinerary: forward means that the vehicle passes the way in its orientation while backward means the opposite. +

+ + + +
+ +

Create Stops from GPX

+
+ +

If you have a GPX file and want to create bus stops or stations from it, use this dialogue window. Each time you open this dialogue window, you must select from which GPX file you want to create stops. For this purpose, please choose a file in the file open dialogue window Select GPX file. After you have chosen a file, you can use the subsequently described items. If you close the dialogue window, the generated stops remain as ordinary nodes in the JOSM dataset - you cannot manage them any more from this dialogue window.

+ +
+ +

Tab Tracks

+
+ +
+

List Tracks in this GPX file

+

The large list in the center contains all tracks that have been found in the GPX file. They are described by their name. The features in the tabs Settings and Stops depend on the content of the track and can only be used if you choose a track here.

+ +
+ +

Tab Settings

+
+ +

In this tab you configure the values for the nodes you create or manage with the dialogue window. Depending on the method you use to create stops, different parts of this tab might be relevant:

+ + +
+

Combo box Type of stops to add

+

Choose here which kind of stops you want to generate. Available options are bus stops, tram stops, light rail stations, subway stations and railway stations.

+ +
+

Text field Time on your GPS device

+

If you map with a tracklog and a stopwatch, put here the time on your GPS device when you have synchronised your logger and your stopwatch. For other mapping methods, this field is meaningless. It is initially set to the time of the first trackpoint in the track.

+ +
+

Text field Time on your stopwatch

+

If you map with a tracklog and a stopwatch, put here the time on your stopwatch when you have synchronised your logger and your stopwatch. Usually, this will be zero. If you map with a tracklog only, set this field to the same value as Time on your GPS device. Then you can see the real GPS times of the points where the software guesses the stops to be. For other mapping methods, this field is meaningless.

+ +
+

Text field Time window

+

This field influences the behaviour of the suggest stops feature. It indicates for how much the tracklog must remain at (almost) the same position to guess the location to be a stop.

+ +
+

Text field Move Threshold

+

This field influences the behaviour of the suggest stops feature. It indicates for what amount of meters the position in a tracklog may move to still assume the location to be a stop. It also sets the minimum distance between two stops: a location is only guessed to be a stop if it is at least this amount of meters away from the last guessed stop.

+ +
+

Button Suggest Stops

+

Creates a collection of nodes from the selected track at all the positions where the vehicle has stopped. This feature works with heuristics and is thus configurable to fit best to the characteristics of the GPS logger (in particular, its exactitude) and the journey made: the software assumes a stop when the tracklog remains for a certain time (by default, 20 seconds) within a certain distance (by default, 20 meters). If the software generates too few stops, you should try to raise distance or afterwards to lower time. If the software generates clusters of stops, you should try to raise distance. If the software generates too much stops, try to lower distance.

+ +
+ +

Tab Stops

+
+ +

This tab is only accessible if you have selected a track from Tracks in this GPX file in the tab Tracks. You can ignore this tab if you have mapped the stops by using waypoints.

+ +
+

List of created stops

+

This list contains all the nodes created from the current track and still managed by the dialogue window. The tag that identifies such a node as a certain kind of stop is set according to Type of stops to add. The two other important tags are name and shelter: name should be set to the name of the stop, shelter can be set to yes (there is a shelter), no (there is no shelter) or implicit (there is no shelter but some other kind of rain protection, e.g. the stop is situated below a bridge). If you don't have noted whether there were shelters, you can leave the tag empty (this is the default). These values are edited in the second and third column. The first column specifies the stopwatch time when the tracklog has passed this point. You can edit this column as well and input the values from you stopwatch record if you have mapped with tracklog and stopwatch.

+ +
+

Button Find

+

Detects lines in the list of created stops whose corresponding nodes are marked on the map. Mark one or more nodes on the map. Then a click on Find marks the created nodes for the current track that are currently marked on the map.

+ +
+

Button Show

+

Changes the view on the map such that all nodes belonging to a marked line in the list of created stops become visible. If no entry is marked, then the view will show all nodes belonging to a line in the list.

+ +
+

Button Mark

+

Marks all nodes belonging to a marked line in the list of created stops and unmarks all other nodes.

+ +
+

Button Detach

+

Detaches the nodes belonging to marked lines in the list of created stops. In particular, the dialogue window no more manages these nodes. You can use this functionality for example to generate stops of one type first, then detach these nodes, then change the type of nodes to generate and treat the other stops.

+ +
+

Button Add

+

Adds a line to the list of created stops before the first marked entry. If no line is marked, then the new line is appended. New lines contain always 00:00:00.000 as a default time and don't have a node associated yet. The node gets associated when you start to edit this line by setting the time, a name or the shelter status.

+ +
+

Button Delete

+

This button deletes all currently marked lines in the list of created stops and their associated nodes. If no line is marked, then all lines are deleted.

+ +
+

Button Sort

+

Exists for your convenience only and allows to sort the marked lines in the list of created stops by their time. It doesn't change the associations between the lines and their nodes. If no line is marked, then all lines are sorted.

+ +
+ +

Tab Waypoints

+
+ +

This tab only contains useful information if your GPX file contains waypoints.

+ +
+

List of waypoints in the file

+

This list contains all the nodes created from the current waypoints and still managed by the dialogue window. Each line corresponds to a waypoint from the GPX file. Thus, line can neither be deleted or added. Only the node corresponding to a particular line can be enabled or disabled. The tag that identifies such a node as a certain kind of stop is set according to Type of stops to add. The two other important tags are name and shelter: name should be set to the name of the stop, shelter can be set to yes (there is a shelter), no (there is no shelter) or implicit (there is no shelter but some other kind of rain protection, e.g. the stop is situated below a bridge). If you don't have noted whether there were shelters, you can leave the tag empty (this is the default). These values are edited in the second and third column. The first column contains the name of the respective waypoint.

+ +
+

Button Find

+

Detects lines in the list of waypoints whose corresponding nodes are marked on the map. Mark one or more nodes on the map. Then a click on Find marks the created nodes that are currently marked on the map.

+ +
+

Button Show

+

Changes the view on the map such that all nodes belonging to a marked line in the list of waypoints become visible. If no entry is marked, then the view will show all nodes belonging to a line in the list.

+ +
+

Button Mark

+

Marks all nodes belonging to a marked line in the list of waypoints and unmarks all other nodes.

+ +
+

Button Detach

+

Detaches the nodes belonging to marked lines in the list of waypoints. In particular, the dialogue window no more manages these nodes. You can use this functionality for example to generate stops of one type first, then detach these nodes, then change the type of nodes to generate and treat the other stops.

+ +
+

Button Enable

+

Adds nodes to all lines in the list of waypoints that are marked and don't have a node yet. If no line is marked, then all lines that don't have a node yet are invoked.

+ +
+

Button Disable

+

Deletes nodes from all lines in the list of waypoints that are marked and have an associated node. If no line is marked, then all lines that have an associated node are invoked.

+ + + +
+ +

Route patterns

+
+ +
+ +

Tab Overview

+
+ +
+

List Existing route patterns

+

The large list in the center contains all relations that are recognised as public transport routes. They are listed with the value of their tag ref, the value of their tag to and the ID of their relation. A relation is considered as public transport service if it has the tags type=route and route is set to one of the values bus, tram, light_rail, subway or rail.

+ +
+

Button Refresh

+

This button refreshes the list Existing route patterns.

+ +
+

Button New

+

This button generates a new route pattern.

+ +
+

Button Delete

+

This button deletes the currently marked route pattern.

+ +
+

Button Duplicate

+

This button makes a copy of the currently marked route pattern.

+ +
+

Button Reflect

+

This button changes the direction of the route pattern: the values of the tags to and from are exchanged and the itinerary and the list of the stops are reflected.

+ + +
+ +

Tab Tags

+
+ +
+

List Required tags

+

The list contains the five tags that every public transport route must have:

+
    +
  • type: Must always have the value route.
    • +
  • route: Designates the kind of vehicle that performs the service. It can be set to one of the values bus, tram, light_rail, subway or rail.
    • +
  • ref: The line identifier of the route.
    • +
  • to: The destination shown in front of the vehicle and/or at the platform to clarify the direction of the service. It is usually the name of the terminus. Compare the tag direction.
    • +
  • network: The network this route belongs to.
    • +
+ +
+

List Common tags

+

The list contains further tags which are quite common for public transport routes:

+
    +
  • direction: The destination shown in front of the vehicle and/or at the platform (an alternative for the tag to).
    • +
  • from: The origin of this route. Usually the first station.
    • +
  • operator: The company that runs this service.
    • +
  • color: If the line has a designated color then set this tag to it. It should be either a valid keyword (see W3C specification), i.e. aqua, black, blue, fuchsia, gray, green, lime, maroon, navy, olive, purple, red, silver, teal, white or yellow. Or a RGB value, i.e. a # followed by six hexadecimal values.
    • +
  • name: If the route has a particular name, then add it here. Unlike ref, this is neither displayed anywhere nor needs it to fulfil any uniqueness properties.
    • +
+ +
+

List Additional tags

+

Additional tags can be added here. These tags might be of use for specific software or describe special local features but aren't part of the standard data format. If you leave a key empty or delete the key, the respective key will be removed from the relation.

+ +
+

Button Add a new Tag

+

This adds an empty line to the additional tags list.

+ +
+ +

Tab Itinerary

+
+ +
+

List of member ways

+

This list contains all the current members of the relation you are editing that are ways. The intended format of a route relation expects a continuous list of ways that represents the itinerary the vehicle takes in reality. Whenever two ways don't fit head on tail, a marker [gap] is put between the two corresponding entries in an extra line to make breaks clearly visible. This is not a member of the relation but just a marker. You can change the role of a way in the right column. Choose forward if the vehicle passes the way along the orientation of the way and backward if the vehicle passes the way against the orientation of the way. To properly display relations that don't follow the Oxmoa scheme, all other roles including the empty role are also displayed and you can choose despite forward and backward also an empty role.

+ +
+

Button Find

+

Detects entries whose corresponding objects are marked on the map. Mark one or more ways on the map. Then a click on Find marks every entry in the current relation that corresponds to a way currently marked on the map.

+ +
+

Button Show

+

This button changes the view on the map such that all ways belonging to a marked entry become visible. If no entry is marked, then the view will show all ways belonging to an entry.

+ +
+

Button Mark

+

This button marks all entries that are marked in the list as ways on the map and unmarks all other ways. It also copies a list of the marked entries to the plug-in's internal clipboard, such that roles and the order can be reconstructed. If no entry is marked, then all objects belonging to an entry are marked and copied to the clipboard.

+ +
+

Button Add

+

This button adds all ways that are currently marked on the map as entries in the list. The entries are added in arbitrary order before the first marked entry. If no entry is marked, then the new entries will be appended. You can order the just added elements by marking them and clicking Sort.

+ +
+

Button Delete

+

This button deletes all currently marked entries.

+ +
+

Button Sort

+

If one or more entries are marked, all marked entries are sorted. I.e. their order and role is changed such that they form a continuous itinerary. If this is not possible, the plug-in tries to construct long continuous sequences of sections. If no entries are marked, the entire list is sorted.

+ +
+

Button Reflect

+

If one or more entries are marked, their order is reflected and their roles get swapped between forward and backward, i.e. every entry is put after its successor. If no entry is marked, then the entire list will be reflected.

+ + +
+ +

Tab Stops

+
+ +
+

List of member nodes

+

This list contains all the current members of the relation you are editing that are nodes. The intended format of a route relation expects a list of nodes that represents the stops in the order the bus takes them in reality. The roles can be changed to forward_stop or backward_stop but according to Oxmoa scheme, they should remain empty.

+ +
+

Button Find

+

Detects entries whose corresponding objects are marked on the map. Mark one or more nodes on the map. Then a click on Find marks every entry in the current relation that corresponds to a node currently marked on the map.

+ +
+

Button Show

+

This button changes the view on the map such that all nodes belonging to a marked entry become visible. If no entry is marked, then the view will show all nodes belonging to an entry.

+ +
+

Button Mark

+

This button marks all entries that are marked in the list as nodes on the map and unmarks all other nodes. It also copies a list of the marked entries to the plug-in's internal clipboard, such that roles and the order can be reconstructed. If no entry is marked, then all objects belonging to an entry are marked and copied to the clipboard.

+ +
+

Button Add

+

This button adds all nodes that are currently marked on the map as entries in the list. The entries are added in arbitrary order before the first marked entry. If no entry is marked, then the new entries will be appended. You can order the just added elements by marking them and clicking Sort.

+ +
+

Button Delete

+

This button deletes all currently marked entries.

+ +
+

Button Sort

+

If one or more entries are marked, all marked entries are sorted. The sorting order depends on the itinerary, the settings for the distance limit and the orientation check box: the sorting algorithm attaches each stop to the nearest segment of the itinerary and then orders them in the order they are passed on the itinerary. Then all stops that can't be attached are added to the end of the list. If no entry is marked, all entries are sorted.

+ +
+

Button Reflect

+

If one or more entries are marked, their order is reflected. I.e. every entry is put after its successor.

+ +
+ +

Tab Meta

+
+ +
+

Check box Stops are possible

+

This check box controls the behaviour of the button Suggest stops and the button Sort in the tab Stops. If you mark only one of the boxes Right hand side or Left hand side, only stops on the respective side are taken into account. If you mark both boxes, stops on both sides are taken into account.

+ +
+

Text field Maximum distance from route

+

This text field also controls the behaviour of the button Suggest stops and the button Sort in the tab Stops. Only stops that have a distance less or equal the limit set here are taken into account.

+ +
+

Button Suggest Stops

+

This button replaces the current list of stops by a list of all stops that are close to the itinerary with regard to the setting of the check boxes and the text field described above.

+ + + Index: /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/BoundingBoxDownloader2.java =================================================================== --- /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/BoundingBoxDownloader2.java (revision 27678) +++ /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/BoundingBoxDownloader2.java (revision 27678) @@ -0,0 +1,35 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package mirrored_download; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.IOException; +import java.io.InputStream; + +import org.openstreetmap.josm.io.BoundingBoxDownloader; +import org.openstreetmap.josm.io.OsmApi; +import org.openstreetmap.josm.io.OsmTransferException; + +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.gpx.GpxData; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.gui.progress.ProgressMonitor; +import org.xml.sax.SAXException; + +public class BoundingBoxDownloader2 extends BoundingBoxDownloader { + + public BoundingBoxDownloader2(Bounds downloadArea) { + super(downloadArea); + } + + protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException { + try { + OsmApi.getOsmApi().initialize(progressMonitor); + urlStr = "http://overpass-api.de/api/xapi?" + urlStr; + return getInputStreamRaw(urlStr, progressMonitor); + } finally { + progressMonitor.invalidate(); + } + } + +} Index: /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java =================================================================== --- /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java (revision 27678) +++ /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java (revision 27678) @@ -0,0 +1,54 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package mirrored_download; + +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.concurrent.Future; + +import org.openstreetmap.josm.actions.JosmAction; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask; +import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.gui.download.DownloadDialog; +import org.openstreetmap.josm.tools.Shortcut; + +/** + * Action that opens a connection to the osm server and downloads map data. + * + * An dialog is displayed asking the user to specify a rectangle to grab. + * The url and account settings from the preferences are used. + * + * @author imi + */ +public class DownloadAction2 extends JosmAction { + public DownloadAction2() { + super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."), + Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true); + putValue("help", ht("/Action/Download")); + } + + public void actionPerformed(ActionEvent e) { + DownloadDialog dialog = DownloadDialog.getInstance(); + dialog.restoreSettings(); + dialog.setVisible(true); + if (! dialog.isCanceled()) { + dialog.rememberSettings(); + Bounds area = dialog.getSelectedDownloadArea(); + if (dialog.isDownloadOsmData()) { + DownloadOsmTask2 task = new DownloadOsmTask2(); + Future future = task.download(dialog.isNewLayerRequired(), area, null); + Main.worker.submit(new PostDownloadHandler(task, future)); + } + if (dialog.isDownloadGpxData()) { + DownloadGpsTask task = new DownloadGpsTask(); + Future future = task.download(dialog.isNewLayerRequired(),area, null); + Main.worker.submit(new PostDownloadHandler(task, future)); + } + } + } +} Index: /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadOsmTask2.java =================================================================== --- /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadOsmTask2.java (revision 27678) +++ /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadOsmTask2.java (revision 27678) @@ -0,0 +1,39 @@ +package mirrored_download; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.IOException; +import java.util.Collection; +import java.util.concurrent.Future; + +import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.DataSource; +import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; +import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.gui.progress.ProgressMonitor; +import org.openstreetmap.josm.io.OsmServerLocationReader; +import org.openstreetmap.josm.io.OsmServerReader; +import org.openstreetmap.josm.io.OsmTransferCanceledException; +import org.openstreetmap.josm.io.OsmTransferException; +import org.xml.sax.SAXException; + +public class DownloadOsmTask2 extends DownloadOsmTask { + + public Future download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) { + + downloadTask = new DownloadTask(newLayer, + new BoundingBoxDownloader2(downloadArea), progressMonitor); + currentBounds = new Bounds(downloadArea); + // We need submit instead of execute so we can wait for it to finish and get the error + // message if necessary. If no one calls getErrorMessage() it just behaves like execute. + return Main.worker.submit(downloadTask); + } + +} Index: /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadPlugin.java =================================================================== --- /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadPlugin.java (revision 27678) +++ /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadPlugin.java (revision 27678) @@ -0,0 +1,55 @@ +package mirrored_download; + +import static org.openstreetmap.josm.tools.I18n.marktr; + +import java.awt.event.KeyEvent; + +import javax.swing.JMenu; +import javax.swing.JMenuItem; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.data.ProjectionBounds; +import org.openstreetmap.josm.gui.IconToggleButton; +import org.openstreetmap.josm.gui.MainMenu; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.gui.preferences.PreferenceSetting; +import org.openstreetmap.josm.io.CacheFiles; +import org.openstreetmap.josm.io.MirroredInputStream; +import org.openstreetmap.josm.plugins.Plugin; +import org.openstreetmap.josm.plugins.PluginInformation; + +public class MirroredDownloadPlugin extends Plugin { + + static JMenu jMenu; + + public MirroredDownloadPlugin(PluginInformation info) + { + super(info); + refreshMenu(); + } + + public static void refreshMenu() + { + MainMenu menu = Main.main.menu; + + if (jMenu == null) + jMenu = menu.addMenu(marktr("Mirrored Download"), KeyEvent.VK_P, menu.defaultMenuPos, "help"); + else + jMenu.removeAll(); + + jMenu.addSeparator(); + jMenu.add(new JMenuItem(new DownloadAction2())); + setEnabledAll(true); + } + + private static void setEnabledAll(boolean isEnabled) + { + for(int i=0; i < jMenu.getItemCount(); i++) { + JMenuItem item = jMenu.getItem(i); + + if(item != null) item.setEnabled(isEnabled); + } + } +}